/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
/// move ordering is at the current node.
MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h,
- SearchStack* ss, Value beta) : pos(p), H(h), depth(d) {
+ Search::Stack* ss, Value beta) : pos(p), H(h), depth(d) {
captureThreshold = 0;
badCaptures = moves + MAX_MOVES;
killers[0].move = ss->killers[0];
killers[1].move = ss->killers[1];
- // Consider sligtly negative captures as good if at low
- // depth and far from beta.
+ // Consider sligtly negative captures as good if at low depth and far from beta
if (ss && ss->eval < beta - PawnValueMidgame && d < 3 * ONE_PLY)
captureThreshold = -PawnValueMidgame;
+ // Consider negative captures as good if still enough to reach beta
+ else if (ss && ss->eval > beta)
+ captureThreshold = beta - ss->eval;
+
phasePtr = MainSearchTable;
}
assert (!pos.in_check());
// In ProbCut we consider only captures better than parent's move
- captureThreshold = piece_value_midgame(Piece(parentCapture));
+ captureThreshold = PieceValueMidgame[Piece(parentCapture)];
phasePtr = ProbCutTable;
if ( ttm != MOVE_NONE
/// MovePicker::score_captures(), MovePicker::score_noncaptures() and
/// MovePicker::score_evasions() assign a numerical move ordering score
/// to each move in a move list. The moves with highest scores will be
-/// picked first by get_next_move().
+/// picked first by next_move().
void MovePicker::score_captures() {
// Winning and equal captures in the main search are ordered by MVV/LVA.
for (MoveStack* cur = moves; cur != lastMove; cur++)
{
m = cur->move;
- cur->score = piece_value_midgame(pos.piece_on(move_to(m)))
- - type_of(pos.piece_on(move_from(m)));
+ cur->score = PieceValueMidgame[pos.piece_on(to_sq(m))]
+ - type_of(pos.piece_on(from_sq(m)));
if (is_promotion(m))
- cur->score += piece_value_midgame(Piece(promotion_piece_type(m)));
+ cur->score += PieceValueMidgame[Piece(promotion_piece_type(m))];
}
}
for (MoveStack* cur = moves; cur != lastMove; cur++)
{
m = cur->move;
- from = move_from(m);
- cur->score = H.value(pos.piece_on(from), move_to(m));
+ from = from_sq(m);
+ cur->score = H.value(pos.piece_on(from), to_sq(m));
}
}
if ((seeScore = pos.see_sign(m)) < 0)
cur->score = seeScore - History::MaxValue; // Be sure we are at the bottom
else if (pos.is_capture(m))
- cur->score = piece_value_midgame(pos.piece_on(move_to(m)))
- - type_of(pos.piece_on(move_from(m))) + History::MaxValue;
+ cur->score = PieceValueMidgame[pos.piece_on(to_sq(m))]
+ - type_of(pos.piece_on(from_sq(m))) + History::MaxValue;
else
- cur->score = H.value(pos.piece_on(move_from(m)), move_to(m));
+ cur->score = H.value(pos.piece_on(from_sq(m)), to_sq(m));
}
}
-/// MovePicker::get_next_move() is the most important method of the MovePicker
-/// class. It returns a new pseudo legal move every time it is called, until there
+/// MovePicker::next_move() is the most important method of the MovePicker class.
+/// It returns a new pseudo 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.
-Move MovePicker::get_next_move() {
+Move MovePicker::next_move() {
Move move;
case PH_QRECAPTURES:
move = (curMove++)->move;
- if (move_to(move) == recaptureSquare)
+ if (to_sq(move) == recaptureSquare)
return move;
break;