Don't update gamePly after each move

[stockfish] / src / position.h

diff --git a/src/position.h b/src/position.h
index f326e4fbaa99b3fa27955abc6948398511dfb24b..a933c3faf6e41f843000730a34839a6fa0ad0627 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -26,11 +26,6 @@
 #include "move.h"
 #include "types.h"
 
-/// 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).
-const int MaxGameLength = 220;
-
 
 /// The checkInfo struct is initialized at c'tor time and keeps info used
 /// to detect if a move gives check.
@@ -53,10 +48,10 @@ class Position;
 
 struct StateInfo {
   Key pawnKey, materialKey;
-  int castleRights, rule50, gamePly, pliesFromNull;
-  Square epSquare;
-  Score value;
   Value npMaterial[2];
+  int castleRights, rule50, pliesFromNull;
+  Score value;
+  Square epSquare;
 
   Key key;
   Bitboard checkersBB;
@@ -89,8 +84,10 @@ struct StateInfo {
 
 class Position {
 
-  Position(); // No default or copy c'tor allowed
-  Position(const Position& pos);
+  // No defaul, copy c'tor or assignment allowed, default c'tor will not be
+  // generated anyhow because of user-defined c'tors.
+  Position(const Position&);
+  Position& operator=(const Position&);
 
 public:
   Position(const Position& pos, int threadID);
@@ -132,8 +129,8 @@ public:
   Square castle_rook_square(CastleRight f) const;
 
   // Bitboards for pinned pieces and discovered check candidates
-  Bitboard discovered_check_candidates(Color c) const;
-  Bitboard pinned_pieces(Color c) const;
+  Bitboard discovered_check_candidates() const;
+  Bitboard pinned_pieces() const;
 
   // Checking pieces and under check information
   Bitboard checkers() const;
@@ -166,7 +163,6 @@ public:
   bool pawn_is_passed(Color c, Square s) const;
 
   // Doing and undoing moves
-  void do_setup_move(Move m);
   void do_move(Move m, StateInfo& st);
   void do_move(Move m, StateInfo& st, const CheckInfo& ci, bool moveIsCheck);
   void undo_move(Move m);
@@ -192,7 +188,7 @@ public:
   bool is_mate() const;
   template<bool SkipRepetition> bool is_draw() const;
 
-  // Number of plies from starting position
+  // Plies from start position to the beginning of search
   int startpos_ply_counter() const;
 
   // Other properties of the position
@@ -217,11 +213,10 @@ private:
 
   // Initialization helper functions (used while setting up a position)
   void clear();
-  void detach();
   void put_piece(Piece p, Square s);
   void set_castle(int f, Square ksq, Square rsq);
   void set_castling_rights(char token);
-  bool move_is_pl_slow(const Move m) const;
+  bool move_is_legal(const Move m) const;
 
   // Helper functions for doing and undoing moves
   void do_capture_move(Key& key, PieceType capture, Color them, Square to, bool ep);
@@ -229,7 +224,7 @@ private:
   void undo_castle_move(Move m);
 
   template<bool FindPinned>
-  Bitboard hidden_checkers(Color c) const;
+  Bitboard hidden_checkers() const;
 
   // Computing hash keys from scratch (for initialization and debugging)
   Key compute_key() const;
@@ -256,13 +251,12 @@ private:
   int index[64];               // [square]
 
   // Other info
-  Key history[MaxGameLength];
   int castleRightsMask[64];    // [square]
   Square castleRookSquare[16]; // [castleRight]
   StateInfo startState;
   int64_t nodes;
+  int startPosPly;
   Color sideToMove;
-  int fullMoves;
   int threadID;
   StateInfo* st;
   int chess960;
@@ -429,7 +423,7 @@ inline bool Position::move_is_passed_pawn_push(Move m) const {
 }
 
 inline int Position::startpos_ply_counter() const {
-  return Max(2 * (fullMoves - 1), 0) + int(sideToMove == BLACK);
+  return startPosPly;
 }
 
 inline bool Position::opposite_colored_bishops() const {
@@ -449,15 +443,14 @@ inline bool Position::is_chess960() const {
 
 inline bool Position::move_is_capture_or_promotion(Move m) const {
 
-  assert(m != MOVE_NONE && m != MOVE_NULL);
+  assert(move_is_ok(m));
   return move_is_special(m) ? !move_is_castle(m) : !square_is_empty(move_to(m));
 }
 
 inline bool Position::move_is_capture(Move m) const {
 
-  assert(m != MOVE_NONE && m != MOVE_NULL);
-
   // Note that castle is coded as "king captures the rook"
+  assert(move_is_ok(m));
   return (!square_is_empty(move_to(m)) && !move_is_castle(m)) || move_is_ep(m);
 }