cleanup for 0.8

.gitlab-ci.yml

@@ -23,6 +23,5 @@ build:
   script:
     - ./gradlew clean
     - ./gradlew downloadAndUnzipFile
-    - ./gradlew installJBotsim
     - ./gradlew assemble
 

build.gradle

@@ -9,29 +9,22 @@ apply plugin: "java"
 apply plugin: "idea"
 apply plugin: "application"
 
-// Install jbotsim locally in davis/lib
-task installJBotsim(type: Copy, group: "distribution", description: "Install jbotsim locally"){
-    dependsOn installDist
-    from 'build/install/basic-example/lib/'
-    include 'jbotsim-*'
-    into 'davis/lib'
-}
+
 
 // Basic task to launch davis with appropriate arguments :
-// <network> <id> <size> <algo>
-task helloejcim(type: Exec, group: "Application", description: "Run default Davis") {
-    commandLine 'davis/bin/udavis','src/RingAnon2AgentsSym.java','RandomIds','18','src/RandomWalkRing.java'
-    dependsOn installJBotsim
+// -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'
 }
 
-def davisFiles = "${projectDir}/davis/"
+def davisFiles = "${projectDir}/davis-beta/"
 println("${davisFiles}")
 
 repositories {
     jcenter()
     mavenCentral()
     flatDir {
-        dirs davisInstall + File.separator + "lib"
+        dirs davisInstall + File.separator + "davis-beta/lib"
     }
 }
 

gradle.properties

@@ -3,4 +3,4 @@ jbotsimVersion = 1.0.0
 # Define davis version
 davisVersion = 0.8
 # Define davis install directory
-davisInstall = davis
+davisInstall = build/install

src/scenario

-RandomWalkRing RingAnon2AgentsSym.java RandomIds 18 RandomWalkRing.java
-RandomWalkPath RectangularTwoAgents.java RandomIds 18*1 RandomWalkPath.java
+[RandomWalkRing2agents] -n RingAnon2AgentsSym.java -i RandomIds -s 16 -al RandomWalkRing.java
+[RandomWalkPath] -n RectangularTwoAgents.java -i RandomIds -s 18*1 -al RandomWalkPath.java