ENH: minor changes for multiUI mode

AMAKFX/src/fr/irit/smac/amak/Amas.java

@@ -164,10 +164,12 @@ public class Amas<E extends Environment> implements Schedulable {
 	
 	public Amas(AmasMultiUIWindow window, VUIMulti vui, E environment, Scheduling scheduling, Object... params) {
 		
-		amasMultiUIWindow = window;
-		vuiMulti = vui;
-		amasMultiUIWindow.addTabbedPanel(vuiMulti.title, vuiMulti.getPanel());
-		//vuiMulti.addTabbedDefaultPanel(amasMultiUIWindow);
+		if(!Configuration.commandLineMode) {
+			amasMultiUIWindow = window;
+			vuiMulti = vui;
+			amasMultiUIWindow.addTabbedPanel(vuiMulti.title, vuiMulti.getPanel());
+		}
+		
 		
 		executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(Configuration.allowedSimultaneousAgentsExecution);
 		

AMAKFX/src/fr/irit/smac/amak/examples/randomantsMultiUi/AntsLaunchExampleMultiUI.java

@@ -5,7 +5,13 @@ import fr.irit.smac.amak.ui.AmasMultiUIWindow;
 import fr.irit.smac.amak.ui.MainWindow;
 import fr.irit.smac.amak.ui.VUIMulti;
 import javafx.application.Application;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.scene.control.Button;
 import javafx.scene.control.Label;
+import javafx.scene.control.Slider;
 import javafx.scene.layout.Pane;
 import javafx.stage.Stage;
 
@@ -24,6 +30,7 @@ public class AntsLaunchExampleMultiUI extends Application{
 	public void start(Stage primaryStage) throws Exception {
 		
 		Configuration.multiUI=true;
+		Configuration.commandLineMode =false;
 		
 		
 		AmasMultiUIWindow window = new AmasMultiUIWindow("Random Ants Multi UI 1");
@@ -34,11 +41,31 @@ public class AntsLaunchExampleMultiUI extends Application{
 		//WorldExampleMultiUI env2 = new WorldExampleMultiUI(window2);
 		
 
-		AntHillExampleMultiUI ants = new AntHillExampleMultiUI(window, VUIMulti.get("Ants VUI 1"), env);
+		AntHillExampleMultiUI ants = new AntHillExampleMultiUI(window, new VUIMulti("Ants VUI 1"), env);
 		//new AntHillExampleMultiUI(window2, VUIMulti.get("Ants VUI 2"), env2);
 		
-		for(int i=0;i<1000;i++)
-			ants.cycle();
+		Button btn = new Button();
+        btn.setText("GO");
+        btn.setOnAction(new EventHandler<ActionEvent>() {
+            @Override
+            public void handle(ActionEvent event) {
+            	for(int i=0;i<10000;i++) {
+        			System.out.println(i);
+        			ants.cycle();
+        		}
+            }
+        });
+        
+        window.addToolbar(btn);
+		
+		
+        for(int i=0;i<10000;i++) {
+			System.out.println(i);
+			ants.getScheduler().step();
+		}
+		
+		
+			
 	}
 	
 	@Override

AMAKFX/src/fr/irit/smac/amak/ui/AmasMultiUIWindow.java

@@ -65,7 +65,6 @@ public class AmasMultiUIWindow extends Stage{
 	public TabPane tabbedPanel;
 
 	
-	protected static Object startEnded = new Object();
 
 	/**
 	 * Create the frame.
@@ -75,55 +74,57 @@ public class AmasMultiUIWindow extends Stage{
 	 *             should be used by the Application of JavaFX only.
 	 */
 	public AmasMultiUIWindow(String title) {
-		synchronized (startEnded) {
-			VBox root = new VBox();
-			
-			// Creation of the menu bar (Top)
-			menuBar = new MenuBar();
-			root.getChildren().add(menuBar);
+
 			
-			// Border organization
-			organizationPane = new BorderPane();
-			organizationPane.setMinSize(200, 200); //that way we avoid 0 size, which can cause problems
-			root.getChildren().add(organizationPane);
-			VBox.setVgrow(organizationPane, Priority.ALWAYS);
 			
-			// Creation of scene
-			this.setTitle(title);
-			Scene scene = new Scene(root, 450, 300);
-			//stage = primaryStage;
-			this.setScene(scene);
-			this.setOnCloseRequest(new EventHandler<WindowEvent>() {
-				@Override
-				public void handle(WindowEvent event) {
-					Platform.exit();
-				}
-			});
-	
-			// Creation of the toolbar (Bottom)
-			toolbarPanel = new ToolBar();
-			organizationPane.setBottom(toolbarPanel);
-	
-			// Creation of the right part of the split pane (Center Right)
-			tabbedPanel = new TabPane();
-			organizationPane.setCenter(tabbedPanel);
-	
-			// Creation of the close menu item
-			MenuItem menuItem = new MenuItem("Close");
-			menuItem.setOnAction(new EventHandler<ActionEvent>() {
-				@Override
-				public void handle(ActionEvent event) {
-					System.exit(0);
-				}
-			});
-			addToMenu("Options", menuItem);
-	
-			menuBar.getMenus().add(new Menu("AMAKFX v" + Information.VERSION));
-	
-			this.show();
+		VBox root = new VBox();
+		
+		// Creation of the menu bar (Top)
+		menuBar = new MenuBar();
+		root.getChildren().add(menuBar);
+		
+		// Border organization
+		organizationPane = new BorderPane();
+		organizationPane.setMinSize(200, 200); //that way we avoid 0 size, which can cause problems
+		root.getChildren().add(organizationPane);
+		VBox.setVgrow(organizationPane, Priority.ALWAYS);
+		
+		// Creation of scene
+		this.setTitle(title);
+		Scene scene = new Scene(root, 450, 300);
+		//stage = primaryStage;
+		this.setScene(scene);
+		this.setOnCloseRequest(new EventHandler<WindowEvent>() {
+			@Override
+			public void handle(WindowEvent event) {
+				Platform.exit();
+			}
+		});
+
+		// Creation of the toolbar (Bottom)
+		toolbarPanel = new ToolBar();
+		organizationPane.setBottom(toolbarPanel);
+
+		// Creation of the right part of the split pane (Center Right)
+		tabbedPanel = new TabPane();
+		organizationPane.setCenter(tabbedPanel);
+
+		// Creation of the close menu item
+		MenuItem menuItem = new MenuItem("Close");
+		menuItem.setOnAction(new EventHandler<ActionEvent>() {
+			@Override
+			public void handle(ActionEvent event) {
+				System.exit(0);
+			}
+		});
+		addToMenu("Options", menuItem);
+
+		menuBar.getMenus().add(new Menu("AMAKFX v" + Information.VERSION));
+
+		this.show();
 			
-			startEnded.notify();
-		}
+
+
 	}
 
 //	@Override
@@ -231,7 +232,8 @@ public class AmasMultiUIWindow extends Stage{
 	 */
 	public void addTabbedPanel(String title, Node panel) {
 		Tab t = new DraggableTab(title, panel);
-		RunLaterHelper.runLater(() -> tabbedPanel.getTabs().add(t));
+		tabbedPanel.getTabs().add(t);
+		//RunLaterHelper.runLater(() -> tabbedPanel.getTabs().add(t));
 	}
 	
 	/**

AMOEBAonAMAK/src/experiments/F_XY_System.java

@@ -48,7 +48,7 @@ public class F_XY_System implements StudiedSystem {
 
 		out.put("px0", x);
 		out.put("px1", y);
-		out.put("oracle", 0.0);
+		out.put("oracle", result);
 		return out;
 	}