fixed alpha beta

mbluemer · May 2, 2017 · 6b93529 · 6b93529
1 parent f09370c
commit 6b93529
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/src/MinimaxSearch.cpp b/src/MinimaxSearch.cpp
@@ -40,21 +40,19 @@ double MinimaxSearch::alphaBeta(bup &board, double alpha, double beta, int depth
 //
   // black is max player here
   double v;
-  if (board->player() == "black") {
+  if (board->getIsBlacksTurn()) {
     v = std::numeric_limits<double>::lowest();
     for (mup &move : board->actions()) {
       bup result = board->result(move);
-      v = std::max(v, alphaBeta(result, alpha, beta, depth + 1));
-      if (v >= beta) return v;
-      alpha = std::max(alpha, v);
+      alpha = std::max(alpha, alphaBeta(result, alpha, beta, depth + 1));
+      if (beta <= alpha) return beta;
     }
   } else {
     v = std::numeric_limits<double>::max();
     for (mup &move : board->actions()) {
       bup result = board->result(move);
-      v = std::min(v, alphaBeta(result, alpha, beta, depth + 1));
-      if (v <= alpha) return v;
-      beta = std::min(beta, v);
+      beta = std::min(beta, alphaBeta(result, alpha, beta, depth + 1));
+      if (beta <= alpha) return alpha;
     }
   }