X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovepick.cpp;h=793a90da39e5efee50922257ebda0fa3860a112b;hb=013dc43d5d297ee78526f8d03651915673cf2d49;hp=6a4b26eef6e92bae6d1efd5cb774ab712be108cd;hpb=45ce92b89c9191f1606d82611620587157956e1b;p=stockfish diff --git a/src/movepick.cpp b/src/movepick.cpp index 6a4b26ee..793a90da 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -48,8 +48,7 @@ namespace { 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 @@ -64,8 +63,6 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h, assert(d > DEPTH_ZERO); - pinned = p.pinned_pieces(pos.side_to_move()); - if (p.in_check()) { ttMoves[1].move = killers[0].move = killers[1].move = MOVE_NONE; @@ -98,8 +95,6 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h) assert(d <= DEPTH_ZERO); - pinned = p.pinned_pieces(pos.side_to_move()); - if (p.in_check()) phasePtr = EvasionTable; else if (d >= DEPTH_QS_CHECKS) @@ -255,7 +250,7 @@ void MovePicker::score_evasions() { } /// 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 @@ -275,16 +270,14 @@ Move MovePicker::get_next_move() { case PH_TT_MOVES: move = (curMove++)->move; if ( move != MOVE_NONE - && pos.move_is_pl(move) - && pos.pl_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); @@ -292,7 +285,7 @@ Move MovePicker::get_next_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; } @@ -302,7 +295,6 @@ Move MovePicker::get_next_move() { move = (curMove++)->move; if ( move != MOVE_NONE && pos.move_is_pl(move) - && pos.pl_move_is_legal(move, pinned) && move != ttMoves[0].move && move != ttMoves[1].move && !pos.move_is_capture(move)) @@ -318,8 +310,7 @@ Move MovePicker::get_next_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; @@ -330,15 +321,13 @@ Move MovePicker::get_next_move() { 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;