Document and cleanup new effective-single-reply code

[stockfish] / src / position.h

diff --git a/src/position.h b/src/position.h
index eecf53527a7e169a33119ba5461a1bd2bebd8228..a1d53f042c8cb111124746c0b68919bb6285ddb5 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -236,7 +236,7 @@ public:
   // Doing and undoing moves
   void saveState();
   void do_move(Move m, StateInfo& st);
   // Doing and undoing moves
   void saveState();
   void do_move(Move m, StateInfo& st);

-  void do_move(Move m, StateInfo& st, Bitboard dcCandidates, bool moveCanBeCheck = true);
+  void do_move(Move m, StateInfo& st, const CheckInfo& ci, bool moveIsCheck);

   void undo_move(Move m);
   void do_null_move(StateInfo& st);
   void undo_null_move();
   void undo_move(Move m);
   void do_null_move(StateInfo& st);
   void undo_null_move();


@@ -249,13 +249,13 @@ public:
 
   // Accessing hash keys
   Key get_key() const;
 
   // Accessing hash keys
   Key get_key() const;

+  Key get_exclusion_key() const;

   Key get_pawn_key() const;
   Key get_material_key() const;
 
   // Incremental evaluation
   Score value() const;
   Value non_pawn_material(Color c) const;
   Key get_pawn_key() const;
   Key get_material_key() const;
 
   // Incremental evaluation
   Score value() const;
   Value non_pawn_material(Color c) const;

-  Phase game_phase() const;

   Score pst_delta(Piece piece, Square from, Square to) const;
 
   // Game termination checks
   Score pst_delta(Piece piece, Square from, Square to) const;
 
   // Game termination checks


@@ -296,9 +296,6 @@ private:
   void undo_castle_move(Move m);
   void find_checkers();
 
   void undo_castle_move(Move m);
   void find_checkers();
 

-  template<PieceType Piece>
-  void update_checkers(Bitboard* pCheckersBB, Square ksq, Square from, Square to, Bitboard dcCandidates);
-

   template<bool FindPinned>
   Bitboard hidden_checkers(Color c) const;
 
   template<bool FindPinned>
   Bitboard hidden_checkers(Color c) const;
 


@@ -341,6 +338,7 @@ private:
   static Key zobMaterial[2][8][16];
   static Key zobSideToMove;
   static Score PieceSquareTable[16][64];
   static Key zobMaterial[2][8][16];
   static Key zobSideToMove;
   static Score PieceSquareTable[16][64];

+  static Key zobExclusion;

 };
 
 
 };
 
 


@@ -505,6 +503,10 @@ inline Key Position::get_key() const {
   return st->key;
 }
 
   return st->key;
 }
 

+inline Key Position::get_exclusion_key() const {
+  return st->key ^ zobExclusion;
+}
+

 inline Key Position::get_pawn_key() const {
   return st->pawnKey;
 }
 inline Key Position::get_pawn_key() const {
   return st->pawnKey;
 }


@@ -529,22 +531,6 @@ inline Value Position::non_pawn_material(Color c) const {
   return st->npMaterial[c];
 }
 
   return st->npMaterial[c];
 }
 

-inline Phase Position::game_phase() const {
-
-  // Values modified by Joona Kiiski
-  static const Value MidgameLimit = Value(15581);
-  static const Value EndgameLimit = Value(3998);
-
-  Value npm = non_pawn_material(WHITE) + non_pawn_material(BLACK);
-
-  if (npm >= MidgameLimit)
-      return PHASE_MIDGAME;
-  else if(npm <= EndgameLimit)
-      return PHASE_ENDGAME;
-  else
-      return Phase(((npm - EndgameLimit) * 128) / (MidgameLimit - EndgameLimit));
-}
-

 inline bool Position::move_is_passed_pawn_push(Move m) const {
 
   Color c = side_to_move();
 inline bool Position::move_is_passed_pawn_push(Move m) const {
 
   Color c = side_to_move();