X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=b992d2353041f69b1579c064904fc5b15ce28cb3;hp=b9594ba1cf998689596a139300ffc473688a9285;hb=c2d42ea8339b49e52a116e488214a14fda09d413;hpb=fbdabe2975c0e86a04b01c36c9f3eec5494ecf0d diff --git a/src/movepick.cpp b/src/movepick.cpp index b9594ba1..b992d235 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -51,12 +51,12 @@ namespace { const uint8_t QsearchRecapturesTable[] = { PH_TT_MOVE, PH_QRECAPTURES, PH_STOP }; const uint8_t ProbCutTable[] = { PH_TT_MOVE, PH_GOOD_PROBCUT, PH_STOP }; - // Unary predicate used by std::partition to split positive scores from ramining + // Unary predicate used by std::partition to split positive scores from remaining // ones so to sort separately the two sets, and with the second sort delayed. inline bool has_positive_score(const MoveStack& move) { return move.score > 0; } // Picks and pushes to the front the best move in range [firstMove, lastMove), - // it is faster then sorting all the moves in advance when moves are few, as + // it is faster than sorting all the moves in advance when moves are few, as // normally are the possible captures. inline MoveStack* pick_best(MoveStack* firstMove, MoveStack* lastMove) { @@ -72,7 +72,7 @@ namespace { /// 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; @@ -88,15 +88,18 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h, 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; } - ttMove = (ttm && pos.move_is_pl(ttm) ? ttm : MOVE_NONE); + ttMove = (ttm && pos.is_pseudo_legal(ttm) ? ttm : MOVE_NONE); phasePtr += int(ttMove == MOVE_NONE) - 1; go_next_phase(); } @@ -117,7 +120,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h, S // 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.is_capture_or_promotion(ttm)) ttm = MOVE_NONE; } else @@ -127,7 +130,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h, S ttm = MOVE_NONE; } - ttMove = (ttm && pos.move_is_pl(ttm) ? ttm : MOVE_NONE); + ttMove = (ttm && pos.is_pseudo_legal(ttm) ? ttm : MOVE_NONE); phasePtr += int(ttMove == MOVE_NONE) - 1; go_next_phase(); } @@ -138,14 +141,14 @@ MovePicker::MovePicker(const Position& p, Move ttm, const History& h, PieceType 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 - && (!pos.move_is_capture(ttm) || pos.see(ttm) <= captureThreshold)) + && (!pos.is_capture(ttm) || pos.see(ttm) <= captureThreshold)) ttm = MOVE_NONE; - ttMove = (ttm && pos.move_is_pl(ttm) ? ttm : MOVE_NONE); + ttMove = (ttm && pos.is_pseudo_legal(ttm) ? ttm : MOVE_NONE); phasePtr += int(ttMove == MOVE_NONE) - 1; go_next_phase(); } @@ -229,7 +232,7 @@ void MovePicker::go_next_phase() { /// 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. @@ -251,11 +254,11 @@ void MovePicker::score_captures() { for (MoveStack* cur = moves; cur != lastMove; cur++) { m = cur->move; - cur->score = piece_value_midgame(pos.piece_on(move_to(m))) - - piece_type(pos.piece_on(move_from(m))); + cur->score = PieceValueMidgame[pos.piece_on(move_to(m))] + - type_of(pos.piece_on(move_from(m))); - if (move_is_promotion(m)) - cur->score += QueenValueMidgame; + if (is_promotion(m)) + cur->score += PieceValueMidgame[Piece(promotion_piece_type(m))]; } } @@ -289,22 +292,22 @@ void MovePicker::score_evasions() { m = cur->move; if ((seeScore = pos.see_sign(m)) < 0) cur->score = seeScore - History::MaxValue; // Be sure we are at the bottom - else if (pos.move_is_capture(m)) - cur->score = piece_value_midgame(pos.piece_on(move_to(m))) - - piece_type(pos.piece_on(move_from(m))) + History::MaxValue; + else if (pos.is_capture(m)) + cur->score = PieceValueMidgame[pos.piece_on(move_to(m))] + - type_of(pos.piece_on(move_from(m))) + History::MaxValue; else cur->score = H.value(pos.piece_on(move_from(m)), move_to(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; @@ -331,8 +334,7 @@ Move MovePicker::get_next_move() { if (seeValue >= captureThreshold) return move; - // Losing capture, move it to the tail of the array, note - // that move has now been already checked for pseudo legality. + // Losing capture, move it to the tail of the array (--badCaptures)->move = move; badCaptures->score = seeValue; } @@ -348,9 +350,9 @@ Move MovePicker::get_next_move() { case PH_KILLERS: move = (curMove++)->move; if ( move != MOVE_NONE - && pos.move_is_pl(move) + && pos.is_pseudo_legal(move) && move != ttMove - && !pos.move_is_capture(move)) + && !pos.is_capture(move)) return move; break;