X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fsearch.cpp;h=693bea940548f31d975db84c428d2b8273819c8a;hb=221f41c2dffd100e8069bde7785022f4366f1e70;hp=8fa1a37928399d45da5d8bf4173e7bbe20f7d08a;hpb=ab127028ed51ccf2fe22285f8032d2455e6d98d2;p=stockfish diff --git a/src/search.cpp b/src/search.cpp index 8fa1a379..693bea94 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -89,7 +89,7 @@ namespace { void idle_loop(int threadID, SplitPoint* sp); template - void split(const Position& pos, SearchStack* ss, Value* alpha, const Value beta, Value* bestValue, + void split(const Position& pos, SearchStack* ss, int ply, Value* alpha, const Value beta, Value* bestValue, Depth depth, bool mateThreat, int* moveCount, MovePicker* mp, bool pvNode); private: @@ -236,7 +236,7 @@ namespace { // Last seconds noise filtering (LSN) const bool UseLSNFiltering = true; - const int LSNTime = 4000; // In milliseconds + const int LSNTime = 100; // In milliseconds const Value LSNValue = value_from_centipawns(200); bool loseOnTime = false; @@ -285,10 +285,10 @@ namespace { Value root_search(Position& pos, SearchStack* ss, RootMoveList& rml, Value* alphaPtr, Value* betaPtr); template - Value search(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth); + Value search(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth, int ply); template - Value qsearch(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth); + Value qsearch(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth, int ply); template void sp_search(SplitPoint* sp, int threadID); @@ -296,8 +296,8 @@ namespace { template Depth extension(const Position& pos, Move m, bool captureOrPromotion, bool moveIsCheck, bool singleEvasion, bool mateThreat, bool* dangerous); - void update_pv(SearchStack* ss, int ply); - void sp_update_pv(SearchStack* pss, SearchStack* ss, int ply); + void update_pv(SearchStack* ss); + void sp_update_pv(SearchStack* pss, SearchStack* ss); bool connected_moves(const Position& pos, Move m1, Move m2); bool value_is_mate(Value value); bool move_is_killer(Move m, SearchStack* ss); @@ -366,9 +366,9 @@ void init_search() { // SearchStack::init() initializes a search stack. Used at the beginning of a // new search from the root. -void SearchStack::init(int ply) { +void SearchStack::init() { - pv[ply] = pv[ply + 1] = MOVE_NONE; + pv[0] = pv[1] = MOVE_NONE; currentMove = threatMove = MOVE_NONE; reduction = Depth(0); eval = VALUE_NONE; @@ -635,7 +635,6 @@ namespace { H.clear(); init_ss_array(ss, PLY_MAX_PLUS_2); ValueByIteration[1] = rml.get_move_score(0); - p.reset_ply(); Iteration = 1; // Is one move significantly better than others after initial scoring ? @@ -876,7 +875,7 @@ namespace { alpha = -VALUE_INFINITE; // Full depth PV search, done on first move or after a fail high - value = -search(pos, ss+1, -beta, -alpha, newDepth); + value = -search(pos, ss+1, -beta, -alpha, newDepth, 1); } else { @@ -892,23 +891,37 @@ namespace { ss->reduction = reduction(depth, i - MultiPV + 2); if (ss->reduction) { + assert(newDepth-ss->reduction >= OnePly); + // Reduced depth non-pv search using alpha as upperbound - value = -search(pos, ss+1, -(alpha+1), -alpha, newDepth-ss->reduction); + value = -search(pos, ss+1, -(alpha+1), -alpha, newDepth-ss->reduction, 1); + doFullDepthSearch = (value > alpha); + } + + // The move failed high, but if reduction is very big we could + // face a false positive, retry with a less aggressive reduction, + // if the move fails high again then go with full depth search. + if (doFullDepthSearch && ss->reduction > 2 * OnePly) + { + assert(newDepth - OnePly >= OnePly); + + ss->reduction = OnePly; + value = -search(pos, ss+1, -(alpha+1), -alpha, newDepth-ss->reduction, 1); doFullDepthSearch = (value > alpha); } + ss->reduction = Depth(0); // Restore original reduction } // Step 15. Full depth search if (doFullDepthSearch) { // Full depth non-pv search using alpha as upperbound - ss->reduction = Depth(0); - value = -search(pos, ss+1, -(alpha+1), -alpha, newDepth); + value = -search(pos, ss+1, -(alpha+1), -alpha, newDepth, 1); // If we are above alpha then research at same depth but as PV // to get a correct score or eventually a fail high above beta. if (value > alpha) - value = -search(pos, ss+1, -beta, -alpha, newDepth); + value = -search(pos, ss+1, -beta, -alpha, newDepth, 1); } } @@ -922,7 +935,7 @@ namespace { // We are failing high and going to do a research. It's important to update // the score before research in case we run out of time while researching. rml.set_move_score(i, value); - update_pv(ss, 0); + update_pv(ss); TT.extract_pv(pos, ss->pv, PLY_MAX); rml.set_move_pv(i, ss->pv); @@ -962,7 +975,7 @@ namespace { // Update PV rml.set_move_score(i, value); - update_pv(ss, 0); + update_pv(ss); TT.extract_pv(pos, ss->pv, PLY_MAX); rml.set_move_pv(i, ss->pv); @@ -1031,12 +1044,12 @@ namespace { // search<>() is the main search function for both PV and non-PV nodes template - Value search(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth) { + Value search(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth, int ply) { assert(alpha >= -VALUE_INFINITE && alpha <= VALUE_INFINITE); assert(beta > alpha && beta <= VALUE_INFINITE); assert(PvNode || alpha == beta - 1); - assert(pos.ply() > 0 && pos.ply() < PLY_MAX); + assert(ply > 0 && ply < PLY_MAX); assert(pos.thread() >= 0 && pos.thread() < TM.active_threads()); Move movesSearched[256]; @@ -1052,14 +1065,13 @@ namespace { bool mateThreat = false; int moveCount = 0; int threadID = pos.thread(); - int ply = pos.ply(); refinedValue = bestValue = value = -VALUE_INFINITE; oldAlpha = alpha; // Step 1. Initialize node and poll. Polling can abort search TM.incrementNodeCounter(threadID); - ss->init(ply); - (ss + 2)->initKillers(); + ss->init(); + (ss+2)->initKillers(); if (threadID == 0 && ++NodesSincePoll > NodesBetweenPolls) { @@ -1134,8 +1146,12 @@ namespace { && !value_is_mate(beta) && !pos.has_pawn_on_7th(pos.side_to_move())) { + // Pass ss->eval to qsearch() and avoid an evaluate call + if (!tte || tte->static_value() == VALUE_NONE) + TT.store(posKey, ss->eval, VALUE_TYPE_EXACT, Depth(-127*OnePly), MOVE_NONE, ss->eval, ei.kingDanger[pos.side_to_move()]); + Value rbeta = beta - razor_margin(depth); - Value v = qsearch(pos, ss, rbeta-1, rbeta, Depth(0)); + Value v = qsearch(pos, ss, rbeta-1, rbeta, Depth(0), ply); if (v < rbeta) // Logically we should return (v + razor_margin(depth)), but // surprisingly this did slightly weaker in tests. @@ -1178,8 +1194,8 @@ namespace { pos.do_null_move(st); (ss+1)->skipNullMove = true; - nullValue = depth-R*OnePly < OnePly ? -qsearch(pos, ss+1, -beta, -alpha, Depth(0)) - : - search(pos, ss+1, -beta, -alpha, depth-R*OnePly); + nullValue = depth-R*OnePly < OnePly ? -qsearch(pos, ss+1, -beta, -alpha, Depth(0), ply+1) + : - search(pos, ss+1, -beta, -alpha, depth-R*OnePly, ply+1); (ss+1)->skipNullMove = false; pos.undo_null_move(); @@ -1194,7 +1210,7 @@ namespace { return nullValue; ss->skipNullMove = true; - Value v = search(pos, ss, alpha, beta, depth-5*OnePly); + Value v = search(pos, ss, alpha, beta, depth-5*OnePly, ply); ss->skipNullMove = false; if (v >= beta) @@ -1227,10 +1243,10 @@ namespace { Depth d = (PvNode ? depth - 2 * OnePly : depth / 2); ss->skipNullMove = true; - search(pos, ss, alpha, beta, d); + search(pos, ss, alpha, beta, d, ply); ss->skipNullMove = false; - ttMove = ss->pv[ply]; + ttMove = ss->pv[0]; tte = TT.retrieve(posKey); } @@ -1279,10 +1295,9 @@ namespace { Value b = ttValue - SingularExtensionMargin; ss->excludedMove = move; ss->skipNullMove = true; - Value v = search(pos, ss, b - 1, b, depth / 2); + Value v = search(pos, ss, b - 1, b, depth / 2, ply); ss->skipNullMove = false; ss->excludedMove = MOVE_NONE; - if (v < ttValue - SingularExtensionMargin) ext = OnePly; } @@ -1328,8 +1343,8 @@ namespace { // Step extra. pv search (only in PV nodes) // The first move in list is the expected PV if (PvNode && moveCount == 1) - value = newDepth < OnePly ? -qsearch(pos, ss+1, -beta, -alpha, Depth(0)) - : - search(pos, ss+1, -beta, -alpha, newDepth); + value = newDepth < OnePly ? -qsearch(pos, ss+1, -beta, -alpha, Depth(0), ply+1) + : - search(pos, ss+1, -beta, -alpha, newDepth, ply+1); else { // Step 14. Reduced depth search @@ -1346,8 +1361,8 @@ namespace { if (ss->reduction) { Depth d = newDepth - ss->reduction; - value = d < OnePly ? -qsearch(pos, ss+1, -(alpha+1), -alpha, Depth(0)) - : - search(pos, ss+1, -(alpha+1), -alpha, d); + value = d < OnePly ? -qsearch(pos, ss+1, -(alpha+1), -alpha, Depth(0), ply+1) + : - search(pos, ss+1, -(alpha+1), -alpha, d, ply+1); doFullDepthSearch = (value > alpha); } @@ -1360,7 +1375,7 @@ namespace { assert(newDepth - OnePly >= OnePly); ss->reduction = OnePly; - value = -search(pos, ss+1, -(alpha+1), -alpha, newDepth-ss->reduction); + value = -search(pos, ss+1, -(alpha+1), -alpha, newDepth-ss->reduction, ply+1); doFullDepthSearch = (value > alpha); } ss->reduction = Depth(0); // Restore original reduction @@ -1369,15 +1384,15 @@ namespace { // Step 15. Full depth search if (doFullDepthSearch) { - value = newDepth < OnePly ? -qsearch(pos, ss+1, -(alpha+1), -alpha, Depth(0)) - : - search(pos, ss+1, -(alpha+1), -alpha, newDepth); + value = newDepth < OnePly ? -qsearch(pos, ss+1, -(alpha+1), -alpha, Depth(0), ply+1) + : - search(pos, ss+1, -(alpha+1), -alpha, newDepth, ply+1); // Step extra. pv search (only in PV nodes) // Search only for possible new PV nodes, if instead value >= beta then // parent node fails low with value <= alpha and tries another move. if (PvNode && value > alpha && value < beta) - value = newDepth < OnePly ? -qsearch(pos, ss+1, -beta, -alpha, Depth(0)) - : - search(pos, ss+1, -beta, -alpha, newDepth); + value = newDepth < OnePly ? -qsearch(pos, ss+1, -beta, -alpha, Depth(0), ply+1) + : - search(pos, ss+1, -beta, -alpha, newDepth, ply+1); } } @@ -1395,7 +1410,7 @@ namespace { if (PvNode && value < beta) // This guarantees that always: alpha < beta alpha = value; - update_pv(ss, ply); + update_pv(ss); if (value == value_mate_in(ply + 1)) ss->mateKiller = move; @@ -1410,7 +1425,7 @@ namespace { && !AbortSearch && !TM.thread_should_stop(threadID) && Iteration <= 99) - TM.split(pos, ss, &alpha, beta, &bestValue, depth, + TM.split(pos, ss, ply, &alpha, beta, &bestValue, depth, mateThreat, &moveCount, &mp, PvNode); } @@ -1433,7 +1448,7 @@ namespace { else if (bestValue >= beta) { TM.incrementBetaCounter(pos.side_to_move(), depth, threadID); - move = ss->pv[ply]; + move = ss->pv[0]; TT.store(posKey, value_to_tt(bestValue, ply), VALUE_TYPE_LOWER, depth, move, ss->eval, ei.kingDanger[pos.side_to_move()]); if (!pos.move_is_capture_or_promotion(move)) { @@ -1442,7 +1457,7 @@ namespace { } } else - TT.store(posKey, value_to_tt(bestValue, ply), VALUE_TYPE_EXACT, depth, ss->pv[ply], ss->eval, ei.kingDanger[pos.side_to_move()]); + TT.store(posKey, value_to_tt(bestValue, ply), VALUE_TYPE_EXACT, depth, ss->pv[0], ss->eval, ei.kingDanger[pos.side_to_move()]); assert(bestValue > -VALUE_INFINITE && bestValue < VALUE_INFINITE); @@ -1455,27 +1470,26 @@ namespace { // less than OnePly). template - Value qsearch(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth) { + Value qsearch(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth, int ply) { assert(alpha >= -VALUE_INFINITE && alpha <= VALUE_INFINITE); assert(beta >= -VALUE_INFINITE && beta <= VALUE_INFINITE); assert(PvNode || alpha == beta - 1); assert(depth <= 0); - assert(pos.ply() > 0 && pos.ply() < PLY_MAX); + assert(ply > 0 && ply < PLY_MAX); assert(pos.thread() >= 0 && pos.thread() < TM.active_threads()); EvalInfo ei; StateInfo st; Move ttMove, move; - Value staticValue, bestValue, value, futilityBase, futilityValue; - bool isCheck, enoughMaterial, moveIsCheck, evasionPrunable; - const TTEntry* tte = NULL; - int moveCount = 0; - int ply = pos.ply(); + Value bestValue, value, futilityValue, futilityBase; + bool isCheck, deepChecks, enoughMaterial, moveIsCheck, evasionPrunable; + const TTEntry* tte; Value oldAlpha = alpha; TM.incrementNodeCounter(pos.thread()); - ss->init(ply); + ss->pv[0] = ss->pv[1] = ss->currentMove = MOVE_NONE; + ss->eval = VALUE_NONE; // Check for an instant draw or maximum ply reached if (pos.is_draw() || ply >= PLY_MAX - 1) @@ -1496,39 +1510,42 @@ namespace { // Evaluate the position statically if (isCheck) - staticValue = -VALUE_INFINITE; - else if (tte && tte->static_value() != VALUE_NONE) { - staticValue = tte->static_value(); - ei.kingDanger[pos.side_to_move()] = tte->king_danger(); + bestValue = futilityBase = -VALUE_INFINITE; + deepChecks = enoughMaterial = false; } else - staticValue = evaluate(pos, ei); - - if (!isCheck) { - ss->eval = staticValue; + if (tte && tte->static_value() != VALUE_NONE) + { + ei.kingDanger[pos.side_to_move()] = tte->king_danger(); + bestValue = tte->static_value(); + } + else + bestValue = evaluate(pos, ei); + + ss->eval = bestValue; update_gains(pos, (ss-1)->currentMove, (ss-1)->eval, ss->eval); - } - // Initialize "stand pat score", and return it immediately if it is - // at least beta. - bestValue = staticValue; + // Stand pat. Return immediately if static value is at least beta + if (bestValue >= beta) + { + if (!tte) + TT.store(pos.get_key(), value_to_tt(bestValue, ply), VALUE_TYPE_LOWER, Depth(-127*OnePly), MOVE_NONE, ss->eval, ei.kingDanger[pos.side_to_move()]); - if (bestValue >= beta) - { - // Store the score to avoid a future costly evaluation() call - if (!isCheck && !tte) - TT.store(pos.get_key(), value_to_tt(bestValue, ply), VALUE_TYPE_LOWER, Depth(-127*OnePly), MOVE_NONE, ss->eval, ei.kingDanger[pos.side_to_move()]); + return bestValue; + } - return bestValue; - } + if (PvNode && bestValue > alpha) + alpha = bestValue; - if (bestValue > alpha) - alpha = bestValue; + // If we are near beta then try to get a cutoff pushing checks a bit further + deepChecks = (depth == -OnePly && bestValue >= beta - PawnValueMidgame / 8); - // If we are near beta then try to get a cutoff pushing checks a bit further - bool deepChecks = (depth == -OnePly && staticValue >= beta - PawnValueMidgame / 8); + // Futility pruning parameters, not needed when in check + futilityBase = bestValue + FutilityMarginQS + ei.kingDanger[pos.side_to_move()]; + enoughMaterial = pos.non_pawn_material(pos.side_to_move()) > RookValueMidgame; + } // Initialize a MovePicker object for the current position, and prepare // to search the moves. Because the depth is <= 0 here, only captures, @@ -1536,8 +1553,6 @@ namespace { // and we are near beta) will be generated. MovePicker mp = MovePicker(pos, ttMove, deepChecks ? Depth(0) : depth, H); CheckInfo ci(pos); - enoughMaterial = pos.non_pawn_material(pos.side_to_move()) > RookValueMidgame; - futilityBase = staticValue + FutilityMarginQS + ei.kingDanger[pos.side_to_move()]; // Loop through the moves until no moves remain or a beta cutoff occurs while ( alpha < beta @@ -1547,16 +1562,12 @@ namespace { moveIsCheck = pos.move_is_check(move, ci); - // Update current move - moveCount++; - ss->currentMove = move; - // Futility pruning if ( !PvNode - && enoughMaterial && !isCheck && !moveIsCheck && move != ttMove + && enoughMaterial && !move_is_promotion(move) && !pos.move_is_passed_pawn_push(move)) { @@ -1587,9 +1598,12 @@ namespace { && pos.see_sign(move) < 0) continue; + // Update current move + ss->currentMove = move; + // Make and search the move pos.do_move(move, st, ci, moveIsCheck); - value = -qsearch(pos, ss+1, -beta, -alpha, depth-OnePly); + value = -qsearch(pos, ss+1, -beta, -alpha, depth-OnePly, ply+1); pos.undo_move(move); assert(value > -VALUE_INFINITE && value < VALUE_INFINITE); @@ -1601,27 +1615,23 @@ namespace { if (value > alpha) { alpha = value; - update_pv(ss, ply); + update_pv(ss); } } } // All legal moves have been searched. A special case: If we're in check // and no legal moves were found, it is checkmate. - if (!moveCount && isCheck) // Mate! + if (isCheck && bestValue == -VALUE_INFINITE) return value_mated_in(ply); // Update transposition table Depth d = (depth == Depth(0) ? Depth(0) : Depth(-1)); if (bestValue <= oldAlpha) - { - // If bestValue isn't changed it means it is still the static evaluation - // of the node, so keep this info to avoid a future evaluation() call. TT.store(pos.get_key(), value_to_tt(bestValue, ply), VALUE_TYPE_UPPER, d, MOVE_NONE, ss->eval, ei.kingDanger[pos.side_to_move()]); - } else if (bestValue >= beta) { - move = ss->pv[ply]; + move = ss->pv[0]; TT.store(pos.get_key(), value_to_tt(bestValue, ply), VALUE_TYPE_LOWER, d, move, ss->eval, ei.kingDanger[pos.side_to_move()]); // Update killers only for good checking moves @@ -1629,7 +1639,7 @@ namespace { update_killers(move, ss); } else - TT.store(pos.get_key(), value_to_tt(bestValue, ply), VALUE_TYPE_EXACT, d, ss->pv[ply], ss->eval, ei.kingDanger[pos.side_to_move()]); + TT.store(pos.get_key(), value_to_tt(bestValue, ply), VALUE_TYPE_EXACT, d, ss->pv[0], ss->eval, ei.kingDanger[pos.side_to_move()]); assert(bestValue > -VALUE_INFINITE && bestValue < VALUE_INFINITE); @@ -1662,7 +1672,6 @@ namespace { Position pos(*sp->pos, threadID); CheckInfo ci(pos); - int ply = pos.ply(); SearchStack* ss = sp->sstack[threadID] + 1; isCheck = pos.is_check(); @@ -1737,8 +1746,9 @@ namespace { { Value localAlpha = sp->alpha; Depth d = newDepth - ss->reduction; - value = d < OnePly ? -qsearch(pos, ss+1, -(localAlpha+1), -localAlpha, Depth(0)) - : - search(pos, ss+1, -(localAlpha+1), -localAlpha, d); + value = d < OnePly ? -qsearch(pos, ss+1, -(localAlpha+1), -localAlpha, Depth(0), sp->ply+1) + : - search(pos, ss+1, -(localAlpha+1), -localAlpha, d, sp->ply+1); + doFullDepthSearch = (value > localAlpha); } @@ -1751,7 +1761,7 @@ namespace { ss->reduction = OnePly; Value localAlpha = sp->alpha; - value = -search(pos, ss+1, -(localAlpha+1), -localAlpha, newDepth-ss->reduction); + value = -search(pos, ss+1, -(localAlpha+1), -localAlpha, newDepth-ss->reduction, sp->ply+1); doFullDepthSearch = (value > localAlpha); } ss->reduction = Depth(0); // Restore original reduction @@ -1761,15 +1771,15 @@ namespace { if (doFullDepthSearch) { Value localAlpha = sp->alpha; - value = newDepth < OnePly ? -qsearch(pos, ss+1, -(localAlpha+1), -localAlpha, Depth(0)) - : - search(pos, ss+1, -(localAlpha+1), -localAlpha, newDepth); + value = newDepth < OnePly ? -qsearch(pos, ss+1, -(localAlpha+1), -localAlpha, Depth(0), sp->ply+1) + : - search(pos, ss+1, -(localAlpha+1), -localAlpha, newDepth, sp->ply+1); // Step extra. pv search (only in PV nodes) // Search only for possible new PV nodes, if instead value >= beta then // parent node fails low with value <= alpha and tries another move. if (PvNode && value > localAlpha && value < sp->beta) - value = newDepth < OnePly ? -qsearch(pos, ss+1, -sp->beta, -sp->alpha, Depth(0)) - : - search(pos, ss+1, -sp->beta, -sp->alpha, newDepth); + value = newDepth < OnePly ? -qsearch(pos, ss+1, -sp->beta, -sp->alpha, Depth(0), sp->ply+1) + : - search(pos, ss+1, -sp->beta, -sp->alpha, newDepth, sp->ply+1); } // Step 16. Undo move @@ -1792,7 +1802,7 @@ namespace { if (PvNode && value < sp->beta) // This guarantees that always: sp->alpha < sp->beta sp->alpha = value; - sp_update_pv(sp->parentSstack, ss, ply); + sp_update_pv(sp->parentSstack, ss); } } } @@ -1808,18 +1818,16 @@ namespace { // It updates the PV in the SearchStack object corresponding to the // current node. - void update_pv(SearchStack* ss, int ply) { - - assert(ply >= 0 && ply < PLY_MAX); - - int p; + void update_pv(SearchStack* ss) { - ss->pv[ply] = ss->currentMove; + Move* src = (ss+1)->pv; + Move* dst = ss->pv; - for (p = ply + 1; (ss+1)->pv[p] != MOVE_NONE; p++) - ss->pv[p] = (ss+1)->pv[p]; + *dst = ss->currentMove; - ss->pv[p] = MOVE_NONE; + do + *++dst = *src; + while (*src++ != MOVE_NONE); } @@ -1827,18 +1835,17 @@ namespace { // difference between the two functions is that sp_update_pv also updates // the PV at the parent node. - void sp_update_pv(SearchStack* pss, SearchStack* ss, int ply) { - - assert(ply >= 0 && ply < PLY_MAX); - - int p; + void sp_update_pv(SearchStack* pss, SearchStack* ss) { - ss->pv[ply] = pss->pv[ply] = ss->currentMove; + Move* src = (ss+1)->pv; + Move* dst = ss->pv; + Move* pdst = pss->pv; - for (p = ply + 1; (ss+1)->pv[p] != MOVE_NONE; p++) - ss->pv[p] = pss->pv[p] = (ss+1)->pv[p]; + *dst = *pdst = ss->currentMove; - ss->pv[p] = pss->pv[p] = MOVE_NONE; + do + *++dst = *++pdst = *src; + while (*src++ != MOVE_NONE); } @@ -1941,7 +1948,7 @@ namespace { if (*dangerous) { - if (moveIsCheck) + if (moveIsCheck && pos.see_sign(m)>= 0) result += CheckExtension[PvNode]; if (singleEvasion) @@ -2243,7 +2250,7 @@ namespace { if (i < 3) { - ss->init(i); + ss->init(); ss->initKillers(); } } @@ -2617,10 +2624,11 @@ namespace { // split() returns. template - void ThreadsManager::split(const Position& p, SearchStack* ss, Value* alpha, const Value beta, - Value* bestValue, Depth depth, bool mateThreat, int* moveCount, - MovePicker* mp, bool pvNode) { + void ThreadsManager::split(const Position& p, SearchStack* ss, int ply, Value* alpha, + const Value beta, Value* bestValue, Depth depth, bool mateThreat, + int* moveCount, MovePicker* mp, bool pvNode) { assert(p.is_ok()); + assert(ply > 0 && ply < PLY_MAX); assert(*bestValue >= -VALUE_INFINITE); assert(*bestValue <= *alpha); assert(*alpha < beta); @@ -2648,6 +2656,7 @@ namespace { // Initialize the split point object splitPoint->parent = threads[master].splitPoint; splitPoint->stopRequest = false; + splitPoint->ply = ply; splitPoint->depth = depth; splitPoint->mateThreat = mateThreat; splitPoint->alpha = *alpha; @@ -2782,7 +2791,7 @@ namespace { init_ss_array(ss, PLY_MAX_PLUS_2); pos.do_move(cur->move, st); moves[count].move = cur->move; - moves[count].score = -qsearch(pos, ss+1, -VALUE_INFINITE, VALUE_INFINITE, Depth(0)); + moves[count].score = -qsearch(pos, ss+1, -VALUE_INFINITE, VALUE_INFINITE, Depth(0), 1); moves[count].pv[0] = cur->move; moves[count].pv[1] = MOVE_NONE; pos.undo_move(cur->move);