Introduce variant piece values

fairy-stockfish · Dec 29, 2020 · 839509d · 839509d
1 parent 253f1d8
commit 839509d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/movepick.cpp b/src/movepick.cpp
@@ -104,7 +104,7 @@ void MovePicker::score() {
 
   for (auto& m : *this)
       if (Type == CAPTURES)
-          m.value =  int(PieceValue[MG][pos.piece_on(to_sq(m))]) * 6
+          m.value =  int(VariantPieceValue[MG][pos.piece_on(to_sq(m))]) * 6
                    + (*captureHistory)[pos.moved_piece(m)][to_sq(m)][type_of(pos.piece_on(to_sq(m)))];
 
       else if (Type == QUIETS)
@@ -118,7 +118,7 @@ void MovePicker::score() {
       else // Type == EVASIONS
       {
           if (pos.capture(m))
-              m.value =  PieceValue[MG][pos.piece_on(to_sq(m))]
+              m.value =  VariantPieceValue[MG][pos.piece_on(to_sq(m))]
                        - Value(type_of(pos.moved_piece(m)));
           else
               m.value =  (*mainHistory)[pos.side_to_move()][from_to(m)]

diff --git a/src/psqt.cpp b/src/psqt.cpp
@@ -25,6 +25,8 @@
 #include "variant.h"
 #include "misc.h"
 
+Value VariantPieceValue[PHASE_NB][PIECE_NB];
+
 namespace PSQT {
 
 #define S(mg, eg) make_score(mg, eg)
@@ -177,6 +179,9 @@ void init(const Variant* v) {
           && v->extinctionPieceTypes.find(ALL_PIECES) != v->extinctionPieceTypes.end())
           score = -make_score(mg_value(score) / 8, eg_value(score) / 8 / (1 + !pi->sliderCapture.size()));
 
+      VariantPieceValue[MG][pc] = VariantPieceValue[MG][~pc] = mg_value(score);
+      VariantPieceValue[EG][pc] = VariantPieceValue[EG][~pc] = eg_value(score);
+
       // Determine pawn rank
       std::istringstream ss(v->startFen);
       unsigned char token;

diff --git a/src/types.h b/src/types.h
@@ -470,6 +470,9 @@ constexpr Value PieceValue[PHASE_NB][PIECE_NB] = {
 static_assert(   PieceValue[MG][PIECE_TYPE_NB + 1] == PawnValueMg
               && PieceValue[EG][PIECE_TYPE_NB + 1] == PawnValueEg, "PieceValue array broken");
 
+extern Value VariantPieceValue[PHASE_NB][PIECE_NB];
+
+
 typedef int Depth;
 
 enum : int {