diff --git a/AMAKFX/src/fr/irit/smac/amak/examples/randomantsMultiUi/AntsLaunchExampleMultiUI.java b/AMAKFX/src/fr/irit/smac/amak/examples/randomantsMultiUi/AntsLaunchExampleMultiUI.java
index 560e6cf40d4ce635d9d96ecdd043fc7843f81c1c..6faff017f1dd934a1101652535f9cc31a9387269 100644
--- a/AMAKFX/src/fr/irit/smac/amak/examples/randomantsMultiUi/AntsLaunchExampleMultiUI.java
+++ b/AMAKFX/src/fr/irit/smac/amak/examples/randomantsMultiUi/AntsLaunchExampleMultiUI.java
@@ -27,15 +27,23 @@ public class AntsLaunchExampleMultiUI extends Application{
AmasMultiUIWindow window = new AmasMultiUIWindow("Random Ants Multi UI 1");
- AmasMultiUIWindow window2 = new AmasMultiUIWindow("Random Ants Multi UI 2");
+ //AmasMultiUIWindow window2 = new AmasMultiUIWindow("Random Ants Multi UI 2");
WorldExampleMultiUI env = new WorldExampleMultiUI(window);
- WorldExampleMultiUI env2 = new WorldExampleMultiUI(window2);
+ //WorldExampleMultiUI env2 = new WorldExampleMultiUI(window2);
- AntHillExampleMultiUI amas1 = new AntHillExampleMultiUI(window, VUIMulti.getDefault(), env);
- AntHillExampleMultiUI amas2 = new AntHillExampleMultiUI(window2, VUIMulti.getDefault(), env2);
-
+ AntHillExampleMultiUI ants = new AntHillExampleMultiUI(window, VUIMulti.get("Ants VUI 1"), env);
+ //new AntHillExampleMultiUI(window2, VUIMulti.get("Ants VUI 2"), env2);
+
+ for(int i=0;i<1000;i++)
+ ants.cycle();
+ }
+
+ @Override
+ public void stop() throws Exception {
+ super.stop();
+ System.exit(0);
}
}
diff --git a/AMOEBAonAMAK/src/experiments/AdvancedMain.java b/AMOEBAonAMAK/src/experiments/AdvancedMain.java
index d0267bb169fd4cb920fb0d8ae0dd01ab69ffec4c..b02ccdbd7497cc74a9a546554a4ebdc8a2ed28bf 100644
--- a/AMOEBAonAMAK/src/experiments/AdvancedMain.java
+++ b/AMOEBAonAMAK/src/experiments/AdvancedMain.java
@@ -1,122 +1,145 @@
-package experiments;
-
-import java.io.File;
-import java.io.IOException;
-
-import fr.irit.smac.amak.Configuration;
-import fr.irit.smac.amak.tools.Log;
-import gui.AmoebaWindow;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.scene.control.Slider;
-import kernel.AMOEBA;
-import kernel.StudiedSystem;
-import kernel.backup.BackupSystem;
-import kernel.backup.IBackupSystem;
-import kernel.backup.SaveHelperImpl;
-
-/**
- * A more advanced and complete main.
- * @author Hugo
- *
- */
-public class AdvancedMain {
-
- public static void main(String[] args) throws IOException {
- // Instantiating the MainWindow before usage.
- // It also allows you to change some of its behavior before creating an AMOEBA.
- // If you use Configuration.commandLineMode = True , then you should skip it.
- AmoebaWindow.instance();
- example();
- }
-
- private static void example() throws IOException {
-
- // Set AMAK configuration before creating an AMOEBA
- Configuration.commandLineMode = false;
- Configuration.allowedSimultaneousAgentsExecution = 1;
- Configuration.waitForGUI = true;
-
- // Create an AMOEBA
- AMOEBA amoeba = new AMOEBA();
- // Create a studied system and add it to the amoeba.
- // Adding a studied system to an amoeba allow you to control the learning speed (the simulation : how many cycles per second)
- // with amoeba's scheduler, graphically or programmatically.
- StudiedSystem studiedSystem = new F_XY_System(50.0);
- amoeba.setStudiedSystem(studiedSystem);
- // A window appeared, allowing to control the simulation, but if you try to run it
- // it will crash (there's no percepts !). We need to load a configuration :
-
- // Change how new Context are rendered.
- //Context.defaultRenderStrategy = NoneRenderer.class;
-
- // Create a backup system for the AMOEBA
- IBackupSystem backupSystem = new BackupSystem(amoeba);
- // Load a configuration matching the studied system
- File file = new File("resources/twoDimensionsLauncher.xml");
- backupSystem.load(file);
- // Note : if you intend to use a SaveHelper, you can use SaveHelper.load instead of a BackupSystem
-
- // We add an optional saver, allowing us to autosave the amoeba at each cycle.
- // The SaveHelper also add graphical tools to save and load AMOEBA's state.
- amoeba.saver = new SaveHelperImpl(amoeba);
- // Autosave slow execution, if you want fast training, set saver to null,
- // or saver.autoSave = false.
-
- // The amoeba is ready to be used.
- // Next we show how to control it with code :
-
- // We deny the possibility to change simulation speed with the UI
- amoeba.allowGraphicalScheduler(false);
- // We allow rendering
- amoeba.setRenderUpdate(true);
- long start = System.currentTimeMillis();
- // We run some learning cycles
- int nbCycle = 1000;
- for (int i = 0; i < nbCycle; ++i) {
- studiedSystem.playOneStep();
- amoeba.learn(studiedSystem.getOutput());
- }
- long end = System.currentTimeMillis();
- System.out.println("Done in : " + (end - start) / 1000.0);
-
- // We create a manual save point
- amoeba.saver.newManualSave("TestManualSave");
-
- // We set the log level to INFORM, to avoid debug logs that slow down simulation
- Log.defaultMinLevel = Log.Level.INFORM;
-
- // We deactivate rendering
- amoeba.setRenderUpdate(false);
- // Do some more learning
- start = System.currentTimeMillis();
- for (int i = 0; i < nbCycle; ++i) {
- studiedSystem.playOneStep();
- amoeba.learn(studiedSystem.getOutput());
- }
- end = System.currentTimeMillis();
- System.out.println("Done in : " + (end - start) / 1000.0);
-
-
- // Activate rendering back
- amoeba.setRenderUpdate(true);
- // After activating rendering we need to update agent's visualization
- amoeba.updateAgentsVisualisation();
- // We allow simulation control with the UI
- amoeba.allowGraphicalScheduler(true);
-
- // Exemple for adding a tool in the toolbar
- Slider slider = new Slider(0, 10, 0);
- slider.setShowTickLabels(true);
- slider.setShowTickMarks(true);
- slider.valueProperty().addListener(new ChangeListener<Number>() {
- @Override
- public void changed(ObservableValue<? extends Number> observable, Number oldValue, Number newValue) {
- System.out.println("new Value "+newValue);
- }
- });
- AmoebaWindow.addToolbar(slider);
-
- System.out.println("End main");
- }
-}
+package experiments;
+
+import java.io.File;
+import java.io.IOException;
+
+import fr.irit.smac.amak.Configuration;
+import fr.irit.smac.amak.tools.Log;
+import fr.irit.smac.amak.ui.VUIMulti;
+import gui.AmoebaMultiUIWindow;
+import gui.AmoebaWindow;
+import javafx.application.Application;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.scene.control.Slider;
+import javafx.stage.Stage;
+import kernel.AMOEBA;
+import kernel.StudiedSystem;
+import kernel.backup.BackupSystem;
+import kernel.backup.IBackupSystem;
+import kernel.backup.SaveHelperImpl;
+
+/**
+ * A more advanced and complete main.
+ * @author Hugo
+ *
+ */
+public class AdvancedMain extends Application{
+
+
+ public static void main(String[] args) throws IOException {
+
+ // Application.launch(args) launches JavaFX process
+ // It also allows you to change some of its behavior before creating an AMOEBA.
+ // If you use Configuration.commandLineMode = True , then you should skip it.
+ Application.launch(args);
+
+
+ }
+
+ @Override
+ public void start(Stage primaryStage) throws Exception, IOException {
+
+ example();
+
+ }
+
+
+
+ private static void example() throws IOException {
+
+ // Set AMAK configuration before creating an AMOEBA
+ Configuration.commandLineMode = false;
+ Configuration.allowedSimultaneousAgentsExecution = 1;
+ Configuration.waitForGUI = true;
+ Configuration.multiUI = true;
+
+
+ VUIMulti amoebaVUI = VUIMulti.get("2D");
+ AmoebaMultiUIWindow amoebaUI = new AmoebaMultiUIWindow("ELLSA", amoebaVUI);
+
+ // Create an AMOEBA
+ AMOEBA amoeba = new AMOEBA(amoebaUI, amoebaVUI);
+ // Create a studied system and add it to the amoeba.
+ // Adding a studied system to an amoeba allow you to control the learning speed (the simulation : how many cycles per second)
+ // with amoeba's scheduler, graphically or programmatically.
+ StudiedSystem studiedSystem = new F_XY_System(50.0);
+ amoeba.setStudiedSystem(studiedSystem);
+ // A window appeared, allowing to control the simulation, but if you try to run it
+ // it will crash (there's no percepts !). We need to load a configuration :
+
+ // Change how new Context are rendered.
+ //Context.defaultRenderStrategy = NoneRenderer.class;
+
+ // Create a backup system for the AMOEBA
+ IBackupSystem backupSystem = new BackupSystem(amoeba);
+ // Load a configuration matching the studied system
+ File file = new File("resources/twoDimensionsLauncher.xml");
+ backupSystem.load(file);
+ // Note : if you intend to use a SaveHelper, you can use SaveHelper.load instead of a BackupSystem
+
+ // We add an optional saver, allowing us to autosave the amoeba at each cycle.
+ // The SaveHelper also add graphical tools to save and load AMOEBA's state.
+ amoeba.saver = new SaveHelperImpl(amoeba);
+ // Autosave slow execution, if you want fast training, set saver to null,
+ // or saver.autoSave = false.
+
+ // The amoeba is ready to be used.
+ // Next we show how to control it with code :
+
+ // We deny the possibility to change simulation speed with the UI
+ amoeba.allowGraphicalScheduler(false);
+ // We allow rendering
+ amoeba.setRenderUpdate(true);
+ long start = System.currentTimeMillis();
+ // We run some learning cycles
+ int nbCycle = 1000;
+ for (int i = 0; i < nbCycle; ++i) {
+ studiedSystem.playOneStep();
+ amoeba.learn(studiedSystem.getOutput());
+ }
+ long end = System.currentTimeMillis();
+ System.out.println("Done in : " + (end - start) / 1000.0);
+
+ // We create a manual save point
+ amoeba.saver.newManualSave("TestManualSave");
+
+ // We set the log level to INFORM, to avoid debug logs that slow down simulation
+ Log.defaultMinLevel = Log.Level.INFORM;
+
+ // We deactivate rendering
+ amoeba.setRenderUpdate(false);
+ // Do some more learning
+ start = System.currentTimeMillis();
+ for (int i = 0; i < nbCycle; ++i) {
+ studiedSystem.playOneStep();
+ amoeba.learn(studiedSystem.getOutput());
+ }
+ end = System.currentTimeMillis();
+ System.out.println("Done in : " + (end - start) / 1000.0);
+
+
+ // Activate rendering back
+ amoeba.setRenderUpdate(true);
+ // After activating rendering we need to update agent's visualization
+ amoeba.updateAgentsVisualisation();
+ // We allow simulation control with the UI
+ amoeba.allowGraphicalScheduler(true);
+
+ // Exemple for adding a tool in the toolbar
+ Slider slider = new Slider(0, 10, 0);
+ slider.setShowTickLabels(true);
+ slider.setShowTickMarks(true);
+ slider.valueProperty().addListener(new ChangeListener<Number>() {
+ @Override
+ public void changed(ObservableValue<? extends Number> observable, Number oldValue, Number newValue) {
+ System.out.println("new Value "+newValue);
+ }
+ });
+ amoebaUI.addToolbar(slider);
+
+ System.out.println("End main");
+ }
+
+
+}