mirror of
https://github.com/sockspls/badfish
synced 2025-05-02 01:29:36 +00:00
Remove skipQuiets variable in search()
This is a functional simplification. The moveCountPruning variable and the skipQuiets variable are similar enough in function that they can be combined. This removes the skipQuiets variable in search. STC LLR: 2.96 (-2.94,2.94) [-3.00,1.00] Total: 23278 W: 5210 L: 5091 D: 12977 http://tests.stockfishchess.org/tests/view/5c65dc490ebc5925cffc12e9 LTC LLR: 2.95 (-2.94,2.94) [-3.00,1.00] Total: 77107 W: 12792 L: 12761 D: 51554 http://tests.stockfishchess.org/tests/view/5c65e4360ebc5925cffc1490 Closes https://github.com/official-stockfish/Stockfish/pull/2011 bench 3640330
This commit is contained in:
parent
3c92f849ab
commit
76d2f5b94a
1 changed files with 6 additions and 8 deletions
|
@ -570,7 +570,7 @@ namespace {
|
||||||
Depth extension, newDepth;
|
Depth extension, newDepth;
|
||||||
Value bestValue, value, ttValue, eval, maxValue, pureStaticEval;
|
Value bestValue, value, ttValue, eval, maxValue, pureStaticEval;
|
||||||
bool ttHit, ttPv, inCheck, givesCheck, improving;
|
bool ttHit, ttPv, inCheck, givesCheck, improving;
|
||||||
bool captureOrPromotion, doFullDepthSearch, moveCountPruning, skipQuiets, ttCapture;
|
bool captureOrPromotion, doFullDepthSearch, moveCountPruning, ttCapture;
|
||||||
Piece movedPiece;
|
Piece movedPiece;
|
||||||
int moveCount, captureCount, quietCount;
|
int moveCount, captureCount, quietCount;
|
||||||
|
|
||||||
|
@ -880,12 +880,12 @@ moves_loop: // When in check, search starts from here
|
||||||
ss->killers);
|
ss->killers);
|
||||||
value = bestValue; // Workaround a bogus 'uninitialized' warning under gcc
|
value = bestValue; // Workaround a bogus 'uninitialized' warning under gcc
|
||||||
|
|
||||||
skipQuiets = false;
|
moveCountPruning = false;
|
||||||
ttCapture = ttMove && pos.capture_or_promotion(ttMove);
|
ttCapture = ttMove && pos.capture_or_promotion(ttMove);
|
||||||
|
|
||||||
// Step 12. Loop through all pseudo-legal moves until no moves remain
|
// Step 12. Loop through all pseudo-legal moves until no moves remain
|
||||||
// or a beta cutoff occurs.
|
// or a beta cutoff occurs.
|
||||||
while ((move = mp.next_move(skipQuiets)) != MOVE_NONE)
|
while ((move = mp.next_move(moveCountPruning)) != MOVE_NONE)
|
||||||
{
|
{
|
||||||
assert(is_ok(move));
|
assert(is_ok(move));
|
||||||
|
|
||||||
|
@ -914,8 +914,9 @@ moves_loop: // When in check, search starts from here
|
||||||
movedPiece = pos.moved_piece(move);
|
movedPiece = pos.moved_piece(move);
|
||||||
givesCheck = gives_check(pos, move);
|
givesCheck = gives_check(pos, move);
|
||||||
|
|
||||||
moveCountPruning = depth < 16 * ONE_PLY
|
// Skip quiet moves if movecount exceeds our FutilityMoveCount threshold
|
||||||
&& moveCount >= FutilityMoveCounts[improving][depth / ONE_PLY];
|
moveCountPruning = depth < 16 * ONE_PLY
|
||||||
|
&& moveCount >= FutilityMoveCounts[improving][depth / ONE_PLY];
|
||||||
|
|
||||||
// Step 13. Extensions (~70 Elo)
|
// Step 13. Extensions (~70 Elo)
|
||||||
|
|
||||||
|
@ -973,10 +974,7 @@ moves_loop: // When in check, search starts from here
|
||||||
{
|
{
|
||||||
// Move count based pruning (~30 Elo)
|
// Move count based pruning (~30 Elo)
|
||||||
if (moveCountPruning)
|
if (moveCountPruning)
|
||||||
{
|
|
||||||
skipQuiets = true;
|
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
// Reduced depth of the next LMR search
|
// Reduced depth of the next LMR search
|
||||||
int lmrDepth = std::max(newDepth - reduction<PvNode>(improving, depth, moveCount), DEPTH_ZERO) / ONE_PLY;
|
int lmrDepth = std::max(newDepth - reduction<PvNode>(improving, depth, moveCount), DEPTH_ZERO) / ONE_PLY;
|
||||||
|
|
Loading…
Add table
Reference in a new issue