Retire "Active reparenting"

[stockfish] / src / search.cpp

diff --git a/src/search.cpp b/src/search.cpp
index ebbff3a4a966adfeb3461df1e25ab3edb1b96d50..bab8f398cc8f0ebc684c94df9d2e24a29f145a17 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -265,7 +265,7 @@ void Search::think() {
       goto finalize;
   }
 
       goto finalize;
   }
 

-  if (Options["OwnBook"])
+  if (Options["OwnBook"] && !Limits.infinite)

   {
       Move bookMove = book.probe(pos, Options["Book File"], Options["Best Book Move"]);
 
   {
       Move bookMove = book.probe(pos, Options["Book File"], Options["Best Book Move"]);
 


@@ -332,7 +332,7 @@ finalize:
   // but if we are pondering or in infinite search, we shouldn't print the best
   // move before we are told to do so.
   if (!Signals.stop && (Limits.ponder || Limits.infinite))
   // but if we are pondering or in infinite search, we shouldn't print the best
   // move before we are told to do so.
   if (!Signals.stop && (Limits.ponder || Limits.infinite))

-      this_thread->wait_for_stop_or_ponderhit();
+      pos.this_thread()->wait_for_stop_or_ponderhit();

 
   // Best move could be MOVE_NONE when searching on a stalemate position
   cout << "bestmove " << move_to_uci(RootMoves[0].pv[0], Chess960)
 
   // Best move could be MOVE_NONE when searching on a stalemate position
   cout << "bestmove " << move_to_uci(RootMoves[0].pv[0], Chess960)


@@ -531,7 +531,7 @@ namespace {
     assert((alpha == beta - 1) || PvNode);
     assert(depth > DEPTH_ZERO);
 
     assert((alpha == beta - 1) || PvNode);
     assert(depth > DEPTH_ZERO);
 

-    Move movesSearched[MAX_MOVES];
+    Move movesSearched[64];

     StateInfo st;
     const TTEntry *tte;
     Key posKey;
     StateInfo st;
     const TTEntry *tte;
     Key posKey;


@@ -543,7 +543,7 @@ namespace {
     bool isPvMove, inCheck, singularExtensionNode, givesCheck;
     bool captureOrPromotion, dangerous, doFullDepthSearch;
     int moveCount = 0, playedMoveCount = 0;
     bool isPvMove, inCheck, singularExtensionNode, givesCheck;
     bool captureOrPromotion, dangerous, doFullDepthSearch;
     int moveCount = 0, playedMoveCount = 0;

-    Thread* thisThread = this_thread;
+    Thread* thisThread = pos.this_thread();

     SplitPoint* sp = NULL;
 
     refinedValue = bestValue = value = -VALUE_INFINITE;
     SplitPoint* sp = NULL;
 
     refinedValue = bestValue = value = -VALUE_INFINITE;


@@ -944,7 +944,7 @@ split_point_start: // At split points actual search starts from here
       }
 
       ss->currentMove = move;
       }
 
       ss->currentMove = move;

-      if (!SpNode && !captureOrPromotion)
+      if (!SpNode && !captureOrPromotion && playedMoveCount < 64)

           movesSearched[playedMoveCount++] = move;
 
       // Step 14. Make the move
           movesSearched[playedMoveCount++] = move;
 
       // Step 14. Make the move


@@ -1337,7 +1337,7 @@ split_point_start: // At split points actual search starts from here
     // Rule 1. Checks which give opponent's king at most one escape square are dangerous
     b = kingAtt & ~pos.pieces(them) & ~newAtt & ~(1ULL << to);
 
     // Rule 1. Checks which give opponent's king at most one escape square are dangerous
     b = kingAtt & ~pos.pieces(them) & ~newAtt & ~(1ULL << to);
 

-    if (single_bit(b)) // Catches also !b
+    if (!more_than_one(b))

         return true;
 
     // Rule 2. Queen contact check is very dangerous
         return true;
 
     // Rule 2. Queen contact check is very dangerous


@@ -1386,7 +1386,7 @@ split_point_start: // At split points actual search starts from here
 
     // Case 3: Moving through the vacated square
     p2 = pos.piece_on(f2);
 
     // Case 3: Moving through the vacated square
     p2 = pos.piece_on(f2);

-    if (piece_is_slider(p2) && (squares_between(f2, t2) & f1))
+    if (piece_is_slider(p2) && (between_bb(f2, t2) & f1))

       return true;
 
     // Case 4: The destination square for m2 is defended by the moving piece in m1
       return true;
 
     // Case 4: The destination square for m2 is defended by the moving piece in m1


@@ -1397,7 +1397,7 @@ split_point_start: // At split points actual search starts from here
     // Case 5: Discovered check, checking piece is the piece moved in m1
     ksq = pos.king_square(pos.side_to_move());
     if (    piece_is_slider(p1)
     // Case 5: Discovered check, checking piece is the piece moved in m1
     ksq = pos.king_square(pos.side_to_move());
     if (    piece_is_slider(p1)

-        && (squares_between(t1, ksq) & f2)
+        && (between_bb(t1, ksq) & f2)

         && (pos.attacks_from(p1, t1, pos.pieces() ^ f2) & ksq))
         return true;
 
         && (pos.attacks_from(p1, t1, pos.pieces() ^ f2) & ksq))
         return true;
 


@@ -1469,7 +1469,7 @@ split_point_start: // At split points actual search starts from here
     // Case 3: If the moving piece in the threatened move is a slider, don't
     // prune safe moves which block its ray.
     if (    piece_is_slider(pos.piece_on(tfrom))
     // Case 3: If the moving piece in the threatened move is a slider, don't
     // prune safe moves which block its ray.
     if (    piece_is_slider(pos.piece_on(tfrom))

-        && (squares_between(tfrom, tto) & mto)
+        && (between_bb(tfrom, tto) & mto)

         &&  pos.see_sign(m) >= 0)
         return true;
 
         &&  pos.see_sign(m) >= 0)
         return true;
 


@@ -1825,7 +1825,7 @@ void Thread::idle_loop(SplitPoint* sp_master) {
           lock_release(Threads.splitLock);
 
           Stack ss[MAX_PLY_PLUS_2];
           lock_release(Threads.splitLock);
 
           Stack ss[MAX_PLY_PLUS_2];

-          Position pos(*sp->pos);
+          Position pos(*sp->pos, this);

 
           memcpy(ss, sp->ss - 1, 4 * sizeof(Stack));
           (ss+1)->sp = sp;
 
           memcpy(ss, sp->ss - 1, 4 * sizeof(Stack));
           (ss+1)->sp = sp;