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

diff --git a/src/psqt.cpp b/src/psqt.cpp
index 3addc288..8a02bf72 100644
--- a/src/psqt.cpp
+++ b/src/psqt.cpp
@@ -2,7 +2,7 @@
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
   Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
-  Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+  Copyright (C) 2015-2018 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -35,36 +35,36 @@ 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) },
    { S(-11, 7), S(  6,-4), S(  7, 8), S( 3,-2) },
    { S(-18,-4), S( -2,-5), S( 19, 5), S(24, 4) },
    { S(-17, 3), S( -9, 3), S( 20,-8), S(35,-3) },
-   { S(- 6, 8), S(  5, 9), S(  3, 7), S(21,-6) },
-   { S(- 6, 8), S(- 8,-5), S( -6, 2), S(-2, 4) },
+   { S( -6, 8), S(  5, 9), S(  3, 7), S(21,-6) },
+   { S( -6, 8), S( -8,-5), S( -6, 2), S(-2, 4) },
    { S( -4, 3), S( 20,-9), S( -8, 1), S(-4,18) }
   },
   { // Knight
-   { S(-143, -97), S(-96,-82), S(-80,-46), S(-73,-14) },
-   { S( -83, -69), S(-43,-55), S(-21,-17), S(-10,  9) },
-   { S( -71, -50), S(-22,-39), S(  0, -8), S(  9, 28) },
-   { S( -25, -41), S( 18,-25), S( 43,  7), S( 47, 38) },
-   { S( -26, -46), S( 16,-25), S( 38,  2), S( 50, 41) },
-   { S( -11, -55), S( 37,-38), S( 56, -8), S( 71, 27) },
-   { S( -62, -64), S(-17,-50), S(  5,-24), S( 14, 13) },
-   { S(-195,-110), S(-66,-90), S(-42,-50), S(-29,-13) }
+   { S(-161,-105), S(-96,-82), S(-80,-46), S(-73,-14) },
+   { S( -83, -69), S(-43,-54), S(-21,-17), S(-10,  9) },
+   { S( -71, -50), S(-22,-39), S(  0, -7), S(  9, 28) },
+   { S( -25, -41), S( 18,-25), S( 43,  6), S( 47, 38) },
+   { S( -26, -46), S( 16,-25), S( 38,  3), S( 50, 40) },
+   { S( -11, -54), S( 37,-38), S( 56, -7), S( 65, 27) },
+   { S( -63, -65), S(-19,-50), S(  5,-24), S( 14, 13) },
+   { S(-195,-109), S(-67,-89), S(-42,-50), S(-29,-13) }
   },
   { // Bishop
-   { S(-54,-68), S(-23,-40), S(-35,-46), S(-44,-28) },
-   { S(-30,-43), S( 10,-17), S(  2,-23), S( -9, -5) },
-   { S(-19,-32), S( 17, -9), S( 11,-13), S(  1,  8) },
-   { S(-21,-36), S( 18,-13), S( 11,-15), S(  0,  7) },
-   { S(-21,-36), S( 14,-14), S(  6,-17), S( -1,  3) },
-   { S(-27,-35), S(  6,-13), S(  2,-10), S( -8,  1) },
-   { S(-33,-44), S(  7,-21), S( -4,-22), S(-12, -4) },
-   { S(-45,-65), S(-21,-42), S(-29,-46), S(-39,-27) }
+   { 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) },
@@ -77,24 +77,24 @@ const Score Bonus[][RANK_NB][int(FILE_NB) / 2] = {
    { S(-23, 0), S(-15, 0), S(-11, 0), S(-5, 0) }
   },
   { // Queen
-   { S( 0,-70), S(-3,-57), S(-4,-41), S(-1,-29) },
-   { S(-4,-58), S( 6,-30), S( 9,-21), S( 8, -4) },
-   { S(-2,-39), S( 6,-17), S( 9, -7), S( 9,  5) },
-   { S(-1,-29), S( 8, -5), S(10,  9), S( 7, 17) },
-   { S(-3,-27), S( 9, -5), S( 8, 10), S( 7, 23) },
-   { S(-2,-40), S( 6,-16), S( 8,-11), S(10,  3) },
-   { S(-2,-54), S( 7,-30), S( 7,-21), S( 6, -7) },
-   { S(-1,-75), S(-4,-54), S(-1,-44), S( 0,-30) }
+   { S( 0,-71), S(-4,-56), S(-3,-42), S(-1,-29) },
+   { S(-4,-56), S( 6,-30), S( 9,-21), S( 8, -5) },
+   { S(-2,-39), S( 6,-17), S( 9, -8), S( 9,  5) },
+   { S(-1,-29), S( 8, -5), S(10,  9), S( 7, 19) },
+   { S(-3,-27), S( 9, -5), S( 8, 10), S( 7, 21) },
+   { S(-2,-40), S( 6,-16), S( 8,-10), S(10,  3) },
+   { S(-2,-55), S( 7,-30), S( 7,-21), S( 6, -6) },
+   { S(-1,-74), S(-4,-55), S(-1,-43), S( 0,-30) }
   },
   { // King
-   { S(291, 28), S(344, 76), S(294,103), S(219,112) },
-   { S(289, 70), S(329,119), S(263,170), S(205,159) },
-   { S(226,109), S(271,164), S(202,195), S(136,191) },
-   { S(204,131), S(212,194), S(175,194), S(137,204) },
-   { S(177,132), S(205,187), S(143,224), S( 94,227) },
-   { S(147,118), S(188,178), S(113,199), S( 70,197) },
-   { S(116, 72), S(158,121), S( 93,142), S( 48,161) },
-   { S( 94, 30), S(120, 76), S( 78,101), S( 31,111) }
+   { 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_H - file_of(s));
-          psq[ pc][ s] = v + Bonus[pc][rank_of(s)][f];
+          File f = std::min(file_of(s), ~file_of(s));
+          psq[ pc][ s] = score + Bonus[pc][rank_of(s)][f];
           psq[~pc][~s] = -psq[pc][s];
       }
   }