X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=6b8949569f753b38f1f9ee98960d1a8fba7bdaf9;hp=847fc762e53644abb7959622e211a1c3966b3f03;hb=dc0030de4fdece2851dd0072c9aea53695ed90ce;hpb=ec6aab01366ba1d2de27084d3cc7415a31aa5a24 diff --git a/src/search.cpp b/src/search.cpp index 847fc762..6b894956 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). @@ -1007,13 +1008,18 @@ moves_loop: // When in check search starts from here 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)) r += ONE_PLY; // Decrease/increase reduction for moves with a good/bad history - int rHist = (hValue + cmhValue) / 14980; + int rHist = (hValue + cmhValue + fmValue + fm2Value) / 20000; r = std::max(DEPTH_ZERO, r - rHist * ONE_PLY); // Decrease reduction for moves that escape a capture. Filter out