X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=d0bbc9675c9618ff780cb51b3f89a8eb8abf31f6;hp=2678f7d5d9bae66685e3a108ec1868bdfde5d014;hb=df50ea5dc635457dd34fd08c0d332889483f5e7f;hpb=4a0db9ea3c34d7663a039c40ce810ba9cb743cca diff --git a/src/search.cpp b/src/search.cpp index 2678f7d5..d0bbc967 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -368,7 +368,6 @@ void Thread::search() { size_t pvFirst = 0; pvLast = 0; - Depth adjustedDepth = rootDepth; // MultiPV loop. We perform a full root search for each PV line for (pvIdx = 0; pvIdx < multiPV && !Threads.stop; ++pvIdx) @@ -405,7 +404,7 @@ void Thread::search() { int failedHighCnt = 0; while (true) { - adjustedDepth = std::max(ONE_PLY, rootDepth - failedHighCnt * ONE_PLY); + Depth adjustedDepth = std::max(ONE_PLY, rootDepth - failedHighCnt * ONE_PLY); bestValue = ::search(rootPos, ss, alpha, beta, adjustedDepth, false); // Bring the best move to the front. It is critical that sorting @@ -428,7 +427,7 @@ void Thread::search() { && multiPV == 1 && (bestValue <= alpha || bestValue >= beta) && Time.elapsed() > 3000) - sync_cout << UCI::pv(rootPos, adjustedDepth, alpha, beta) << sync_endl; + sync_cout << UCI::pv(rootPos, rootDepth, alpha, beta) << sync_endl; // In case of failing low/high increase aspiration window and // re-search, otherwise exit the loop. @@ -463,15 +462,15 @@ void Thread::search() { if ( mainThread && (Threads.stop || pvIdx + 1 == multiPV || Time.elapsed() > 3000)) - sync_cout << UCI::pv(rootPos, adjustedDepth, alpha, beta) << sync_endl; + sync_cout << UCI::pv(rootPos, rootDepth, alpha, beta) << sync_endl; } if (!Threads.stop) - completedDepth = adjustedDepth; + completedDepth = rootDepth; if (rootMoves[0].pv[0] != lastBestMove) { lastBestMove = rootMoves[0].pv[0]; - lastBestMoveDepth = adjustedDepth; + lastBestMoveDepth = rootDepth; } // Have we found a "mate in x"? @@ -944,6 +943,12 @@ moves_loop: // When in check, search starts from here && pos.see_ge(move)) extension = ONE_PLY; + // Extension for king moves that change castling rights + if ( pos.can_castle(us) + && type_of(movedPiece) == KING + && depth < 12 * ONE_PLY) + extension = ONE_PLY; + // Calculate new depth for this move newDepth = depth - ONE_PLY + extension;