X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpsqt.cpp;h=c9065cbe37289cad176c4331f18f667ff42a4ba7;hp=3baf8a86acd6f2ec0d839f41120715af027332e2;hb=8bb7a737087ca82cb97380bf06bbfa659dec1f73;hpb=c243cd5f4a8a2cd37896eff1dbc705bc69aade1f

diff --git a/src/psqt.cpp b/src/psqt.cpp
index 3baf8a86..c9065cbe 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-2017 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,39 +35,39 @@ 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( -4, 3), S( 20,-9), S( -8, 1), S(-4,18) }
+   { S(  0, 0), S(  0,  0), S(  0, 0), S( 0, 0) },
+   { S(-11,-3), S(  7, -1), S(  7, 7), S(17, 2) },
+   { S(-16,-2), S( -3,  2), S( 23, 6), S(23,-1) },
+   { S(-14, 7), S( -7, -4), S( 20,-8), S(24, 2) },
+   { S( -5,13), S( -2, 10), S( -1,-1), S(12,-8) },
+   { S(-11,16), S(-12,  6), S( -2, 1), S( 4,16) },
+   { S( -2, 1), S( 20,-12), S(-10, 6), S(-2,25) }
   },
   { // Knight
-   { S(-144, -98), 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( -62, -65), S(-17,-50), S(  5,-24), S( 14, 13) },
-   { S(-194,-109), S(-66,-89), S(-42,-50), S(-29,-13) }
+   { S(-169,-105), S(-96,-74), S(-80,-46), S(-79,-18) },
+   { S( -79, -70), S(-39,-56), S(-24,-15), S( -9,  6) },
+   { S( -64, -38), S(-20,-33), S(  4, -5), S( 19, 27) },
+   { S( -28, -36), S(  5,  0), S( 41, 13), S( 47, 34) },
+   { S( -29, -41), S( 13,-20), S( 42,  4), S( 52, 35) },
+   { S( -11, -51), S( 28,-38), S( 63,-17), S( 55, 19) },
+   { S( -67, -64), S(-21,-45), S(  6,-37), S( 37, 16) },
+   { S(-200, -98), S(-80,-89), S(-53,-53), S(-32,-16) }
   },
   { // 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( 24, -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(-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) }
   },
   { // Rook
-   { S(-25, 0), S(-16, 0), S(-16, 0), S(-9, 0) },
+   { S(-25, 0), S(-16, 0), S(-10, 5), S( 6, 5) },
    { S(-21, 0), S( -8, 0), S( -3, 0), S( 0, 0) },
    { S(-21, 0), S( -9, 0), S( -4, 0), S( 2, 0) },
    { S(-22, 0), S( -6, 0), S( -1, 0), S( 2, 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( 86, 50), S(128, 99), S( 63,122), S( 18,139) },
-   { S( 63,  9), S( 89, 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_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];
       }
   }