Retire init_piece_square_tables()

Merge in init_zobrist() and rename the latter.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

diff --git a/src/main.cpp b/src/main.cpp
index e6dfe9344d5837a8194839aa7680927d46a75f3e..72201971a073d769e1e9388a6796ac5e4934a028 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -51,8 +51,7 @@ int main(int argc, char* argv[]) {
 
   // Startup initializations
   init_bitboards();
 
   // Startup initializations
   init_bitboards();

-  Position::init_zobrist();
-  Position::init_piece_square_tables();
+  Position::init();

   init_kpk_bitbase();
   init_search();
   Threads.init();
   init_kpk_bitbase();
   init_search();
   Threads.init();

diff --git a/src/position.cpp b/src/position.cpp
index 32321b89c6fd51da27fa6ef3820c7ed02e026315..adeef6ec06d3164762b6c3949da8fb20b683e9aa 100644 (file)
--- a/src/position.cpp
+++ b/src/position.cpp
@@ -1788,10 +1788,14 @@ bool Position::is_mate() const {
 }
 
 
 }
 
 

-/// Position::init_zobrist() is a static member function which initializes at
-/// startup the various arrays used to compute hash keys.
+/// Position::init() is a static member function which initializes at
+/// startup the various arrays used to compute hash keys and the piece
+/// square tables. The latter is a two-step operation: First, the white
+/// halves of the tables are copied from the MgPST[][] and EgPST[][] arrays.
+/// Second, the black halves of the tables are initialized by mirroring
+/// and changing the sign of the corresponding white scores.

 
 

-void Position::init_zobrist() {
+void Position::init() {

 
   RKISS rk;
 
 
   RKISS rk;
 


@@ -1808,16 +1812,6 @@ void Position::init_zobrist() {
 
   zobSideToMove = rk.rand<Key>();
   zobExclusion  = rk.rand<Key>();
 
   zobSideToMove = rk.rand<Key>();
   zobExclusion  = rk.rand<Key>();

-}
-
-
-/// Position::init_piece_square_tables() initializes the piece square tables.
-/// This is a two-step operation: First, the white halves of the tables are
-/// copied from the MgPST[][] and EgPST[][] arrays. Second, the black halves
-/// of the tables are initialized by mirroring and changing the sign of the
-/// corresponding white scores.
-
-void Position::init_piece_square_tables() {

 
   for (Square s = SQ_A1; s <= SQ_H8; s++)
       for (Piece p = WP; p <= WK; p++)
 
   for (Square s = SQ_A1; s <= SQ_H8; s++)
       for (Piece p = WP; p <= WK; p++)

diff --git a/src/position.h b/src/position.h
index 56f5546936650d751db0e14f081120ac49b6b9e2..6307f126a4a613652c1f76ebef662f01babad9f7 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -247,9 +247,8 @@ public:
   // Position consistency check, for debugging
   bool is_ok(int* failedStep = NULL) const;
 
   // Position consistency check, for debugging
   bool is_ok(int* failedStep = NULL) const;
 

-  // Static member functions
-  static void init_zobrist();
-  static void init_piece_square_tables();
+  // Global initialization
+  static void init();

 
 private:
 
 
 private: