X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=e3fa28d17d0f4074087ee519c3ea05237d403c53;hp=ed9b8edcc6ff0ac7c20e8ce951060b0be0c83ab9;hb=cb506d3b1657c03738f823a98faed3c6b5216c40;hpb=20c2a314642b8fb911a8e00895544581d4ee2dda

diff --git a/src/position.h b/src/position.h
index ed9b8edc..e3fa28d1 100644
--- a/src/position.h
+++ b/src/position.h
@@ -91,6 +91,7 @@ struct StateInfo {
   int castleRights, rule50;
   Square epSquare;
   Value mgValue, egValue;
+  Value npMaterial[2];
 
   PieceType capture;
   Bitboard checkersBB;
@@ -126,6 +127,11 @@ class Position {
   friend class EndgameFunctions;
 
 public:
+  enum GamePhase {
+      MidGame,
+      EndGame
+  };
+
   // Constructors
   Position() {};
   Position(const Position& pos);
@@ -137,8 +143,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;
@@ -238,18 +244,15 @@ public:
 
   // Information about pawns
   bool pawn_is_passed(Color c, Square s) const;
-  bool pawn_is_isolated(Color c, Square s) const;
-  bool pawn_is_doubled(Color c, Square s) const;
-
-  // Open and half-open files
-  bool file_is_open(File f) const;
-  bool file_is_half_open(Color c, File f) const;
+  static bool pawn_is_passed(Bitboard theirPawns, Color c, Square s);
+  static bool pawn_is_isolated(Bitboard ourPawns, Square s);
+  static bool pawn_is_doubled(Bitboard ourPawns, Color c, Square s);
 
   // Weak squares
   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);
@@ -260,6 +263,7 @@ public:
   int see(Square from, Square to) const;
   int see(Move m) const;
   int see(Square to) const;
+  int see_sign(Move m) const;
 
   // Accessing hash keys
   Key get_key() const;
@@ -271,7 +275,7 @@ public:
   Value eg_value() const;
   Value non_pawn_material(Color c) const;
   Phase game_phase() const;
-  Value mg_pst_delta(Move m) const;
+  template<GamePhase> Value pst_delta(Piece piece, Square from, Square to) const;
 
   // Game termination checks
   bool is_mate() const;
@@ -306,10 +310,9 @@ private:
   void allow_ooo(Color c);
 
   // Helper functions for doing and undoing moves
-  void do_capture_move(PieceType capture, Color them, Square to);
+  void do_capture_move(PieceType capture, Color them, Square to, bool ep);
   void do_castle_move(Move m);
   void do_promotion_move(Move m);
-  void do_ep_move(Move m);
   void undo_castle_move(Move m);
   void undo_promotion_move(Move m);
   void undo_ep_move(Move m);
@@ -327,10 +330,6 @@ private:
   Key compute_material_key() const;
 
   // Computing incremental evaluation scores and material counts
-  enum GamePhase {
-      MidGame,
-      EndGame
-  };
   template<GamePhase> Value pst(Color c, PieceType pt, Square s) const;
   template<GamePhase> Value compute_value() const;
   Value compute_non_pawn_material(Color c) const;
@@ -353,7 +352,6 @@ private:
   Color sideToMove;
   int gamePly;
   Key history[MaxGameLength];
-  Value npMaterial[2];
   File initialKFile, initialKRFile, initialQRFile;
   StateInfo startState;
   StateInfo* st;
@@ -494,10 +492,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];
 }
@@ -538,14 +532,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<PAWN>(Square s) const {
-  return StepAttackBB[piece_of_color_and_type(opposite_color(sideToMove), PAWN)][s];
+template<PieceType Piece> // Knight and King
+inline Bitboard Position::piece_attacks(Square s) const {
+  return StepAttackBB[Piece][s];
 }
 
 template<>
-inline Bitboard Position::piece_attacks<KNIGHT>(Square s) const {
-  return StepAttackBB[KNIGHT][s];
+inline Bitboard Position::piece_attacks<PAWN>(Square s) const {
+  return StepAttackBB[piece_of_color_and_type(opposite_color(sideToMove), PAWN)][s];
 }
 
 template<>
@@ -563,11 +557,6 @@ inline Bitboard Position::piece_attacks<QUEEN>(Square s) const {
   return piece_attacks<ROOK>(s) | piece_attacks<BISHOP>(s);
 }
 
-template<>
-inline Bitboard Position::piece_attacks<KING>(Square s) const {
-  return StepAttackBB[KING][s];
-}
-
 inline Bitboard Position::checkers() const {
   return st->checkersBB;
 }
@@ -599,20 +588,16 @@ inline bool Position::pawn_is_passed(Color c, Square s) const {
   return !(pawns(opposite_color(c)) & passed_pawn_mask(c, s));
 }
 
-inline bool Position::pawn_is_isolated(Color c, Square s) const {
-  return !(pawns(c) & neighboring_files_bb(s));
-}
-
-inline bool Position::pawn_is_doubled(Color c, Square s) const {
-  return pawns(c) & squares_behind(c, s);
+inline bool Position::pawn_is_passed(Bitboard theirPawns, Color c, Square s) {
+  return !(theirPawns & passed_pawn_mask(c, s));
 }
 
-inline bool Position::file_is_open(File f) const {
-  return !(pawns() & file_bb(f));
+inline bool Position::pawn_is_isolated(Bitboard ourPawns, Square s) {
+  return !(ourPawns & neighboring_files_bb(s));
 }
 
-inline bool Position::file_is_half_open(Color c, File f) const {
-  return !(pawns(c) & file_bb(f));
+inline bool Position::pawn_is_doubled(Bitboard ourPawns, Color c, Square s) {
+  return ourPawns & squares_behind(c, s);
 }
 
 inline bool Position::square_is_weak(Square s, Color c) const {
@@ -631,15 +616,16 @@ inline Key Position::get_material_key() const {
   return st->materialKey;
 }
 
-template<Position::GamePhase Phase>
+template<Position::GamePhase Ph>
 inline Value Position::pst(Color c, PieceType pt, Square s) const {
-  return (Phase == MidGame ? MgPieceSquareTable[piece_of_color_and_type(c, pt)][s]
-                           : EgPieceSquareTable[piece_of_color_and_type(c, pt)][s]);
+  return (Ph == MidGame ? MgPieceSquareTable[piece_of_color_and_type(c, pt)][s]
+                        : EgPieceSquareTable[piece_of_color_and_type(c, pt)][s]);
 }
 
-inline Value Position::mg_pst_delta(Move m) const {
-  return MgPieceSquareTable[piece_on(move_from(m))][move_to(m)]
-        -MgPieceSquareTable[piece_on(move_from(m))][move_from(m)];
+template<Position::GamePhase Ph>
+inline Value Position::pst_delta(Piece piece, Square from, Square to) const {
+  return (Ph == MidGame ? MgPieceSquareTable[piece][to] - MgPieceSquareTable[piece][from]
+                        : EgPieceSquareTable[piece][to] - EgPieceSquareTable[piece][from]);
 }
 
 inline Value Position::mg_value() const {
@@ -651,14 +637,14 @@ 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 {
 
   // Values modified by Joona Kiiski
-  static const Value MidgameLimit = Value(15713);
-  static const Value EndgameLimit = Value(4428);
+  static const Value MidgameLimit = Value(15581);
+  static const Value EndgameLimit = Value(3998);
 
   Value npm = non_pawn_material(WHITE) + non_pawn_material(BLACK);