const uint8_t QsearchWithoutChecksTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_STOP };
}
+bool MovePicker::isBadCapture() const { return phase == PH_BAD_CAPTURES; }
-/// Constructor for the MovePicker class. Apart from the position for which
-/// it is asked to pick legal moves, MovePicker also wants some information
+/// Constructor for the MovePicker class. As arguments we pass information
/// to help it to return the presumably good moves first, to decide which
/// moves to return (in the quiescence search, for instance, we only want to
/// search captures, promotions and some checks) and about how important good
int searchTT = ttm;
ttMoves[0].move = ttm;
badCaptureThreshold = 0;
- badCaptures = moves + MOVES_MAX;
+ badCaptures = moves + MAX_MOVES;
assert(d > DEPTH_ZERO);
- pinned = p.pinned_pieces(pos.side_to_move());
-
- if (p.is_check())
+ if (p.in_check())
{
ttMoves[1].move = killers[0].move = killers[1].move = MOVE_NONE;
phasePtr = EvasionTable;
assert(d <= DEPTH_ZERO);
- pinned = p.pinned_pieces(pos.side_to_move());
-
- if (p.is_check())
+ if (p.in_check())
phasePtr = EvasionTable;
else if (d >= DEPTH_QS_CHECKS)
phasePtr = QsearchWithChecksTable;
// Skip TT move if is not a capture or a promotion, this avoids
// qsearch tree explosion due to a possible perpetual check or
// similar rare cases when TT table is full.
- if (ttm != MOVE_NONE && !pos.move_is_capture_or_promotion(ttm))
+ if (ttm != MOVE_NONE && !pos.move_is_capture(ttm) && !move_is_promotion(ttm))
searchTT = ttMoves[0].move = MOVE_NONE;
}
// 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:
- assert(pos.is_check());
+ assert(pos.in_check());
lastMove = generate<MV_EVASION>(pos, moves);
score_evasions();
return;
}
/// 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
+/// 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
case PH_TT_MOVES:
move = (curMove++)->move;
if ( move != MOVE_NONE
- && pos.move_is_legal(move, pinned))
+ && pos.move_is_pl(move))
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))
+ && move != ttMoves[1].move)
{
// Check for a non negative SEE now
int seeValue = pos.see_sign(move);
return move;
// Losing capture, move it to the tail of the array, note
- // that move has now been already checked for legality.
+ // that move has now been already checked for pseudo legality.
(--badCaptures)->move = move;
badCaptures->score = seeValue;
}
case PH_KILLERS:
move = (curMove++)->move;
if ( move != MOVE_NONE
- && pos.move_is_legal(move, pinned)
+ && pos.move_is_pl(move)
&& move != ttMoves[0].move
&& move != ttMoves[1].move
&& !pos.move_is_capture(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))
+ && move != killers[1].move)
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))
+ if (move != ttMoves[0].move)
return move;
break;
case PH_QCHECKS:
move = (curMove++)->move;
- if ( move != ttMoves[0].move
- && pos.pl_move_is_legal(move, pinned))
+ if (move != ttMoves[0].move)
return move;
break;