X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fsearch.cpp;h=2072c4bc241d7590d8dca47ba04e3e2c6985146b;hb=6634f41ac9e76fe623dd36d312b6955ab2c66a4f;hp=b61a21ad39018fa251ca743200194fdfdbd65ebe;hpb=0143c6f0c2137aac0ea3531d0f1d95009be0924c;p=stockfish diff --git a/src/search.cpp b/src/search.cpp index b61a21ad..2072c4bc 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -92,7 +92,7 @@ namespace { // History and stats update bonus, based on depth int stat_bonus(Depth depth) { int d = depth / ONE_PLY; - return d > 17 ? 0 : d * d + 2 * d - 2; + return d > 17 ? 0 : 32 * d * d + 64 * d - 64; } // Skill structure is used to implement strength limit @@ -107,7 +107,7 @@ namespace { }; template - Value search(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth, bool cutNode, bool skipEarlyPruning); + Value search(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth, bool cutNode); template Value qsearch(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth = DEPTH_ZERO); @@ -317,7 +317,7 @@ void Thread::search() { multiPV = std::min(multiPV, rootMoves.size()); - int ct = Options["Contempt"] * PawnValueEg / 100; // From centipawns + int ct = int(Options["Contempt"]) * PawnValueEg / 100; // From centipawns // In analysis mode, adjust contempt in accordance with user preference if (Limits.infinite || Options["UCI_AnalyseMode"]) @@ -379,7 +379,7 @@ void Thread::search() { beta = std::min(previousScore + delta, VALUE_INFINITE); // Adjust contempt based on root move's previousScore (dynamic contempt) - int dct = ct + int(std::round(48 * atan(float(previousScore) / 128))); + int dct = ct + 88 * previousScore / (abs(previousScore) + 200); contempt = (us == WHITE ? make_score(dct, dct / 2) : -make_score(dct, dct / 2)); @@ -390,7 +390,7 @@ void Thread::search() { // high/low anymore. while (true) { - bestValue = ::search(rootPos, ss, alpha, beta, rootDepth, false, false); + bestValue = ::search(rootPos, ss, alpha, beta, rootDepth, false); // Bring the best move to the front. It is critical that sorting // is done with a stable algorithm because all the values but the @@ -517,7 +517,7 @@ namespace { // search<>() is the main search function for both PV and non-PV nodes template - Value search(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth, bool cutNode, bool skipEarlyPruning) { + Value search(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth, bool cutNode) { // Use quiescence search when needed if (depth < ONE_PLY) @@ -713,7 +713,7 @@ namespace { improving = ss->staticEval >= (ss-2)->staticEval ||(ss-2)->staticEval == VALUE_NONE; - if (skipEarlyPruning || !pos.non_pawn_material(pos.side_to_move())) + if (ss->excludedMove || !pos.non_pawn_material(pos.side_to_move())) goto moves_loop; // Step 7. Razoring (skipped when in check, ~2 Elo) @@ -736,6 +736,7 @@ namespace { // Step 9. Null move search with verification search (~40 Elo) if ( !PvNode + && (ss-1)->currentMove != MOVE_NULL && eval >= beta && ss->staticEval >= beta - 36 * depth / ONE_PLY + 225 && (ss->ply >= thisThread->nmp_ply || ss->ply % 2 != thisThread->nmp_odd)) @@ -750,7 +751,7 @@ namespace { pos.do_null_move(st); - Value nullValue = -search(pos, ss+1, -beta, -beta+1, depth-R, !cutNode, true); + Value nullValue = -search(pos, ss+1, -beta, -beta+1, depth-R, !cutNode); pos.undo_null_move(); @@ -768,7 +769,7 @@ namespace { thisThread->nmp_ply = ss->ply + 3 * (depth-R) / 4; thisThread->nmp_odd = ss->ply % 2; - Value v = search(pos, ss, beta-1, beta, depth-R, false, true); + Value v = search(pos, ss, beta-1, beta, depth-R, false); thisThread->nmp_odd = thisThread->nmp_ply = 0; @@ -784,8 +785,6 @@ namespace { && depth >= 5 * ONE_PLY && abs(beta) < VALUE_MATE_IN_MAX_PLY) { - assert(is_ok((ss-1)->currentMove)); - Value rbeta = std::min(beta + 216 - 48 * improving, VALUE_INFINITE); MovePicker mp(pos, ttMove, rbeta - ss->staticEval, &thisThread->captureHistory); int probCutCount = 0; @@ -808,7 +807,7 @@ namespace { // If the qsearch held perform the regular search if (value >= rbeta) - value = -search(pos, ss+1, -rbeta, -rbeta+1, depth - 4 * ONE_PLY, !cutNode, false); + value = -search(pos, ss+1, -rbeta, -rbeta+1, depth - 4 * ONE_PLY, !cutNode); pos.undo_move(move); @@ -818,12 +817,11 @@ namespace { } // Step 11. Internal iterative deepening (skipped when in check, ~2 Elo) - if ( depth >= 6 * ONE_PLY - && !ttMove - && (PvNode || ss->staticEval + 128 >= beta)) + if ( depth >= 8 * ONE_PLY + && !ttMove) { Depth d = 3 * depth / 4 - 2 * ONE_PLY; - search(pos, ss, alpha, beta, d, cutNode, true); + search(pos, ss, alpha, beta, d, cutNode); tte = TT.probe(posKey, ttHit); ttValue = ttHit ? value_from_tt(tte->value(), ss->ply) : VALUE_NONE; @@ -835,7 +833,11 @@ moves_loop: // When in check, search starts from here const PieceToHistory* contHist[] = { (ss-1)->contHistory, (ss-2)->contHistory, nullptr, (ss-4)->contHistory }; Move countermove = thisThread->counterMoves[pos.piece_on(prevSq)][prevSq]; - MovePicker mp(pos, ttMove, depth, &thisThread->mainHistory, &thisThread->captureHistory, contHist, countermove, ss->killers); + MovePicker mp(pos, ttMove, depth, &thisThread->mainHistory, + &thisThread->captureHistory, + contHist, + countermove, + ss->killers); value = bestValue; // Workaround a bogus 'uninitialized' warning under gcc skipQuiets = false; @@ -894,7 +896,7 @@ moves_loop: // When in check, search starts from here { Value rBeta = std::max(ttValue - 2 * depth / ONE_PLY, -VALUE_MATE); ss->excludedMove = move; - value = search(pos, ss, rBeta - 1, rBeta, depth / 2, cutNode, true); + value = search(pos, ss, rBeta - 1, rBeta, depth / 2, cutNode); ss->excludedMove = MOVE_NONE; if (value < rBeta) @@ -1024,7 +1026,7 @@ moves_loop: // When in check, search starts from here Depth d = std::max(newDepth - r, ONE_PLY); - value = -search(pos, ss+1, -(alpha+1), -alpha, d, true, false); + value = -search(pos, ss+1, -(alpha+1), -alpha, d, true); doFullDepthSearch = (value > alpha && d != newDepth); } @@ -1033,7 +1035,7 @@ moves_loop: // When in check, search starts from here // Step 17. Full depth search when LMR is skipped or fails high if (doFullDepthSearch) - value = -search(pos, ss+1, -(alpha+1), -alpha, newDepth, !cutNode, false); + value = -search(pos, ss+1, -(alpha+1), -alpha, newDepth, !cutNode); // For PV nodes only, do a full PV search on the first move or after a fail // high (in the latter case search only if value < beta), otherwise let the @@ -1043,7 +1045,7 @@ moves_loop: // When in check, search starts from here (ss+1)->pv = pv; (ss+1)->pv[0] = MOVE_NONE; - value = -search(pos, ss+1, -beta, -alpha, newDepth, false, false); + value = -search(pos, ss+1, -beta, -alpha, newDepth, false); } // Step 18. Undo move @@ -1275,7 +1277,9 @@ moves_loop: // When in check, search starts from here // to search the moves. Because the depth is <= 0 here, only captures, // queen promotions and checks (only if depth >= DEPTH_QS_CHECKS) will // be generated. - MovePicker mp(pos, ttMove, depth, &pos.this_thread()->mainHistory, &pos.this_thread()->captureHistory, to_sq((ss-1)->currentMove)); + MovePicker mp(pos, ttMove, depth, &pos.this_thread()->mainHistory, + &pos.this_thread()->captureHistory, + to_sq((ss-1)->currentMove)); // Loop through the moves until no moves remain or a beta cutoff occurs while ((move = mp.next_move()) != MOVE_NONE) @@ -1632,9 +1636,9 @@ bool RootMove::extract_ponder_from_tt(Position& pos) { void Tablebases::rank_root_moves(Position& pos, Search::RootMoves& rootMoves) { RootInTB = false; - UseRule50 = Options["Syzygy50MoveRule"]; - ProbeDepth = Options["SyzygyProbeDepth"] * ONE_PLY; - Cardinality = Options["SyzygyProbeLimit"]; + UseRule50 = bool(Options["Syzygy50MoveRule"]); + ProbeDepth = int(Options["SyzygyProbeDepth"]) * ONE_PLY; + Cardinality = int(Options["SyzygyProbeLimit"]); bool dtz_available = true; // Tables with fewer pieces than SyzygyProbeLimit are searched with