Some variables renamed (following textbook name conventions).

aimacode · Apr 22, 2016 · 90fc4d5 · 90fc4d5
1 parent e447ca8
commit 90fc4d5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/aima-core/src/main/java/aima/core/search/framework/SearchUtils.java b/aima-core/src/main/java/aima/core/search/framework/SearchUtils.java
@@ -40,7 +40,7 @@ public static interface NodeListener {
 	 *         specified problem.
 	 */
 	public static List<Node> expandNode(Node node, Problem problem) {
-		List<Node> childNodes = new ArrayList<Node>();
+		List<Node> successors = new ArrayList<Node>();
 
 		for (NodeListener listener : nodeListeners)
 			listener.onNodeExpanded(node);
@@ -53,9 +53,9 @@ public static List<Node> expandNode(Node node, Problem problem) {
 			Object successorState = resultFunction.result(node.getState(), action);
 
 			double stepCost = stepCostFunction.c(node.getState(), action, successorState);
-			childNodes.add(new Node(successorState, node, action, stepCost));
+			successors.add(new Node(successorState, node, action, stepCost));
 		}
-		return childNodes;
+		return successors;
 	}
 
 	/**

diff --git a/aima-core/src/main/java/aima/core/search/framework/qsearch/BidirectionalSearch.java b/aima-core/src/main/java/aima/core/search/framework/qsearch/BidirectionalSearch.java
@@ -103,16 +103,16 @@ public List<Action> search(Problem problem, Queue<Node> frontier) {
 			// expand the chosen node, adding the resulting nodes to the
 			// frontier
 			metrics.incrementInt(METRIC_NODES_EXPANDED);
-			for (Node cn : SearchUtils.expandNode(nodeToExpand, problem)) {
+			for (Node s : SearchUtils.expandNode(nodeToExpand, problem)) {
-				ExtendedNode childNode = new ExtendedNode(cn, nodeToExpand.getProblemIndex());
+				ExtendedNode successor = new ExtendedNode(s, nodeToExpand.getProblemIndex());
 				if (!isReverseActionTestEnabled || nodeToExpand.getProblemIndex() == ORG_P_IDX
-						|| getReverseAction(orgP, childNode) != null) {
+						|| getReverseAction(orgP, successor) != null) {
 
 					if (checkGoalBeforeAddingToFrontier
-							&& (nodeFromOtherProblem = getCorrespondingNodeFromOtherProblem(childNode)) != null)
+							&& (nodeFromOtherProblem = getCorrespondingNodeFromOtherProblem(successor)) != null)
-						return getSolution(orgP, childNode, nodeFromOtherProblem);
+						return getSolution(orgP, successor, nodeFromOtherProblem);
 
-					insertIntoFrontier(childNode);
+					insertIntoFrontier(successor);
 				}
 			}
 		}

diff --git a/aima-core/src/main/java/aima/core/search/framework/qsearch/QueueSearch.java b/aima-core/src/main/java/aima/core/search/framework/qsearch/QueueSearch.java
@@ -70,12 +70,12 @@ public List<Action> search(Problem problem, Queue<Node> frontier) {
 			// expand the chosen node, adding the resulting nodes to the
 			// frontier
 			metrics.incrementInt(METRIC_NODES_EXPANDED);
-			for (Node childNode : SearchUtils.expandNode(nodeToExpand, problem)) {
+			for (Node successor : SearchUtils.expandNode(nodeToExpand, problem)) {
 				if (checkGoalBeforeAddingToFrontier) {
-					if (SearchUtils.isGoalState(problem, childNode))
+					if (SearchUtils.isGoalState(problem, successor))
-						return getSolution(childNode);
+						return getSolution(successor);
 				}
-				insertIntoFrontier(childNode);
+				insertIntoFrontier(successor);
 			}
 		}
 		// if the frontier is empty then return failure