Merge hash key computation functions

[stockfish] / src / position.h

diff --git a/src/position.h b/src/position.h
index 4aa0efb60bfb4998de0d33d7148f4ab5bfca5110..ded55d7b80d99b6ee56267b3ce7237b6ed0aa74a 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -171,6 +171,9 @@ private:
   // Initialization helpers (used while setting up a position)
   void clear();
   void set_castling_right(Color c, Square rfrom);
+  void compute_keys(StateInfo* si) const;
+  void compute_non_pawn_material(StateInfo* si) const;
+  Score compute_psq_score() const;
 
   // Helper functions
   void do_castling(Square kfrom, Square kto, Square rfrom, Square rto);
@@ -179,15 +182,6 @@ private:
   void remove_piece(Square s, Color c, PieceType pt);
   void move_piece(Square from, Square to, Color c, PieceType pt);
 
-  // Computing hash keys from scratch (for initialization and debugging)
-  Key compute_key() const;
-  Key compute_pawn_key() const;
-  Key compute_material_key() const;
-
-  // Computing incremental evaluation scores and material counts
-  Score compute_psq_score() const;
-  Value compute_non_pawn_material(Color c) const;
-
   // Board and pieces
   Piece board[SQUARE_NB];
   Bitboard byTypeBB[PIECE_TYPE_NB];