Minor improvements added.

Author: RuedigerLunde

aima-gui/src/main/java/aima/gui/fx/demo/search/MapColoringApp.java

@@ -6,7 +6,6 @@
 import aima.gui.fx.framework.SimulationPaneBuilder;
 import aima.gui.fx.framework.SimulationPaneCtrl;
 import aima.gui.fx.views.BinaryCspViewCtrl;
-import aima.gui.fx.views.NQueensViewCtrl;
 import javafx.application.Platform;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.Pane;

aima-gui/src/main/java/aima/gui/fx/demo/search/NQueensSearchApp.java

@@ -1,9 +1,12 @@
 package aima.gui.fx.demo.search;
 
+import aima.core.environment.nqueens.AttackingPairsHeuristic;
 import aima.core.environment.nqueens.NQueensBoard;
 import aima.core.environment.nqueens.NQueensBoard.Config;
 import aima.core.search.framework.Metrics;
+import aima.core.search.framework.qsearch.GraphSearch;
 import aima.core.search.framework.qsearch.TreeSearch;
+import aima.core.search.informed.AStarSearch;
 import aima.core.search.uninformed.DepthFirstSearch;
 import aima.gui.fx.framework.IntegrableApplication;
 import aima.gui.fx.framework.Parameter;
@@ -15,11 +18,13 @@
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.StackPane;
 
+import java.util.Arrays;
+
 
 /**
  * Integrable application which demonstrates how different search strategies
  * solve the N-Queens problem.
- * 
+ *
  * @author Ruediger Lunde
  *
  */
@@ -69,10 +74,10 @@ public Pane createRootPane() {
 
 		return root;
 	}
-	
+
 	protected Parameter[] createParameters() {
-		Parameter p1 = new Parameter(PARAM_STRATEGY, "Depth-First Search", "Hill Climbing", "Simulated Annealing",
-				"Genetic Algorithm");
+		Parameter p1 = new Parameter(PARAM_STRATEGY, "Depth-First Search", "A* search (attacking pair heuristic)",
+                "Hill Climbing", "Simulated Annealing", "Genetic Algorithm");
 		Parameter p2 = new Parameter(PARAM_BOARD_SIZE, 8, 16, 32, 64);
 		Parameter p3 = new Parameter(PARAM_INIT_CONFIG, "FirstRow", "Random");
 		p3.setDependency(PARAM_STRATEGY, "Hill Climbing", "Simulated Annealing", "Genetic Algorithm");
@@ -85,7 +90,8 @@ public void initialize() {
 		experiment.setBoardSize(simPaneCtrl.getParamAsInt(PARAM_BOARD_SIZE));
 		Object strategy = simPaneCtrl.getParamValue(PARAM_STRATEGY);
 		Config config;
-		if (strategy.equals("Depth-First Search") || strategy.equals("Genetic Algorithm"))
+		if (Arrays.asList("Depth-First Search", "A* search (attacking pair heuristic)", "Genetic Algorithm")
+                .contains(strategy))
 			config = Config.EMPTY;
 		else if (simPaneCtrl.getParamValue(PARAM_INIT_CONFIG).equals("Random"))
 			config = Config.QUEEN_IN_EVERY_COL;
@@ -105,6 +111,8 @@ public void simulate() {
 		Object strategy = simPaneCtrl.getParamValue(PARAM_STRATEGY);
 		if (strategy.equals("Depth-First Search"))
 			experiment.startExperiment(new DepthFirstSearch(new TreeSearch()));
+        else if (strategy.equals("A* search (attacking pair heuristic)"))
+            experiment.startExperiment(new AStarSearch(new GraphSearch(), new AttackingPairsHeuristic()));
 		else if (strategy.equals("Hill Climbing"))
 			experiment.startHillClimbingExperiment();
 		else if (strategy.equals("Simulated Annealing"))

aima-gui/src/main/java/aima/gui/fx/views/BinaryCspViewCtrl.java

@@ -127,9 +127,9 @@ protected void visualize(Constraint constraint) {
     }
 
     /**
-     * Computes transforms (translations and scaling) and applies them to the
-     * environment state view. Those transforms map location positions in the
-     * map to screen positions in the viewer pane.
+     * Computes transforms (translations and scaling) and applies them to the environment state view. Those transforms
+     * map logical positions to screen positions in the viewer pane. The purpose is to show the graphical state
+     * representation as large as possible.
      *
      * @return The scale value.
      */
@@ -145,11 +145,11 @@ private double adjustTransform() {
             yMin = Math.min(yMin, point.getY());
             yMax = Math.max(yMax, point.getY());
         }
-        double scale = Math.min((pane.getWidth() - 150) / (xMax - xMin + 60),
-                (pane.getHeight() - 100) / (yMax - yMin + 60));
+        double scale = Math.min(pane.getWidth() / (xMax - xMin + 300),
+                pane.getHeight() / (yMax - yMin + 150));
 
-        pane.setTranslateX((scale * (pane.getWidth() - xMin - xMax) / 2.0 - 30));
-        pane.setTranslateY((scale * (pane.getHeight() - yMin - yMax) / 2.0 - 30));
+        pane.setTranslateX((scale * (pane.getWidth() - xMin - xMax) / 2.0));
+        pane.setTranslateY((scale * (pane.getHeight() - yMin - yMax) / 2.0));
         pane.setScaleX(scale);
         pane.setScaleY(scale);
         return scale;