X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=0cbe09e007a1fa3e1c49337fc2919fcca8d909b5;hp=7eb04308b4c3bbd6c72247a6d920927ffc91b9e5;hb=bd618941ce6586507a641724646b9fe6b211a1b1;hpb=5bec768d42fc8ce34b4dc0574ef9f4e61bfd8853 diff --git a/src/search.cpp b/src/search.cpp index 7eb04308..0cbe09e0 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -173,19 +173,15 @@ namespace { // If the TT move is at least SingleReplyMargin better then the // remaining ones we will extend it. - const Value SingleReplyMargin = Value(0x64); + const Value SingleReplyMargin = Value(0x20); // Margins for futility pruning in the quiescence search, and at frontier // and near frontier nodes. const Value FutilityMarginQS = Value(0x80); // Each move futility margin is decreased - const Value IncrementalFutilityMargin = Value(0x8); + const Value IncrementalFutilityMargin = Value(0x4); - // Remaining depth: 1 ply 1.5 ply 2 ply 2.5 ply 3 ply 3.5 ply - const Value FutilityMargins[12] = { Value(0x100), Value(0x120), Value(0x200), Value(0x220), Value(0x250), Value(0x270), - // 4 ply 4.5 ply 5 ply 5.5 ply 6 ply 6.5 ply - Value(0x2A0), Value(0x2C0), Value(0x340), Value(0x360), Value(0x3A0), Value(0x3C0) }; // Razoring const Depth RazorDepth = 4*OnePly; @@ -406,13 +402,13 @@ bool think(const Position& pos, bool infinite, bool ponder, int side_to_move, Problem = false; ExactMaxTime = maxTime; + if (button_was_pressed("New Game")) + loseOnTime = false; // reset at the beginning of a new game + // Read UCI option values TT.set_size(get_option_value_int("Hash")); if (button_was_pressed("Clear Hash")) - { TT.clear(); - loseOnTime = false; // reset at the beginning of a new game - } bool PonderingEnabled = get_option_value_bool("Ponder"); MultiPV = get_option_value_int("MultiPV"); @@ -681,6 +677,14 @@ namespace { // searchMoves are verified, copied, scored and sorted RootMoveList rml(p, searchMoves); + if (rml.move_count() == 0) + { + if (PonderSearch) + wait_for_stop_or_ponderhit(); + + return pos.is_check()? -VALUE_MATE : VALUE_DRAW; + } + // Print RootMoveList c'tor startup scoring to the standard output, // so that we print information also for iteration 1. std::cout << "info depth " << 1 << "\ninfo depth " << 1 @@ -1139,9 +1143,8 @@ namespace { ttMove = ss[ply].pv[ply]; tte = TT.retrieve(pos.get_key()); - // Following assert could fail, for instance when we have - // moveCount == 0 we return without saving a TT entry. - /* assert(tte); */ + // If tte->move() != MOVE_NONE then it equals ttMove + assert(!(tte && tte->move()) || tte->move() == ttMove); } // Initialize a MovePicker object for the current position, and prepare @@ -1170,9 +1173,7 @@ namespace { // To verify this we do a reduced search on all the other moves but the ttMove, // if result is lower then TT value minus a margin then we assume ttMove is the // only one playable. It is a kind of relaxed single reply extension. - // Note that could be ttMove != tte->move() due to IID, so we always use tte->move() - // to avoid aliases when we probe tte->depth() and tte->type() - if ( depth >= 8 * OnePly + if ( depth >= 6 * OnePly && tte && move == tte->move() && ext < OnePly @@ -1183,7 +1184,7 @@ namespace { if (abs(ttValue) < VALUE_KNOWN_WIN) { - Value excValue = search(pos, ss, ttValue - SingleReplyMargin, depth / 2, ply, false, threadID, ttMove); + Value excValue = search(pos, ss, ttValue - SingleReplyMargin, depth / 2, ply, false, threadID, move); // If search result is well below the foreseen score of the ttMove then we // assume ttMove is the only one realistically playable and we extend it. @@ -1362,7 +1363,7 @@ namespace { if (tte && ok_to_use_TT(tte, depth, beta, ply)) { - ss[ply].currentMove = ttMove; // can be MOVE_NONE + ss[ply].currentMove = ttMove; // Can be MOVE_NONE return value_from_tt(tte->value(), ply); } @@ -1448,12 +1449,13 @@ namespace { futilityValue = VALUE_NONE; useFutilityPruning = depth < SelectiveDepth && !isCheck; + // Calculate depth dependant futility pruning parameters + const int FutilityMoveCountMargin = 3 + (1 << (3 * int(depth) / 8)); + const int FutilityValueMargin = 112 * bitScanReverse32(int(depth) * int(depth) / 2); + // Avoid calling evaluate() if we already have the score in TT if (tte && (tte->type() & VALUE_TYPE_EVAL)) - futilityValue = value_from_tt(tte->value(), ply) + FutilityMargins[int(depth) - 2]; - - // Move count pruning limit - const int MCLimit = 3 + (1 << (3*int(depth)/8)); + futilityValue = value_from_tt(tte->value(), ply) + FutilityValueMargin; // Loop through all legal moves until no moves remain or a beta cutoff occurs while ( bestValue < beta @@ -1476,8 +1478,6 @@ namespace { // To verify this we do a reduced search on all the other moves but the ttMove, // if result is lower then TT value minus a margin then we assume ttMove is the // only one playable. It is a kind of relaxed single reply extension. - // Note that could be ttMove != tte->move() due to IID, so we always use tte->move() - // to avoid aliases when we probe tte->depth() and tte->type() if ( depth >= 8 * OnePly && tte && move == tte->move() @@ -1490,7 +1490,7 @@ namespace { if (abs(ttValue) < VALUE_KNOWN_WIN) { - Value excValue = search(pos, ss, ttValue - SingleReplyMargin, depth / 2, ply, false, threadID, ttMove); + Value excValue = search(pos, ss, ttValue - SingleReplyMargin, depth / 2, ply, false, threadID, move); // If search result is well below the foreseen score of the ttMove then we // assume ttMove is the only one realistically playable and we extend it. @@ -1511,26 +1511,22 @@ namespace { && move != ttMove) { // History pruning. See ok_to_prune() definition - if ( moveCount >= MCLimit + if ( moveCount >= FutilityMoveCountMargin && ok_to_prune(pos, move, ss[ply].threatMove, depth) && bestValue > value_mated_in(PLY_MAX)) continue; // Value based pruning - if (approximateEval < beta) - { - if (futilityValue == VALUE_NONE) - futilityValue = evaluate(pos, ei, threadID) - + 64*(2+bitScanReverse32(int(depth) * int(depth))); + if (futilityValue == VALUE_NONE) + futilityValue = evaluate(pos, ei, threadID) + FutilityValueMargin; - futilityValueScaled = futilityValue - moveCount * IncrementalFutilityMargin; + futilityValueScaled = futilityValue - moveCount * IncrementalFutilityMargin; - if (futilityValueScaled < beta) - { - if (futilityValueScaled > bestValue) - bestValue = futilityValueScaled; - continue; - } + if (futilityValueScaled < beta) + { + if (futilityValueScaled > bestValue) + bestValue = futilityValueScaled; + continue; } } @@ -1550,7 +1546,7 @@ namespace { value = -search(pos, ss, -(beta-1), newDepth-OnePly, ply+1, true, threadID); } else - value = beta; // Just to trigger next condition + value = beta; // Just to trigger next condition if (value >= beta) // Go with full depth non-pv search { @@ -1564,12 +1560,12 @@ namespace { // New best move? if (value > bestValue) { - bestValue = value; - if (value >= beta) - update_pv(ss, ply); + bestValue = value; + if (value >= beta) + update_pv(ss, ply); - if (value == value_mate_in(ply + 1)) - ss[ply].mateKiller = move; + if (value == value_mate_in(ply + 1)) + ss[ply].mateKiller = move; } // Split? @@ -1582,7 +1578,7 @@ namespace { && !thread_should_stop(threadID) && split(pos, ss, ply, &beta, &beta, &bestValue, futilityValue, approximateEval, depth, &moveCount, &mp, threadID, false)) - break; + break; } // All legal moves have been searched. A special case: If there were @@ -1661,10 +1657,10 @@ namespace { } ttMove = (tte ? tte->move() : MOVE_NONE); - // Evaluate the position statically isCheck = pos.is_check(); ei.futilityMargin = Value(0); // Manually initialize futilityMargin + // Evaluate the position statically if (isCheck) staticValue = -VALUE_INFINITE; @@ -1673,7 +1669,7 @@ namespace { // Use the cached evaluation score if possible assert(ei.futilityMargin == Value(0)); - staticValue = tte->value(); + staticValue = value_from_tt(tte->value(), ply); } else staticValue = evaluate(pos, ei, threadID); @@ -1818,6 +1814,8 @@ namespace { bool useFutilityPruning = sp->depth < SelectiveDepth && !isCheck; + const int FutilityValueMargin = 112 * bitScanReverse32(int(sp->depth) * int(sp->depth) / 2); + while ( sp->bestValue < sp->beta && !thread_should_stop(threadID) && (move = sp->mp->get_next_move(sp->lock)) != MOVE_NONE) @@ -1855,8 +1853,7 @@ namespace { if (sp->futilityValue == VALUE_NONE) { EvalInfo ei; - sp->futilityValue = evaluate(pos, ei, threadID) - + FutilityMargins[int(sp->depth) - 2]; + sp->futilityValue = evaluate(pos, ei, threadID) + FutilityValueMargin; } if (sp->futilityValue < sp->beta)