Retire pieces_of_color_and_type()

[stockfish] / src / position.h

diff --git a/src/position.h b/src/position.h
index 2762d2f88f72392b35db97b33669b349c6164488..16e72519f130ee01820423928c217585ace81f04 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -133,7 +133,7 @@ public:
   };
 
   // Constructors
-  Position() {};
+  Position() {}
   Position(const Position& pos);
   Position(const std::string& fen);
 
@@ -163,7 +163,6 @@ public:
   Bitboard occupied_squares() const;
   Bitboard pieces_of_color(Color c) const;
   Bitboard pieces_of_type(PieceType pt) const;
-  Bitboard pieces_of_color_and_type(Color c, PieceType pt) const;
   Bitboard pawns() const;
   Bitboard knights() const;
   Bitboard bishops() const;
@@ -236,10 +235,7 @@ public:
   bool move_is_check(Move m) const;
   bool move_is_check(Move m, Bitboard dcCandidates) const;
   bool move_is_capture(Move m) const;
-  bool move_is_deep_pawn_push(Move m) const;
-  bool move_is_pawn_push_to_7th(Move m) const;
   bool move_is_passed_pawn_push(Move m) const;
-  bool move_was_passed_pawn_push(Move m) const;
   bool move_attacks_square(Move m, Square s) const;
 
   // Information about pawns
@@ -248,10 +244,6 @@ public:
   static bool pawn_is_isolated(Bitboard ourPawns, Square s);
   static bool pawn_is_doubled(Bitboard ourPawns, Color c, Square s);
 
-  // Open and half-open files
-  static bool file_is_open(Bitboard pawns, File f);
-  static bool file_is_half_open(Bitboard pawns, File f);
-
   // Weak squares
   bool square_is_weak(Square s, Color c) const;
 
@@ -267,6 +259,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;
@@ -313,13 +306,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(Bitboard& key, 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);
   void find_checkers();
 
   template<PieceType Piece>
@@ -349,7 +338,7 @@ private:
 
   // Piece lists
   Square pieceList[2][8][16]; // [color][pieceType][index]
-  int index[64];
+  int index[64]; // [square]
 
   // Other info
   Square kingSquare[2];
@@ -424,10 +413,6 @@ inline Bitboard Position::pieces_of_type(PieceType pt) const {
   return byTypeBB[pt];
 }
 
-inline Bitboard Position::pieces_of_color_and_type(Color c, PieceType pt) const {
-  return pieces_of_color(c) & pieces_of_type(pt);
-}
-
 inline Bitboard Position::pawns() const {
   return pieces_of_type(PAWN);
 }
@@ -465,35 +450,35 @@ inline Bitboard Position::sliders() const {
 }
 
 inline Bitboard Position::pawns(Color c) const {
-  return pieces_of_color_and_type(c, PAWN);
+  return pieces_of_color(c) & pieces_of_type(PAWN);
 }
 
 inline Bitboard Position::knights(Color c) const {
-  return pieces_of_color_and_type(c, KNIGHT);
+  return pieces_of_color(c) & pieces_of_type(KNIGHT);
 }
 
 inline Bitboard Position::bishops(Color c) const {
-  return pieces_of_color_and_type(c, BISHOP);
+  return pieces_of_color(c) & pieces_of_type(BISHOP);
 }
 
 inline Bitboard Position::rooks(Color c) const {
-  return pieces_of_color_and_type(c, ROOK);
+  return pieces_of_color(c) & pieces_of_type(ROOK);
 }
 
 inline Bitboard Position::queens(Color c) const {
-  return pieces_of_color_and_type(c, QUEEN);
+  return pieces_of_color(c) & pieces_of_type(QUEEN);
 }
 
 inline Bitboard Position::kings(Color c) const {
-  return pieces_of_color_and_type(c, KING);
+  return pieces_of_color(c) & pieces_of_type(KING);
 }
 
 inline Bitboard Position::rooks_and_queens(Color c) const {
-  return rooks_and_queens() & pieces_of_color(c);
+  return pieces_of_color(c) & rooks_and_queens();
 }
 
 inline Bitboard Position::bishops_and_queens(Color c) const {
-  return bishops_and_queens() & pieces_of_color(c);
+  return pieces_of_color(c) & bishops_and_queens();
 }
 
 inline int Position::piece_count(Color c, PieceType pt) const {
@@ -604,14 +589,6 @@ inline bool Position::pawn_is_doubled(Bitboard ourPawns, Color c, Square s) {
   return ourPawns & squares_behind(c, s);
 }
 
-inline bool Position::file_is_open(Bitboard pawns, File f) {
-  return !(pawns & file_bb(f));
-}
-
-inline bool Position::file_is_half_open(Bitboard pawns, File f) {
-  return !(pawns & file_bb(f));
-}
-
 inline bool Position::square_is_weak(Square s, Color c) const {
   return !(pawns(c) & outpost_mask(opposite_color(c), s));
 }
@@ -655,8 +632,8 @@ inline Value Position::non_pawn_material(Color c) const {
 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);
 
@@ -668,20 +645,6 @@ inline Phase Position::game_phase() const {
       return Phase(((npm - EndgameLimit) * 128) / (MidgameLimit - EndgameLimit));
 }
 
-inline bool Position::move_is_deep_pawn_push(Move m) const {
-
-  Color c = side_to_move();
-  return   piece_on(move_from(m)) == piece_of_color_and_type(c, PAWN)
-        && relative_rank(c, move_to(m)) > RANK_4;
-}
-
-inline bool Position::move_is_pawn_push_to_7th(Move m) const {
-
-  Color c = side_to_move();
-  return   piece_on(move_from(m)) == piece_of_color_and_type(c, PAWN)
-        && relative_rank(c, move_to(m)) == RANK_7;
-}
-
 inline bool Position::move_is_passed_pawn_push(Move m) const {
 
   Color c = side_to_move();
@@ -689,13 +652,6 @@ inline bool Position::move_is_passed_pawn_push(Move m) const {
         && pawn_is_passed(c, move_to(m));
 }
 
-inline bool Position::move_was_passed_pawn_push(Move m) const {
-
-  Color c = opposite_color(side_to_move());
-  return   piece_on(move_to(m)) == piece_of_color_and_type(c, PAWN)
-        && pawn_is_passed(c, move_to(m));
-}
-
 inline int Position::rule_50_counter() const {
 
   return st->rule50;