Retire Phase type

Following the previous commit, retire the associated Phase type for tapered evaluations Non-regression STC: LLR: 3.00/2.94<-6.00, 0.00> Elo diff: 2.75 [-0.91, 6.41] (95%) Games: 6441 W: 744 L: 693 D: 5004 Draw ratio: 77.7% Pntl: [23, 469, 2197, 496, 35] No functional change
ruicoelhopedro · May 10, 2024 · 61f586e · 61f586e
1 parent c05147d
commit 61f586e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 34 deletions.
diff --git a/src/Position.cpp b/src/Position.cpp
@@ -85,8 +85,7 @@ Board::Board()
 
 
 Board::Board(std::string fen)
-    : m_hash(0),
-      m_phase(Phases::Total)
+    : m_hash(0)
 {
     auto c = fen.cbegin();
 
@@ -499,22 +498,18 @@ bool Board::is_valid() const
         return false;
 
     // Material and phase evaluation
-    uint8_t phase = Phases::Total;
     NNUE::Accumulator acc[2];
     for (PieceType piece : { PAWN, KNIGHT, BISHOP, ROOK, QUEEN, KING })
         for (Turn turn : { WHITE, BLACK })
         {
             Bitboard bb = get_pieces(turn, piece);
-            phase -= bb.count() * Phases::Pieces[piece];
             while (bb)
             {
                 Square s = bb.bitscan_forward_reset();
                 acc[WHITE].push(piece, s, m_king_sq[WHITE], turn, WHITE);
                 acc[BLACK].push(piece, s, m_king_sq[BLACK], turn, BLACK);
             }
         }
-    if (phase != m_phase)
-        return false;
     if (acc[WHITE] != m_acc[WHITE] || acc[BLACK] != m_acc[BLACK])
         return false;
 
@@ -660,12 +655,6 @@ Score Board::see(Move move, Score threshold) const
 }
 
 
-uint8_t Board::phase() const
-{
-    return m_phase;
-}
-
-
 bool Board::legal(Move move) const
 {
     // Same source and destination squares?

diff --git a/src/Position.hpp b/src/Position.hpp
@@ -30,7 +30,6 @@ class Board
     Hash m_hash;
     Bitboard m_checkers;
     NNUE::Accumulator m_acc[NUM_COLORS];
-    uint8_t m_phase;
     Piece m_board_pieces[NUM_SQUARES];
 
 protected:
@@ -484,7 +483,6 @@ class Board
         m_board_pieces[square] = get_piece(piece, turn);
         m_acc[WHITE].push(piece, square, m_king_sq[WHITE], turn, WHITE);
         m_acc[BLACK].push(piece, square, m_king_sq[BLACK], turn, BLACK);
-        m_phase -= Phases::Pieces[piece];
     }
 
 
@@ -495,7 +493,6 @@ class Board
         m_board_pieces[square] = NO_PIECE;
         m_acc[WHITE].pop(piece, square, m_king_sq[WHITE], turn, WHITE);
         m_acc[BLACK].pop(piece, square, m_king_sq[BLACK], turn, BLACK);
-        m_phase += Phases::Pieces[piece];
     }
 
 
@@ -654,9 +651,6 @@ class Board
     Score see(Move move, Score threshold = 0) const;
 
 
-    uint8_t phase() const;
-
-
     bool legal(Move move) const;
 
 

diff --git a/src/Types.hpp b/src/Types.hpp
@@ -140,22 +140,6 @@ enum ScoreType : Score
     SCORE_NONE = 32002
 };
 
-
-namespace Phases
-{
-    constexpr int Pawn = 0;
-    constexpr int Knight = 1;
-    constexpr int Bishop = 1;
-    constexpr int Rook = 2;
-    constexpr int Queen = 4;
-    constexpr int King = 0;
-    constexpr int Pieces[NUM_PIECE_TYPES] = { Pawn, Knight, Bishop, Rook, Queen, King };
-    constexpr int Total = 16 * Pawn + 4 * Knight + 4 * Bishop + 4 * Rook + 2 * Queen + 2 * King;
-
-    constexpr int MgLimit = 4;
-    constexpr int EgLimit = 19;
-}
-
 constexpr Score ScoreToCp = 200;
 
 constexpr Score   PawnValue(  125);