From dc5caff6385c8802b20470efda1d1e0c5d16cfaa Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Sat, 19 Jun 2010 16:48:36 +0100 Subject: [PATCH] Test killer for legality earlier Many killers moves, around 40%, are not legal, so skip earlier in this case. Some Movepicker c'tor cleanup while there. No functional change. Signed-off-by: Marco Costalba --- src/movepick.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/movepick.cpp b/src/movepick.cpp index 19785b64..63f77dba 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -70,18 +70,18 @@ namespace { /// search captures, promotions and some checks) and about how important good /// 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) { +MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h, + SearchStack* ss, Value beta) : pos(p), H(h) { int searchTT = ttm; ttMoves[0].move = ttm; - lastBadCapture = badCaptures; badCaptureThreshold = 0; + lastBadCapture = badCaptures; pinned = p.pinned_pieces(pos.side_to_move()); 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; killers[0].move = ss->killers[0]; killers[1].move = ss->killers[1]; @@ -98,7 +98,8 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, badCaptureThreshold = -PawnValueMidgame; phasePtr = MainSearchPhaseTable; - } else if (d == Depth(0)) + } + else if (d == Depth(0)) phasePtr = QsearchWithChecksPhaseTable; else { @@ -312,9 +313,9 @@ Move MovePicker::get_next_move() { case PH_KILLERS: move = (curMove++)->move; if ( move != MOVE_NONE + && move_is_legal(pos, move, pinned) && move != ttMoves[0].move && move != ttMoves[1].move - && move_is_legal(pos, move, pinned) && !pos.move_is_capture(move)) return move; break; -- 2.39.2