Moves getBestMoves & getLow from SearchResult static to SearchParameters

Author: fathzer

src/main/java/com/fathzer/games/ai/SearchParameters.java

@@ -1,5 +1,10 @@
 package com.fathzer.games.ai;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fathzer.games.ai.evaluation.EvaluatedMove;
+
 /** The parameters of an AI search.
  * @see SearchResult
  */
@@ -73,4 +78,21 @@ public void setAccuracy(int accuracy) {
 		}
 		this.accuracy = accuracy;
 	}
+	
+	public <M> int getLow(List<EvaluatedMove<M>> moves) {
+		return moves.size()>=size ? moves.get(size-1).getScore() - accuracy -1 : Integer.MIN_VALUE;
+	}
+	
+	public <M> List<EvaluatedMove<M>> getBestMoves(List<EvaluatedMove<M>> moves) {
+		final List<EvaluatedMove<M>> cut = new ArrayList<>(moves.size());
+		final int low = getLow(moves);
+		int currentCount = 0;
+		for (EvaluatedMove<M> ev : moves) {
+			if (ev.getScore()>low || currentCount<size) {
+				cut.add(ev);
+				currentCount++;
+			}
+		}
+		return cut;
+	}
 }

src/main/java/com/fathzer/games/ai/SearchResult.java

@@ -1,6 +1,5 @@
 package com.fathzer.games.ai;
 
-import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -23,8 +22,12 @@ public SearchResult(SearchParameters params) {
 		this.result = new LinkedList<>();
 	}
 
+	public SearchParameters getSearchParameters() {
+		return params;
+	}
+	
 	synchronized int getLow() {
-		return getLow(result, params);
+		return params.getLow(result);
 	}
 
 	public synchronized void add(M move, Evaluation value) {
@@ -57,26 +60,7 @@ synchronized int getIndex(M move) {
      * It can also have less than size elements if there's less than size legal moves or search was interrupted before it finished. 
 	 */
 	public synchronized List<EvaluatedMove<M>> getCut() {
-		return getBestMoves(result, params);
-	}
-	
-	public static <M> int getLow(List<EvaluatedMove<M>> moves, SearchParameters params) {
-		return moves.size()>=params.getSize() ? moves.get(params.getSize()-1).getScore() - params.getAccuracy() -1 : Integer.MIN_VALUE;
-	}
-	
-	//TODO Move this method in SearchParameters?
-	public static <M> List<EvaluatedMove<M>> getBestMoves(List<EvaluatedMove<M>> moves, SearchParameters params) {
-		final List<EvaluatedMove<M>> cut = new ArrayList<>(moves.size());
-		final int low = getLow(moves, params);
-		int currentCount = 0;
-		for (EvaluatedMove<M> ev : moves) {
-			if (ev.getScore()>low || currentCount<params.getSize()) {
-				cut.add(ev);
-				currentCount++;
-			}
-		}
-		return cut;
-		
+		return params.getBestMoves(result);
 	}
 
 	/** Gets the list of moves evaluation.

src/main/java/com/fathzer/games/ai/iterativedeepening/DeepeningPolicy.java

@@ -139,6 +139,9 @@ public <M> List<M> getMovesToDeepen(DepthFirstSearchParameters currentParams, Se
 	 * @param history The search history, including the result at {@code depth}
 	 * @param evaluatedMoves The evaluations obtained at {@code currentParams}'s depth
 	 * @return The list of evaluations without the win/loose moves that we do not need to deepen.
+	 * <br>If some winning moves has been removed, <code>currentParams</code> is also decremented accordingly
+	 * (for instance, if size was 3 and 2 moves are winning, <code>currentParams</code>'s size is set to 1,
+	 * allowing deeper search to return only 1 move with an exact evaluation). 
 	 */
 	protected <M> List<EvaluatedMove<M>> filterWinLooseMoves(DepthFirstSearchParameters currentParams, SearchHistory<M> history, List<EvaluatedMove<M>> evaluatedMoves) {
 		final AtomicInteger size = new AtomicInteger(currentParams.getSize());
@@ -188,7 +191,7 @@ public <M> Optional<SearchResult<M>> mergeInterrupted(SearchHistory<M> history,
 			return Optional.empty();
 		}
 		final List<EvaluatedMove<M>> historyMoves = history.getLastList();
-		final int previousLow = SearchResult.getLow(historyMoves, this);
+		final int previousLow = this.getLow(historyMoves);
 		final boolean trap = partialList.get(partialList.size()-1).getScore()<=previousLow;
 		final SearchResult<M> mergedResult = new SearchResult<>(this);
 		if (trap) {

src/main/java/com/fathzer/games/ai/iterativedeepening/FirstBestMoveSelector.java

@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import com.fathzer.games.ai.SearchResult;
 import com.fathzer.games.ai.evaluation.EvaluatedMove;
 import com.fathzer.games.ai.moveselector.MoveSelector;
 
@@ -21,7 +20,7 @@ public List<EvaluatedMove<M>> select(SearchHistory<M> history, List<EvaluatedMov
 
 	protected List<EvaluatedMove<M>> filter(SearchHistory<M> history, List<EvaluatedMove<M>> bestMoves) {
 		for (int i=history.length()-1;i>=0;i--) {
-			final List<EvaluatedMove<M>> best = SearchResult.getBestMoves(history.getList(i), history.getSearchParameters());
+			final List<EvaluatedMove<M>> best = history.getSearchParameters().getBestMoves(history.getList(i));
 			final List<M> cut = best.stream().map(EvaluatedMove::getMove).toList();
 			bestMoves = getCandidates(bestMoves, cut);
 			log(i, cut, bestMoves);

src/main/java/com/fathzer/games/ai/iterativedeepening/SearchHistory.java

@@ -4,7 +4,6 @@
 import java.util.List;
 
 import com.fathzer.games.ai.SearchParameters;
-import com.fathzer.games.ai.SearchResult;
 import com.fathzer.games.ai.evaluation.EvaluatedMove;
 import com.fathzer.games.ai.moveselector.MoveSelector;
 
@@ -79,12 +78,12 @@ public List<EvaluatedMove<M>> getList(int index) {
 	}
 
 	/** Returns the best moves of a result added with {@link #add(List, int)} method.
-	 * <br>This move is computed by {@link SearchResult#getBestMoves(List, SearchParameters)}
+	 * <br>This move is computed by {@link SearchParameters#getBestMoves(List)}
 	 * @param index The index of the result
 	 * @return a list of moves restricted to the size and accuracy of this history
 	 */
 	public List<EvaluatedMove<M>> getBestMoves(int index) {
-		return SearchResult.getBestMoves(results.get(index), params);
+		return params.getBestMoves(results.get(index));
 	}
 
 	/** Gets the depth of the last list of moves added to this history
@@ -103,11 +102,11 @@ public List<EvaluatedMove<M>> getLastList() {
 
 	/** Gets the last list of best moves added to this history
 	 * @return a list of moves (restricted to the search parameters of this history), or null if this history is empty
-	 * @see SearchResult#getBestMoves(List, SearchParameters)
+	 * @see SearchParameters#getBestMoves(List)
 	 */
 	public List<EvaluatedMove<M>> getBestMoves() {
 		final List<EvaluatedMove<M>> last = getLastList();
-		return last==null ? null : SearchResult.getBestMoves(last, params);
+		return last==null ? null : params.getBestMoves(last);
 	}
 
 	/** Gets the best move according to the given selector