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

Join all capture init stages in MovePicker

Browse source 
Passed STC:
LLR: 2.96 (-2.94,2.94) [-3.00,1.00]
Total: 16789 W: 3685 L: 3554 D: 9550
http://tests.stockfishchess.org/tests/view/5a91a8bb0ebc590297cc875b

Passed LTC:
LLR: 2.96 (-2.94,2.94) [-3.00,1.00]
Total: 21293 W: 3527 L: 3407 D: 14359
http://tests.stockfishchess.org/tests/view/5a920a730ebc590297cc87ba

No functional change
This commit is contained in:
Joost VandeVondele 2018-02-25 12:49:03 +01:00 • committed by Stéphane Nicolet
parent 16b31bb249
commit 8dd6875240
1 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/movepick.cpp
View file

@ -27,7 +27,7 @@ namespace {
enum Stages { enum Stages {
MAIN_SEARCH, CAPTURES_INIT, GOOD_CAPTURES, KILLERS, COUNTERMOVE, QUIET_INIT, QUIET, BAD_CAPTURES, MAIN_SEARCH, CAPTURES_INIT, GOOD_CAPTURES, KILLERS, COUNTERMOVE, QUIET_INIT, QUIET, BAD_CAPTURES,
EVASION, EVASIONS_INIT, ALL_EVASIONS, EVASION, EVASIONS_INIT, ALL_EVASIONS,
PROBCUT, PROBCUT_INIT, PROBCUT_CAPTURES, PROBCUT, PROBCUT_CAPTURES_INIT, PROBCUT_CAPTURES,
QSEARCH, QCAPTURES_INIT, QCAPTURES, QCHECKS, QSEARCH_RECAPTURES, QRECAPTURES QSEARCH, QCAPTURES_INIT, QCAPTURES, QCHECKS, QSEARCH_RECAPTURES, QRECAPTURES
}; };
@ -161,11 +161,16 @@ Move MovePicker::next_move(bool skipQuiets) {
return ttMove; return ttMove;
case CAPTURES_INIT: case CAPTURES_INIT:
case PROBCUT_CAPTURES_INIT:
case QCAPTURES_INIT:
case QSEARCH_RECAPTURES:
endBadCaptures = cur = moves; endBadCaptures = cur = moves;
endMoves = generate<CAPTURES>(pos, cur); endMoves = generate<CAPTURES>(pos, cur);
score<CAPTURES>(); score<CAPTURES>();
++stage; ++stage;
/* fallthrough */
// Rebranch at the top of the switch via a recursive call
return next_move(skipQuiets);
case GOOD_CAPTURES: case GOOD_CAPTURES:
while (cur < endMoves) while (cur < endMoves)
@ -257,13 +262,6 @@ Move MovePicker::next_move(bool skipQuiets) {
} }
break; break;
case PROBCUT_INIT:
cur = moves;
endMoves = generate<CAPTURES>(pos, cur);
score<CAPTURES>();
++stage;
/* fallthrough */
case PROBCUT_CAPTURES: case PROBCUT_CAPTURES:
while (cur < endMoves) while (cur < endMoves)
{ {
@ -274,13 +272,6 @@ Move MovePicker::next_move(bool skipQuiets) {
} }
break; break;
case QCAPTURES_INIT:
cur = moves;
endMoves = generate<CAPTURES>(pos, cur);
score<CAPTURES>();
++stage;
/* fallthrough */
case QCAPTURES: case QCAPTURES:
while (cur < endMoves) while (cur < endMoves)
{ {
@ -304,12 +295,6 @@ Move MovePicker::next_move(bool skipQuiets) {
} }
break; break;
case QSEARCH_RECAPTURES:
cur = moves;
endMoves = generate<CAPTURES>(pos, cur);
++stage;
/* fallthrough */
case QRECAPTURES: case QRECAPTURES:
while (cur < endMoves) while (cur < endMoves)
{ {