Don't need to assert for pos.is_ok() when position is constant

[stockfish] / src / position.h

diff --git a/src/position.h b/src/position.h
index d02514feb860b6723c60fc900ddc9208ca568f7f..c1f639288ca024b7e3fdaebcf38e76149a99a467 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -89,8 +89,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 +134,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;
@@ -193,7 +195,7 @@ public:
   template<bool SkipRepetition> bool is_draw() const;
 
   // Number of plies from starting position
-  int full_moves() const;
+  int startpos_ply_counter() const;
 
   // Other properties of the position
   bool opposite_colored_bishops() const;
@@ -221,7 +223,7 @@ private:
   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 +231,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;
@@ -428,8 +430,8 @@ inline bool Position::move_is_passed_pawn_push(Move m) const {
         && pawn_is_passed(c, move_to(m));
 }
 
-inline int Position::full_moves() const {
-  return fullMoves;
+inline int Position::startpos_ply_counter() const {
+  return Max(2 * (fullMoves - 1), 0) + int(sideToMove == BLACK);
 }
 
 inline bool Position::opposite_colored_bishops() const {
@@ -449,15 +451,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);
 }