X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=9737d7614981756382ab2fc150f149fa24f95c2b;hp=61b164b89fa3d60155260ae60f9fca5f69a7f1f4;hb=b1e79fed99d52dcb20d2d6a9c62522226e957963;hpb=6176357ac18dcc2f0dd12c17d5ac654c86a32009 diff --git a/src/position.h b/src/position.h index 61b164b8..9737d761 100644 --- a/src/position.h +++ b/src/position.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008 Marco Costalba + Copyright (C) 2008-2009 Marco Costalba Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ #if !defined(POSITION_H_INCLUDED) #define POSITION_H_INCLUDED -// Disable a silly and noisy warning from MSVC compiler +// Disable some silly and noisy warning from MSVC compiler #if defined(_MSC_VER) // Forcing value to bool 'true' or 'false' (performance warning) @@ -50,13 +50,12 @@ //// Constants //// -/// FEN string for the initial position: -const std::string StartPosition = - "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1"; +/// FEN string for the initial position +const std::string StartPosition = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1"; /// Maximum number of plies per game (220 should be enough, because the /// maximum search depth is 100, and during position setup we reset the -/// move counter for every non-reversible move): +/// move counter for every non-reversible move). const int MaxGameLength = 220; @@ -67,11 +66,11 @@ const int MaxGameLength = 220; /// Castle rights, encoded as bit fields enum CastleRights { - NO_CASTLES = 0, - WHITE_OO = 1, - BLACK_OO = 2, - WHITE_OOO = 4, - BLACK_OOO = 8, + NO_CASTLES = 0, + WHITE_OO = 1, + BLACK_OO = 2, + WHITE_OOO = 4, + BLACK_OOO = 8, ALL_CASTLES = 15 }; @@ -92,34 +91,33 @@ struct StateInfo { int castleRights, rule50; Square epSquare; Value mgValue, egValue; + Value npMaterial[2]; PieceType capture; Bitboard checkersBB; - Move lastMove; StateInfo* previous; }; -/// The position data structure. A position consists of the following data: +/// The position data structure. A position consists of the following data: /// /// * For each piece type, a bitboard representing the squares occupied /// by pieces of that type. -/// * For each color, a bitboard representing the squares occupiecd by +/// * For each color, a bitboard representing the squares occupied by /// pieces of that color. /// * A bitboard of all occupied squares. /// * A bitboard of all checking pieces. /// * A 64-entry array of pieces, indexed by the squares of the board. /// * The current side to move. /// * Information about the castling rights for both sides. -/// * The initial files of the kings and both pairs of rooks. This is +/// * The initial files of the kings and both pairs of rooks. This is /// used to implement the Chess960 castling rules. /// * The en passant square (which is SQ_NONE if no en passant capture is /// possible). /// * The squares of the kings for both sides. -/// * The last move played. /// * Hash keys for the position itself, the current pawn structure, and /// the current material situation. -/// * Hash keys for all previous positions in the game (for detecting +/// * Hash keys for all previous positions in the game for detecting /// repetition draws. /// * A counter for detecting 50 move rule draws. @@ -140,8 +138,8 @@ public: void print(Move m = MOVE_NONE) const; // Copying - void copy(const Position &pos); - void flipped_copy(const Position &pos); + void copy(const Position& pos); + void flipped_copy(const Position& pos); // The piece on a given square Piece piece_on(Square s) const; @@ -252,7 +250,7 @@ public: bool square_is_weak(Square s, Color c) const; // Doing and undoing moves - void setStartState(const StateInfo& st); + void saveState(); void do_move(Move m, StateInfo& st); void do_move(Move m, StateInfo& st, Bitboard dcCandidates); void undo_move(Move m); @@ -356,7 +354,6 @@ private: Color sideToMove; int gamePly; Key history[MaxGameLength]; - Value npMaterial[2]; File initialKFile, initialKRFile, initialQRFile; StateInfo startState; StateInfo* st; @@ -497,10 +494,6 @@ inline Bitboard Position::bishops_and_queens(Color c) const { return bishops_and_queens() & pieces_of_color(c); } -inline Bitboard Position::sliders_of_color(Color c) const { - return sliders() & pieces_of_color(c); -} - inline int Position::piece_count(Color c, PieceType pt) const { return pieceCount[c][pt]; } @@ -541,14 +534,14 @@ inline Bitboard Position::pawn_attacks(Color c, Square s) const { return StepAttackBB[piece_of_color_and_type(c, PAWN)][s]; } -template<> -inline Bitboard Position::piece_attacks(Square s) const { - return StepAttackBB[piece_of_color_and_type(opposite_color(sideToMove), PAWN)][s]; +template // Knight and King +inline Bitboard Position::piece_attacks(Square s) const { + return StepAttackBB[Piece][s]; } template<> -inline Bitboard Position::piece_attacks(Square s) const { - return StepAttackBB[KNIGHT][s]; +inline Bitboard Position::piece_attacks(Square s) const { + return StepAttackBB[piece_of_color_and_type(opposite_color(sideToMove), PAWN)][s]; } template<> @@ -566,11 +559,6 @@ inline Bitboard Position::piece_attacks(Square s) const { return piece_attacks(s) | piece_attacks(s); } -template<> -inline Bitboard Position::piece_attacks(Square s) const { - return StepAttackBB[KING][s]; -} - inline Bitboard Position::checkers() const { return st->checkersBB; } @@ -654,7 +642,7 @@ inline Value Position::eg_value() const { } inline Value Position::non_pawn_material(Color c) const { - return npMaterial[c]; + return st->npMaterial[c]; } inline Phase Position::game_phase() const {