kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-30 08:43:09 +00:00
Code Issues Releases Wiki Activity

MovePicker: combine countermove with killers.

Browse source 
Handle the countermove in the same way we use stages to progress
through the killer moves, using a common array called "refutations".
Removes some lines of code and simplifies a bit the jump table.

STC: LLR: 2.95 (-2.94,2.94) [-3.00,1.00]
Total: 71707 W: 14622 L: 14595 D: 42490
http://tests.stockfishchess.org/tests/view/5aa003cf0ebc590297cb6276

LTC: LLR: 2.95 (-2.94,2.94) [-3.00,1.00]
Total: 22320 W: 3470 L: 3352 D: 15498
http://tests.stockfishchess.org/tests/view/5aa051020ebc590297cb62ba

Closes https://github.com/official-stockfish/Stockfish/pull/1468

No functional change.
This commit is contained in:
protonspring 2018-03-12 02:47:35 +01:00 • committed by Stéphane Nicolet
parent c3af52c43b
commit 6e9337b107
2 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/movepick.cpp
View file

@ -67,8 +67,8 @@ namespace {
/// MovePicker constructor for the main search
MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const ButterflyHistory* mh,
const CapturePieceToHistory* cph, const PieceToHistory** ch, Move cm, Move* killers_p)
: pos(p), mainHistory(mh), captureHistory(cph), contHistory(ch), countermove(cm),
killers{killers_p[0], killers_p[1]}, depth(d){
: pos(p), mainHistory(mh), captureHistory(cph), contHistory(ch),
refutations{killers_p[0], killers_p[1], cm}, depth(d){
assert(d > DEPTH_ZERO);
@ -143,9 +143,14 @@ Move MovePicker::next_move(bool skipQuiets) {
Move move;
begin_switch:
switch (stage) {
case MAIN_SEARCH: case EVASION: case QSEARCH: case PROBCUT:
case MAIN_SEARCH:
case EVASION:
case QSEARCH:
case PROBCUT:
++stage;
return ttMove;
@ -157,8 +162,8 @@ Move MovePicker::next_move(bool skipQuiets) {
score<CAPTURES>();
++stage;
// Rebranch at the top of the switch via a recursive call
return next_move(skipQuiets);
// Rebranch at the top of the switch
goto begin_switch;
case GOOD_CAPTURES:
while (cur < endMoves)
@ -174,31 +179,26 @@ Move MovePicker::next_move(bool skipQuiets) {
}
}
++stage;
// If the countermove is the same as a killer, skip it
if ( refutations[0] == refutations[2]
|| refutations[1] == refutations[2])
refutations[2] = MOVE_NONE;
/* fallthrough */
case KILLER0:
case KILLER1:
do
case COUNTERMOVE:
while (stage <= COUNTERMOVE)
{
move = killers[++stage - KILLER1];
move = refutations[ stage++ - KILLER0 ];
if ( move != MOVE_NONE
&& move != ttMove
&& pos.pseudo_legal(move)
&& !pos.capture(move))
return move;
} while (stage <= KILLER1);
/* fallthrough */
case COUNTERMOVE:
++stage;
move = countermove;
if ( move != MOVE_NONE
&& move != ttMove
&& move != killers[0]
&& move != killers[1]
&& pos.pseudo_legal(move)
&& !pos.capture(move))
return move;
}
/* fallthrough */
case QUIET_INIT:
@ -215,9 +215,9 @@ Move MovePicker::next_move(bool skipQuiets) {
{
move = *cur++;
if ( move != ttMove
&& move != killers[0]
&& move != killers[1]
&& move != countermove)
&& move != refutations[0]
&& move != refutations[1]
&& move != refutations[2])
return move;
}
++stage;

2
src/movepick.h
View file

@ -128,7 +128,7 @@ private:
const ButterflyHistory* mainHistory;
const CapturePieceToHistory* captureHistory;
const PieceToHistory** contHistory;
Move ttMove, countermove, killers[2];
Move ttMove, refutations[3];
ExtMove *cur, *endMoves, *endBadCaptures;
int stage;
Square recaptureSquare;