X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=52bb09877e26445428b3958182dd8cfd7bf741b0;hp=a50f7990f2cf20c6e8171f832d16fa2fa40ac170;hb=5486911e019c8be689e75462e2fc36ef7eb2c84a;hpb=e082112cfeb6a40ca592a15983cdedb0210daf3a diff --git a/src/search.cpp b/src/search.cpp index a50f7990..52bb0987 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -350,6 +350,7 @@ void MainThread::search() { Thread* bestThread = this; if ( !this->easyMovePlayed && Options["MultiPV"] == 1 + && !Limits.depth && !Skill(Options["Skill Level"]).enabled() && rootMoves[0].pv[0] != MOVE_NONE) { @@ -411,7 +412,7 @@ void Thread::search() { multiPV = std::min(multiPV, rootMoves.size()); // Iterative deepening loop until requested to stop or the target depth is reached. - while (++rootDepth < DEPTH_MAX && !Signals.stop && (!Limits.depth || rootDepth <= Limits.depth)) + while (++rootDepth < DEPTH_MAX && !Signals.stop && (!Limits.depth || Threads.main()->rootDepth <= Limits.depth)) { // Set up the new depths for the helper threads skipping on average every // 2nd ply (using a half-density matrix). @@ -1006,19 +1007,18 @@ moves_loop: // When in check search starts from here Depth r = reduction(improving, depth, moveCount); Value hValue = thisThread->history[pos.piece_on(to_sq(move))][to_sq(move)]; Value cmhValue = cmh[pos.piece_on(to_sq(move))][to_sq(move)]; - + const CounterMoveStats* fm = (ss - 2)->counterMoves; const CounterMoveStats* fm2 = (ss - 4)->counterMoves; Value fmValue = (fm ? (*fm)[pos.piece_on(to_sq(move))][to_sq(move)] : VALUE_ZERO); Value fm2Value = (fm2 ? (*fm2)[pos.piece_on(to_sq(move))][to_sq(move)] : VALUE_ZERO); - // Increase reduction for cut nodes and moves with a bad history - if ( (!PvNode && cutNode) - || (hValue < VALUE_ZERO && cmhValue <= VALUE_ZERO)) + // Increase reduction for cut nodes + if (!PvNode && cutNode) r += ONE_PLY; // Decrease/increase reduction for moves with a good/bad history - int rHist = (hValue + cmhValue + fmValue + fm2Value) / 20000; + int rHist = (hValue + cmhValue + fmValue + fm2Value - 10000) / 20000; r = std::max(DEPTH_ZERO, r - rHist * ONE_PLY); // Decrease reduction for moves that escape a capture. Filter out