HCha/Stockfish
1
0
Fork 0
mirror of https://github.com/HChaZZY/Stockfish.git synced 2025-12-20 00:56:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Retire follow-up move heuristic

Browse Source 
STC: http://tests.stockfishchess.org/tests/view/5501d0f30ebc5902160ec0fd
LLR: 2.95 (-2.94,2.94) [-3.00,1.00]
Total: 34891 W: 6904 L: 6808 D: 21179

LTC: http://tests.stockfishchess.org/tests/view/550328540ebc5902160ec133
LLR: 3.10 (-2.94,2.94) [-3.00,1.00]
Total: 182653 W: 29866 L: 29993 D: 122794

Bench: 8396161

Resolves #310
This commit is contained in:
mbootsector
2015-03-28 22:09:48 +00:00
committed by Joona Kiiski
parent ac8e6ff000
commit 1d5eaba573
3 changed files with 12 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/search.cpp
View File

@@ -137,7 +137,7 @@ namespace {
HistoryStats History;
CounterMovesHistoryStats CounterMovesHistory;
GainsStats Gains;
MovesStats Countermoves, Followupmoves;
MovesStats Countermoves;
template <NodeType NT, bool SpNode>
Value search(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth, bool cutNode);
@@ -339,8 +339,7 @@ namespace {
CounterMovesHistory.clear();
Gains.clear();
Countermoves.clear();
Followupmoves.clear();
size_t multiPV = Options["MultiPV"];
Skill skill(Options["Skill Level"]);
@@ -595,7 +594,7 @@ namespace {
{
ss->currentMove = ttMove; // Can be MOVE_NONE
// If ttMove is quiet, update killers, history, counter move and followup move on TT hit
// If ttMove is quiet, update killers, history, counter move on TT hit
if (ttValue >= beta && ttMove && !pos.capture_or_promotion(ttMove) && !inCheck)
update_stats(pos, ss, ttMove, depth, nullptr, 0);
@@ -787,11 +786,7 @@ moves_loop: // When in check and at SpNode search starts from here
Move countermoves[] = { Countermoves[pos.piece_on(prevMoveSq)][prevMoveSq].first,
Countermoves[pos.piece_on(prevMoveSq)][prevMoveSq].second };
Square prevOwnMoveSq = to_sq((ss-2)->currentMove);
Move followupmoves[] = { Followupmoves[pos.piece_on(prevOwnMoveSq)][prevOwnMoveSq].first,
Followupmoves[pos.piece_on(prevOwnMoveSq)][prevOwnMoveSq].second };
MovePicker mp(pos, ttMove, depth, History, CounterMovesHistory, countermoves, followupmoves, ss);
MovePicker mp(pos, ttMove, depth, History, CounterMovesHistory, countermoves, ss);
CheckInfo ci(pos);
value = bestValue; // Workaround a bogus 'uninitialized' warning under gcc
improving = ss->staticEval >= (ss-2)->staticEval
@@ -1144,7 +1139,7 @@ moves_loop: // When in check and at SpNode search starts from here
bestValue = excludedMove ? alpha
: inCheck ? mated_in(ss->ply) : DrawValue[pos.side_to_move()];
// Quiet best move: update killers, history, countermoves and followupmoves
// Quiet best move: update killers, history and countermoves
else if (bestValue >= beta && !pos.capture_or_promotion(bestMove) && !inCheck)
update_stats(pos, ss, bestMove, depth, quietsSearched, quietCount - 1);
@@ -1404,8 +1399,8 @@ moves_loop: // When in check and at SpNode search starts from here
*pv = MOVE_NONE;
}
// update_stats() updates killers, history, countermoves and followupmoves
// stats after a fail-high of a quiet move.
// update_stats() updates killers, history and countermoves stats after a fail-high
// of a quiet move.
void update_stats(const Position& pos, Stack* ss, Move move, Depth depth, Move* quiets, int quietsCnt) {
@@ -1440,7 +1435,6 @@ moves_loop: // When in check and at SpNode search starts from here
if (is_ok((ss-2)->currentMove) && (ss-1)->currentMove == (ss-1)->ttMove)
{
Square prevPrevSq = to_sq((ss-2)->currentMove);
Followupmoves.update(pos.piece_on(prevPrevSq), prevPrevSq, move);
// Extra penalty for TT move in previous ply when it gets refuted
HistoryStats& ttMoveCmh = CounterMovesHistory[pos.piece_on(prevPrevSq)][prevPrevSq];