X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fposition.cpp;h=fb0a32f3acf29c56d7231d59b15baeda3c092031;hb=0363b5435847e66678cd3fa0d8a94e30b9a91663;hp=35e2627634ed2f9f0926dfc9216bb6e9382f3dfd;hpb=e6376d9b8daae0aa0dcda618ec6330bda2dcfaf7;p=stockfish diff --git a/src/position.cpp b/src/position.cpp index 35e26276..fb0a32f3 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -71,10 +71,16 @@ struct PieceLetters : std::map { } }; + //// -//// Variables +//// Constants and variables //// +/// Bonus for having the side to move (modified by Joona Kiiski) + +static const Score TempoValue = make_score(48, 22); + + Key Position::zobrist[2][8][64]; Key Position::zobEp[64]; Key Position::zobCastle[16]; @@ -182,7 +188,7 @@ void Position::from_fen(const string& fen) { { if (isdigit(token)) { - file += token - '0'; // Skip the given number of files + file += File(token - '0'); // Skip the given number of files continue; } else if (token == '/') @@ -889,7 +895,7 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI st->value += pst(us, promotion, to); // Update material - st->npMaterial[us] += piece_value_midgame(promotion); + st->npMaterial[us] += PieceValueMidgame[promotion]; } } @@ -962,7 +968,7 @@ void Position::do_capture_move(Key& key, PieceType capture, Color them, Square t st->pawnKey ^= zobrist[them][PAWN][capsq]; } else - st->npMaterial[them] -= piece_value_midgame(capture); + st->npMaterial[them] -= PieceValueMidgame[capture]; // Remove captured piece clear_bit(&(byColorBB[them]), capsq); @@ -1658,7 +1664,7 @@ Key Position::compute_material_key() const { /// updated by do_move and undo_move when the program is running in debug mode. Score Position::compute_value() const { - Score result = make_score(0, 0); + Score result = SCORE_ZERO; Bitboard b; Square s; @@ -1686,7 +1692,7 @@ Score Position::compute_value() const { Value Position::compute_non_pawn_material(Color c) const { - Value result = Value(0); + Value result = VALUE_ZERO; for (PieceType pt = KNIGHT; pt <= QUEEN; pt++) { @@ -1694,8 +1700,9 @@ Value Position::compute_non_pawn_material(Color c) const { while (b) { assert(piece_on(first_1(b)) == piece_of_color_and_type(c, pt)); + pop_1st_bit(&b); - result += piece_value_midgame(pt); + result += PieceValueMidgame[pt]; } } return result; @@ -1733,82 +1740,79 @@ bool Position::is_draw() const { bool Position::is_mate() const { MoveStack moves[256]; - return is_check() && (generate_moves(*this, moves, false) == moves); + return is_check() && (generate_moves(*this, moves) == moves); } -/// Position::has_mate_threat() tests whether a given color has a mate in one -/// from the current position. +/// Position::has_mate_threat() tests whether the side to move is under +/// a threat of being mated in one from the current position. -bool Position::has_mate_threat(Color c) { +bool Position::has_mate_threat() { + MoveStack mlist[256], *last, *cur; StateInfo st1, st2; - Color stm = side_to_move(); + bool mateFound = false; + // If we are under check it's up to evasions to do the job if (is_check()) return false; - // If the input color is not equal to the side to move, do a null move - if (c != stm) - do_null_move(st1); - - MoveStack mlist[120]; - bool result = false; - Bitboard pinned = pinned_pieces(sideToMove); + // First pass the move to our opponent doing a null move + do_null_move(st1); - // Generate pseudo-legal non-capture and capture check moves - MoveStack* last = generate_non_capture_checks(*this, mlist); + // Then generate pseudo-legal moves that give check + last = generate_non_capture_checks(*this, mlist); last = generate_captures(*this, last); - // Loop through the moves, and see if one of them is mate - for (MoveStack* cur = mlist; cur != last; cur++) + // Loop through the moves, and see if one of them gives mate + Bitboard pinned = pinned_pieces(sideToMove); + CheckInfo ci(*this); + for (cur = mlist; cur != last && !mateFound; cur++) { Move move = cur->move; - if (!pl_move_is_legal(move, pinned)) + if ( !pl_move_is_legal(move, pinned) + || !move_is_check(move, ci)) continue; - do_move(move, st2); + do_move(move, st2, ci, true); + if (is_mate()) - result = true; + mateFound = true; undo_move(move); } - // Undo null move, if necessary - if (c != stm) - undo_null_move(); - - return result; + undo_null_move(); + return mateFound; } -/// Position::init_zobrist() is a static member function which initializes the -/// various arrays used to compute hash keys. +/// Position::init_zobrist() is a static member function which initializes at +/// startup the various arrays used to compute hash keys. void Position::init_zobrist() { - for (int i = 0; i < 2; i++) - for (int j = 0; j < 8; j++) - for (int k = 0; k < 64; k++) - zobrist[i][j][k] = Key(genrand_int64()); + int i,j, k; - for (int i = 0; i < 64; i++) + for (i = 0; i < 2; i++) for (j = 0; j < 8; j++) for (k = 0; k < 64; k++) + zobrist[i][j][k] = Key(genrand_int64()); + + for (i = 0; i < 64; i++) zobEp[i] = Key(genrand_int64()); - for (int i = 0; i < 16; i++) - zobCastle[i] = genrand_int64(); + for (i = 0; i < 16; i++) + zobCastle[i] = Key(genrand_int64()); - zobSideToMove = genrand_int64(); - zobExclusion = genrand_int64(); + zobSideToMove = Key(genrand_int64()); + zobExclusion = Key(genrand_int64()); } /// Position::init_piece_square_tables() initializes the piece square tables. -/// This is a two-step operation: -/// First, the white halves of the tables are -/// copied from the MgPST[][] and EgPST[][] arrays. -/// Second, the black halves of the tables are initialized by mirroring -/// and changing the sign of the corresponding white scores. +/// This is a two-step operation: First, the white halves of the tables are +/// copied from the MgPST[][] and EgPST[][] arrays. Second, the black halves +/// of the tables are initialized by mirroring and changing the sign of the +/// corresponding white scores. void Position::init_piece_square_tables() {