diff --git a/src/main/sarl/io/sarl/demos/fireworks/Configuration.sarl b/src/main/sarl/io/sarl/demos/fireworks/Configuration.sarl new file mode 100644 index 0000000..2f5bd1d --- /dev/null +++ b/src/main/sarl/io/sarl/demos/fireworks/Configuration.sarl @@ -0,0 +1,14 @@ +package io.sarl.demos.fireworks + + +public class Configuration { + + /** + * Delay in miillisecond + */ + public static val RocketLifeCycleSchedulingRate : long = 30 + + public static val FireLifeCycleSchedulingRate : long = 30 + + +} \ No newline at end of file diff --git a/src/main/sarl/io/sarl/demos/fireworks/agents/Fire.sarl b/src/main/sarl/io/sarl/demos/fireworks/agents/Fire.sarl index daa2ca8..d2bd135 100644 --- a/src/main/sarl/io/sarl/demos/fireworks/agents/Fire.sarl +++ b/src/main/sarl/io/sarl/demos/fireworks/agents/Fire.sarl @@ -7,6 +7,7 @@ import io.sarl.core.Initialize import io.sarl.core.Lifecycle import io.sarl.core.Logging import io.sarl.core.Schedules +import io.sarl.demos.fireworks.Configuration import io.sarl.demos.fireworks.Positions import io.sarl.demos.fireworks.events.Exit import io.sarl.demos.fireworks.events.FireReady @@ -62,7 +63,7 @@ agent Fire { } on FireReady { - move = atFixedDelay(30) [ + move = atFixedDelay(Configuration.FireLifeCycleSchedulingRate) [ try { wake(new UpdateFirePosition); } catch (e : Exception) { diff --git a/src/main/sarl/io/sarl/demos/fireworks/agents/LaunchingArea.sarl b/src/main/sarl/io/sarl/demos/fireworks/agents/LaunchingArea.sarl index 85fe3e1..008df47 100644 --- a/src/main/sarl/io/sarl/demos/fireworks/agents/LaunchingArea.sarl +++ b/src/main/sarl/io/sarl/demos/fireworks/agents/LaunchingArea.sarl @@ -55,13 +55,13 @@ agent LaunchingArea { on Initialize [!occurrence.parameters.empty] { var ctrl = occurrence.parameters.get(0) as FXMLViewerController - var ^space = defaultContext.createSpace(OpenEventSpaceSpecification, UUID.randomUUID) - ctrl.setGUISpace(^space) - ^space.register(asEventListener) + var ispace = defaultContext.createSpace(OpenEventSpaceSpecification, UUID.randomUUID) + ctrl.setGUISpace(ispace) + ispace.register(asEventListener) ctrl.listenAndDraw(grid) - info("Setup Area") + info("Finishing initialization of Launching Area") } @@ -81,7 +81,7 @@ agent LaunchingArea { } on MemberJoined [occurrence.inInnerDefaultSpace && memberAgentCount == rocketsQuantity] { - info("Area Ready") + info("Area is Ready: All rockets are here") innerContext.defaultSpace.emit(new Launch) } diff --git a/src/main/sarl/io/sarl/demos/fireworks/agents/Rocket.sarl b/src/main/sarl/io/sarl/demos/fireworks/agents/Rocket.sarl index b167b8f..4e4ec18 100644 --- a/src/main/sarl/io/sarl/demos/fireworks/agents/Rocket.sarl +++ b/src/main/sarl/io/sarl/demos/fireworks/agents/Rocket.sarl @@ -10,6 +10,7 @@ import io.sarl.core.Logging import io.sarl.core.MemberJoined import io.sarl.core.MemberLeft import io.sarl.core.Schedules +import io.sarl.demos.fireworks.Configuration import io.sarl.demos.fireworks.Positions import io.sarl.demos.fireworks.events.Exit import io.sarl.demos.fireworks.events.Explode @@ -77,7 +78,7 @@ agent Rocket { lifetime = rnd.nextInt(5) * 300 + 300 id = UUID.randomUUID - move = atFixedDelay(30) [ + move = atFixedDelay(Configuration.RocketLifeCycleSchedulingRate) [ try { wake(new UpdateRocketPosition); } catch (e : Exception) {