X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fsearch.cpp;h=548ea9143d37c48f3aeec316744803a797c13aa1;hb=65c3bb8586eba11277f8297ef0f55c121772d82c;hp=e9afc1c58b2655374c056161e08f325a1c67d7b7;hpb=ad5d86c7714ae3eaad71e8b3630d38c29dd2c3fe;p=stockfish diff --git a/src/search.cpp b/src/search.cpp index e9afc1c5..548ea914 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -66,9 +66,12 @@ namespace { const int SkipSize[] = { 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4 }; const int SkipPhase[] = { 0, 1, 0, 1, 2, 3, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7 }; - // Razoring and futility margins - const int RazorMargin = 590; - Value futility_margin(Depth d) { return Value(150 * d / ONE_PLY); } + // Razor and futility margins + const int RazorMargin1 = 590; + const int RazorMargin2 = 604; + Value futility_margin(Depth d, bool improving) { + return Value((175 - 50 * improving) * d / ONE_PLY); + } // Futility and reductions lookup tables, initialized at startup int FutilityMoveCounts[2][16]; // [improving][depth] @@ -288,7 +291,7 @@ void Thread::search() { std::memset(ss-4, 0, 7 * sizeof(Stack)); for (int i = 4; i > 0; i--) - (ss-i)->contHistory = &this->contHistory[NO_PIECE][0]; // Use as sentinel + (ss-i)->contHistory = this->contHistory[NO_PIECE][0].get(); // Use as sentinel bestValue = delta = alpha = -VALUE_INFINITE; beta = VALUE_INFINITE; @@ -345,11 +348,13 @@ void Thread::search() { alpha = std::max(rootMoves[PVIdx].previousScore - delta,-VALUE_INFINITE); beta = std::min(rootMoves[PVIdx].previousScore + delta, VALUE_INFINITE); - // Adjust contempt based on current bestValue - ct = Options["Contempt"] * PawnValueEg / 100 // From centipawns - + (bestValue > 500 ? 50: // Dynamic contempt - bestValue < -500 ? -50: - bestValue / 10); + ct = Options["Contempt"] * PawnValueEg / 100; // From centipawns + + // Adjust contempt based on current bestValue (dynamic contempt) + int sign = (bestValue > 0) - (bestValue < 0); + ct += bestValue > 500 ? 70 : + bestValue < -500 ? -70 : + bestValue / 10 + sign * int(std::round(3.22 * log(1 + abs(bestValue)))); Eval::Contempt = (us == WHITE ? make_score(ct, ct / 2) : -make_score(ct, ct / 2)); @@ -549,7 +554,7 @@ namespace { (ss+1)->ply = ss->ply + 1; ss->currentMove = (ss+1)->excludedMove = bestMove = MOVE_NONE; - ss->contHistory = &thisThread->contHistory[NO_PIECE][0]; + ss->contHistory = thisThread->contHistory[NO_PIECE][0].get(); (ss+2)->killers[0] = (ss+2)->killers[1] = MOVE_NONE; Square prevSq = to_sq((ss-1)->currentMove); @@ -594,7 +599,7 @@ namespace { else if (!pos.capture_or_promotion(ttMove)) { int penalty = -stat_bonus(depth); - thisThread->mainHistory.update(pos.side_to_move(), ttMove, penalty); + thisThread->mainHistory[pos.side_to_move()][from_to(ttMove)] << penalty; update_continuation_histories(ss, pos.moved_piece(ttMove), to_sq(ttMove), penalty); } } @@ -675,19 +680,35 @@ namespace { ss->staticEval, TT.generation()); } + improving = ss->staticEval >= (ss-2)->staticEval + /* || ss->staticEval == VALUE_NONE Already implicit in the previous condition */ + ||(ss-2)->staticEval == VALUE_NONE; + if (skipEarlyPruning || !pos.non_pawn_material(pos.side_to_move())) goto moves_loop; // Step 7. Razoring (skipped when in check) - if ( !PvNode - && depth <= ONE_PLY - && eval + RazorMargin <= alpha) - return qsearch(pos, ss, alpha, alpha+1); + if ( !PvNode + && depth <= 2 * ONE_PLY) + { + if ( depth == ONE_PLY + && eval + RazorMargin1 <= alpha) + return qsearch(pos, ss, alpha, alpha+1); + + else if (eval + RazorMargin2 <= alpha) + { + Value ralpha = alpha - RazorMargin2; + Value v = qsearch(pos, ss, ralpha, ralpha+1); + + if (v <= ralpha) + return v; + } + } // Step 8. Futility pruning: child node (skipped when in check) if ( !rootNode && depth < 7 * ONE_PLY - && eval - futility_margin(depth) >= beta + && eval - futility_margin(depth, improving) >= beta && eval < VALUE_KNOWN_WIN) // Do not return unproven wins return eval; @@ -703,7 +724,7 @@ namespace { Depth R = ((823 + 67 * depth / ONE_PLY) / 256 + std::min((eval - beta) / PawnValueMg, 3)) * ONE_PLY; ss->currentMove = MOVE_NULL; - ss->contHistory = &thisThread->contHistory[NO_PIECE][0]; + ss->contHistory = thisThread->contHistory[NO_PIECE][0].get(); pos.do_null_move(st); Value nullValue = depth-R < ONE_PLY ? -qsearch(pos, ss+1, -beta, -beta+1) @@ -745,12 +766,16 @@ namespace { Value rbeta = std::min(beta + 200, VALUE_INFINITE); MovePicker mp(pos, ttMove, rbeta - ss->staticEval, &thisThread->captureHistory); + int probCutCount = 0; - while ((move = mp.next_move()) != MOVE_NONE) + while ( (move = mp.next_move()) != MOVE_NONE + && probCutCount < depth / ONE_PLY - 3) if (pos.legal(move)) { + probCutCount++; + ss->currentMove = move; - ss->contHistory = &thisThread->contHistory[pos.moved_piece(move)][to_sq(move)]; + ss->contHistory = thisThread->contHistory[pos.moved_piece(move)][to_sq(move)].get(); assert(depth >= 5 * ONE_PLY); @@ -768,6 +793,7 @@ namespace { value = -search(pos, ss+1, -rbeta, -rbeta+1, depth - 4 * ONE_PLY, !cutNode, false); pos.undo_move(move); + if (value >= rbeta) return value; } @@ -925,7 +951,7 @@ moves_loop: // When in check, search starts from here // Update the current move (this must be done after singular extension search) ss->currentMove = move; - ss->contHistory = &thisThread->contHistory[movedPiece][to_sq(move)]; + ss->contHistory = thisThread->contHistory[movedPiece][to_sq(move)].get(); // Step 15. Make the move pos.do_move(move, st, givesCheck); @@ -1389,7 +1415,7 @@ moves_loop: // When in check, search starts from here for (int i : {1, 2, 4}) if (is_ok((ss-i)->currentMove)) - (ss-i)->contHistory->update(pc, to, bonus); + (*(ss-i)->contHistory)[pc][to] << bonus; } @@ -1401,14 +1427,14 @@ moves_loop: // When in check, search starts from here CapturePieceToHistory& captureHistory = pos.this_thread()->captureHistory; Piece moved_piece = pos.moved_piece(move); PieceType captured = type_of(pos.piece_on(to_sq(move))); - captureHistory.update(moved_piece, to_sq(move), captured, bonus); + captureHistory[moved_piece][to_sq(move)][captured] << bonus; // Decrease all the other played capture moves for (int i = 0; i < captureCnt; ++i) { moved_piece = pos.moved_piece(captures[i]); captured = type_of(pos.piece_on(to_sq(captures[i]))); - captureHistory.update(moved_piece, to_sq(captures[i]), captured, -bonus); + captureHistory[moved_piece][to_sq(captures[i])][captured] << -bonus; } } @@ -1426,7 +1452,7 @@ moves_loop: // When in check, search starts from here Color us = pos.side_to_move(); Thread* thisThread = pos.this_thread(); - thisThread->mainHistory.update(us, move, bonus); + thisThread->mainHistory[us][from_to(move)] << bonus; update_continuation_histories(ss, pos.moved_piece(move), to_sq(move), bonus); if (is_ok((ss-1)->currentMove)) @@ -1438,7 +1464,7 @@ moves_loop: // When in check, search starts from here // Decrease all the other played quiet moves for (int i = 0; i < quietsCnt; ++i) { - thisThread->mainHistory.update(us, quiets[i], -bonus); + thisThread->mainHistory[us][from_to(quiets[i])] << -bonus; update_continuation_histories(ss, pos.moved_piece(quiets[i]), to_sq(quiets[i]), -bonus); } }