fix: adapt the tutorial to Alchemist 29

AlchemistSimulator · Dec 9, 2023 · b004768 · b004768
1 parent 21310d7
commit b004768
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 8 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -64,11 +64,22 @@ File(rootProject.rootDir.path + "/src/main/yaml").listFiles()
                     exportsDir.mkdirs()
                 }
             }
-            args("-y", it.absolutePath, "-e", "$exportsDir/${it.nameWithoutExtension}-${System.currentTimeMillis()}")
+            args("run", it.absolutePath)
             if (System.getenv("CI") == "true" || batch == "true") {
-                args("-hl", "-t", maxTime)
+                args(
+                    "--override",
+                    """
+                    {
+                        launcher: { type: HeadlessSimulationLauncher, parameters: [] },
+                        terminate: { type: AfterTime, parameters: 2 }
+                    }
+                    """.trimIndent()
+                )
             } else {
-                args("-g", "effects/${it.nameWithoutExtension}.json")
+                args(
+                    "--override",
+                    "{ launcher: { parameters: { graphics: \"effects/${it.nameWithoutExtension}.json\" } } }"
+                )
             }
             outputs.dir(exportsDir)
         }

diff --git a/src/main/yaml/00-minimal.yml b/src/main/yaml/00-minimal.yml
@@ -1,3 +1,6 @@
 incarnation: protelis
 
+launcher:
+  type: SingleRunSwingUI
+
 # An empty world
diff --git a/src/main/yaml/01-nodes.yml b/src/main/yaml/01-nodes.yml
@@ -1,5 +1,8 @@
 incarnation: protelis
 
+launcher:
+  type: SingleRunSwingUI
+
 # Link nodes that are closer than 5 distance units
 network-model:
   type: ConnectWithinDistance

diff --git a/src/main/yaml/02-manynodes.yml b/src/main/yaml/02-manynodes.yml
@@ -1,5 +1,8 @@
 incarnation: protelis
 
+launcher:
+  type: SingleRunSwingUI
+
 # Link nodes separated by at most 0.5 space units
 network-model:
   type: ConnectWithinDistance

diff --git a/src/main/yaml/03-grid.yml b/src/main/yaml/03-grid.yml
@@ -1,5 +1,10 @@
 incarnation: protelis
 
+launcher:
+  type: SingleRunSwingUI
+  parameters:
+    graphics: "effects/07-gradient"
+
 network-model:
   type: ConnectWithinDistance
   parameters: [0.5]

diff --git a/src/main/yaml/04-perturb-grid.yml b/src/main/yaml/04-perturb-grid.yml
@@ -1,5 +1,8 @@
 incarnation: protelis
 
+launcher:
+  type: SingleRunSwingUI
+
 network-model:
   type: ConnectWithinDistance
   parameters: [0.5]

diff --git a/src/main/yaml/05-content.yml b/src/main/yaml/05-content.yml
@@ -1,5 +1,8 @@
 incarnation: protelis
 
+launcher:
+  type: SingleRunSwingUI
+
 network-model:
   type: ConnectWithinDistance
   parameters: [0.5]

diff --git a/src/main/yaml/06-program.yml b/src/main/yaml/06-program.yml
@@ -1,5 +1,8 @@
 incarnation: protelis
 
+launcher:
+  type: SingleRunSwingUI
+
 network-model:
   type: ConnectWithinDistance
   parameters: [0.5]

diff --git a/src/test/kotlin/RunSimulationTest.kt b/src/test/kotlin/RunSimulationTest.kt
@@ -2,12 +2,12 @@ import io.kotest.core.spec.style.StringSpec
 import io.kotest.matchers.collections.beEmpty
 import io.kotest.matchers.file.shouldHaveExtension
 import io.kotest.matchers.shouldNot
-import it.unibo.alchemist.core.implementations.Engine
-import it.unibo.alchemist.core.interfaces.Status
-import it.unibo.alchemist.loader.LoadAlchemist
-import it.unibo.alchemist.model.implementations.positions.Euclidean2DPosition
+import it.unibo.alchemist.boundary.LoadAlchemist
+import it.unibo.alchemist.core.Engine
+import it.unibo.alchemist.core.Status
+import it.unibo.alchemist.model.positions.Euclidean2DPosition
+import it.unibo.alchemist.model.times.DoubleTime
 import java.io.File
-import it.unibo.alchemist.model.implementations.times.DoubleTime
 import java.util.concurrent.TimeUnit
 
 class RunSimulationTest<T : Any?> : StringSpec(