Fixed unit tests. Updated classpath.
This commit is contained in:
@@ -11,9 +11,12 @@ public class CaptureTest {
|
||||
public void testCapture() {
|
||||
GameConfig gameConfig = new GameConfig(5);
|
||||
GameState gameState = new GameState(gameConfig);
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("A2"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("B3"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("B1"));
|
||||
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("A2")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("B3")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("B1")));
|
||||
|
||||
assertTrue(gameState.playStone(Player.BLACK, Action.PASS));
|
||||
assertTrue(gameState.playStone(Player.WHITE, Action.getInstance("B2")));
|
||||
|
||||
assertEquals(0,gameState.getBlackPrisoners());
|
||||
@@ -32,14 +35,14 @@ public class CaptureTest {
|
||||
GameConfig gameConfig = new GameConfig(5);
|
||||
GameState gameState = new GameState(gameConfig);
|
||||
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("A2"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("B3"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("B1"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("C4"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("D3"));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("A2")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("B3")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("B1")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("C4")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("D3")));
|
||||
|
||||
assertTrue(gameState.playStone(Player.WHITE, Action.getInstance("B2")));
|
||||
assertTrue(gameState.playStone(Player.WHITE, Action.getInstance("C3")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B2")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("C3")));
|
||||
|
||||
assertEquals(0,gameState.getBlackPrisoners());
|
||||
assertEquals(0,gameState.getWhitePrisoners());
|
||||
@@ -62,14 +65,16 @@ public class CaptureTest {
|
||||
GameConfig gameConfig = new GameConfig(5);
|
||||
GameState gameState = new GameState(gameConfig);
|
||||
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("A1"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("B2"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("C1"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("A2"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("B3"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("C2"));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("A1")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("B2")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("C1")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("A2")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B3")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("C2")));
|
||||
|
||||
//This capture should be allowed.
|
||||
assertTrue(gameState.playStone(Player.BLACK, Action.PASS));
|
||||
|
||||
System.out.println("State before WHITE move: ");
|
||||
System.out.println(gameState);
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ public class IllegalMoveTest {
|
||||
public void testIllegalMoveOnOwnStone() {
|
||||
GameConfig gameConfig = new GameConfig(5);
|
||||
GameState gameState = new GameState(gameConfig);
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("B3"));
|
||||
gameState.placeStone(Player.BLACK, Action.getInstance("B3"));
|
||||
assertFalse(gameState.playStone(Player.BLACK, Action.getInstance("B3")));
|
||||
}
|
||||
|
||||
@@ -33,12 +33,16 @@ public class IllegalMoveTest {
|
||||
public void testIllegalMoveNoLiberties() {
|
||||
GameConfig gameConfig = new GameConfig(5);
|
||||
GameState gameState = new GameState(gameConfig);
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("A2"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("B1"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("B3"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("C2"));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("A2")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("B1")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("B3")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("C2")));
|
||||
|
||||
System.out.println(gameState);
|
||||
|
||||
assertTrue(gameState.playStone(Player.BLACK,Action.PASS));
|
||||
assertFalse(gameState.playStone(Player.WHITE, Action.getInstance("B2")));
|
||||
|
||||
System.out.println(gameState);
|
||||
}
|
||||
|
||||
@@ -46,12 +50,16 @@ public class IllegalMoveTest {
|
||||
public void testIllegalMoveFormsTrappedGroup() {
|
||||
GameConfig gameConfig = new GameConfig(9);
|
||||
GameState gameState = new GameState(gameConfig);
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("A5"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("B6"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("B7"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("A8"));
|
||||
assertTrue(gameState.playStone(Player.WHITE, Action.getInstance("A6")));
|
||||
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("A5")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("B6")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("B7")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("A8")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("A6")));
|
||||
|
||||
assertTrue(gameState.playStone(Player.BLACK,Action.PASS));
|
||||
assertFalse(gameState.playStone(Player.WHITE, Action.getInstance("A7")));
|
||||
|
||||
System.out.println(gameState);
|
||||
}
|
||||
|
||||
@@ -59,16 +67,20 @@ public class IllegalMoveTest {
|
||||
public void testIllegalMoveFormsTrappedGroup2() {
|
||||
GameConfig gameConfig = new GameConfig(9);
|
||||
GameState gameState = new GameState(gameConfig);
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("G1"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("H2"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("H3"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("J4"));
|
||||
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("A8"));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("G1")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("H2")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("H3")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("J4")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("A8")));
|
||||
|
||||
assertTrue(gameState.playStone(Player.BLACK,Action.PASS));
|
||||
assertTrue(gameState.playStone(Player.WHITE, Action.getInstance("H1")));
|
||||
assertTrue(gameState.playStone(Player.BLACK,Action.PASS));
|
||||
assertTrue(gameState.playStone(Player.WHITE, Action.getInstance("J2")));
|
||||
assertTrue(gameState.playStone(Player.BLACK,Action.PASS));
|
||||
assertTrue(gameState.playStone(Player.WHITE, Action.getInstance("J3")));
|
||||
assertTrue(gameState.playStone(Player.BLACK,Action.PASS));
|
||||
|
||||
System.out.println("State before move: ");
|
||||
System.out.println(gameState);
|
||||
@@ -80,15 +92,16 @@ public class IllegalMoveTest {
|
||||
GameConfig gameConfig = new GameConfig(3);
|
||||
GameState gameState = new GameState(gameConfig);
|
||||
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("A1"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("B1"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("B2"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("A3"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("B3"));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("A1")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B1")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B2")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("A3")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B3")));
|
||||
|
||||
System.out.println("State before move: ");
|
||||
System.out.println(gameState);
|
||||
assertFalse("Play by BLACK at A2 should have failed.",gameState.playStone(Player.BLACK, Action.getInstance("A2")));
|
||||
|
||||
List<Action> validMoves = new ValidMoveGenerator().getActions(gameConfig, gameState, Player.BLACK, ActionGenerator.ALL_ACTIONS);
|
||||
assertEquals(4, validMoves.size());
|
||||
assertTrue(validMoves.contains(Action.PASS));
|
||||
|
||||
@@ -29,47 +29,50 @@ public class LegalMoveTest {
|
||||
//Illegal move detected by gokgs.com server
|
||||
GameConfig gameConfig = new GameConfig(9);
|
||||
GameState gameState = new GameState(gameConfig);
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("G5"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("G7"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("F6"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("H6"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("C7"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("D7"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("E7"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("F7"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("G8"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("H9"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("J7"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("E5"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("F4"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("G3"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("D4"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("E3"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("B4"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("C3"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("D2"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("E1"));
|
||||
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("H8"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("H7"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("D9"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("D8"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("E8"));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("G5")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("G7")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("F6")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("H6")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("C7")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("D7")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("E7")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("F7")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("G8")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("H9")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("J7")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("E5")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("F4")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("G3")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("D4")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("E3")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("B4")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("C3")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("D2")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("E1")));
|
||||
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("A7"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("A6"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("B8"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("B7"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("B6"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("C5"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("D5"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("D6"));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("H8")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("H7")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("D9")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("D8")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("E8")));
|
||||
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("A3"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("B3"));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("A7")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("A6")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B8")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B7")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B6")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("C5")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("D5")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("D6")));
|
||||
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("B1"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("F1"));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("A3")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B3")));
|
||||
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B1")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("F1")));
|
||||
|
||||
assertTrue(gameState.playStone(Player.BLACK, Action.PASS));
|
||||
|
||||
System.out.println("State before move: ");
|
||||
System.out.println(gameState);
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package net.woodyfolsom.msproj;
|
||||
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
public class TerritoryFinderTest {
|
||||
@@ -8,11 +10,11 @@ public class TerritoryFinderTest {
|
||||
GameConfig gameConfig = new GameConfig(5);
|
||||
GameState gameState = new GameState(gameConfig);
|
||||
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("A2"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("B3"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("C2"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("B1"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("E5"));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("A2")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("B3")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("C2")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("B1")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("E5")));
|
||||
|
||||
TerritoryMarker.markTerritory(gameState.getGameBoard());
|
||||
System.out.println(gameState);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package net.woodyfolsom.msproj.policy;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import net.woodyfolsom.msproj.Action;
|
||||
import net.woodyfolsom.msproj.GameConfig;
|
||||
import net.woodyfolsom.msproj.GameState;
|
||||
@@ -14,11 +15,12 @@ public class MinimaxTest {
|
||||
Policy treeSearch = new Minimax();
|
||||
GameConfig gameConfig = new GameConfig(6);
|
||||
GameState gameState = new GameState(gameConfig);
|
||||
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"));
|
||||
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("A2")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B1")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("C2")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("B2")));
|
||||
assertTrue(gameState.playStone(Player.BLACK, Action.PASS));
|
||||
|
||||
Action move = treeSearch.getAction(gameConfig, gameState,
|
||||
Player.WHITE);
|
||||
|
||||
@@ -28,7 +30,7 @@ public class MinimaxTest {
|
||||
System.out.println("NumStateEvaluations: " + treeSearch.getNumStateEvaluations());
|
||||
|
||||
assertEquals(Action.getInstance("B3"), move);
|
||||
gameState.playStone(Player.WHITE, move);
|
||||
assertTrue(gameState.playStone(Player.WHITE, move));
|
||||
|
||||
System.out.println(gameState);
|
||||
}
|
||||
@@ -38,10 +40,10 @@ public class MinimaxTest {
|
||||
Policy treeSearch = new Minimax();
|
||||
GameConfig gameConfig = new GameConfig(6);
|
||||
GameState gameState = new GameState(gameConfig);
|
||||
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"));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("A2")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("B1")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("C2")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B2")));
|
||||
|
||||
Action move = treeSearch.getAction(gameConfig, gameState,
|
||||
Player.BLACK);
|
||||
@@ -52,7 +54,7 @@ public class MinimaxTest {
|
||||
System.out.println("NumStateEvaluations: " + treeSearch.getNumStateEvaluations());
|
||||
|
||||
assertEquals("Expected B3 but was: " + move, Action.getInstance("B3"), move);
|
||||
gameState.playStone(Player.BLACK, move);
|
||||
assertTrue(gameState.playStone(Player.BLACK, move));
|
||||
|
||||
System.out.println(gameState);
|
||||
}
|
||||
|
||||
@@ -1,78 +1,80 @@
|
||||
package net.woodyfolsom.msproj.policy;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertFalse;
|
||||
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import net.woodyfolsom.msproj.Action;
|
||||
import net.woodyfolsom.msproj.GameConfig;
|
||||
import net.woodyfolsom.msproj.GameState;
|
||||
import net.woodyfolsom.msproj.Player;
|
||||
import net.woodyfolsom.msproj.policy.Policy;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
public class MonteCarloUCTTest {
|
||||
@Test
|
||||
public void testGenmoveAsW() {
|
||||
Policy treeSearch = new MonteCarloUCT(new RandomMovePolicy(),10000L);
|
||||
Policy treeSearch = new MonteCarloUCT(new RandomMovePolicy(), 2000L);
|
||||
GameConfig gameConfig = new GameConfig(6);
|
||||
GameState gameState = new GameState(gameConfig);
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("PASS"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("A2"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("PASS"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("B1"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("PASS"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("C2"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("B2"));
|
||||
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("A2")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B1")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("C2")));
|
||||
|
||||
// if this were PLACE stone instad of PLAY stone, white should pass as
|
||||
// well, and win.
|
||||
assertTrue(gameState.playStone(Player.BLACK, Action.getInstance("B2")));
|
||||
|
||||
Action move = treeSearch.getAction(gameConfig, gameState, Player.WHITE);
|
||||
|
||||
|
||||
System.out.println(gameState);
|
||||
|
||||
System.out.println("Generated move: " + move);
|
||||
System.out.println("NumStateEvaluations: " + treeSearch.getNumStateEvaluations());
|
||||
|
||||
assertEquals("Expected B3 but was: " + move, "B3", move);
|
||||
gameState.playStone(Player.WHITE, move);
|
||||
System.out.println("NumStateEvaluations: "
|
||||
+ treeSearch.getNumStateEvaluations());
|
||||
|
||||
assertTrue(gameState.playStone(Player.WHITE, move));
|
||||
|
||||
System.out.println(gameState);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGenmoveAsB() {
|
||||
Policy treeSearch = new MonteCarloUCT(new RandomMovePolicy(),10000L);
|
||||
Policy treeSearch = new MonteCarloUCT(new RandomMovePolicy(), 2000L);
|
||||
GameConfig gameConfig = new GameConfig(5);
|
||||
GameState gameState = new GameState(gameConfig);
|
||||
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"));
|
||||
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("A2")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("B1")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("C2")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B2")));
|
||||
|
||||
Action move = treeSearch.getAction(gameConfig, gameState, Player.BLACK);
|
||||
|
||||
|
||||
System.out.println(gameState);
|
||||
|
||||
System.out.println("Generated move: " + move);
|
||||
System.out.println("NumStateEvaluations: " + treeSearch.getNumStateEvaluations());
|
||||
|
||||
assertEquals("Expected B3 but was: " + move, "B3", move);
|
||||
gameState.playStone(Player.BLACK, move);
|
||||
System.out.println("NumStateEvaluations: "
|
||||
+ treeSearch.getNumStateEvaluations());
|
||||
|
||||
assertTrue(gameState.playStone(Player.BLACK, move));
|
||||
|
||||
System.out.println(gameState);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testIllegalMoveRejection() {
|
||||
Policy treeSearch = new MonteCarloUCT(new RandomMovePolicy(),2000L);
|
||||
Policy treeSearch = new MonteCarloUCT(new RandomMovePolicy(), 1000L);
|
||||
GameConfig gameConfig = new GameConfig(5);
|
||||
GameState gameState = new GameState(gameConfig);
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("A2"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("B1"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("C2"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("B3"));
|
||||
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("A2")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B1")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("C2")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B3")));
|
||||
|
||||
Action move;
|
||||
|
||||
|
||||
// verify that UCT does not generate an illegal move in 20 calls
|
||||
for (int i = 0; i < 10; i++) {
|
||||
move = treeSearch.getAction(gameConfig, gameState, Player.BLACK);
|
||||
System.out.println("Generated move: " + move);
|
||||
|
||||
@@ -34,22 +34,27 @@ public class RandomTest {
|
||||
public void testAlternativeToIllegalMove() {
|
||||
GameConfig gameConfig = new GameConfig(4);
|
||||
GameState gameState = new GameState(gameConfig);
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("A1"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("A2"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("A3"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("A4"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("B1"));;
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("B2"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("B4"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("C2"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("C3"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("C4"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("D4"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("C1"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("D2"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("D3"));
|
||||
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("A1")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("A2")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("A3")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("A4")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("B1")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("B2")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("B4")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("C2")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("C3")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("C4")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("D4")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("C1")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("D2")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("D3")));
|
||||
|
||||
assertTrue(gameState.playStone(Player.BLACK, Action.PASS));
|
||||
|
||||
System.out.println("State before random WHITE move selection:");
|
||||
System.out.println(gameState);
|
||||
|
||||
//This is correct - checked vs. MFOG
|
||||
//PASS would otherwise be a valid move
|
||||
List<Action> prohibitedMoves = new ArrayList<Action>();
|
||||
@@ -65,11 +70,11 @@ public class RandomTest {
|
||||
GameConfig gameConfig = new GameConfig(3);
|
||||
GameState gameState = new GameState(gameConfig);
|
||||
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("A1"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("B1"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("B2"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("A3"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("B3"));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("A1")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B1")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B2")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("A3")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B3")));
|
||||
|
||||
System.out.println("State before move: ");
|
||||
System.out.println(gameState);
|
||||
@@ -89,13 +94,13 @@ public class RandomTest {
|
||||
GameConfig gameConfig = new GameConfig(4);
|
||||
GameState gameState = new GameState(gameConfig);
|
||||
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("B1"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("A2"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("C2"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("B3"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("A3"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("C3"));
|
||||
gameState.playStone(Player.BLACK, Action.getInstance("B4"));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B1")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("A2")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("C2")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B3")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("A3")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("C3")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("B4")));
|
||||
|
||||
System.out.println("State before move: ");
|
||||
System.out.println(gameState);
|
||||
|
||||
87
test/net/woodyfolsom/msproj/policy/RootParTest.java
Normal file
87
test/net/woodyfolsom/msproj/policy/RootParTest.java
Normal file
@@ -0,0 +1,87 @@
|
||||
package net.woodyfolsom.msproj.policy;
|
||||
|
||||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import net.woodyfolsom.msproj.Action;
|
||||
import net.woodyfolsom.msproj.GameConfig;
|
||||
import net.woodyfolsom.msproj.GameState;
|
||||
import net.woodyfolsom.msproj.Player;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
public class RootParTest {
|
||||
@Test
|
||||
public void testGenmoveAsW() {
|
||||
Policy treeSearch = new RootParallelization(2, 2000L);
|
||||
GameConfig gameConfig = new GameConfig(6);
|
||||
GameState gameState = new GameState(gameConfig);
|
||||
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("A2")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B1")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("C2")));
|
||||
|
||||
// if this were PLACE stone instad of PLAY stone, white should pass as
|
||||
// well, and win.
|
||||
assertTrue(gameState.playStone(Player.BLACK, Action.getInstance("B2")));
|
||||
|
||||
Action move = treeSearch.getAction(gameConfig, gameState, Player.WHITE);
|
||||
|
||||
System.out.println(gameState);
|
||||
|
||||
System.out.println("Generated move: " + move);
|
||||
System.out.println("NumStateEvaluations: "
|
||||
+ treeSearch.getNumStateEvaluations());
|
||||
|
||||
assertTrue(gameState.playStone(Player.WHITE, move));
|
||||
|
||||
System.out.println(gameState);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGenmoveAsB() {
|
||||
Policy treeSearch = new RootParallelization(2, 2000L);
|
||||
GameConfig gameConfig = new GameConfig(5);
|
||||
GameState gameState = new GameState(gameConfig);
|
||||
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("A2")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("B1")));
|
||||
assertTrue(gameState.placeStone(Player.BLACK, Action.getInstance("C2")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B2")));
|
||||
|
||||
Action move = treeSearch.getAction(gameConfig, gameState, Player.BLACK);
|
||||
|
||||
System.out.println(gameState);
|
||||
|
||||
System.out.println("Generated move: " + move);
|
||||
System.out.println("NumStateEvaluations: "
|
||||
+ treeSearch.getNumStateEvaluations());
|
||||
|
||||
assertTrue(gameState.playStone(Player.BLACK, move));
|
||||
|
||||
System.out.println(gameState);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testIllegalMoveRejection() {
|
||||
Policy treeSearch = new RootParallelization(2, 2000L);
|
||||
GameConfig gameConfig = new GameConfig(5);
|
||||
GameState gameState = new GameState(gameConfig);
|
||||
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("A2")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B1")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("C2")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B3")));
|
||||
|
||||
Action move;
|
||||
|
||||
// verify that UCT does not generate an illegal move in 20 calls
|
||||
for (int i = 0; i < 10; i++) {
|
||||
move = treeSearch.getAction(gameConfig, gameState, Player.BLACK);
|
||||
System.out.println("Generated move: " + move);
|
||||
GameState stateCopy = new GameState(gameState);
|
||||
stateCopy.playStone(Player.BLACK, move);
|
||||
System.out.println(stateCopy);
|
||||
assertFalse(Action.getInstance("B2").equals(move));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -28,10 +28,11 @@ public class ValidMoveGeneratorTest {
|
||||
*/
|
||||
GameConfig gameConfig = new GameConfig(5);
|
||||
GameState gameState = new GameState(gameConfig);
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("A2"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("B1"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("B4"));
|
||||
gameState.playStone(Player.WHITE, Action.getInstance("C2"));
|
||||
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("A2")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B1")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("B4")));
|
||||
assertTrue(gameState.placeStone(Player.WHITE, Action.getInstance("C2")));
|
||||
|
||||
assertFalse(gameState.playStone(Player.BLACK, Action.getInstance("A1")));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user