Unify do_ep_move()

[stockfish] / src / position.h

diff --git a/src/position.h b/src/position.h
index 2762d2f88f72392b35db97b33669b349c6164488..e3fa28d17d0f4074087ee519c3ea05237d403c53 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -248,10 +248,6 @@ public:
   static bool pawn_is_isolated(Bitboard ourPawns, Square s);
   static bool pawn_is_doubled(Bitboard ourPawns, Color c, Square s);
 
   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;
 
   // Weak squares
   bool square_is_weak(Square s, Color c) const;
 


@@ -267,6 +263,7 @@ public:
   int see(Square from, Square to) const;
   int see(Move m) const;
   int see(Square to) const;
   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;
 
   // Accessing hash keys
   Key get_key() const;


@@ -313,10 +310,9 @@ private:
   void allow_ooo(Color c);
 
   // Helper functions for doing and undoing moves
   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_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 undo_castle_move(Move m);
   void undo_promotion_move(Move m);
   void undo_ep_move(Move m);


@@ -604,14 +600,6 @@ inline bool Position::pawn_is_doubled(Bitboard ourPawns, Color c, Square s) {
   return ourPawns & squares_behind(c, 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));
 }
 inline bool Position::square_is_weak(Square s, Color c) const {
   return !(pawns(c) & outpost_mask(opposite_color(c), s));
 }


@@ -655,8 +643,8 @@ inline Value Position::non_pawn_material(Color c) const {
 inline Phase Position::game_phase() const {
 
   // Values modified by Joona Kiiski
 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);
 
 
   Value npm = non_pawn_material(WHITE) + non_pawn_material(BLACK);