Some application class names changed.

RuedigerLunde · RuedigerLunde · commit 070fd8925d9f · 2017-07-10T11:00:16.000+02:00
diff --git a/aima-core/src/main/java/aima/core/environment/map/MapAgent.java b/aima-core/src/main/java/aima/core/environment/map/MapAgent.java
@@ -97,8 +97,8 @@ protected Optional<Object> formulateGoal() {
                 ((Informed<String, MoveToAction>) search).setHeuristicFunction(hFnFactory.apply(goal));
 
             if (notifier != null)
-                notifier.notifyViews("CurrentLocation=In(" + state.getAttribute(DynAttributeNames.AGENT_LOCATION)
-                        + "), Goal=In(" + goal + ")");
+                notifier.notifyViews("Current location: In(" + state.getAttribute(DynAttributeNames.AGENT_LOCATION)
+                        + "), Goal: In(" + goal + ")");
         }
         return goal != null ? Optional.of(goal) : Optional.empty();
     }
@@ -117,11 +117,7 @@ protected Optional<List<MoveToAction>> search(Problem<String, MoveToAction> prob
     }
 
     protected void notifyViewOfMetrics() {
-        if (notifier != null) {
-            Set<String> keys = search.getMetrics().keySet();
-            for (String key : keys) {
-                notifier.notifyViews("METRIC[" + key + "]=" + search.getMetrics().get(key));
-            }
-        }
+        if (notifier != null)
+            notifier.notifyViews("Search metrics: " + search.getMetrics());
     }
 }
diff --git a/aima-gui/src/main/uml/IntegratedAimaOsmFxApp.png b/aima-gui/src/main/uml/IntegratedAimaOsmFxApp.png
diff --git a/aimax-osm/README.md b/aimax-osm/README.md
@@ -11,12 +11,12 @@ This project provides a framework for building intelligent Open Street Map
 and search concepts from the AIMA library in a non-trivial
 application area and provide an interesting coding environment for student
 projects. Typical programming challenges include:
-* Extend the `OsmRoutePlannerApp` and provide additional options, e.g. to optimize
+* Extend the `RoutePlannerOsmApp` and provide additional options, e.g. to optimize
   time for a driver, to optimize fun for a cyclist, ...
-* Extend the `OsmLRTAStarAgentApp` and add variants of the original LRTAStar-based
+* Extend the `OnlineAgentOsmApp` and add variants of the original LRTAStar-based
   agent which try to perform better than the original in this special environment, e.g.
   by increasing greediness.
-* Extend the `OsmAgentBaseApp` and add a new agent which is able to react on unforeseen
+* Extend the `RouteFindingAgentOsmApp` and add a new agent which is able to react on unforeseen
   events, e.g. on a road blocking defined by additional markers.
 * Develop an agent which plans the Saturday morning shopping tour for you. Try to
   create an optimal tour (the typical greedy TSP implementation is not that challenging...).
diff --git a/aimax-osm/src/main/java/aimax/osm/data/DataResource.java b/aimax-osm/src/main/java/aimax/osm/data/DataResource.java
@@ -7,7 +7,7 @@
  * @author Ruediger Lunde
  */
 public class DataResource {
-	public static InputStream getULMFileResource() {
+	public static InputStream getUlmFileResource() {
 		return DataResource.class.getResourceAsStream("ulm.osm");
 	}
 }
diff --git a/aimax-osm/src/main/java/aimax/osm/gui/fx/IntegratedAimaOsmFxApp.java b/aimax-osm/src/main/java/aimax/osm/gui/fx/IntegratedAimaOsmFxApp.java
@@ -2,10 +2,10 @@
 
 import aima.gui.fx.applications.IntegratedAimaFxApp;
 import aima.gui.fx.framework.IntegratedAppBuilder;
-import aimax.osm.gui.fx.applications.OsmOnlineAgentApp;
-import aimax.osm.gui.fx.applications.OsmRouteFindingAgentApp;
-import aimax.osm.gui.fx.applications.OsmRoutePlannerApp;
-import aimax.osm.gui.fx.applications.OsmAgentBaseApp;
+import aimax.osm.gui.fx.applications.OnlineAgentOsmApp;
+import aimax.osm.gui.fx.applications.ExtendedRouteFindingAgentOsmApp;
+import aimax.osm.gui.fx.applications.RoutePlannerOsmApp;
+import aimax.osm.gui.fx.applications.RouteFindingAgentOsmApp;
 import javafx.application.Application;
 import javafx.stage.Stage;
 
@@ -35,9 +35,9 @@ public void start(Stage primaryStage) throws Exception {
 	public static void defineContent(IntegratedAppBuilder builder) {
 		IntegratedAimaFxApp.defineContent(builder);
 
-		builder.registerApp(OsmRoutePlannerApp.class);
-		builder.registerApp(OsmAgentBaseApp.class);
-		builder.registerApp(OsmRouteFindingAgentApp.class);
-		builder.registerApp(OsmOnlineAgentApp.class);
+		builder.registerApp(RoutePlannerOsmApp.class);
+		builder.registerApp(RouteFindingAgentOsmApp.class);
+		builder.registerApp(ExtendedRouteFindingAgentOsmApp.class);
+		builder.registerApp(OnlineAgentOsmApp.class);
 	}
 }
diff --git a/aimax-osm/src/main/java/aimax/osm/gui/fx/applications/ExtendedRouteFindingAgentOsmApp.java b/aimax-osm/src/main/java/aimax/osm/gui/fx/applications/ExtendedRouteFindingAgentOsmApp.java
@@ -26,14 +26,14 @@
 /**
  * Integrable application which demonstrates how different kinds of search
  * algorithms perform in a route finding scenario based on a real OSM map. This
- * implementation extends <code>OsmAgentBaseApp</code> by two aspects: Map
+ * implementation extends {@link RouteFindingAgentOsmApp} by two aspects: Map
  * locations corresponding to expanded nodes are highlighted in green. The user
  * can define several goals by placing more then two markers on the map.
  *
  * @author Ruediger Lunde
  *
  */
-public class OsmRouteFindingAgentApp extends OsmAgentBaseApp {
+public class ExtendedRouteFindingAgentOsmApp extends RouteFindingAgentOsmApp {
 
 	public static void main(String[] args) {
 		launch(args);
@@ -47,7 +47,7 @@ public static void main(String[] args) {
 
 	@Override
 	public String getTitle() {
-		return "OSM Route Finding Agent App";
+		return "Extended Route Finding Agent OSM App";
 	}
 
 	/**
@@ -99,8 +99,8 @@ protected Agent createAgent(List<String> locations) {
 	// helper classes...
 
 	/**
-	 * Variant of the <code>DefaultMapEntityRenderer</code> which highlights way
-	 * nodes mentioned in {@link SearchDemoOsmAgentApp#visitedStates}.
+	 * Variant of the {@link DefaultEntityRenderer} which highlights way
+	 * nodes mentioned in {@link ExtendedRouteFindingAgentOsmApp#visitedStates}.
 	 */
 	private static class SDMapEntityRenderer extends DefaultEntityRenderer {
 		DefaultEntityViewInfo highlightProp = new MapStyleFactory().createPoiInfo(0, 0, 5, UColor.GREEN,
diff --git a/aimax-osm/src/main/java/aimax/osm/gui/fx/applications/InteractiveMapViewerOsmApp.java b/aimax-osm/src/main/java/aimax/osm/gui/fx/applications/InteractiveMapViewerOsmApp.java
@@ -17,7 +17,7 @@
  *
  * @author Ruediger Lunde
  */
-public class OsmViewerApp extends Application {
+public class InteractiveMapViewerOsmApp extends Application {
     public static void main(String[] args) {
         launch(args);
     }
@@ -32,13 +32,13 @@ public void start(Stage primaryStage) throws Exception {
 
         StackPane mapPane = new StackPane();
         MapPaneCtrl mapPaneCtrl = new MapPaneCtrl(mapPane);
-        mapPaneCtrl.loadMap(DataResource.getULMFileResource());
+        mapPaneCtrl.loadMap(DataResource.getUlmFileResource());
 
         BorderPane root = new BorderPane();
         root.setCenter(mapPane);
         Scene scene = new Scene(root, 800, 600);
 
-        primaryStage.setTitle("Osm Viewer App");
+        primaryStage.setTitle("Interactive Map Viewer OSM App");
         primaryStage.setScene(scene);
         primaryStage.show();
     }
diff --git a/aimax-osm/src/main/java/aimax/osm/gui/fx/applications/OnlineAgentOsmApp.java b/aimax-osm/src/main/java/aimax/osm/gui/fx/applications/OnlineAgentOsmApp.java
@@ -41,7 +41,7 @@
  * @author Ruediger Lunde
  *
  */
-public class OsmOnlineAgentApp extends IntegrableApplication {
+public class OnlineAgentOsmApp extends IntegrableApplication {
 
 	public static String PARAM_STRATEGY = "strategy";
 
@@ -61,12 +61,12 @@ public static void main(String[] args) {
 
 	@Override
 	public String getTitle() {
-		return "OSM Online Agent App";
+		return "Online Agent OSM App";
 	}
 	
 	/** Loads a map of the city of Ulm, Germany. Override to change the map. */
 	protected void loadMap() {
-		mapPaneCtrl.loadMap(DataResource.getULMFileResource());
+		mapPaneCtrl.loadMap(DataResource.getUlmFileResource());
 	}
 	
 	protected List<Parameter> createParameters() {
diff --git a/aimax-osm/src/main/java/aimax/osm/gui/fx/applications/RouteFindingAgentOsmApp.java b/aimax-osm/src/main/java/aimax/osm/gui/fx/applications/RouteFindingAgentOsmApp.java
@@ -41,7 +41,7 @@
  * @author Ruediger Lunde
  *
  */
-public class OsmAgentBaseApp extends IntegrableApplication {
+public class RouteFindingAgentOsmApp extends IntegrableApplication {
 
 	public static void main(String[] args) {
 		launch(args);
@@ -62,12 +62,12 @@ public static void main(String[] args) {
 
 	@Override
 	public String getTitle() {
-		return "OSM Agent Base App";
+		return "Route Finding Agent OSM App";
 	}
 
 	/** Loads a map of the city of Ulm, Germany. Override to change the map. */
 	protected void loadMap() {
-		mapPaneCtrl.loadMap(DataResource.getULMFileResource());
+		mapPaneCtrl.loadMap(DataResource.getUlmFileResource());
 	}
 
 	/** Defines the parameters to be shown in the simulation pane tool bar. */
diff --git a/aimax-osm/src/main/java/aimax/osm/gui/fx/applications/RoutePlannerOsmApp.java b/aimax-osm/src/main/java/aimax/osm/gui/fx/applications/RoutePlannerOsmApp.java
@@ -23,7 +23,7 @@
  *
  * @author Ruediger Lunde
  */
-public class OsmRoutePlannerApp extends IntegrableApplication {
+public class RoutePlannerOsmApp extends IntegrableApplication {
 
     public static void main(String[] args) {
         launch(args);
@@ -69,7 +69,7 @@ public Pane createRootPane() {
         StackPane mapPane = new StackPane();
         mapPaneCtrl = new MapPaneCtrl(mapPane);
         mapPaneCtrl.getMap().addMapDataEventListener(ev -> updateEnabledState());
-        mapPaneCtrl.loadMap(DataResource.getULMFileResource());
+        mapPaneCtrl.loadMap(DataResource.getUlmFileResource());
 
         root.setCenter(mapPane);
 
diff --git a/aimax-osm/src/main/java/aimax/osm/gui/fx/applications/SimpleMapViewerOsmApp.java b/aimax-osm/src/main/java/aimax/osm/gui/fx/applications/SimpleMapViewerOsmApp.java
@@ -19,7 +19,7 @@
  *
  * @author Ruediger Lunde
  */
-public class SimpleOsmViewerApp extends Application {
+public class SimpleMapViewerOsmApp extends Application {
 
     public static void main(String[] args) {
         launch(args);
@@ -34,15 +34,15 @@ public void start(Stage primaryStage) throws Exception {
         Locale.setDefault(Locale.US);
 
         UnifiedMapDrawer<Canvas> mapDrawer = new UnifiedMapDrawer<>(new FXImageBuilder());
-        mapDrawer.loadMap(DataResource.getULMFileResource());
+        mapDrawer.loadMap(DataResource.getUlmFileResource());
 
         Canvas canvas = new Canvas(600, 400);
         mapDrawer.drawMap(canvas, true);
         Group root = new Group();
         root.getChildren().add(canvas);
         Scene scene = new Scene(root, Color.BLACK);
 
-        primaryStage.setTitle("Simple Osm Viewer App");
+        primaryStage.setTitle("Simple Map Viewer OSM App");
         primaryStage.setScene(scene);
         primaryStage.show();
     }
diff --git a/aimax-osm/src/main/java/aimax/osm/gui/swing/applications/MiniNaviApp.java b/aimax-osm/src/main/java/aimax/osm/gui/swing/applications/MiniNaviApp.java
@@ -309,7 +309,7 @@ public static void main(String[] args) {
 		// System.setProperty(MiniNaviApp.MAP_CLASS_PROPERTY,
 		// "rl.osm.data.perst.PerstMap");
 		MiniNaviApp demo = new MiniNaviApp(args);
-		demo.getFrame().readMap(DataResource.getULMFileResource());
+		demo.getFrame().readMap(DataResource.getUlmFileResource());
 		// demo.getFrame().readMap(new File("maps/ulm.osm"));
 		demo.showFrame();
 	}
diff --git a/aimax-osm/src/main/java/aimax/osm/gui/swing/applications/OsmAgentApp.java b/aimax-osm/src/main/java/aimax/osm/gui/swing/applications/OsmAgentApp.java
@@ -62,7 +62,7 @@ public void readMap(File file) {
 	@Override
 	public AgentAppFrame constructApplicationFrame() {
 		if (map == null)
-			readMap(DataResource.getULMFileResource());
+			readMap(DataResource.getUlmFileResource());
 		return super.constructApplicationFrame();
 	}
 	
diff --git a/aimax-osm/src/main/java/aimax/osm/gui/swing/applications/OsmViewerApp.java b/aimax-osm/src/main/java/aimax/osm/gui/swing/applications/OsmViewerApp.java
@@ -24,7 +24,7 @@ public static void main(String[] args) {
 		
 		Locale.setDefault(Locale.US);
 		MapViewFrame frame = new MapViewFrame(args);
-		frame.readMap(DataResource.getULMFileResource());
+		frame.readMap(DataResource.getUlmFileResource());
 		frame.setTitle("OSM Viewer");
 		frame.setSize(800, 600);
 		frame.setVisible(true);
diff --git a/aimax-osm/src/main/java/aimax/osm/gui/swing/applications/OsmViewerPlusApp.java b/aimax-osm/src/main/java/aimax/osm/gui/swing/applications/OsmViewerPlusApp.java
@@ -120,7 +120,7 @@ public static void main(String[] args) {
 		
 		Locale.setDefault(Locale.US);
 		OsmViewerPlusApp demo = new OsmViewerPlusApp(args);
-		demo.getFrame().readMap(DataResource.getULMFileResource());
+		demo.getFrame().readMap(DataResource.getUlmFileResource());
 		demo.showFrame();
 	}
 }
diff --git a/aimax-osm/src/main/java/aimax/osm/gui/swing/applications/RoutePlannerApp.java b/aimax-osm/src/main/java/aimax/osm/gui/swing/applications/RoutePlannerApp.java
@@ -78,7 +78,7 @@ public void showFrame() {
 	 */
 	public MapViewFrame constructApplicationFrame() {
 		if (frame.getMap().isEmpty())
-			frame.readMap(DataResource.getULMFileResource());
+			frame.readMap(DataResource.getUlmFileResource());
 		return frame;
 	}
 
@@ -123,7 +123,7 @@ public static void main(String[] args) {
 
 		Locale.setDefault(Locale.US);
 		RoutePlannerApp demo = new RoutePlannerApp(args);
-		demo.getFrame().readMap(DataResource.getULMFileResource());
+		demo.getFrame().readMap(DataResource.getUlmFileResource());
 		demo.showFrame();
 	}
 }
diff --git a/aimax-osm/src/main/java/aimax/osm/gui/swing/applications/SearchDemoOsmAgentApp.java b/aimax-osm/src/main/java/aimax/osm/gui/swing/applications/SearchDemoOsmAgentApp.java
@@ -170,7 +170,7 @@ public static void main(String args[]) {
 		// Logger.getLogger("").getHandlers()[0].setLevel(Level.FINE);
 
 		SearchDemoOsmAgentApp demo = new SearchDemoOsmAgentApp();
-		demo.readMap(DataResource.getULMFileResource());
+		demo.readMap(DataResource.getUlmFileResource());
 		demo.startApplication();
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,8 @@ protected Optional<Object> formulateGoal() {`
`97`	`97`	`((Informed<String, MoveToAction>) search).setHeuristicFunction(hFnFactory.apply(goal));`
`98`	`98`
`99`	`99`	`if (notifier != null)`
`100`		`- notifier.notifyViews("CurrentLocation=In(" + state.getAttribute(DynAttributeNames.AGENT_LOCATION)`
`101`		`- + "), Goal=In(" + goal + ")");`
	`100`	`+ notifier.notifyViews("Current location: In(" + state.getAttribute(DynAttributeNames.AGENT_LOCATION)`
	`101`	`+ + "), Goal: In(" + goal + ")");`
`102`	`102`	`}`
`103`	`103`	`return goal != null ? Optional.of(goal) : Optional.empty();`
`104`	`104`	`}`
`@@ -117,11 +117,7 @@ protected Optional<List<MoveToAction>> search(Problem<String, MoveToAction> prob`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`protected void notifyViewOfMetrics() {`
`120`		`- if (notifier != null) {`
`121`		`- Set<String> keys = search.getMetrics().keySet();`
`122`		`- for (String key : keys) {`
`123`		`- notifier.notifyViews("METRIC[" + key + "]=" + search.getMetrics().get(key));`
`124`		`- }`
`125`		`- }`
	`120`	`+ if (notifier != null)`
	`121`	`+ notifier.notifyViews("Search metrics: " + search.getMetrics());`
`126`	`122`	`}`
`127`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* @author Ruediger Lunde`
`8`	`8`	`*/`
`9`	`9`	`public class DataResource {`
`10`		`- public static InputStream getULMFileResource() {`
	`10`	`+ public static InputStream getUlmFileResource() {`
`11`	`11`	`return DataResource.class.getResourceAsStream("ulm.osm");`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@`
`41`	`41`	`* @author Ruediger Lunde`
`42`	`42`	`*`
`43`	`43`	`*/`
`44`		`-public class OsmOnlineAgentApp extends IntegrableApplication {`
	`44`	`+public class OnlineAgentOsmApp extends IntegrableApplication {`
`45`	`45`
`46`	`46`	`public static String PARAM_STRATEGY = "strategy";`
`47`	`47`
`@@ -61,12 +61,12 @@ public static void main(String[] args) {`
`61`	`61`
`62`	`62`	`@Override`
`63`	`63`	`public String getTitle() {`
`64`		`- return "OSM Online Agent App";`
	`64`	`+ return "Online Agent OSM App";`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`/** Loads a map of the city of Ulm, Germany. Override to change the map. */`
`68`	`68`	`protected void loadMap() {`
`69`		`- mapPaneCtrl.loadMap(DataResource.getULMFileResource());`
	`69`	`+ mapPaneCtrl.loadMap(DataResource.getUlmFileResource());`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`protected List<Parameter> createParameters() {`