#include <cassert>
-#include "history.h"
#include "movegen.h"
#include "movepick.h"
#include "search.h"
-#include "value.h"
+#include "types.h"
namespace {
enum MovegenPhase {
- PH_TT_MOVES, // Transposition table move and mate killer
- PH_GOOD_CAPTURES, // Queen promotions and captures with SEE values >= 0
- PH_KILLERS, // Killer moves from the current ply
- PH_NONCAPTURES, // Non-captures and underpromotions
- PH_BAD_CAPTURES, // Queen promotions and captures with SEE values < 0
- PH_EVASIONS, // Check evasions
- PH_QCAPTURES, // Captures in quiescence search
- PH_QCHECKS, // Non-capture checks in quiescence search
+ PH_TT_MOVES, // Transposition table move and mate killer
+ PH_GOOD_CAPTURES, // Queen promotions and captures with SEE values >= 0
+ PH_KILLERS, // Killer moves from the current ply
+ PH_NONCAPTURES, // Non-captures and underpromotions
+ PH_BAD_CAPTURES, // Queen promotions and captures with SEE values < 0
+ PH_EVASIONS, // Check evasions
+ PH_QCAPTURES, // Captures in quiescence search
+ PH_QCHECKS, // Non-capture checks in quiescence search
PH_STOP
};
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 EvasionsPhaseTable[] = { PH_TT_MOVES, PH_EVASIONS, 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 MainSearchTable[] = { PH_TT_MOVES, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP };
+ const uint8_t EvasionTable[] = { PH_TT_MOVES, PH_EVASIONS, PH_STOP };
+ const uint8_t QsearchWithChecksTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_QCHECKS, PH_STOP };
+ const uint8_t QsearchWithoutChecksTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_STOP };
}
int searchTT = ttm;
ttMoves[0].move = ttm;
badCaptureThreshold = 0;
- badCaptures = moves + MOVES_MAX;
+ badCaptures = moves + MAX_MOVES;
assert(d > DEPTH_ZERO);
if (p.is_check())
{
ttMoves[1].move = killers[0].move = killers[1].move = MOVE_NONE;
- phasePtr = EvasionsPhaseTable;
+ phasePtr = EvasionTable;
}
else
{
if (ss && ss->eval < beta - PawnValueMidgame && d < 3 * ONE_PLY)
badCaptureThreshold = -PawnValueMidgame;
- phasePtr = MainSearchPhaseTable;
+ phasePtr = MainSearchTable;
}
phasePtr += int(!searchTT) - 1;
pinned = p.pinned_pieces(pos.side_to_move());
if (p.is_check())
- phasePtr = EvasionsPhaseTable;
+ phasePtr = EvasionTable;
else if (d >= DEPTH_QS_CHECKS)
- phasePtr = QsearchWithChecksPhaseTable;
+ phasePtr = QsearchWithChecksTable;
else
{
- phasePtr = QsearchWithoutChecksPhaseTable;
+ phasePtr = QsearchWithoutChecksTable;
// Skip TT move if is not a capture or a promotion, this avoids
// qsearch tree explosion due to a possible perpetual check or
// Bad captures SEE value is already calculated so just pick
// them in order to get SEE move ordering.
curMove = badCaptures;
- lastMove = moves + MOVES_MAX;
+ lastMove = moves + MAX_MOVES;
return;
case PH_EVASIONS:
return;
case PH_STOP:
- lastMove = curMove + 1; // Avoids another go_next_phase() call
+ lastMove = curMove + 1; // Avoid another go_next_phase() call
return;
default:
}
void MovePicker::score_noncaptures() {
- // First score by history, when no history is available then use
- // piece/square tables values. This seems to be better then a
- // random choice when we don't have an history for any move.
+
Move m;
- Piece piece;
- Square from, to;
+ Square from;
for (MoveStack* cur = moves; cur != lastMove; cur++)
{
m = cur->move;
from = move_from(m);
- to = move_to(m);
- piece = pos.piece_on(from);
- cur->score = H.value(piece, to) + H.gain(piece, to);
+ cur->score = H.value(pos.piece_on(from), move_to(m));
}
}
/// MovePicker::get_next_move() is the most important method of the MovePicker
/// class. It returns a new legal move every time it is called, until there
-/// are no more moves left.
-/// It picks the move with the biggest score from a list of generated moves taking
-/// care not to return the tt move if has already been searched previously.
-/// Note that this function is not thread safe so should be lock protected by
-/// caller when accessed through a shared MovePicker object.
+/// are no more moves left. It picks the move with the biggest score from a list
+/// of generated moves taking care not to return the tt move if has already been
+/// searched previously. Note that this function is not thread safe so should be
+/// lock protected by caller when accessed through a shared MovePicker object.
Move MovePicker::get_next_move() {
while (true)
{
- while (curMove != lastMove)
- {
- switch (phase) {
-
- case PH_TT_MOVES:
- move = (curMove++)->move;
- if ( move != MOVE_NONE
- && move_is_legal(pos, move, pinned))
- return move;
- break;
-
- case PH_GOOD_CAPTURES:
- move = pick_best(curMove++, lastMove).move;
- if ( move != ttMoves[0].move
- && move != ttMoves[1].move
- && pos.pl_move_is_legal(move, pinned))
- {
- // Check for a non negative SEE now
- int seeValue = pos.see_sign(move);
- if (seeValue >= badCaptureThreshold)
- return move;
-
- // Losing capture, move it to the tail of the array, note
- // that move has now been already checked for legality.
- (--badCaptures)->move = move;
- badCaptures->score = seeValue;
- }
- break;
-
- case PH_KILLERS:
- move = (curMove++)->move;
- if ( move != MOVE_NONE
- && move_is_legal(pos, move, pinned)
- && move != ttMoves[0].move
- && move != ttMoves[1].move
- && !pos.move_is_capture(move))
- return move;
- break;
-
- case PH_NONCAPTURES:
+ while (curMove == lastMove)
+ go_next_phase();
- // Sort negative scored moves only when we get there
- if (curMove == lastGoodNonCapture)
- insertion_sort<MoveStack>(lastGoodNonCapture, lastMove);
+ switch (phase) {
- move = (curMove++)->move;
- if ( move != ttMoves[0].move
- && move != ttMoves[1].move
- && move != killers[0].move
- && move != killers[1].move
- && pos.pl_move_is_legal(move, pinned))
+ case PH_TT_MOVES:
+ move = (curMove++)->move;
+ if ( move != MOVE_NONE
+ && pos.move_is_legal(move, pinned))
+ return move;
+ break;
+
+ case PH_GOOD_CAPTURES:
+ move = pick_best(curMove++, lastMove).move;
+ if ( move != ttMoves[0].move
+ && move != ttMoves[1].move
+ && pos.pl_move_is_legal(move, pinned))
+ {
+ // Check for a non negative SEE now
+ int seeValue = pos.see_sign(move);
+ if (seeValue >= badCaptureThreshold)
return move;
- break;
- case PH_BAD_CAPTURES:
- move = pick_best(curMove++, lastMove).move;
+ // Losing capture, move it to the tail of the array, note
+ // that move has now been already checked for legality.
+ (--badCaptures)->move = move;
+ badCaptures->score = seeValue;
+ }
+ break;
+
+ case PH_KILLERS:
+ move = (curMove++)->move;
+ if ( move != MOVE_NONE
+ && pos.move_is_legal(move, pinned)
+ && move != ttMoves[0].move
+ && move != ttMoves[1].move
+ && !pos.move_is_capture(move))
+ return move;
+ break;
+
+ case PH_NONCAPTURES:
+ // Sort negative scored moves only when we get there
+ if (curMove == lastGoodNonCapture)
+ insertion_sort<MoveStack>(lastGoodNonCapture, lastMove);
+
+ move = (curMove++)->move;
+ if ( move != ttMoves[0].move
+ && move != ttMoves[1].move
+ && move != killers[0].move
+ && move != killers[1].move
+ && pos.pl_move_is_legal(move, pinned))
return move;
+ break;
- case PH_EVASIONS:
- case PH_QCAPTURES:
- move = pick_best(curMove++, lastMove).move;
- if ( move != ttMoves[0].move
- && pos.pl_move_is_legal(move, pinned))
- return move;
- break;
+ case PH_BAD_CAPTURES:
+ move = pick_best(curMove++, lastMove).move;
+ return move;
- case PH_QCHECKS:
- move = (curMove++)->move;
- if ( move != ttMoves[0].move
- && pos.pl_move_is_legal(move, pinned))
- return move;
- break;
+ case PH_EVASIONS:
+ case PH_QCAPTURES:
+ move = pick_best(curMove++, lastMove).move;
+ if ( move != ttMoves[0].move
+ && pos.pl_move_is_legal(move, pinned))
+ return move;
+ break;
- case PH_STOP:
- return MOVE_NONE;
+ case PH_QCHECKS:
+ move = (curMove++)->move;
+ if ( move != ttMoves[0].move
+ && pos.pl_move_is_legal(move, pinned))
+ return move;
+ break;
- default:
- assert(false);
- break;
- }
+ case PH_STOP:
+ return MOVE_NONE;
+
+ default:
+ assert(false);
+ break;
}
- go_next_phase();
}
}
projects / stockfish / blobdiff