diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4fb3c4523fbf2e34915d6d4a3c8dca94e45a8320..54a7413ed147c2a6d5649d470c9925b9c5aac9fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,4 +24,5 @@ build: - ./gradlew clean - ./gradlew downloadAndUnzipFile - ./gradlew assemble + - ./gradlew helloNoX diff --git a/build.gradle b/build.gradle index 314f9319dc231ff0c32c97c7e6e1856abff1a9a5..66a181fd223a7fb339f9623a901a9224127494d4 100644 --- a/build.gradle +++ b/build.gradle @@ -14,9 +14,14 @@ apply plugin: "application" // Basic task to launch davis with appropriate arguments : // -n <network> -i <id> -s <size> -al <algo> task hello(type: Exec, group: "Application", description: "Run default Davis") { - commandLine 'davis-beta/bin/udavis','-n','src/RingAnon2AgentsSym.java','-i', 'RandomIds','-s', '18','-al', 'src/RandomWalkRing.java' + commandLine davisInstall + File.separator + 'davis-beta/bin/udavis','-n','src/RingAnon2AgentsSym.java','-i', 'RandomIds','-s', '18','-al', 'src/RandomWalkRing.java' } +// Basic task to launch davis with appropriate arguments without GUI: +// -n <network> -i <id> -s <size> -al <algo> +task helloNoX(type: Exec, group: "Application", description: "Run default Davis without GUI") { + commandLine davisInstall + File.separator + 'davis-beta/bin/udavis-nogui','-n','src/RingAnon2AgentsSym.java','-i', 'RandomIds','-s', '18','-al', 'src/RandomWalkRing.java' +} def davisFiles = "${projectDir}/davis-beta/" println("${davisFiles}") diff --git a/src/RandomWalkRing.java b/src/RandomWalkRing.java index d2fdeba2d1b45138c80dbd9d39bfeef4ed2634e1..c863d1358d0358f2e37fad80d686b1d0be737c8e 100644 --- a/src/RandomWalkRing.java +++ b/src/RandomWalkRing.java @@ -11,7 +11,10 @@ public class RandomWalkRing extends RDVRingAgent { } public void randomWalk(Object board) { - if (random.nextBoolean()) goLeft(); - else goRight(); + if (random.nextBoolean()) { + goLeft(); + } else if (random.nextBoolean()) { + goRight(); + } else stay(); } }