Refactoring in progress.

Player and Action classes are now singletons (factory pattern) rather than String values.
Implementing more general treesearch code for minimax, alpha-beta, monte carlo using simplified backup logic.

test/net/woodyfolsom/msproj/policy/MinimaxTest.java

@@ -1,34 +1,53 @@
 package net.woodyfolsom.msproj.policy;
 
 import static org.junit.Assert.assertEquals;
-
-import net.woodyfolsom.msproj.GameBoard;
+import net.woodyfolsom.msproj.Action;
 import net.woodyfolsom.msproj.GameConfig;
 import net.woodyfolsom.msproj.GameState;
-import net.woodyfolsom.msproj.policy.Policy;
+import net.woodyfolsom.msproj.Player;
 
 import org.junit.Test;
 
-
 public class MinimaxTest {
-	
 	@Test
-	public void testGenmove() {
-		Policy moveGenerator = new Minimax();
-		GameState gameState = new GameState(5);
-		gameState.playStone('A', 2, GameBoard.BLACK_STONE);
-		gameState.playStone('B', 1, GameBoard.BLACK_STONE);
-		gameState.playStone('C', 2, GameBoard.BLACK_STONE);
-		gameState.playStone('B', 4, GameBoard.BLACK_STONE);
-		
-		String move = moveGenerator.getAction(new GameConfig(), gameState, "w");
-		System.out.println("Generated move: " + move);
-		gameState.playStone("w", move);
-		
+	public void testGenmoveAsW() {
+		Policy treeSearch = new Minimax();
+		GameState gameState = new GameState(6);
+		gameState.playStone(Player.WHITE, Action.getInstance("A2"));
+		gameState.playStone(Player.WHITE, Action.getInstance("B1"));
+		gameState.playStone(Player.WHITE, Action.getInstance("C2"));
+		gameState.playStone(Player.BLACK, Action.getInstance("B2"));
+
+		Action move = treeSearch.getAction(new GameConfig(), gameState,
+				Player.WHITE);
+
 		System.out.println(gameState);
-		
-		assertEquals(Policy.PASS,moveGenerator.getAction(new GameConfig(), gameState, "?"));
-		
+
+		System.out.println("Generated move: " + move);
+		assertEquals("Expected B3 but was: " + move, "B3", move);
+		gameState.playStone(Player.WHITE, move);
+
 		System.out.println(gameState);
 	}
-}
+
+	@Test
+	public void testGenmoveAsB() {
+		Policy treeSearch = new Minimax();
+		GameState gameState = new GameState(6);
+		gameState.playStone(Player.BLACK, Action.getInstance("A2"));
+		gameState.playStone(Player.BLACK, Action.getInstance("B1"));
+		gameState.playStone(Player.BLACK, Action.getInstance("C2"));
+		gameState.playStone(Player.WHITE, Action.getInstance("B2"));
+
+		Action move = treeSearch.getAction(new GameConfig(), gameState,
+				Player.BLACK);
+
+		System.out.println(gameState);
+
+		System.out.println("Generated move: " + move);
+		assertEquals("Expected B3 but was: " + move, "B3", move);
+		gameState.playStone(Player.BLACK, move);
+
+		System.out.println(gameState);
+	}
+}