Implemented naive Monte Carlo move generator (simulates 10 random moves for 3 turns by each player).

Consequently, it performs strictly worse than Alpha-Beta, but usually avoids setting players up for an easy capture,
unlike Alpha-Beta.

src/model/comPlayer/MonteCarloComPlayer.java

@@ -1,48 +1,16 @@
 package model.comPlayer;
 
-import java.util.Random;
-
 import model.Board;
-import model.CellPointer;
 import model.Move;
-import model.Board.TileColor;
-
+import model.comPlayer.generator.MonteCarloMoveGenerator;
+import model.comPlayer.generator.MoveGenerator;
 
 public class MonteCarloComPlayer implements Player {
-	private final Random rand = new Random();
+	private MoveGenerator moveGenerator = new MonteCarloMoveGenerator();
 
 	@Override
 	public Move getMove(Board board) {
-		return getRandomMove(board,true);
-	}
-	
-	public Move getRandomMove(Board board, boolean isCompTurn) {
-		TileColor tile = TileColor.BLUE;
-		int r = -1;
-		int c = -1;
-
-		while (tile != TileColor.NONE) {
-			r = rand.nextInt(Board.NUM_ROWS);
-			c = rand.nextInt(Board.NUM_COLS);
-
-			tile = board.getTile(r, c);
-		}
-
-		switch (rand.nextInt(4)) {
-		case 0:
-			tile = TileColor.BLUE;
-			break;
-		case 1:
-			tile = TileColor.GREEN;
-			break;
-		case 2:
-			tile = TileColor.RED;
-			break;
-		case 3:
-			tile = TileColor.YELLOW;
-		}
-
-		return new Move(new CellPointer(r, c), tile);
+		return moveGenerator.genMove(board, false);
 	}
 
 	@Override
@@ -59,4 +27,4 @@ public class MonteCarloComPlayer implements Player {
 	public String toString() {
 		return "Monte Carlo ComPlayer";
 	}
-}
+}

src/model/comPlayer/generator/AlphaBetaMoveGenerator.java

@@ -29,22 +29,6 @@ public class AlphaBetaMoveGenerator implements MoveGenerator {
 					Integer.MAX_VALUE).move;
 		}
 	}
-
-	private SearchResult getMax(SearchResult sr1, SearchResult sr2) {
-		if (sr1.score >= sr2.score) {
-			return sr1;
-		} else {
-			return sr2;
-		}
-	}
-	
-	private SearchResult getMin(SearchResult sr1, SearchResult sr2) {
-		if (sr1.score <= sr2.score) {
-			return sr1;
-		} else {
-			return sr2;
-		}
-	}
 	
 	private SearchResult  getMaxValue(Board board, boolean asHuman, int recursionLevel,
 			int alpha, int beta) {
@@ -72,7 +56,9 @@ public class AlphaBetaMoveGenerator implements MoveGenerator {
 			SearchResult searchResult = new SearchResult(nextMove,getMinValue(nextBoard, !asHuman, recursionLevel - 1,
 					alpha, beta).score);
 
-			bestResult = getMax(bestResult,searchResult);
+			if (searchResult.compareTo(bestResult) > 0) {
+				bestResult = searchResult;
+			}
 
 			if (bestResult.score >= beta) {
 				return bestResult;
@@ -110,7 +96,9 @@ public class AlphaBetaMoveGenerator implements MoveGenerator {
 			SearchResult searchResult = new SearchResult(nextMove,getMaxValue(nextBoard, !asHuman, recursionLevel - 1,
 					alpha, beta).score);
 
-			bestResult = getMin(bestResult,searchResult);
+			if (searchResult.compareTo(bestResult) < 0) {
+				bestResult = searchResult;
+			}
 
 			if (bestResult.score <= alpha) {
 				return bestResult;

src/model/comPlayer/generator/ValidMoveGenerator.java

@@ -39,6 +39,11 @@ public class ValidMoveGenerator implements MoveGenerator {
 		}
 
 		Collections.shuffle(validMoves);
-		return validMoves;
+		
+		if (nMoves == MoveGenerator.ALL_MOVES) {
+			return validMoves;
+		} else {
+			return validMoves.subList(0, Math.min(validMoves.size(),nMoves));
+		}
 	}
 }