diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/dictionaries/project.xml b/.idea/dictionaries/project.xml deleted file mode 100644 index 2cbbd44..0000000 --- a/.idea/dictionaries/project.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - vidmode - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index aa00ffa..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 4c0d94f..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 67f7df6..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index 2b63946..0000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/main/java/org/toop/ConsoleGui.java b/src/main/java/org/toop/ConsoleGui.java index 44be9ec..5d0f6e0 100644 --- a/src/main/java/org/toop/ConsoleGui.java +++ b/src/main/java/org/toop/ConsoleGui.java @@ -121,10 +121,6 @@ public class ConsoleGui { int move = -1; if (ai1 != null && current.name() == ai1 || ai2 != null && current.name() == ai2) { - try { - Thread.sleep(2000); - } catch (Exception e) {} - move = ai.findBestMove(game); } else { System.out.printf("%s's (%c) turn. Please choose an empty cell between 0-8: ", current.name(), current.move()); diff --git a/src/main/java/org/toop/Main.java b/src/main/java/org/toop/Main.java index 0440c73..09623ba 100644 --- a/src/main/java/org/toop/Main.java +++ b/src/main/java/org/toop/Main.java @@ -53,16 +53,14 @@ public class Main { // GlobalEventBus.post(new Events.ServerEvents.Command(connectionId, "MOVE", "" + x)); // } -// ConsoleGui console = new ConsoleGui(); -// GameBase.State state = GameBase.State.INVALID; -// -// console.print(); -// -// do { -// console.print(); -// } while (console.next()); -// -// console.print(); + ConsoleGui console = new ConsoleGui(); + GameBase.State state = GameBase.State.INVALID; + + do { + console.print(); + } while (console.next()); + + console.print(); } public static void initSystems() { diff --git a/src/test/java/MinMaxTicTacToeTest.java b/src/test/java/MinMaxTicTacToeTest.java index b1a982b..7da0adc 100644 --- a/src/test/java/MinMaxTicTacToeTest.java +++ b/src/test/java/MinMaxTicTacToeTest.java @@ -1,4 +1,3 @@ - import org.junit.jupiter.api.Test; import org.toop.game.tictactoe.*; @@ -53,7 +52,7 @@ class MinMaxTicTacToeTest { @Test void testMinimax_ScoreLoss() { - TicTacToe game = makeGame("OOO ", 1); + TicTacToe game = makeGame("OOO------", 1); MinMaxTicTacToe ai = new MinMaxTicTacToe(); int score = ai.doMinimax(game, 5, true); assertTrue(score < 0, "AI loss is negative"); @@ -69,7 +68,7 @@ class MinMaxTicTacToeTest { @Test void testMiniMax_MultipleMoves() { - TicTacToe game = makeGame(" X-OX--O-", 0); + TicTacToe game = makeGame("-X-OX--O-", 0); MinMaxTicTacToe ai = new MinMaxTicTacToe(); int bestMove = ai.findBestMove(game); assertTrue(bestMove == 0 || bestMove == 2, "Can look at multiple moves!");