fixed minimax search and added testing to main.cpp

mbluemer · Apr 20, 2017 · ccee1bc · ccee1bc
1 parent 8ca9a64
commit ccee1bc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/include/MinimaxSearch.h b/include/MinimaxSearch.h
@@ -8,7 +8,7 @@
 class MinimaxSearch
 {
 private:
-  static const int maxDepth = 9;
+  static const int maxDepth = 7;
 
   double minValue(const BitBoard &board, int currentDepth) const;
   double maxValue(const BitBoard &board, int currentDepth) const;

diff --git a/src/MinimaxSearch.cpp b/src/MinimaxSearch.cpp
@@ -11,7 +11,7 @@
 double MinimaxSearch::minValue(const BitBoard &board, int currentDepth) const
 {
   if (currentDepth == maxDepth) return board.utility(board.player());
-  double v = std::numeric_limits<double>::lowest();
+  double v = std::numeric_limits<double>::max();
   for (Move move : board.actions()) {
     v = std::min(v, maxValue(board.result(move), currentDepth + 1));
   }
@@ -21,7 +21,7 @@ double MinimaxSearch::minValue(const BitBoard &board, int currentDepth) const
 double MinimaxSearch::maxValue(const BitBoard &board, int currentDepth) const
 {
   if (currentDepth == maxDepth) return board.utility(board.player());
-  double v = std::numeric_limits<double>::max();
+  double v = std::numeric_limits<double>::lowest();
   for (Move move : board.actions()) {
     v = std::max(v, minValue(board.result(move), currentDepth + 1));
   }

diff --git a/src/main.cpp b/src/main.cpp
@@ -3,14 +3,16 @@
 #include <vector>
 #include "BitBoard.h"
 #include "Move.h"
+#include "MinimaxSearch.h"
 
 int main(int argc, const char * argv[]) {
-    BitBoard board(16384, 2097280, 16384);
-    std::vector<Move> moves = board.generateImmediateJumps(16384);
-    for (Move move : moves) {
-      for (int x : move.getMoves()) {
-        std::cout << x << std::endl;
-      }
+    BitBoard board;
+    MinimaxSearch search;
+    for (int i = 0; i < 20; i++) {
+      board.printState();
+      Move next = search.minimaxDecision(board);
+      board = board.result(next);
+      std::cout << "==============================" << std::endl;
     }
     return 0;
 }