executeAction of Environment does not return a state anymore(was never

ruediger.lunde@gmail.com · ruediger.lunde@gmail.com · commit 0befd0804d26 · 2016-08-07T15:27:51.000+02:00
used)
diff --git a/aima-core/src/main/java/aima/core/agent/impl/AbstractEnvironment.java b/aima-core/src/main/java/aima/core/agent/impl/AbstractEnvironment.java
@@ -38,11 +38,15 @@ public abstract class AbstractEnvironment implements Environment,
 	// PRUBLIC METHODS
 	//
 
+	/** Default implementation returns null. */
+	public EnvironmentState getCurrentState() {
+		return null;
+	}
+	
 	//
 	// Methods to be implemented by subclasses.
-	public abstract EnvironmentState getCurrentState();
 
-	public abstract EnvironmentState executeAction(Agent agent, Action action);
+	public abstract void executeAction(Agent agent, Action action);
 
 	public abstract Percept getPerceptSeenBy(Agent anAgent);
 
diff --git a/aima-core/src/main/java/aima/core/environment/map/MapEnvironment.java b/aima-core/src/main/java/aima/core/environment/map/MapEnvironment.java
@@ -44,7 +44,7 @@ public EnvironmentState getCurrentState() {
 	}
 
 	@Override
-	public EnvironmentState executeAction(Agent agent, Action a) {
+	public void executeAction(Agent agent, Action a) {
 
 		if (!a.isNoOp()) {
 			MoveToAction act = (MoveToAction) a;
@@ -57,8 +57,6 @@ public EnvironmentState executeAction(Agent agent, Action a) {
 						act.getToLocation(), currTD + distance);
 			}
 		}
-
-		return state;
 	}
 
 	@Override
diff --git a/aima-core/src/main/java/aima/core/environment/vacuum/NondeterministicVacuumEnvironment.java b/aima-core/src/main/java/aima/core/environment/vacuum/NondeterministicVacuumEnvironment.java
@@ -2,7 +2,6 @@
 
 import aima.core.agent.Action;
 import aima.core.agent.Agent;
-import aima.core.agent.EnvironmentState;
 
 /**
  * Create the erratic vacuum world from page 134, AIMA3e. In the erratic vacuum
@@ -38,13 +37,9 @@ public NondeterministicVacuumEnvironment(LocationState locAState, LocationState
 
     /**
      * Execute the agent action
-     *
-     * @param a
-     * @param agentAction
-     * @return the environment state after the action is executed.
      */
     @Override
-    public EnvironmentState executeAction(Agent a, Action agentAction) {
+    public void executeAction(Agent a, Action agentAction) {
         if (ACTION_MOVE_RIGHT == agentAction) {
             envState.setAgentLocation(a, LOCATION_B);
             updatePerformanceMeasure(a, -1);
@@ -72,6 +67,5 @@ else if (VacuumEnvironment.LocationState.Clean == envState.getLocationState(envS
         } else if (agentAction.isNoOp()) {
             isDone = true;
         }
-        return envState;
     }
 }
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
@@ -71,7 +71,7 @@ public EnvironmentState getCurrentState() {
 	}
 
 	@Override
-	public EnvironmentState executeAction(Agent a, Action agentAction) {
+	public void executeAction(Agent a, Action agentAction) {
 
 		if (ACTION_MOVE_RIGHT == agentAction) {
 			envState.setAgentLocation(a, LOCATION_B);
@@ -91,8 +91,6 @@ public EnvironmentState executeAction(Agent a, Action agentAction) {
 			// the agent generates a NoOp.
 			isDone = true;
 		}
-
-		return envState;
 	}
 
 	@Override
diff --git a/aima-core/src/main/java/aima/core/environment/xyenv/XYEnvironment.java b/aima-core/src/main/java/aima/core/environment/xyenv/XYEnvironment.java
@@ -36,9 +36,9 @@ public EnvironmentState getCurrentState() {
 		return envState;
 	}
 
+	/** Does nothing (don't ask me why...). */
 	@Override
-	public EnvironmentState executeAction(Agent a, Action action) {
-		return envState;
+	public void executeAction(Agent a, Action action) {
 	}
 
 	@Override
@@ -50,8 +50,7 @@ public void addObjectToLocation(EnvironmentObject eo, XYLocation loc) {
 		moveObjectToAbsoluteLocation(eo, loc);
 	}
 
-	public void moveObjectToAbsoluteLocation(EnvironmentObject eo,
-			XYLocation loc) {
+	public void moveObjectToAbsoluteLocation(EnvironmentObject eo, XYLocation loc) {
 		// Ensure the object is not already at a location
 		envState.moveObjectToAbsoluteLocation(eo, loc);
 
@@ -119,14 +118,12 @@ public XYEnvironmentState(int width, int height) {
 		this.height = height;
 		for (int h = 1; h <= height; h++) {
 			for (int w = 1; w <= width; w++) {
-				objsAtLocation.put(new XYLocation(h, w),
-						new LinkedHashSet<EnvironmentObject>());
+				objsAtLocation.put(new XYLocation(h, w), new LinkedHashSet<EnvironmentObject>());
 			}
 		}
 	}
 
-	public void moveObjectToAbsoluteLocation(EnvironmentObject eo,
-			XYLocation loc) {
+	public void moveObjectToAbsoluteLocation(EnvironmentObject eo, XYLocation loc) {
 		// Ensure is not already at another location
 		for (Set<EnvironmentObject> eos : objsAtLocation.values()) {
 			if (eos.remove(eo)) {
@@ -180,13 +177,9 @@ public String toString() {
 	//
 	// PRIVATE METHODS
 	//
-	private boolean withinRadius(int radius, XYLocation agentLocation,
-			XYLocation objectLocation) {
-		int xdifference = agentLocation.getXCoOrdinate()
-				- objectLocation.getXCoOrdinate();
-		int ydifference = agentLocation.getYCoOrdinate()
-				- objectLocation.getYCoOrdinate();
-		return Math.sqrt((xdifference * xdifference)
-				+ (ydifference * ydifference)) <= radius;
+	private boolean withinRadius(int radius, XYLocation agentLocation, XYLocation objectLocation) {
+		int xdifference = agentLocation.getXCoOrdinate() - objectLocation.getXCoOrdinate();
+		int ydifference = agentLocation.getYCoOrdinate() - objectLocation.getYCoOrdinate();
+		return Math.sqrt((xdifference * xdifference) + (ydifference * ydifference)) <= radius;
 	}
 }
diff --git a/aima-core/src/main/java/aima/core/learning/reinforcement/example/CellWorldEnvironment.java b/aima-core/src/main/java/aima/core/learning/reinforcement/example/CellWorldEnvironment.java
@@ -82,7 +82,7 @@ public EnvironmentState getCurrentState() {
 	}
 
 	@Override
-	public EnvironmentState executeAction(Agent agent, Action action) {
+	public void executeAction(Agent agent, Action action) {
 		if (!action.isNoOp()) {
 			Cell<Double> s = currentState.getAgentLocation(agent);
 			double probabilityChoice = r.nextDouble();
@@ -103,8 +103,6 @@ public EnvironmentState executeAction(Agent agent, Action action) {
 				throw new IllegalStateException("Failed to simulate the action="+action+" correctly from s="+s);
 			}
 		}
-
-		return currentState;
 	}
 
 	@Override
diff --git a/aima-gui/src/main/java/aima/gui/swing/demo/search/csp/CSPEnvironment.java b/aima-gui/src/main/java/aima/gui/swing/demo/search/csp/CSPEnvironment.java
@@ -2,7 +2,6 @@
 
 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.search.csp.Assignment;
@@ -32,7 +31,7 @@ public Assignment getAssignment() {
 
 	/** Executes the provided action and returns null. */
 	@Override
-	public EnvironmentState executeAction(Agent agent, Action action) {
+	public void executeAction(Agent agent, Action action) {
 		if (action instanceof StateChangeAction) {
 			StateChangeAction a = (StateChangeAction) action;
 			if (a.updateCSP())
@@ -42,13 +41,6 @@ public EnvironmentState executeAction(Agent agent, Action action) {
 			if (agent == null)
 				updateEnvironmentViewsAgentActed(agent, action);
 		}
-		return null;
-	}
-
-	/** Returns null. */
-	@Override
-	public EnvironmentState getCurrentState() {
-		return null;
 	}
 
 	/** Returns null. */
diff --git a/aima-gui/src/main/java/aima/gui/swing/demo/search/games/EightPuzzleApp.java b/aima-gui/src/main/java/aima/gui/swing/demo/search/games/EightPuzzleApp.java
@@ -16,7 +16,6 @@
 import aima.core.agent.Action;
 import aima.core.agent.Agent;
 import aima.core.agent.Environment;
-import aima.core.agent.EnvironmentState;
 import aima.core.agent.Percept;
 import aima.core.agent.impl.AbstractEnvironment;
 import aima.core.environment.eightpuzzle.BidirectionalEightPuzzleProblem;
@@ -361,7 +360,7 @@ protected EightPuzzleBoard getBoard() {
 
 		/** Executes the provided action and returns null. */
 		@Override
-		public EnvironmentState executeAction(Agent agent, Action action) {
+		public void executeAction(Agent agent, Action action) {
 			if (action == EightPuzzleBoard.UP)
 				board.moveGapUp();
 			else if (action == EightPuzzleBoard.DOWN)
@@ -372,13 +371,6 @@ else if (action == EightPuzzleBoard.RIGHT)
 				board.moveGapRight();
 			if (agent == null)
 				updateEnvironmentViewsAgentActed(agent, action);
-			return null;
-		}
-
-		/** Returns null. */
-		@Override
-		public EnvironmentState getCurrentState() {
-			return null;
 		}
 
 		/** Returns null. */
diff --git a/aima-gui/src/main/java/aima/gui/swing/demo/search/games/NQueensApp.java b/aima-gui/src/main/java/aima/gui/swing/demo/search/games/NQueensApp.java
@@ -16,7 +16,6 @@
 import aima.core.agent.Action;
 import aima.core.agent.Agent;
 import aima.core.agent.Environment;
-import aima.core.agent.EnvironmentState;
 import aima.core.agent.Percept;
 import aima.core.agent.impl.AbstractEnvironment;
 import aima.core.environment.nqueens.AttackingPairsHeuristic;
@@ -370,7 +369,7 @@ public NQueensBoard getBoard() {
 		 * Executes the provided action and returns null.
 		 */
 		@Override
-		public EnvironmentState executeAction(Agent agent, Action action) {
+		public void executeAction(Agent agent, Action action) {
 			if (action instanceof QueenAction) {
 				QueenAction act = (QueenAction) action;
 				XYLocation loc = new XYLocation(act.getX(), act.getY());
@@ -383,13 +382,6 @@ else if (act.getName() == QueenAction.MOVE_QUEEN)
 				if (agent == null)
 					updateEnvironmentViewsAgentActed(agent, action);
 			}
-			return null;
-		}
-
-		/** Returns null. */
-		@Override
-		public EnvironmentState getCurrentState() {
-			return null;
 		}
 
 		/** Returns null. */

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public EnvironmentState getCurrentState() {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@Override`
`47`		`- public EnvironmentState executeAction(Agent agent, Action a) {`
	`47`	`+ public void executeAction(Agent agent, Action a) {`
`48`	`48`
`49`	`49`	`if (!a.isNoOp()) {`
`50`	`50`	`MoveToAction act = (MoveToAction) a;`
`@@ -57,8 +57,6 @@ public EnvironmentState executeAction(Agent agent, Action a) {`
`57`	`57`	`act.getToLocation(), currTD + distance);`
`58`	`58`	`}`
`59`	`59`	`}`
`60`		`-`
`61`		`- return state;`
`62`	`60`	`}`
`63`	`61`
`64`	`62`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public EnvironmentState getCurrentState() {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`@Override`
`74`		`- public EnvironmentState executeAction(Agent a, Action agentAction) {`
	`74`	`+ public void executeAction(Agent a, Action agentAction) {`
`75`	`75`
`76`	`76`	`if (ACTION_MOVE_RIGHT == agentAction) {`
`77`	`77`	`envState.setAgentLocation(a, LOCATION_B);`
`@@ -91,8 +91,6 @@ public EnvironmentState executeAction(Agent a, Action agentAction) {`
`91`	`91`	`// the agent generates a NoOp.`
`92`	`92`	`isDone = true;`
`93`	`93`	`}`
`94`		`-`
`95`		`- return envState;`
`96`	`94`	`}`
`97`	`95`
`98`	`96`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public EnvironmentState getCurrentState() {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`@Override`
`85`		`- public EnvironmentState executeAction(Agent agent, Action action) {`
	`85`	`+ public void executeAction(Agent agent, Action action) {`
`86`	`86`	`if (!action.isNoOp()) {`
`87`	`87`	`Cell<Double> s = currentState.getAgentLocation(agent);`
`88`	`88`	`double probabilityChoice = r.nextDouble();`
`@@ -103,8 +103,6 @@ public EnvironmentState executeAction(Agent agent, Action action) {`
`103`	`103`	`throw new IllegalStateException("Failed to simulate the action="+action+" correctly from s="+s);`
`104`	`104`	`}`
`105`	`105`	`}`
`106`		`-`
`107`		`- return currentState;`
`108`	`106`	`}`
`109`	`107`
`110`	`108`	`@Override`