Search interface and IterativeDeepening cleaned up.

Author: RuedigerLunde

aima-core/src/main/java/aima/core/environment/map/MapAgent.java

@@ -102,7 +102,7 @@ protected Problem formulateProblem(Object goal) {
 	protected List<Action> search(Problem problem) {
 		List<Action> result = new ArrayList<Action>();
 		try {
-			result.addAll(search.search(problem));
+			result.addAll(search.findActions(problem));
 		} catch (Exception ex) {
 			ex.printStackTrace();
 		}

aima-core/src/main/java/aima/core/environment/map/SimpleMapAgent.java

@@ -99,7 +99,7 @@ protected Problem formulateProblem(Object goal) {
 	protected List<Action> search(Problem problem) {
 		List<Action> result = new ArrayList<Action>();
 		try {
-			result.addAll(search.search(problem));
+			result.addAll(search.findActions(problem));
 		} catch (Exception ex) {
 			ex.printStackTrace();
 		}

aima-core/src/main/java/aima/core/search/framework/CutOffIndicatorAction.java

@@ -26,16 +26,16 @@ public PrioritySearch(QueueSearch impl, Comparator<Node> comp) {
 	}
 
 	@Override
-	public List<Action> search(Problem p) {
+	public List<Action> findActions(Problem p) {
 		implementation.getNodeExpander().useParentLinks(true);
-		Node node = implementation.search(p, QueueFactory.<Node>createPriorityQueue(comparator));
+		Node node = implementation.findNode(p, QueueFactory.<Node>createPriorityQueue(comparator));
 		return node == null ? SearchUtils.failure() : SearchUtils.getSequenceOfActions(node);
 	}
 
 	@Override
-	public Object searchState(Problem p) {
+	public Object findState(Problem p) {
 		implementation.getNodeExpander().useParentLinks(false);
-		Node node = implementation.search(p, QueueFactory.<Node>createPriorityQueue(comparator));
+		Node node = implementation.findNode(p, QueueFactory.<Node>createPriorityQueue(comparator));
 		return node == null ? null : node.getState();
 	}
 

aima-core/src/main/java/aima/core/search/framework/PrioritySearch.java

@@ -22,7 +22,7 @@ public class SearchAgent extends AbstractAgent {
 	private Metrics searchMetrics;
 
 	public SearchAgent(Problem p, SearchForActions search) throws Exception {
-		actionList = search.search(p);
+		actionList = search.findActions(p);
 		actionIterator = actionList.iterator();
 		searchMetrics = search.getMetrics();
 	}

aima-core/src/main/java/aima/core/search/framework/SearchAgent.java

@@ -28,7 +28,7 @@ public interface SearchForActions {
 	 *         containing a single NoOp Action if already at the goal, or an
 	 *         empty list if the goal could not be found.
 	 */
-	List<Action> search(Problem p);
+	List<Action> findActions(Problem p);
 
 	/**
 	 * Returns all the metrics of the search.

aima-core/src/main/java/aima/core/search/framework/SearchForActions.java

@@ -21,7 +21,7 @@ public interface SearchForStates {
 	 * 
 	 * @return a state.
 	 */
-	Object searchState(Problem p);
+	Object findState(Problem p);
 
 	/**
 	 * Returns all the metrics of the search.

aima-core/src/main/java/aima/core/search/framework/SearchForStates.java

@@ -79,7 +79,7 @@ public BidirectionalSearch(NodeExpander nodeExpander) {
 	 *         containing a single NoOp Action if already at the goal, or an
 	 *         empty list if the goal could not be found.
 	 */
-	public Node search(Problem problem, Queue<Node> frontier) {
+	public Node findNode(Problem problem, Queue<Node> frontier) {
 		assert (problem instanceof BidirectionalProblem);
 
 		nodeExpander.useParentLinks(true); // bidirectional search needs parents!

aima-core/src/main/java/aima/core/search/framework/qsearch/BidirectionalSearch.java

@@ -28,7 +28,7 @@
  * Figure 3.7 An informal description of the general graph-search algorithm.
  * <br>
  * This implementation is based on the template method
- * {@link QueueSearch#search(Problem, Queue)} of the superclass and provides
+ * {@link QueueSearch#findNode(Problem, Queue)} of the superclass and provides
  * implementations for the needed primitive operations. In contrast to the code
  * above, here, nodes resulting from node expansion are added to the frontier
  * even if nodes for the same states already exist there. This makes it possible
@@ -56,10 +56,10 @@ public GraphSearch(NodeExpander nodeExpander) {
 	 * {@link QueueSearch}.
 	 */
 	@Override
-	public Node search(Problem problem, Queue<Node> frontier) {
+	public Node findNode(Problem problem, Queue<Node> frontier) {
 		// initialize the explored set to be empty
 		explored.clear();
-		return super.search(problem, frontier);
+		return super.findNode(problem, frontier);
 	}
 
 	/**

aima-core/src/main/java/aima/core/search/framework/qsearch/GraphSearch.java

@@ -28,7 +28,7 @@
  * Figure 3.7 An informal description of the general graph-search algorithm.
  * <br>
  * This implementation is based on the template method
- * {@link QueueSearch#search(Problem, Queue)} of the superclass and
+ * {@link QueueSearch#findNode(Problem, Queue)} of the superclass and
  * provides implementations for the needed primitive operations. It is the most
  * efficient variant of graph search for breadth first search. But don't expect
  * shortest paths in combination with priority queue frontiers.
@@ -56,11 +56,11 @@ public GraphSearchBFS(NodeExpander nodeExpander) {
 	 * <code>QueSearch</code>
 	 */
 	@Override
-	public Node search(Problem problem, Queue<Node> frontier) {
+	public Node findNode(Problem problem, Queue<Node> frontier) {
 		// Initialize the explored set to be empty
 		explored.clear();
 		frontierStates.clear();
-		return super.search(problem, frontier);
+		return super.findNode(problem, frontier);
 	}
 
 	/**