fixed bug and change min depth to 5

mbluemer · Apr 29, 2017 · 0b12a63 · 0b12a63
1 parent 2108fe2
commit 0b12a63
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 9 deletions.
diff --git a/include/BitBoard.h b/include/BitBoard.h
@@ -89,6 +89,7 @@ class BitBoard
   vmup actions() const;
   bup result(mup &move) const;
   void printState() const;
+  std::string toString() const;
 };
 
 #endif
diff --git a/include/MinimaxSearch.h b/include/MinimaxSearch.h
@@ -13,7 +13,7 @@ typedef std::unique_ptr<Move> mup;
 class MinimaxSearch
 {
 private:
-  static const int MIN_DEPTH = 3;
+  static const int MIN_DEPTH = 5;
   static const int MAX_DEPTH = 9;
     Heuristic heuristic;
 

diff --git a/src/BitBoard.cpp b/src/BitBoard.cpp
@@ -125,18 +125,32 @@ BitBoard BitBoard::boardMove(BitBoard &board, uint32_t piece, uint32_t moveTo) c
   int diff = std::abs((double)pieceLoc - moveLoc);
   int avg = ((pieceLoc + moveLoc) / 2);
   if (board.m_isBlacksTurn) {
-    if (diff == 2 || diff == 14) white &= ~(1<<avg);
+    if (diff == 2 || diff == 14) {
+      white &= ~(1<<avg);
+      kings &= ~(1<<avg);
+    }
     black = (black | moveTo) & ~piece;
-    kings |= (black & blackKingSpots);
-    wasKinged = moveTo & blackKingSpots;
+    if (!(piece & kings) && (moveTo & blackKingSpots)) {
+      kings |= moveTo;
+      wasKinged = true;
+    }
   } else {
-    if (diff == 2 || diff == 14) black &=  ~(1<<avg);
+    if (diff == 2 || diff == 14) {
+      black &= ~(1<<avg);
+      kings &= ~(1<<avg);
+    }
     white = (white | moveTo) & ~piece;
-    kings |= (white & whiteKingSpots);
-    wasKinged = moveTo & whiteKingSpots;
+    if (!(piece & kings) && (moveTo & whiteKingSpots)) {
+      kings |= moveTo;
+      wasKinged = true;
+    }
   }
 
-  if (piece & kings) kings = moveTo | (kings & ~piece);
+  // if you're a king
+  if (piece & kings) {
+    kings &= ~piece; // make sure piece's spot is no longer a king
+    kings |= moveTo; // set piece's new spot as a king;
+  }
 
   return BitBoard(black, white, kings, board.m_isBlacksTurn, wasKinged);
 }
@@ -259,3 +273,15 @@ void BitBoard::printState() const
   std::cout<<"-"<<pieceToString(19)<<"-"<<pieceToString(13)<<"-"<<pieceToString(7)<<"-"<<pieceToString(1)<<std::endl;
   std::cout<<pieceToString(18)<<"-"<<pieceToString(12)<<"-"<<pieceToString(6)<<"-"<<pieceToString(0)<<"-"<<std::endl;
 }
+
+std::string BitBoard::toString() const
+{
+  return "-"+pieceToString(11)+"-"+pieceToString(5)+"-"+pieceToString(31)+"-"+pieceToString(25)+"\n"+
+  pieceToString(10)+"-"+pieceToString(4)+"-"+pieceToString(30)+"-"+pieceToString(24)+"-"+"\n"+
+  "-"+pieceToString(3)+"-"+pieceToString(29)+"-"+pieceToString(23)+"-"+pieceToString(17)+"\n"+
+  pieceToString(2)+"-"+pieceToString(28)+"-"+pieceToString(22)+"-"+pieceToString(16)+"-"+"\n"+
+  "-"+pieceToString(27)+"-"+pieceToString(21)+"-"+pieceToString(15)+"-"+pieceToString(9)+"\n"+
+  pieceToString(26)+"-"+pieceToString(20)+"-"+pieceToString(14)+"-"+pieceToString(8)+"-"+"\n"+
+  "-"+pieceToString(19)+"-"+pieceToString(13)+"-"+pieceToString(7)+"-"+pieceToString(1)+"\n"+
+  pieceToString(18)+"-"+pieceToString(12)+"-"+pieceToString(6)+"-"+pieceToString(0)+"-"+"\n";
+}
diff --git a/src/MinimaxSearch.cpp b/src/MinimaxSearch.cpp
@@ -64,7 +64,7 @@ double MinimaxSearch::alphaBeta(bup &board, double alpha, double beta, int depth
 bool MinimaxSearch::shouldStop(bup &board, int depth)
 {
   // always return at some max depth regardless
-  if (depth == MAX_DEPTH) return true;
+  if (depth >= MAX_DEPTH) return true;
 
   bool jumpAvailable = heuristic.jumpeablePieces() != 0;