X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=d822260dd768fb6eca1776435d80fb39cb7ad318;hp=6307f126a4a613652c1f76ebef662f01babad9f7;hb=c9b24c3358a26afdec5e33e369b6192039562971;hpb=fc519ca74a110a0ceea3c710c88da096fa850c65

diff --git a/src/position.h b/src/position.h
index 6307f126..d822260d 100644
--- a/src/position.h
+++ b/src/position.h
@@ -41,8 +41,8 @@ struct CheckInfo {
     explicit CheckInfo(const Position&);
 
     Bitboard dcCandidates;
+    Bitboard pinned;
     Bitboard checkSq[8];
-    Square ksq;
 };
 
 /// Castle rights, encoded as bit fields
@@ -129,12 +129,8 @@ public:
 
   // The piece on a given square
   Piece piece_on(Square s) const;
-  PieceType type_of_piece_on(Square s) const;
-  Color color_of_piece_on(Square s) const;
   bool square_is_empty(Square s) const;
   bool square_is_occupied(Square s) const;
-  Value midgame_value_of_piece_on(Square s) const;
-  Value endgame_value_of_piece_on(Square s) const;
 
   // Side to move
   Color side_to_move() const;
@@ -187,9 +183,9 @@ public:
   // Properties of moves
   bool pl_move_is_legal(Move m, Bitboard pinned) const;
   bool move_is_pl(const Move m) const;
-  bool move_gives_check(Move m) const;
   bool move_gives_check(Move m, const CheckInfo& ci) const;
   bool move_is_capture(Move m) const;
+  bool move_is_capture_or_promotion(Move m) const;
   bool move_is_passed_pawn_push(Move m) const;
   bool move_attacks_square(Move m, Square s) const;
 
@@ -213,7 +209,6 @@ public:
   // Static exchange evaluation
   int see(Move m) const;
   int see_sign(Move m) const;
-  static int see_value(PieceType pt);
 
   // Accessing hash keys
   Key get_key() const;
@@ -231,7 +226,7 @@ public:
   template<bool SkipRepetition> bool is_draw() const;
 
   // Number of plies from starting position
-  int startpos_ply_counter() const;
+  int full_moves() const;
 
   // Other properties of the position
   bool opposite_colored_bishops() const;
@@ -258,7 +253,7 @@ private:
   void put_piece(Piece p, Square s);
   void set_castle_kingside(Color c);
   void set_castle_queenside(Color c);
-  bool set_castling_rights(char token);
+  void set_castling_rights(char token);
   bool move_is_pl_slow(const Move m) const;
 
   // Helper functions for doing and undoing moves
@@ -300,7 +295,7 @@ private:
   StateInfo startState;
   File initialKFile, initialKRFile, initialQRFile;
   bool chess960;
-  int startPosPlyCounter;
+  int fullMoves;
   int threadID;
   int64_t nodes;
   StateInfo* st;
@@ -312,9 +307,6 @@ private:
   static Key zobSideToMove;
   static Score PieceSquareTable[16][64];
   static Key zobExclusion;
-  static const Value seeValues[8];
-  static const Value PieceValueMidgame[17];
-  static const Value PieceValueEndgame[17];
 };
 
 inline int64_t Position::nodes_searched() const {
@@ -329,14 +321,6 @@ inline Piece Position::piece_on(Square s) const {
   return board[s];
 }
 
-inline Color Position::color_of_piece_on(Square s) const {
-  return color_of_piece(piece_on(s));
-}
-
-inline PieceType Position::type_of_piece_on(Square s) const {
-  return type_of_piece(piece_on(s));
-}
-
 inline bool Position::square_is_empty(Square s) const {
   return piece_on(s) == PIECE_NONE;
 }
@@ -345,14 +329,6 @@ inline bool Position::square_is_occupied(Square s) const {
   return !square_is_empty(s);
 }
 
-inline Value Position::midgame_value_of_piece_on(Square s) const {
-  return PieceValueMidgame[piece_on(s)];
-}
-
-inline Value Position::endgame_value_of_piece_on(Square s) const {
-  return PieceValueEndgame[piece_on(s)];
-}
-
 inline Color Position::side_to_move() const {
   return sideToMove;
 }
@@ -474,10 +450,6 @@ inline bool Position::square_is_weak(Square s, Color c) const {
   return !(pieces(PAWN, opposite_color(c)) & attack_span_mask(c, s));
 }
 
-inline int Position::see_value(PieceType pt) {
-  return seeValues[pt];
-}
-
 inline Key Position::get_key() const {
   return st->key;
 }
@@ -517,8 +489,8 @@ inline bool Position::move_is_passed_pawn_push(Move m) const {
         && pawn_is_passed(c, move_to(m));
 }
 
-inline int Position::startpos_ply_counter() const {
-  return startPosPlyCounter;
+inline int Position::full_moves() const {
+  return fullMoves;
 }
 
 inline bool Position::opposite_colored_bishops() const {
@@ -535,10 +507,18 @@ inline bool Position::is_chess960() const {
   return chess960;
 }
 
+inline bool Position::move_is_capture_or_promotion(Move m) const {
+
+  assert(m != MOVE_NONE && m != MOVE_NULL);
+  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);
-  return !move_is_special(m) ? !square_is_empty(move_to(m)) : move_is_ep(m);
+  assert(m != MOVE_NONE && m != MOVE_NULL);
+
+  // Note that castle is coded as "king captures the rook"
+  return (!square_is_empty(move_to(m)) && !move_is_castle(m)) || move_is_ep(m);
 }
 
 inline PieceType Position::captured_piece_type() const {