SearchInfrastructure removed.

Author: RuedigerLunde

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

@@ -6,14 +6,16 @@
 import aima.core.search.framework.problem.Problem;
 
 /**
- * Interface for all search algorithms which store at least a part of the
- * exploration history as search tree and return a list of actions which lead
- * from the initial state to a goal state.
+ * Interface for all AIMA3e search algorithms which store at least a part of the
+ * exploration history as search tree and return a list of actions leading from
+ * the initial state to a goal state. This search framework expects all search
+ * algorithms to provide some metrics and to actually explore the search space
+ * by expanding nodes.
  * 
  * @author Ruediger Lunde
  *
  */
-public interface SearchForActions extends SearchInfrastructure {
+public interface SearchForActions {
 	/**
 	 * Returns a list of actions to the goal if the goal was found, a list
 	 * containing a single NoOp Action if already at the goal, or an empty list
@@ -27,4 +29,15 @@ public interface SearchForActions extends SearchInfrastructure {
 	 *         empty list if the goal could not be found.
 	 */
 	List<Action> search(Problem p);
+
+	/**
+	 * Returns all the metrics of the search.
+	 */
+	Metrics getMetrics();
+
+	/**
+	 * Returns the node expander used by the search. Useful for progress
+	 * tracing.
+	 */
+	NodeExpander getNodeExpander();
 }

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

@@ -3,13 +3,15 @@
 import aima.core.search.framework.problem.Problem;
 
 /**
- * Interface for all search algorithms which forget the exploration history and
- * return just a single state which is hopefully a goal state.
+ * Interface for all AIMA3e search algorithms which forget the exploration history and
+ * return just a single state which is hopefully a goal state. This search framework expects
+ * all search algorithms to provide some metrics and to actually explore the search space
+ * by expanding nodes.
  * 
  * @author Ruediger Lunde
  *
  */
-public interface SearchForStates extends SearchInfrastructure {
+public interface SearchForStates {
 	/**
 	 * Returns a state which is might be but not necessary is a goal state of
 	 * the problem.
@@ -20,4 +22,14 @@ public interface SearchForStates extends SearchInfrastructure {
 	 * @return a state.
 	 */
 	Object searchState(Problem p);
+	
+	/**
+	 * Returns all the metrics of the search.
+	 */
+	Metrics getMetrics();
+	
+	/**
+	 * Returns the node expander used by the search. Useful for progress tracing.
+	 */
+	NodeExpander getNodeExpander();
 }