X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpsqt.cpp;h=36d99feb7e05280ce9ee6aacc9ab84aec8ebd8d8;hp=9f54069f80af14907e8a1ff87c98c3c233aa9578;hb=a016626825972d546d2e4ef6abd2e55f7bf2f3dc;hpb=883367d21749eb91a5a3737338b5a7f507751a5a

diff --git a/src/psqt.cpp b/src/psqt.cpp
index 9f54069f..36d99feb 100644
--- a/src/psqt.cpp
+++ b/src/psqt.cpp
@@ -49,56 +49,56 @@ constexpr Score Bonus[][RANK_NB][int(FILE_NB) / 2] = {
    { S(-200, -98), S(-80,-89), S(-53,-53), S(-32,-16) }
   },
   { // Bishop
-   { S(-49,-58), S(- 7,-31), S(-10,-37), S(-34,-19) },
-   { S(-24,-34), S(  9, -9), S( 15,-14), S(  1,  4) },
-   { S( -9,-23), S( 22,  0), S( -3, -3), S( 12, 16) },
-   { S(  4,-26), S(  9, -3), S( 18, -5), S( 40, 16) },
-   { S( -8,-26), S( 27, -4), S( 13, -7), S( 30, 14) },
-   { S(-17,-24), S( 14, -2), S( -6,  0), S(  6, 13) },
-   { S(-19,-34), S(-13,-10), S(  7,-12), S(-11,  6) },
-   { S(-47,-55), S( -7,-32), S(-17,-36), S(-29,-17) }
+   { S(-44,-63), S( -4,-30), S(-11,-35), S(-28, -8) },
+   { S(-18,-38), S(  7,-13), S( 14,-14), S(  3,  0) },
+   { S( -8,-18), S( 24,  0), S( -3, -7), S( 15, 13) },
+   { S(  1,-26), S(  8, -3), S( 26,  1), S( 37, 16) },
+   { S( -7,-24), S( 30, -6), S( 23,-10), S( 28, 17) },
+   { S(-17,-26), S(  4,  2), S( -1,  1), S(  8, 16) },
+   { S(-21,-34), S(-19,-18), S( 10, -7), S( -6,  9) },
+   { S(-48,-51), S( -3,-40), S(-12,-39), S(-25,-20) }
   },
   { // Rook
-   { S(-24, 0), S(-15, 3), S( -8, 0), S( 0, 3) },
-   { S(-18,-7), S( -5,-5), S( -1,-5), S( 1,-1) },
-   { S(-19, 6), S(-10,-7), S(  1, 3), S( 0, 3) },
-   { S(-21, 0), S( -7, 4), S( -4,-2), S(-4, 1) },
-   { S(-21,-7), S(-12, 5), S( -1,-5), S( 4,-7) },
-   { S(-23, 3), S(-10, 2), S(  1,-1), S( 6, 3) },
-   { S(-11,-1), S(  8, 7), S(  9,11), S(12,-1) },
-   { S(-25, 6), S(-18, 4), S(-11, 6), S( 2, 2) }
+   { 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) }
   },
   { // 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
-   { S(  0,  0), S(  0,  0), S(  0,  0), S(  0,  0), S(  0,  0), S(  0,  0), S(  0,  0), S(  0,  0) },
-   { S(  0,-11), S( -3, -4), S( 13, -1), S( 19, -4), S( 16, 17), S( 13,  7), S(  4,  4), S( -4,-13) },
-   { S(-16, -8), S(-12, -6), S( 20, -3), S( 21,  0), S( 25,-11), S( 29,  3), S(  0,  0), S(-27, -1) },
-   { S(-11,  3), S(-17,  6), S( 11,-10), S( 21,  1), S( 32, -6), S( 19,-11), S( -5,  0), S(-14, -2) },
-   { S(  4, 13), S(  6,  7), S( -8,  3), S(  3, -5), S(  8,-15), S( -2, -1), S(-19,  9), S( -5, 13) },
-   { S( -5, 25), S(-19, 20), S(  7, 16), S(  8, 12), S( -7, 21), S( -2,  3), S(-10, -4), S(-16, 15) },
-   { S(-10,  6), S(  9, -5), S( -7, 16), S(-12, 27), S( -7, 15), S( -8, 11), S( 16, -7), S( -8,  4) }
+constexpr Score PBonus[RANK_NB][FILE_NB] =
+  { // Pawn (asymmetric distribution)
+   { },
+   { 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