Consolidate pawn storm types

[stockfish] / src / types.h

diff --git a/src/types.h b/src/types.h
index 2cf52ef123ef9694d9aca8772ed4b9f0183295b8..ab5e1b884864108912de21d311a02fe14e5afb5a 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -159,7 +159,6 @@ enum Phase {
 
 enum ScaleFactor {
   SCALE_FACTOR_DRAW    = 0,
 
 enum ScaleFactor {
   SCALE_FACTOR_DRAW    = 0,

-  SCALE_FACTOR_ONEPAWN = 48,

   SCALE_FACTOR_NORMAL  = 64,
   SCALE_FACTOR_MAX     = 128,
   SCALE_FACTOR_NONE    = 255
   SCALE_FACTOR_NORMAL  = 64,
   SCALE_FACTOR_MAX     = 128,
   SCALE_FACTOR_NONE    = 255


@@ -187,7 +186,7 @@ enum Value : int {
   KnightValueMg = 764,   KnightValueEg = 848,
   BishopValueMg = 826,   BishopValueEg = 891,
   RookValueMg   = 1282,  RookValueEg   = 1373,
   KnightValueMg = 764,   KnightValueEg = 848,
   BishopValueMg = 826,   BishopValueEg = 891,
   RookValueMg   = 1282,  RookValueEg   = 1373,

-  QueenValueMg  = 2526,  QueenValueEg  = 2646,
+  QueenValueMg  = 2500,  QueenValueEg  = 2670,

 
   MidgameLimit  = 15258, EndgameLimit  = 3915
 };
 
   MidgameLimit  = 15258, EndgameLimit  = 3915
 };


@@ -257,10 +256,10 @@ enum Rank : int {
 };
 
 
 };
 
 

-/// Score enum stores a middlegame and an endgame value in a single integer
-/// (enum). The least significant 16 bits are used to store the endgame value
-/// and the upper 16 bits are used to store the middlegame value. Take some
-/// care to avoid left-shifting a signed int to avoid undefined behavior.
+/// Score enum stores a middlegame and an endgame value in a single integer (enum).
+/// The least significant 16 bits are used to store the middlegame value and the
+/// upper 16 bits are used to store the endgame value. We have to take care to
+/// avoid left-shifting a signed int to avoid undefined behavior.

 enum Score : int { SCORE_ZERO };
 
 constexpr Score make_score(int mg, int eg) {
 enum Score : int { SCORE_ZERO };
 
 constexpr Score make_score(int mg, int eg) {