X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.cpp;h=45d0147aef1f2c6d4b244ef8ae261ebe36bc4d7a;hp=e7a0017cb033a8e4c15ce407ca1caeb9bb8e73a8;hb=2f01d67a925e01508b4f3ae3bdc1c44d14b85c8e;hpb=1ae8c59c0bf7cc87d69673de95363bd222ef6642 diff --git a/src/position.cpp b/src/position.cpp index e7a0017c..45d0147a 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -52,17 +52,29 @@ Key Position::zobCastle[16]; Key Position::zobMaterial[2][8][16]; Key Position::zobSideToMove; -Value Position::MgPieceSquareTable[16][64]; -Value Position::EgPieceSquareTable[16][64]; +Score Position::PieceSquareTable[16][64]; static bool RequestPending = false; -//// -//// Functions -//// /// Constructors +CheckInfo::CheckInfo(const Position& pos) { + + Color us = pos.side_to_move(); + Color them = opposite_color(us); + + ksq = pos.king_square(them); + dcCandidates = pos.discovered_check_candidates(us); + + checkSq[PAWN] = pos.attacks_from(ksq, them); + checkSq[KNIGHT] = pos.attacks_from(ksq); + checkSq[BISHOP] = pos.attacks_from(ksq); + checkSq[ROOK] = pos.attacks_from(ksq); + checkSq[QUEEN] = checkSq[BISHOP] | checkSq[ROOK]; + checkSq[KING] = EmptyBoardBB; +} + Position::Position(const Position& pos) { copy(pos); } @@ -213,7 +225,7 @@ void Position::from_fen(const string& fen) { st->key = compute_key(); st->pawnKey = compute_pawn_key(); st->materialKey = compute_material_key(); - st->value = Score(compute_value(), compute_value()); + st->value = compute_value(); st->npMaterial[WHITE] = compute_non_pawn_material(WHITE); st->npMaterial[BLACK] = compute_non_pawn_material(BLACK); } @@ -540,126 +552,97 @@ bool Position::pl_move_is_evasion(Move m, Bitboard pinned) const bool Position::move_is_check(Move m) const { - Bitboard dc = discovered_check_candidates(side_to_move()); - return move_is_check(m, dc); + return move_is_check(m, CheckInfo(*this)); } -bool Position::move_is_check(Move m, Bitboard dcCandidates) const { +bool Position::move_is_check(Move m, const CheckInfo& ci) const { assert(is_ok()); assert(move_is_ok(m)); - assert(dcCandidates == discovered_check_candidates(side_to_move())); + assert(ci.dcCandidates == discovered_check_candidates(side_to_move())); + assert(color_of_piece_on(move_from(m)) == side_to_move()); + assert(piece_on(ci.ksq) == piece_of_color_and_type(opposite_color(side_to_move()), KING)); - Color us = side_to_move(); - Color them = opposite_color(us); Square from = move_from(m); Square to = move_to(m); - Square ksq = king_square(them); + PieceType pt = type_of_piece_on(from); - assert(color_of_piece_on(from) == us); - assert(piece_on(ksq) == piece_of_color_and_type(them, KING)); + // Direct check ? + if (bit_is_set(ci.checkSq[pt], to)) + return true; - // Proceed according to the type of the moving piece - switch (type_of_piece_on(from)) + // Discovery check ? + if (ci.dcCandidates && bit_is_set(ci.dcCandidates, from)) { - case PAWN: - - if (bit_is_set(attacks_from(ksq, them), to)) // Normal check? + // For pawn and king moves we need to verify also direction + if ( (pt != PAWN && pt != KING) + ||(direction_between_squares(from, ci.ksq) != direction_between_squares(to, ci.ksq))) return true; + } - if ( dcCandidates // Discovered check? - && bit_is_set(dcCandidates, from) - && (direction_between_squares(from, ksq) != direction_between_squares(to, ksq))) - return true; + // Can we skip the ugly special cases ? + if (!move_is_special(m)) + return false; - if (move_is_promotion(m)) // Promotion with check? - { - Bitboard b = occupied_squares(); - clear_bit(&b, from); + Color us = side_to_move(); + Bitboard b = occupied_squares(); - switch (move_promotion_piece(m)) - { - case KNIGHT: - return bit_is_set(attacks_from(to), ksq); - case BISHOP: - return bit_is_set(bishop_attacks_bb(to, b), ksq); - case ROOK: - return bit_is_set(rook_attacks_bb(to, b), ksq); - case QUEEN: - return bit_is_set(queen_attacks_bb(to, b), ksq); - default: - assert(false); - } - } - // En passant capture with check? We have already handled the case - // of direct checks and ordinary discovered check, the only case we - // need to handle is the unusual case of a discovered check through the - // captured pawn. - else if (move_is_ep(m)) + // Promotion with check ? + if (move_is_promotion(m)) + { + clear_bit(&b, from); + + switch (move_promotion_piece(m)) { - Square capsq = make_square(square_file(to), square_rank(from)); - Bitboard b = occupied_squares(); - clear_bit(&b, from); - clear_bit(&b, capsq); - set_bit(&b, to); - return (rook_attacks_bb(ksq, b) & pieces(ROOK, QUEEN, us)) - ||(bishop_attacks_bb(ksq, b) & pieces(BISHOP, QUEEN, us)); + case KNIGHT: + return bit_is_set(attacks_from(to), ci.ksq); + case BISHOP: + return bit_is_set(bishop_attacks_bb(to, b), ci.ksq); + case ROOK: + return bit_is_set(rook_attacks_bb(to, b), ci.ksq); + case QUEEN: + return bit_is_set(queen_attacks_bb(to, b), ci.ksq); + default: + assert(false); } - return false; + } - // Test discovered check and normal check according to piece type - case KNIGHT: - return (dcCandidates && bit_is_set(dcCandidates, from)) - || bit_is_set(attacks_from(ksq), to); - - case BISHOP: - return (dcCandidates && bit_is_set(dcCandidates, from)) - || (direction_is_diagonal(ksq, to) && bit_is_set(attacks_from(ksq), to)); - - case ROOK: - return (dcCandidates && bit_is_set(dcCandidates, from)) - || (direction_is_straight(ksq, to) && bit_is_set(attacks_from(ksq), to)); - - case QUEEN: - // Discovered checks are impossible! - assert(!bit_is_set(dcCandidates, from)); - return ( (direction_is_straight(ksq, to) && bit_is_set(attacks_from(ksq), to)) - || (direction_is_diagonal(ksq, to) && bit_is_set(attacks_from(ksq), to))); - - case KING: - // Discovered check? - if ( bit_is_set(dcCandidates, from) - && (direction_between_squares(from, ksq) != direction_between_squares(to, ksq))) - return true; + // En passant capture with check? We have already handled the case + // of direct checks and ordinary discovered check, the only case we + // need to handle is the unusual case of a discovered check through the + // captured pawn. + if (move_is_ep(m)) + { + Square capsq = make_square(square_file(to), square_rank(from)); + clear_bit(&b, from); + clear_bit(&b, capsq); + set_bit(&b, to); + return (rook_attacks_bb(ci.ksq, b) & pieces(ROOK, QUEEN, us)) + ||(bishop_attacks_bb(ci.ksq, b) & pieces(BISHOP, QUEEN, us)); + } - // Castling with check? - if (move_is_castle(m)) - { - Square kfrom, kto, rfrom, rto; - Bitboard b = occupied_squares(); - kfrom = from; - rfrom = to; + // Castling with check ? + if (move_is_castle(m)) + { + Square kfrom, kto, rfrom, rto; + kfrom = from; + rfrom = to; - if (rfrom > kfrom) - { - kto = relative_square(us, SQ_G1); - rto = relative_square(us, SQ_F1); - } else { - kto = relative_square(us, SQ_C1); - rto = relative_square(us, SQ_D1); - } - clear_bit(&b, kfrom); - clear_bit(&b, rfrom); - set_bit(&b, rto); - set_bit(&b, kto); - return bit_is_set(rook_attacks_bb(rto, b), ksq); + if (rfrom > kfrom) + { + kto = relative_square(us, SQ_G1); + rto = relative_square(us, SQ_F1); + } else { + kto = relative_square(us, SQ_C1); + rto = relative_square(us, SQ_D1); } - return false; - - default: // NO_PIECE_TYPE - break; + clear_bit(&b, kfrom); + clear_bit(&b, rfrom); + set_bit(&b, rto); + set_bit(&b, kto); + return bit_is_set(rook_attacks_bb(rto, b), ci.ksq); } - assert(false); + return false; } @@ -719,10 +702,10 @@ void Position::do_move(Move m, StateInfo& newSt, Bitboard dcCandidates) { // ones which are recalculated from scratch anyway, then switch our state // pointer to point to the new, ready to be updated, state. struct ReducedStateInfo { - Key key, pawnKey, materialKey; + Key pawnKey, materialKey; int castleRights, rule50, pliesFromNull; Square epSquare; - Value mgValue, egValue; + Value value; Value npMaterial[2]; }; @@ -759,16 +742,15 @@ void Position::do_move(Move m, StateInfo& newSt, Bitboard dcCandidates) { Piece piece = piece_on(from); PieceType pt = type_of_piece(piece); + PieceType capture = ep ? PAWN : type_of_piece_on(to); assert(color_of_piece_on(from) == us); assert(color_of_piece_on(to) == them || square_is_empty(to)); assert(!(ep || pm) || piece == piece_of_color_and_type(us, PAWN)); assert(!pm || relative_rank(us, to) == RANK_8); - st->capture = ep ? PAWN : type_of_piece_on(to); - - if (st->capture) - do_capture_move(key, st->capture, them, to, ep); + if (capture) + do_capture_move(key, capture, them, to, ep); // Update hash key key ^= zobrist[us][pt][from] ^ zobrist[us][pt][to]; @@ -818,7 +800,7 @@ void Position::do_move(Move m, StateInfo& newSt, Bitboard dcCandidates) { st->pawnKey ^= zobrist[us][PAWN][from] ^ zobrist[us][PAWN][to]; // Set en passant square, only if moved pawn can be captured - if (abs(int(to) - int(from)) == 16) + if ((to ^ from) == 16) { if (attacks_from(from + (us == WHITE ? DELTA_N : DELTA_S), us) & pieces(PAWN, them)) { @@ -829,7 +811,10 @@ void Position::do_move(Move m, StateInfo& newSt, Bitboard dcCandidates) { } // Update incremental scores - st->value += Score(pst_delta(piece, from, to), pst_delta(piece, from, to)); + st->value += pst_delta(piece, from, to); + + // Set capture piece + st->capture = capture; if (pm) // promotion ? { @@ -864,8 +849,8 @@ void Position::do_move(Move m, StateInfo& newSt, Bitboard dcCandidates) { st->pawnKey ^= zobrist[us][PAWN][to]; // Partially revert and update incremental scores - st->value -= Score(pst(us, PAWN, to), pst(us, PAWN, to)); - st->value += Score(pst(us, promotion, to), pst(us, promotion, to)); + st->value -= pst(us, PAWN, to); + st->value += pst(us, promotion, to); // Update material st->npMaterial[us] += piece_value_midgame(promotion); @@ -895,7 +880,7 @@ void Position::do_move(Move m, StateInfo& newSt, Bitboard dcCandidates) { // Finish sideToMove = opposite_color(sideToMove); - st->value += (sideToMove == WHITE) ? TempoValue : -TempoValue; + st->value += (sideToMove == WHITE ? TempoValue : -TempoValue); assert(is_ok()); } @@ -931,7 +916,7 @@ void Position::do_capture_move(Bitboard& key, PieceType capture, Color them, Squ key ^= zobrist[them][capture][capsq]; // Update incremental scores - st->value -= Score(pst(them, capture, capsq), pst(them, capture, capsq)); + st->value -= pst(them, capture, capsq); // If the captured piece was a pawn, update pawn hash key, // otherwise update non-pawn material. @@ -1028,8 +1013,8 @@ void Position::do_castle_move(Move m) { index[rto] = tmp; // Update incremental scores - st->value += Score(pst_delta(king, kfrom, kto), pst_delta(king, kfrom, kto)); - st->value += Score(pst_delta(rook, rfrom, rto), pst_delta(rook, rfrom, rto)); + st->value += pst_delta(king, kfrom, kto); + st->value += pst_delta(rook, rfrom, rto); // Update hash key st->key ^= zobrist[us][KING][kfrom] ^ zobrist[us][KING][kto]; @@ -1055,7 +1040,7 @@ void Position::do_castle_move(Move m) { // Finish sideToMove = opposite_color(sideToMove); - st->value += (sideToMove == WHITE) ? TempoValue : -TempoValue; + st->value += (sideToMove == WHITE ? TempoValue : -TempoValue); assert(is_ok()); } @@ -1630,10 +1615,9 @@ Key Position::compute_material_key() const { /// game and the endgame. These functions are used to initialize the incremental /// scores when a new position is set up, and to verify that the scores are correctly /// updated by do_move and undo_move when the program is running in debug mode. -template -Value Position::compute_value() const { +Score Position::compute_value() const { - Value result = Value(0); + Score result = make_score(0, 0); Bitboard b; Square s; @@ -1645,12 +1629,11 @@ Value Position::compute_value() const { { s = pop_1st_bit(&b); assert(piece_on(s) == piece_of_color_and_type(c, pt)); - result += pst(c, pt, s); + result += pst(c, pt, s); } } - const Value tv = (Phase == MidGame ? TempoValue.mg() : TempoValue.eg()); - result += (side_to_move() == WHITE)? tv / 2 : -tv / 2; + result += (side_to_move() == WHITE ? TempoValue / 2 : -TempoValue / 2); return result; } @@ -1799,16 +1782,12 @@ void Position::init_piece_square_tables() { for (Piece p = WP; p <= WK; p++) { i = (r == 0)? 0 : (genrand_int32() % (r*2) - r); - MgPieceSquareTable[p][s] = Value(MgPST[p][s] + i); - EgPieceSquareTable[p][s] = Value(EgPST[p][s] + i); + PieceSquareTable[p][s] = make_score(MgPST[p][s] + i, EgPST[p][s] + i); } for (Square s = SQ_A1; s <= SQ_H8; s++) for (Piece p = BP; p <= BK; p++) - { - MgPieceSquareTable[p][s] = -MgPieceSquareTable[p-8][flip_square(s)]; - EgPieceSquareTable[p][s] = -EgPieceSquareTable[p-8][flip_square(s)]; - } + PieceSquareTable[p][s] = -PieceSquareTable[p-8][flip_square(s)]; } @@ -1863,7 +1842,7 @@ void Position::flipped_copy(const Position& pos) { st->materialKey = compute_material_key(); // Incremental scores - st->value = Score(compute_value(), compute_value()); + st->value = compute_value(); // Material st->npMaterial[WHITE] = compute_non_pawn_material(WHITE); @@ -1990,14 +1969,8 @@ bool Position::is_ok(int* failedStep) const { // Incremental eval OK? if (failedStep) (*failedStep)++; - if (debugIncrementalEval) - { - if (st->value.mg() != compute_value()) - return false; - - if (st->value.eg() != compute_value()) - return false; - } + if (debugIncrementalEval && st->value != compute_value()) + return false; // Non-pawn material OK? if (failedStep) (*failedStep)++;