Clarify the mapping of files to queenside

[stockfish] / src / psqt.cpp

diff --git a/src/psqt.cpp b/src/psqt.cpp
index 26f14625551047d4b5a203c01a25a6d0ff283008..83d11cf1c1a8fe4e923e86eccf31fc2771a50733 100644 (file)
--- a/src/psqt.cpp
+++ b/src/psqt.cpp
@@ -59,46 +59,46 @@ constexpr Score Bonus[][RANK_NB][int(FILE_NB) / 2] = {
    { S(-48,-51), S( -3,-40), S(-12,-39), S(-25,-20) }
   },
   { // Rook
-   { S(-24, -2), S(-13,-6), S( -7, -3), S( 2,-2) },
-   { S(-18,-10), S(-10,-7), S( -5,  1), S( 9, 0) },
-   { S(-21, 10), S( -7,-4), S(  3,  2), S(-1,-2) },
-   { S(-13, -5), S( -5, 2), S( -4, -8), S(-6, 8) },
-   { S(-24, -8), S(-12, 5), S( -1,  4), S( 6,-9) },
-   { S(-24,  3), S( -4,-2), S(  4,-10), S(10, 7) },
-   { S( -8,  1), S(  6, 2), S( 10, 17), S(12,-8) },
-   { S(-22, 12), S(-24,-6), S( -6, 13), S( 4, 7) }
+   { S(-24, -2), S(-13,-6), S(-7, -3), S( 2,-2) },
+   { S(-18,-10), S(-10,-7), S(-5,  1), S( 9, 0) },
+   { S(-21, 10), S( -7,-4), S( 3,  2), S( 7,-2) },
+   { S(-13, -5), S( -5, 2), S(-4, -8), S(-6, 8) },
+   { S(-24, -8), S(-12, 5), S(-1,  4), S( 6,-9) },
+   { S(-24,  3), S( -4,-2), S( 4,-10), S(10, 7) },
+   { S( -8,  1), S(  6, 2), S(10, 17), S(12,-8) },
+   { S(-22, 12), S(-24,-6), S(-6, 13), S( 4, 7) }
   },
   { // Queen
-   { S(  3,-69), S(-5,-57), S(-5,-47), S( 4,-26) },
-   { S( -3,-55), S( 5,-31), S( 8,-22), S(12, -4) },
-   { S( -3,-39), S( 6,-18), S(13, -9), S( 7,  3) },
-   { S(  4,-23), S( 5, -3), S( 9, 13), S( 8, 24) },
-   { S(  0,-29), S(14, -6), S(12,  9), S( 5, 21) },
-   { S( -4,-38), S(10,-18), S( 6,-12), S( 8,  1) },
-   { S( -5,-50), S( 6,-27), S(10,-24), S( 8, -8) },
-   { S( -2,-75), S(-2,-52), S( 1,-43), S(-2,-36) }
+   { S( 3,-69), S(-5,-57), S(-5,-47), S( 4,-26) },
+   { S(-3,-55), S( 5,-31), S( 8,-22), S(12, -4) },
+   { S(-3,-39), S( 6,-18), S(13, -9), S( 7,  3) },
+   { S( 4,-23), S( 5, -3), S( 9, 13), S( 8, 24) },
+   { S( 0,-29), S(14, -6), S(12,  9), S( 5, 21) },
+   { S(-4,-38), S(10,-18), S( 6,-12), S( 8,  1) },
+   { S(-5,-50), S( 6,-27), S(10,-24), S( 8, -8) },
+   { S(-2,-75), S(-2,-52), S( 1,-43), S(-2,-36) }
   },
   { // King
    { 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) }
+   { 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) }
   }
 };
 
 constexpr Score PBonus[RANK_NB][FILE_NB] =
   { // Pawn (asymmetric distribution)
    { },
-   { S(  0,-10), S( -5,-3), S( 10,  7), S( 13, -1), S( 21,  7), S( 17,  6), S(  6,  1), S( -3,-20) },
-   { S(-11, -6), S(-10,-6), S( 15, -1), S( 22, -1), S( 26, -1), S( 28,  2), S(  4, -2), S(-24, -5) },
-   { S( -9,  4), S(-18,-5), S(  8, -4), S( 22, -5), S( 33, -6), S( 25,-13), S( -4, -3), S(-16, -7) },
-   { S(  6, 18), S( -3, 2), S(-10,  2), S(  1, -9), S( 12,-13), S(  6, -8), S(-12, 11), S(  1,  9) },
-   { S( -6, 25), S( -8,17), S(  5, 19), S( 11, 29), S(-14, 29), S(  0,  8), S(-12,  4), S(-14, 12) },
-   { S(-10, -1), S(  6,-6), S( -5, 18), S(-11, 22), S( -2, 22), S(-14, 17), S( 12,  2), S( -1,  9) }
+   { S(  3,-10), S(  3, -6), S( 10, 10), S( 19,  0), S( 16, 14), S( 19,  7), S(  7, -5), S( -5,-19) },
+   { S( -9,-10), S(-15,-10), S( 11,-10), S( 15,  4), S( 32,  4), S( 22,  3), S(  5, -6), S(-22, -4) },
+   { S( -8,  6), S(-23, -2), S(  6, -8), S( 20, -4), S( 40,-13), S( 17,-12), S(  4,-10), S(-12, -9) },
+   { S( 13,  9), S(  0,  4), S(-13,  3), S(  1,-12), S( 11,-12), S( -2, -6), S(-13, 13), S(  5,  8) },
+   { S( -5, 28), S(-12, 20), S( -7, 21), S( 22, 28), S( -8, 30), S( -5,  7), S(-15,  6), S(-18, 13) },
+   { S( -7,  0), S(  7,-11), S( -3, 12), S(-13, 21), S(  5, 25), S(-16, 19), S( 10,  4), S( -8,  7) }
   };
 
 #undef S
@@ -119,7 +119,7 @@ void init() {
 
       for (Square s = SQ_A1; s <= SQ_H8; ++s)
       {
-          File f = std::min(file_of(s), ~file_of(s));
+          File f = map_to_queenside(file_of(s));
           psq[ pc][ s] = score + (type_of(pc) == PAWN ? PBonus[rank_of(s)][file_of(s)]
                                                       : Bonus[pc][rank_of(s)][f]);
           psq[~pc][~s] = -psq[pc][s];