Move game_phase() to material.cpp

For some reason, although game phase is used
only in material, it is computed in Position.

Move computation to material, where it belongs,
and remove the useless call chain.

No functional change.

diff --git a/src/material.cpp b/src/material.cpp
index 114f083171fe748423c83070cb619d853ad44096..d67b95cae96413746d77176e1dcf9bcb31c73b98 100644 (file)
--- a/src/material.cpp
+++ b/src/material.cpp
@@ -60,8 +60,8 @@ namespace {
 
   // QueenMinorsImbalance[opp_minor_count] is applied when only one side has a queen.
   // It contains a bonus/malus for the side with the queen.
 
   // QueenMinorsImbalance[opp_minor_count] is applied when only one side has a queen.
   // It contains a bonus/malus for the side with the queen.

-  const int QueenMinorsImbalance[16] = { 
-    31, -8, -15, -25, -5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+  const int QueenMinorsImbalance[13] = {
+    31, -8, -15, -25, -5

   };
 
   // Endgame evaluation and scaling functions are accessed directly and not through
   };
 
   // Endgame evaluation and scaling functions are accessed directly and not through


@@ -144,7 +144,13 @@ Entry* probe(const Position& pos) {
   std::memset(e, 0, sizeof(Entry));
   e->key = key;
   e->factor[WHITE] = e->factor[BLACK] = (uint8_t)SCALE_FACTOR_NORMAL;
   std::memset(e, 0, sizeof(Entry));
   e->key = key;
   e->factor[WHITE] = e->factor[BLACK] = (uint8_t)SCALE_FACTOR_NORMAL;

-  e->gamePhase = pos.game_phase();
+
+  Value npm_w = pos.non_pawn_material(WHITE);
+  Value npm_b = pos.non_pawn_material(BLACK);
+  Value npm = std::max(EndgameLimit, std::min(npm_w + npm_b, MidgameLimit));
+
+  // Map total non-pawn material into [PHASE_ENDGAME, PHASE_MIDGAME]
+  e->gamePhase = Phase(((npm - EndgameLimit) * PHASE_MIDGAME) / (MidgameLimit - EndgameLimit));

 
   // Let's look if we have a specialized evaluation function for this particular
   // material configuration. Firstly we look for a fixed configuration one, then
 
   // Let's look if we have a specialized evaluation function for this particular
   // material configuration. Firstly we look for a fixed configuration one, then


@@ -181,9 +187,6 @@ Entry* probe(const Position& pos) {
         e->scalingFunction[c] = &ScaleKQKRPs[c];
   }
 
         e->scalingFunction[c] = &ScaleKQKRPs[c];
   }
 

-  Value npm_w = pos.non_pawn_material(WHITE);
-  Value npm_b = pos.non_pawn_material(BLACK);
-

   if (npm_w + npm_b == VALUE_ZERO && pos.pieces(PAWN)) // Only pawns on the board
   {
       if (!pos.count<PAWN>(BLACK))
   if (npm_w + npm_b == VALUE_ZERO && pos.pieces(PAWN)) // Only pawns on the board
   {
       if (!pos.count<PAWN>(BLACK))

diff --git a/src/position.cpp b/src/position.cpp
index 5df07a092433c3dd1975102722840fb696a110fe..49935904bdc5b03afa2418bd342140a000861fe6 100644 (file)
--- a/src/position.cpp
+++ b/src/position.cpp
@@ -450,19 +450,6 @@ const string Position::fen() const {
 }
 
 
 }
 
 

-/// Position::game_phase() calculates the game phase interpolating total non-pawn
-/// material between endgame and midgame limits.
-
-Phase Position::game_phase() const {
-
-  Value npm = st->nonPawnMaterial[WHITE] + st->nonPawnMaterial[BLACK];
-
-  npm = std::max(EndgameLimit, std::min(npm, MidgameLimit));
-
-  return Phase(((npm - EndgameLimit) * PHASE_MIDGAME) / (MidgameLimit - EndgameLimit));
-}
-
-

 /// Position::slider_blockers() returns a bitboard of all the pieces (both colors)
 /// that are blocking attacks on the square 's' from 'sliders'. A piece blocks a
 /// slider if removing that piece from the board would result in a position where
 /// Position::slider_blockers() returns a bitboard of all the pieces (both colors)
 /// that are blocking attacks on the square 's' from 'sliders'. A piece blocks a
 /// slider if removing that piece from the board would result in a position where

diff --git a/src/position.h b/src/position.h
index 22afb3e13278be4e09d8f363e445bcbf4a75864c..ce526b91430790fe43d58642b79b2f09ac79a8eb 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -146,7 +146,6 @@ public:
 
   // Other properties of the position
   Color side_to_move() const;
 
   // Other properties of the position
   Color side_to_move() const;

-  Phase game_phase() const;

   int game_ply() const;
   bool is_chess960() const;
   Thread* this_thread() const;
   int game_ply() const;
   bool is_chess960() const;
   Thread* this_thread() const;