X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpsqt.cpp;h=8a02bf7293e0039472311d1005621e5beee3d289;hp=3f447dc053705f340c34367d28bd0c32aacaee4d;hb=f923dc0fe5ec831c8cb682e1a856122c8964519f;hpb=9afa1d73306cb98e95acec5daf4efd65e592ceff

diff --git a/src/psqt.cpp b/src/psqt.cpp
index 3f447dc0..8a02bf72 100644
--- a/src/psqt.cpp
+++ b/src/psqt.cpp
@@ -35,7 +35,7 @@ namespace PSQT {
 // type on a given square a (middlegame, endgame) score pair is assigned. Table
 // is defined for files A..D and white side: it is symmetric for black side and
 // second half of the files.
-const Score Bonus[][RANK_NB][int(FILE_NB) / 2] = {
+constexpr Score Bonus[][RANK_NB][int(FILE_NB) / 2] = {
   { },
   { // Pawn
    { S(  0, 0), S(  0, 0), S(  0, 0), S( 0, 0) },
@@ -57,14 +57,14 @@ const Score Bonus[][RANK_NB][int(FILE_NB) / 2] = {
    { S(-195,-109), S(-67,-89), S(-42,-50), S(-29,-13) }
   },
   { // Bishop
-   { S(-44,-58), S(-13,-31), S(-25,-37), S(-34,-19) },
-   { S(-20,-34), S( 20, -9), S( 12,-14), S(  1,  4) },
-   { S( -9,-23), S( 27,  0), S( 21, -3), S( 11, 16) },
-   { S(-11,-26), S( 28, -3), S( 21, -5), S( 10, 16) },
-   { S(-11,-26), S( 27, -4), S( 16, -7), S(  9, 14) },
-   { S(-17,-24), S( 16, -2), S( 12,  0), S(  2, 13) },
-   { S(-23,-34), S( 17,-10), S(  6,-12), S( -2,  6) },
-   { S(-35,-55), S(-11,-32), S(-19,-36), S(-29,-17) }
+   { S(-64,-58), S(-13,-31), S(-25,-37), S(-34,-19) },
+   { S(-20,-34), S(  0, -9), S( 12,-14), S(  1,  4) },
+   { S( -9,-23), S( 27,  0), S(  1, -3), S( 11, 16) },
+   { S(-11,-26), S( 28, -3), S( 21, -5), S( 32, 16) },
+   { S(-11,-26), S( 27, -4), S( 16, -7), S( 31, 14) },
+   { S(-17,-24), S( 16, -2), S( -8,  0), S(  2, 13) },
+   { S(-23,-34), S( -3,-10), S(  6,-12), S( -2,  6) },
+   { S(-55,-55), S(-11,-32), S(-19,-36), S(-29,-17) }
   },
   { // Rook
    { S(-25, 0), S(-16, 0), S(-16, 0), S(-9, 0) },
@@ -87,14 +87,14 @@ const Score Bonus[][RANK_NB][int(FILE_NB) / 2] = {
    { S(-1,-74), S(-4,-55), S(-1,-43), S( 0,-30) }
   },
   { // King
-   { S(267,  0), S(320, 48), S(270, 75), S(195, 84) },
-   { S(264, 43), S(304, 92), S(238,143), S(180,132) },
-   { S(200, 83), S(245,138), S(176,167), S(110,165) },
-   { S(177,106), S(185,169), S(148,169), S(110,179) },
-   { S(149,108), S(177,163), S(115,200), S( 66,203) },
-   { S(118, 95), S(159,155), S( 84,176), S( 41,174) },
-   { S( 87, 50), S(128, 99), S( 63,122), S( 20,139) },
-   { S( 63,  9), S( 88, 55), S( 47, 80), S(  0, 90) }
+   { S(272,  0), S(325, 41), S(273, 80), S(190, 93) },
+   { S(277, 57), S(305, 98), S(241,138), S(183,131) },
+   { S(198, 86), S(253,138), S(168,165), S(120,173) },
+   { S(169,103), S(191,152), S(136,168), S(108,169) },
+   { S(145, 98), S(176,166), S(112,197), S(69, 194) },
+   { S(122, 87), S(159,164), S(85, 174), S(36, 189) },
+   { S(87,  40), S(120, 99), S(64, 128), S(25, 141) },
+   { S(64,   5), S(87,  60), S(49,  75), S(0,   75) }
   }
 };
 
@@ -112,12 +112,12 @@ void init() {
       PieceValue[MG][~pc] = PieceValue[MG][pc];
       PieceValue[EG][~pc] = PieceValue[EG][pc];
 
-      Score v = make_score(PieceValue[MG][pc], PieceValue[EG][pc]);
+      Score score = make_score(PieceValue[MG][pc], PieceValue[EG][pc]);
 
       for (Square s = SQ_A1; s <= SQ_H8; ++s)
       {
           File f = std::min(file_of(s), ~file_of(s));
-          psq[ pc][ s] = v + Bonus[pc][rank_of(s)][f];
+          psq[ pc][ s] = score + Bonus[pc][rank_of(s)][f];
           psq[~pc][~s] = -psq[pc][s];
       }
   }