HCha/Stockfish
1
0
Fork 0
mirror of https://github.com/HChaZZY/Stockfish.git synced 2025-12-19 08:36:33 +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

17
src/movepick.cpp
View File

@@ -68,13 +68,12 @@ namespace {
/// ordering is at the current node.
MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h, const CounterMovesHistoryStats& cmh,
Move* cm, Move* fm, Search::Stack* s) : pos(p), history(h), counterMovesHistory(cmh), depth(d) {
Move* cm, Search::Stack* s) : pos(p), history(h), counterMovesHistory(cmh), depth(d) {
assert(d > DEPTH_ZERO);
endBadCaptures = moves + MAX_MOVES - 1;
countermoves = cm;
followupmoves = fm;
ss = s;
if (pos.checkers())
@@ -211,9 +210,8 @@ void MovePicker::generate_next_stage() {
killers[0] = ss->killers[0];
killers[1] = ss->killers[1];
killers[2].move = killers[3].move = MOVE_NONE;
killers[4].move = killers[5].move = MOVE_NONE;
// In SMP case countermoves[] and followupmoves[] could have duplicated entries
// In SMP case countermoves[] could have duplicated entries
// in rare cases (less than 1 out of a million). This is harmless.
// Be sure countermoves and followupmoves are different from killers
@@ -221,13 +219,6 @@ void MovePicker::generate_next_stage() {
if ( countermoves[i] != killers[0]
&& countermoves[i] != killers[1])
*endMoves++ = countermoves[i];
for (int i = 0; i < 2; ++i)
if ( followupmoves[i] != killers[0]
&& followupmoves[i] != killers[1]
&& followupmoves[i] != killers[2]
&& followupmoves[i] != killers[3])
*endMoves++ = followupmoves[i];
break;
case QUIETS_1_S1:
@@ -321,9 +312,7 @@ Move MovePicker::next_move<false>() {
&& move != killers[0]
&& move != killers[1]
&& move != killers[2]
&& move != killers[3]
&& move != killers[4]
&& move != killers[5])
&& move != killers[3])
return move;
break;