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

Enable PH_TT_MOVES during evasion generation

Browse source 
This allow us to avoid the generation of the
evasion moves if we already have a TT move, and
in case we have a cut-off we skip evasion generation
altoghter.

Node count is changed because now we try TT move _before_
to generate evasions. The search on the TT move alters the
piece lists so that when we come back to generate evasions
we build the move list with a diferent order and this alters
the node count.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2009-11-05 14:40:51 +01:00
parent 1c73c1c150
commit e59d053984
1 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/movepick.cpp
View file

@ -52,7 +52,7 @@ namespace {
CACHE_LINE_ALIGNMENT CACHE_LINE_ALIGNMENT
const uint8_t MainSearchPhaseTable[] = { PH_TT_MOVES, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP}; const uint8_t MainSearchPhaseTable[] = { PH_TT_MOVES, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP};
const uint8_t EvasionsPhaseTable[] = { PH_EVASIONS, PH_STOP}; const uint8_t EvasionsPhaseTable[] = { PH_TT_MOVES, PH_EVASIONS, PH_STOP};
const uint8_t QsearchWithChecksPhaseTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_QCHECKS, PH_STOP}; const uint8_t QsearchWithChecksPhaseTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_QCHECKS, PH_STOP};
const uint8_t QsearchWithoutChecksPhaseTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_STOP}; const uint8_t QsearchWithoutChecksPhaseTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_STOP};
} }
@ -77,7 +77,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d,
finished = false; finished = false;
lastBadCapture = badCaptures; lastBadCapture = badCaptures;
if (ss) if (ss && !p.is_check())
{ {
ttMoves[1].move = (ss->mateKiller == ttm)? MOVE_NONE : ss->mateKiller; ttMoves[1].move = (ss->mateKiller == ttm)? MOVE_NONE : ss->mateKiller;
searchTT |= ttMoves[1].move; searchTT |= ttMoves[1].move;
@ -91,13 +91,13 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d,
if (p.is_check()) if (p.is_check())
phasePtr = EvasionsPhaseTable; phasePtr = EvasionsPhaseTable;
else if (d > Depth(0)) else if (d > Depth(0))
phasePtr = MainSearchPhaseTable + !searchTT; phasePtr = MainSearchPhaseTable;
else if (d == Depth(0)) else if (d == Depth(0))
phasePtr = QsearchWithChecksPhaseTable + !searchTT; phasePtr = QsearchWithChecksPhaseTable;
else else
phasePtr = QsearchWithoutChecksPhaseTable + !searchTT; phasePtr = QsearchWithoutChecksPhaseTable;
phasePtr--; phasePtr += !searchTT - 1;
go_next_phase(); go_next_phase();
} }
@ -226,20 +226,17 @@ void MovePicker::score_noncaptures() {
} }
void MovePicker::score_evasions() { void MovePicker::score_evasions() {
// Always try ttMove as first. Then try good captures ordered // Try good captures ordered by MVV/LVA, then non-captures if
// by MVV/LVA, then non-captures if destination square is not // destination square is not under attack, ordered by history
// under attack, ordered by history value, and at the end // value, and at the end bad-captures and non-captures with a
// bad-captures and non-captures with a negative SEE. This // negative SEE. This last group is ordered by the SEE score.
// last group is ordered by the SEE score.
Move m; Move m;
int seeScore; int seeScore;
for (MoveStack* cur = moves; cur != lastMove; cur++) for (MoveStack* cur = moves; cur != lastMove; cur++)
{ {
m = cur->move; m = cur->move;
if (m == ttMoves[0].move) if ((seeScore = pos.see_sign(m)) < 0)
cur->score = 2 * HistoryMax;
else if ((seeScore = pos.see_sign(m)) < 0)
cur->score = seeScore; cur->score = seeScore;
else if (pos.move_is_capture(m)) else if (pos.move_is_capture(m))
cur->score = pos.midgame_value_of_piece_on(move_to(m)) cur->score = pos.midgame_value_of_piece_on(move_to(m))
@ -257,9 +254,6 @@ void MovePicker::score_evasions() {
Move MovePicker::get_next_move() { Move MovePicker::get_next_move() {
assert(!pos.is_check() || *phasePtr == PH_EVASIONS || *phasePtr == PH_STOP);
assert( pos.is_check() || *phasePtr != PH_EVASIONS);
Move move; Move move;
while (true) while (true)
@ -320,11 +314,6 @@ Move MovePicker::get_next_move() {
return move; return move;
case PH_EVASIONS: case PH_EVASIONS:
move = pick_best(curMove++, lastMove).move;
if (pos.pl_move_is_legal(move, pinned))
return move;
break;
case PH_QCAPTURES: case PH_QCAPTURES:
move = pick_best(curMove++, lastMove).move; move = pick_best(curMove++, lastMove).move;
if ( move != ttMoves[0].move if ( move != ttMoves[0].move