Minor improvements (package structure, functional details)

ruediger.lunde@gmail.com · ruediger.lunde@gmail.com · commit 03846ef41595 · 2016-08-09T09:27:12.000+02:00
diff --git a/aima-gui/src/main/java/aima/gui/demo/agent/NondeterministicVacuumEnvironmentProg.java b/aima-gui/src/main/java/aima/gui/demo/agent/NondeterministicVacuumEnvironmentProg.java
@@ -1,4 +1,4 @@
-package aima.gui.demo.search;
+package aima.gui.demo.agent;
 
 import aima.core.environment.vacuum.FullyObservableVacuumEnvironmentPerceptToStateFunction;
 import aima.core.environment.vacuum.NondeterministicVacuumAgent;
diff --git a/aima-gui/src/main/java/aima/gui/fx/demo/IntegratedAimaApp.java b/aima-gui/src/main/java/aima/gui/fx/demo/IntegratedAimaApp.java
@@ -1,5 +1,6 @@
 package aima.gui.fx.demo;
 
+import aima.gui.demo.agent.NondeterministicVacuumEnvironmentProg;
 import aima.gui.demo.agent.TrivialVacuumProg;
 import aima.gui.demo.logic.DPLLProg;
 import aima.gui.demo.logic.FolProg;
@@ -10,7 +11,6 @@
 import aima.gui.demo.search.EightPuzzleProg;
 import aima.gui.demo.search.MapColoringCSPProg;
 import aima.gui.demo.search.NQueensProg;
-import aima.gui.demo.search.NondeterministicVacuumEnvironmentProg;
 import aima.gui.demo.search.TicTacToeProg;
 import aima.gui.fx.demo.agent.VacuumAgentApp;
 import aima.gui.fx.demo.agent.map.RouteFindingAgentApp;
diff --git a/aima-gui/src/main/java/aima/gui/fx/demo/agent/VacuumAgentApp.java b/aima-gui/src/main/java/aima/gui/fx/demo/agent/VacuumAgentApp.java
@@ -52,7 +52,7 @@ public VacuumAgentApp() {
 
 	@Override
 	public String getTitle() {
-		return "Vacuum Agent Application";
+		return "Vacuum Agent App";
 	}
 
 	/**
diff --git a/aima-gui/src/main/java/aima/gui/fx/demo/agent/map/RouteFindingAgentApp.java b/aima-gui/src/main/java/aima/gui/fx/demo/agent/map/RouteFindingAgentApp.java
@@ -18,8 +18,7 @@
 import aima.gui.fx.framework.SimulationPaneBuilder;
 import aima.gui.fx.framework.SimulationPaneCtrl;
 import aima.gui.fx.views.MapEnvironmentViewCtrl;
-import aima.gui.fx.views.SimpleEnvironmentViewCtrl;
-import aima.gui.swing.demo.search.map.SearchFactory;
+import aima.gui.swing.demo.agent.map.SearchFactory;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.StackPane;
@@ -44,7 +43,7 @@ public static void main(String[] args) {
 	public static String PARAM_HEURISTIC = "Heuristic";
 
 	private SimulationPaneCtrl simPaneCtrl;
-	private SimpleEnvironmentViewCtrl envViewCtrl;
+	private MapEnvironmentViewCtrl envViewCtrl;
 	protected MapEnvironment env = null;
 	protected Agent agent = null;
 
@@ -65,7 +64,7 @@ public RouteFindingAgentApp() {
 
 	@Override
 	public String getTitle() {
-		return "Route Finding Agent Application";
+		return "Route Finding Agent App";
 	}
 
 	/**
@@ -165,6 +164,7 @@ public void initialize() {
 		agent = new MapAgent(env.getMap(), search, new String[] { goal });
 		env.addAgent(agent, scenario.getInitAgentLocation());
 		env.addEnvironmentView(envViewCtrl);
+		envViewCtrl.setGoal(goal);
 		envViewCtrl.initialize(env);
 	}
 
diff --git a/aima-gui/src/main/java/aima/gui/fx/demo/search/games/ConnectFourApp.java b/aima-gui/src/main/java/aima/gui/fx/demo/search/games/ConnectFourApp.java
@@ -49,7 +49,7 @@ public static void main(String[] args) {
 
 	@Override
 	public String getTitle() {
-		return "Connect Four";
+		return "Connect Four App";
 	}
 
 	@Override
diff --git a/aima-gui/src/main/java/aima/gui/fx/views/MapEnvironmentViewCtrl.java b/aima-gui/src/main/java/aima/gui/fx/views/MapEnvironmentViewCtrl.java
@@ -27,6 +27,7 @@ public class MapEnvironmentViewCtrl extends SimpleEnvironmentViewCtrl {
 
 	protected Pane envStateView;
 	protected Map map;
+	protected String goal;
 	protected List<String> track;
 
 	public MapEnvironmentViewCtrl(StackPane parent) {
@@ -40,6 +41,10 @@ public MapEnvironmentViewCtrl(StackPane parent) {
 		envStateView.heightProperty().addListener((obs, o, n) -> adjustTransform());
 		track = new ArrayList<String>();
 	}
+	
+	public void setGoal(String goal) {
+		this.goal = goal;
+	}
 
 	@Override
 	public void initialize(Environment env) {
@@ -93,6 +98,11 @@ protected void updateEnvStateView(Environment env) {
 					envStateView.getChildren().add(new Circle(pt.getX(), pt.getY(), 6, Color.RED));
 				}
 			}
+			// print goal
+			if (goal != null) {
+				Point2D pt = map.getPosition(goal);
+				envStateView.getChildren().add(new Circle(pt.getX(), pt.getY(), 4, Color.GREEN));
+			}
 			adjustTransform();
 		}
 	}
diff --git a/aima-gui/src/main/java/aima/gui/swing/demo/AimaDemoApp.java b/aima-gui/src/main/java/aima/gui/swing/demo/AimaDemoApp.java
@@ -1,5 +1,6 @@
 package aima.gui.swing.demo;
 
+import aima.gui.demo.agent.NondeterministicVacuumEnvironmentProg;
 import aima.gui.demo.agent.TrivialVacuumProg;
 import aima.gui.demo.learning.LearningProg;
 import aima.gui.demo.logic.DPLLProg;
@@ -12,15 +13,14 @@
 import aima.gui.demo.search.EightPuzzleProg;
 import aima.gui.demo.search.MapColoringCSPProg;
 import aima.gui.demo.search.NQueensProg;
-import aima.gui.demo.search.NondeterministicVacuumEnvironmentProg;
 import aima.gui.demo.search.TicTacToeProg;
+import aima.gui.swing.demo.agent.VacuumApp;
+import aima.gui.swing.demo.agent.map.RouteFindingAgentApp;
 import aima.gui.swing.demo.search.csp.MapColoringApp;
 import aima.gui.swing.demo.search.games.ConnectFourApp;
 import aima.gui.swing.demo.search.games.EightPuzzleApp;
 import aima.gui.swing.demo.search.games.NQueensApp;
 import aima.gui.swing.demo.search.games.TicTacToeApp;
-import aima.gui.swing.demo.search.map.RouteFindingAgentApp;
-import aima.gui.swing.demo.vacuum.VacuumApp;
 
 /**
  * The all-in-one demo application. Shows everything within one frame.
diff --git a/aima-gui/src/main/java/aima/gui/swing/demo/agent/VacuumApp.java b/aima-gui/src/main/java/aima/gui/swing/demo/agent/VacuumApp.java
@@ -1,4 +1,4 @@
-package aima.gui.swing.demo.vacuum;
+package aima.gui.swing.demo.agent;
 
 import aima.gui.swing.framework.AgentAppController;
 import aima.gui.swing.framework.AgentAppEnvironmentView;
diff --git a/aima-gui/src/main/java/aima/gui/swing/demo/agent/VacuumController.java b/aima-gui/src/main/java/aima/gui/swing/demo/agent/VacuumController.java
@@ -1,4 +1,4 @@
-package aima.gui.swing.demo.vacuum;
+package aima.gui.swing.demo.agent;
 
 import aima.core.agent.impl.AbstractAgent;
 import aima.core.environment.vacuum.FullyObservableVacuumEnvironmentPerceptToStateFunction;
diff --git a/aima-gui/src/main/java/aima/gui/swing/demo/agent/VacuumFrame.java b/aima-gui/src/main/java/aima/gui/swing/demo/agent/VacuumFrame.java
@@ -1,4 +1,4 @@
-package aima.gui.swing.demo.vacuum;
+package aima.gui.swing.demo.agent;
 
 import aima.gui.swing.framework.AgentAppFrame;
 
diff --git a/aima-gui/src/main/java/aima/gui/swing/demo/agent/VacuumView.java b/aima-gui/src/main/java/aima/gui/swing/demo/agent/VacuumView.java
@@ -1,4 +1,4 @@
-package aima.gui.swing.demo.vacuum;
+package aima.gui.swing.demo.agent;
 
 import java.awt.Color;
 import java.awt.Graphics;
diff --git a/aima-gui/src/main/java/aima/gui/swing/demo/agent/map/AbstractMapAgentController.java b/aima-gui/src/main/java/aima/gui/swing/demo/agent/map/AbstractMapAgentController.java
@@ -1,4 +1,4 @@
-package aima.gui.swing.demo.search.map;
+package aima.gui.swing.demo.agent.map;
 
 import java.text.DecimalFormat;
 import java.util.List;
diff --git a/aima-gui/src/main/java/aima/gui/swing/demo/agent/map/ExtendedMapAgentView.java b/aima-gui/src/main/java/aima/gui/swing/demo/agent/map/ExtendedMapAgentView.java
@@ -1,4 +1,4 @@
-package aima.gui.swing.demo.search.map;
+package aima.gui.swing.demo.agent.map;
 
 import java.awt.Color;
 import java.awt.Graphics2D;
diff --git a/aima-gui/src/main/java/aima/gui/swing/demo/agent/map/MapAgentFrame.java b/aima-gui/src/main/java/aima/gui/swing/demo/agent/map/MapAgentFrame.java
@@ -1,4 +1,4 @@
-package aima.gui.swing.demo.search.map;
+package aima.gui.swing.demo.agent.map;
 
 import aima.gui.swing.framework.AgentAppFrame;
 
diff --git a/aima-gui/src/main/java/aima/gui/swing/demo/agent/map/MapAgentView.java b/aima-gui/src/main/java/aima/gui/swing/demo/agent/map/MapAgentView.java
@@ -1,4 +1,4 @@
-package aima.gui.swing.demo.search.map;
+package aima.gui.swing.demo.agent.map;
 
 import java.awt.Color;
 import java.util.ArrayList;
diff --git a/aima-gui/src/main/java/aima/gui/swing/demo/agent/map/RouteFindingAgentApp.java b/aima-gui/src/main/java/aima/gui/swing/demo/agent/map/RouteFindingAgentApp.java
@@ -1,4 +1,4 @@
-package aima.gui.swing.demo.search.map;
+package aima.gui.swing.demo.agent.map;
 
 import java.util.ArrayList;
 
diff --git a/aima-gui/src/main/java/aima/gui/swing/demo/agent/map/SearchFactory.java b/aima-gui/src/main/java/aima/gui/swing/demo/agent/map/SearchFactory.java
@@ -1,4 +1,4 @@
-package aima.gui.swing.demo.search.map;
+package aima.gui.swing.demo.agent.map;
 
 import aima.core.search.framework.HeuristicFunction;
 import aima.core.search.framework.SearchForActions;
diff --git a/aima-gui/src/main/java/aima/gui/swing/demo/agent/map/package-info.java b/aima-gui/src/main/java/aima/gui/swing/demo/agent/map/package-info.java
@@ -2,4 +2,4 @@
  * This package contains useful components for building graphical map agent
  * applications and one example application.
  */
-package aima.gui.swing.demo.search.map;
+package aima.gui.swing.demo.agent.map;
diff --git a/aimax-osm/src/main/java/aimax/osm/applications/SearchDemoOsmAgentApp.java b/aimax-osm/src/main/java/aimax/osm/applications/SearchDemoOsmAgentApp.java
@@ -13,7 +13,7 @@
 import aima.core.search.online.LRTAStarAgent;
 import aima.core.search.online.OnlineSearchProblem;
 import aima.core.util.datastructure.Point2D;
-import aima.gui.swing.demo.search.map.MapAgentFrame;
+import aima.gui.swing.demo.agent.map.MapAgentFrame;
 import aima.gui.swing.framework.AgentAppController;
 import aima.gui.swing.framework.AgentAppFrame;
 import aima.gui.swing.framework.MessageLogger;
diff --git a/aimax-osm/src/main/java/aimax/osm/routing/agent/OsmAgentController.java b/aimax-osm/src/main/java/aimax/osm/routing/agent/OsmAgentController.java
@@ -15,8 +15,8 @@
 import aima.core.search.online.LRTAStarAgent;
 import aima.core.search.online.OnlineSearchProblem;
 import aima.core.util.datastructure.Point2D;
-import aima.gui.swing.demo.search.map.MapAgentFrame;
-import aima.gui.swing.demo.search.map.SearchFactory;
+import aima.gui.swing.demo.agent.map.MapAgentFrame;
+import aima.gui.swing.demo.agent.map.SearchFactory;
 import aima.gui.swing.framework.AgentAppController;
 import aima.gui.swing.framework.MessageLogger;
 import aima.gui.swing.framework.SimulationThread;
diff --git a/aimax-osm/src/main/java/aimax/osm/routing/agent/OsmAgentFrame.java b/aimax-osm/src/main/java/aimax/osm/routing/agent/OsmAgentFrame.java
@@ -1,7 +1,7 @@
 package aimax.osm.routing.agent;
 
-import aima.gui.swing.demo.search.map.MapAgentFrame;
-import aima.gui.swing.demo.search.map.SearchFactory;
+import aima.gui.swing.demo.agent.map.MapAgentFrame;
+import aima.gui.swing.demo.agent.map.SearchFactory;
 
 /**
  * Simple frame for running map agents in maps defined by OSM data.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package aima.gui.demo.search;`
	`1`	`+package aima.gui.demo.agent;`
`2`	`2`
`3`	`3`	`import aima.core.environment.vacuum.FullyObservableVacuumEnvironmentPerceptToStateFunction;`
`4`	`4`	`import aima.core.environment.vacuum.NondeterministicVacuumAgent;`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public VacuumAgentApp() {`
`52`	`52`
`53`	`53`	`@Override`
`54`	`54`	`public String getTitle() {`
`55`		`- return "Vacuum Agent Application";`
	`55`	`+ return "Vacuum Agent App";`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public static void main(String[] args) {`
`49`	`49`
`50`	`50`	`@Override`
`51`	`51`	`public String getTitle() {`
`52`		`- return "Connect Four";`
	`52`	`+ return "Connect Four App";`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ public class MapEnvironmentViewCtrl extends SimpleEnvironmentViewCtrl {`
`27`	`27`
`28`	`28`	`protected Pane envStateView;`
`29`	`29`	`protected Map map;`
	`30`	`+ protected String goal;`
`30`	`31`	`protected List<String> track;`
`31`	`32`
`32`	`33`	`public MapEnvironmentViewCtrl(StackPane parent) {`
`@@ -40,6 +41,10 @@ public MapEnvironmentViewCtrl(StackPane parent) {`
`40`	`41`	`envStateView.heightProperty().addListener((obs, o, n) -> adjustTransform());`
`41`	`42`	`track = new ArrayList<String>();`
`42`	`43`	`}`
	`44`	`+`
	`45`	`+ public void setGoal(String goal) {`
	`46`	`+ this.goal = goal;`
	`47`	`+ }`
`43`	`48`
`44`	`49`	`@Override`
`45`	`50`	`public void initialize(Environment env) {`
`@@ -93,6 +98,11 @@ protected void updateEnvStateView(Environment env) {`
`93`	`98`	`envStateView.getChildren().add(new Circle(pt.getX(), pt.getY(), 6, Color.RED));`
`94`	`99`	`}`
`95`	`100`	`}`
	`101`	`+ // print goal`
	`102`	`+ if (goal != null) {`
	`103`	`+ Point2D pt = map.getPosition(goal);`
	`104`	`+ envStateView.getChildren().add(new Circle(pt.getX(), pt.getY(), 4, Color.GREEN));`
	`105`	`+ }`
`96`	`106`	`adjustTransform();`
`97`	`107`	`}`
`98`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package aima.gui.swing.demo.vacuum;`
	`1`	`+package aima.gui.swing.demo.agent;`
`2`	`2`
`3`	`3`	`import aima.gui.swing.framework.AgentAppController;`
`4`	`4`	`import aima.gui.swing.framework.AgentAppEnvironmentView;`