Extension point for 2D vacuum environments added.

RuedigerLunde · RuedigerLunde · commit ed65db14c24b · 2017-06-30T18:46:21.000+02:00
diff --git a/aima-core/src/main/java/aima/core/environment/vacuum/ModelBasedReflexVacuumAgent.java b/aima-core/src/main/java/aima/core/environment/vacuum/ModelBasedReflexVacuumAgent.java
@@ -62,7 +62,7 @@ protected DynamicState updateState(DynamicState state,
 	private static Set<Rule> getRuleSet() {
 		// Note: Using a LinkedHashSet so that the iteration order (i.e. implied
 		// precedence) of rules can be guaranteed.
-		Set<Rule> rules = new LinkedHashSet<Rule>();
+		Set<Rule> rules = new LinkedHashSet<>();
 
 		rules.add(new Rule(new ANDCondition(new EQUALCondition(
 				ATTRIBUTE_STATE_LOCATION_A,
diff --git a/aima-core/src/main/java/aima/core/environment/vacuum/VacuumEnvironment.java b/aima-core/src/main/java/aima/core/environment/vacuum/VacuumEnvironment.java
@@ -1,16 +1,17 @@
 package aima.core.environment.vacuum;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Random;
-
 import aima.core.agent.Action;
 import aima.core.agent.Agent;
 import aima.core.agent.EnvironmentState;
 import aima.core.agent.Percept;
 import aima.core.agent.impl.AbstractEnvironment;
 import aima.core.agent.impl.DynamicAction;
 import aima.core.search.agent.NondeterministicSearchAgent;
+import aima.core.util.Util;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
 
 /**
  * Artificial Intelligence A Modern Approach (3rd Edition): pg 58.<br>
@@ -25,6 +26,7 @@
  * @author Ravi Mohan
  * @author Ciaran O'Reilly
  * @author Mike Stampone
+ * @author Ruediger Lunde
  */
 public class VacuumEnvironment extends AbstractEnvironment {
 	// Allowable Actions within the Vacuum Environment
@@ -38,23 +40,21 @@ public enum LocationState {
 		Clean, Dirty
 	}
 
-    //
+    private final List<String> locations;
 	protected VacuumEnvironmentState envState = null;
 	protected boolean isDone = false;
 
 	/**
-	 * Constructs a vacuum environment with two locations, in which dirt is
+	 * Constructs a vacuum environment with two locations A and B, in which dirt is
 	 * placed at random.
 	 */
 	public VacuumEnvironment() {
-		Random r = new Random();
-		envState = new VacuumEnvironmentState(
-				0 == r.nextInt(2) ? LocationState.Clean : LocationState.Dirty,
-				0 == r.nextInt(2) ? LocationState.Clean : LocationState.Dirty);
+		this(Util.randomBoolean() ? LocationState.Clean : LocationState.Dirty,
+				Util.randomBoolean() ? LocationState.Clean : LocationState.Dirty);
 	}
 
 	/**
-	 * Constructs a vacuum environment with two locations, in which dirt is
+	 * Constructs a vacuum environment with two locations A and B, in which dirt is
 	 * placed as specified.
 	 * 
 	 * @param locAState
@@ -65,25 +65,69 @@ public VacuumEnvironment() {
 	 *            <em>Clean</em> or <em>Dirty</em>.
 	 */
 	public VacuumEnvironment(LocationState locAState, LocationState locBState) {
-		envState = new VacuumEnvironmentState(locAState, locBState);
+		this(Arrays.asList(LOCATION_A, LOCATION_B), locAState, locBState);
+	}
+
+	protected VacuumEnvironment(List<String> locations, LocationState... locStates) {
+		this.locations = locations;
+		envState = new VacuumEnvironmentState();
+		for (int i = 0; i < locations.size() && i < locStates.length; i++)
+			envState.setLocationState(locations.get(i), locStates[i]);
+	}
+
+	public List<String> getLocations() {
+		return locations;
 	}
 
 	public EnvironmentState getCurrentState() {
 		return envState;
 	}
-	
-	public List<String> getLocations() {
-		return Arrays.asList(LOCATION_A, LOCATION_B);
+
+	public LocationState getLocationState(String location) {
+		return envState.getLocationState(location);
+	}
+
+	public String getAgentLocation(Agent a) {
+		return envState.getAgentLocation(a);
 	}
 
 	@Override
-	public void executeAction(Agent a, Action agentAction) {
+	public void addAgent(Agent a) {
+		int idx = new Random().nextInt(locations.size());
+		envState.setAgentLocation(a, locations.get(idx));
+		super.addAgent(a);
+	}
 
+	public void addAgent(Agent a, String location) {
+		// Ensure the agent state information is tracked before
+		// adding to super, as super will notify the registered
+		// EnvironmentViews that is was added.
+		envState.setAgentLocation(a, location);
+		super.addAgent(a);
+	}
+
+	@Override
+	public Percept getPerceptSeenBy(Agent anAgent) {
+		if (anAgent instanceof NondeterministicSearchAgent) {
+			// This agent expects a fully observable environment. It gets a clone of the environment state.
+			return envState.clone();
+		}
+		// Other agents get a local percept.
+		String agentLocation = envState.getAgentLocation(anAgent);
+		return new LocalVacuumEnvironmentPercept(agentLocation, envState.getLocationState(agentLocation));
+	}
+
+	@Override
+	public void executeAction(Agent a, Action agentAction) {
 		if (ACTION_MOVE_RIGHT == agentAction) {
-			envState.setAgentLocation(a, LOCATION_B);
+			int pos = locations.indexOf(getAgentLocation(a));
+			if (pos < locations.size()-1)
+				envState.setAgentLocation(a, locations.get(pos + 1));
 			updatePerformanceMeasure(a, -1);
 		} else if (ACTION_MOVE_LEFT == agentAction) {
-			envState.setAgentLocation(a, LOCATION_A);
+			int pos = locations.indexOf(getAgentLocation(a));
+			if (pos > 0)
+				envState.setAgentLocation(a, locations.get(pos - 1));
 			updatePerformanceMeasure(a, -1);
 		} else if (ACTION_SUCK == agentAction) {
 			if (LocationState.Dirty == envState.getLocationState(envState
@@ -99,42 +143,34 @@ public void executeAction(Agent a, Action agentAction) {
 		}
 	}
 
-	@Override
-	public Percept getPerceptSeenBy(Agent anAgent) {
-		if (anAgent instanceof NondeterministicSearchAgent) {
-    		// This agent expects a fully observable environment. It gets a clone of the environment state.
-    		return envState.clone();
-    	}
-    	// Other agents get a local percept.
-		String agentLocation = envState.getAgentLocation(anAgent);
-		return new LocalVacuumEnvironmentPercept(agentLocation, envState.getLocationState(agentLocation));
-	}
-
 	@Override
 	public boolean isDone() {
 		return super.isDone() || isDone;
 	}
 
-	@Override
-	public void addAgent(Agent a) {
-		int idx = new Random().nextInt(2);
-		envState.setAgentLocation(a, idx == 0 ? LOCATION_A : LOCATION_B);
-		super.addAgent(a);
+
+	// Information for grid views...
+
+	public int getXDimension() {
+		return locations.size();
 	}
 
-	public void addAgent(Agent a, String location) {
-		// Ensure the agent state information is tracked before
-		// adding to super, as super will notify the registered
-		// EnvironmentViews that is was added.
-		envState.setAgentLocation(a, location);
-		super.addAgent(a);
+	public int getYDimension() {
+		return 1;
 	}
 
-	public LocationState getLocationState(String location) {
-		return envState.getLocationState(location);
+	// 1 means left
+	public int getX(String location) {
+		return getLocations().indexOf(location) % getXDimension() + 1;
 	}
 
-	public String getAgentLocation(Agent a) {
-		return envState.getAgentLocation(a);
+	// 1 means bottom
+	public int getY(String location) {
+		return getYDimension() - getLocations().indexOf(location) / getXDimension();
+	}
+
+	// (1, 1) is bottom left
+	public String getLocation(int x, int y) {
+		return locations.get((getYDimension() - y) * getXDimension() + x - 1);
 	}
 }
diff --git a/aima-core/src/main/java/aima/core/environment/vacuum/VacuumEnvironmentState.java b/aima-core/src/main/java/aima/core/environment/vacuum/VacuumEnvironmentState.java
@@ -27,19 +27,6 @@ public VacuumEnvironmentState() {
 		agentLocations = new LinkedHashMap<>();
 	}
 
-	/**
-	 * Constructor
-	 * 
-	 * @param locAState
-	 * @param locBState
-	 */
-	public VacuumEnvironmentState(VacuumEnvironment.LocationState locAState,
-			VacuumEnvironment.LocationState locBState) {
-		this();
-		state.put(VacuumEnvironment.LOCATION_A, locAState);
-		state.put(VacuumEnvironment.LOCATION_B, locBState);
-	}
-
 	public String getAgentLocation(Agent a) {
 		return agentLocations.get(a);
 	}
diff --git a/aima-core/src/main/java/aima/core/util/Util.java b/aima-core/src/main/java/aima/core/util/Util.java
@@ -5,12 +5,13 @@
 
 /**
  * @author Ravi Mohan
+ * @author Ruediger Lunde
  * 
  */
 public class Util {
 	public static final String NO = "No";
 	public static final String YES = "Yes";
-	//
+
 	private static Random random = new Random();
 
 	private static final double EPSILON = 0.000000000001;
@@ -91,9 +92,12 @@ public static <T> T selectRandomlyFromSet(Set<T> set) {
 		return iterator.next();
 	}
 
+	public static int randomInt(int bound) {
+		return random.nextInt(bound);
+	}
+
 	public static boolean randomBoolean() {
-		int trueOrFalse = random.nextInt(2);
-		return (!(trueOrFalse == 0));
+		return random.nextInt(2) == 1;
 	}
 
 	public static double[] normalize(double[] probDist) {
diff --git a/aima-gui/src/main/java/aima/gui/fx/views/AbstractGridEnvironmentViewCtrl.java b/aima-gui/src/main/java/aima/gui/fx/views/AbstractGridEnvironmentViewCtrl.java
@@ -51,7 +51,6 @@ protected AbstractGridEnvironmentViewCtrl(StackPane viewRoot, ToIntFunction<Envi
         splitPane.setStyle("-fx-background-color: white");
         envStateView.setMinWidth(0.0);
         envStateView.setCenter(gridPane);
-        //viewRoot.setAlignment(Pos.BOTTOM_CENTER);
         squareSize.bind(Bindings.min(envStateView.widthProperty().subtract(20).divide(xDimension),
                 envStateView.heightProperty().subtract(20).subtract(actionLabel.heightProperty()).divide(yDimension)));
         squareSize.addListener((obs, o, n) -> updateFontSize());
@@ -66,8 +65,9 @@ protected AbstractGridEnvironmentViewCtrl(StackPane viewRoot, ToIntFunction<Envi
         envStateView.setBottom(actionLabel);
     }
 
+    /** (1, 1) is bottom left. */
     protected SquareButton getSquareButton(int x, int y) {
-        return squareButtons.get((y - 1) * xDimension.get() + x - 1);
+        return squareButtons.get((yDimension.get() - y) * xDimension.get() + x - 1);
     }
 
     @Override
@@ -102,14 +102,12 @@ private void updateDimensions() {
             gridPane.getColumnConstraints().add(cc);
 
         squareButtons.clear();
-        for (int y = 1; y <= yDim; y++) {
+        for (int y = yDim; y >= 1; y--) {
             for (int x = 1; x <= xDim; x++) {
                 final int x1 = x;
                 final int y1 = y;
                 SquareButton btn = new SquareButton();
                 btn.getIdLabel().setText(x1 + ", " + y1);
-                if (squareSize.get() < 80)
-                    btn.getIdLabel().setVisible(false);
                 btn.setOnAction(ev -> onEdit(x1, y1));
                 squareButtons.add(btn);
                 gridPane.add(btn, x - 1, yDim - y);
@@ -119,8 +117,10 @@ private void updateDimensions() {
     }
 
     private void updateFontSize() {
-        for (SquareButton btn : squareButtons)
+        for (SquareButton btn : squareButtons) {
             btn.getLabel().setFont(Font.font(squareSize.get() * fontSizeFactor));
+            btn.getIdLabel().setVisible(squareSize.get() >= 80);
+        }
     }
 
     /** Can be called from any thread. */
diff --git a/aima-gui/src/main/java/aima/gui/fx/views/VacuumEnvironmentViewCtrl.java b/aima-gui/src/main/java/aima/gui/fx/views/VacuumEnvironmentViewCtrl.java
@@ -30,7 +30,8 @@ public class VacuumEnvironmentViewCtrl extends AbstractGridEnvironmentViewCtrl {
     private Map<Agent, Arc> agentSymbols = new HashMap<>();
 
     public VacuumEnvironmentViewCtrl(StackPane viewRoot) {
-        super(viewRoot, env -> ((VacuumEnvironment) env).getLocations().size(), env -> 1);
+        super(viewRoot, env -> ((VacuumEnvironment) env).getXDimension(),
+                env -> ((VacuumEnvironment) env).getYDimension());
     }
 
     @Override
@@ -39,10 +40,10 @@ public void initialize(Environment env) {
         agentOrientations.clear();
         agentSymbols.clear();
         super.initialize(env);
-        List<String> locations = ((VacuumEnvironment) env).getLocations();
-        for (int x = 1; x <= locations.size(); x++) {
-            SquareButton btn = getSquareButton(x, 1);
-            btn.getIdLabel().setText(locations.get((x - 1)));
+        VacuumEnvironment vEnv = (VacuumEnvironment) env;
+        for (String loc : vEnv.getLocations()) {
+            SquareButton btn = getSquareButton(vEnv.getX(loc), vEnv.getY(loc));
+            btn.getIdLabel().setText(loc);
         }
     }
 
@@ -62,17 +63,17 @@ else if (action == VacuumEnvironment.ACTION_MOVE_RIGHT)
     @Override
     protected void update() {
         VacuumEnvironment vEnv = ((VacuumEnvironment) env);
-        List<String> locations = vEnv.getLocations();
-        for (int x = 1; x <= locations.size(); x++) {
-            SquareButton btn = getSquareButton(x, 1);
-            if (vEnv.getLocationState(locations.get(x-1)).equals(LocationState.Dirty))
+        for (String loc : vEnv.getLocations()) {
+            SquareButton btn = getSquareButton(vEnv.getX(loc), vEnv.getY(loc));
+            if (vEnv.getLocationState(loc).equals(LocationState.Dirty))
                 btn.getLabel().setText("Dirty");
             else
                 btn.getLabel().setText(""); // "Clean"
             btn.getPane().getChildren().clear();
         }
         for (Agent agent : vEnv.getAgents()) {
-            SquareButton btn = getSquareButton(locations.indexOf(vEnv.getAgentLocation(agent)) + 1, 1);
+            String loc = vEnv.getAgentLocation(agent);
+            SquareButton btn = getSquareButton(vEnv.getX(loc), vEnv.getY(loc));
             Integer orientation = agentOrientations.get(agent);
             if (orientation == null)
                 orientation = 0;
@@ -87,7 +88,7 @@ protected void onEdit(int x, int y) {
         else {
             VacuumEnvironment vEnv = (VacuumEnvironment) env;
             VacuumEnvironmentState state = (VacuumEnvironmentState) vEnv.getCurrentState();
-            String loc = vEnv.getLocations().get(x-1);
+            String loc = vEnv.getLocation(x, y);
             state.setLocationState(loc,
                     state.getLocationState(loc) == LocationState.Clean ? LocationState.Dirty : LocationState.Clean);
             update();
