Better check evasion move sorting

[stockfish] / src / psqt.cpp

diff --git a/src/psqt.cpp b/src/psqt.cpp
index 3baf8a86acd6f2ec0d839f41120715af027332e2..e0f15c0636042b49da4268577203fc0d8b02e384 100644 (file)
--- 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,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) },
@@ -47,21 +47,21 @@ const Score Bonus[][RANK_NB][int(FILE_NB) / 2] = {
    { S( -4, 3), S( 20,-9), S( -8, 1), S(-4,18) }
   },
   { // Knight
-   { S(-144, -98), S(-96,-82), S(-80,-46), S(-73,-14) },
+   { 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( -62, -65), S(-17,-50), S(  5,-24), S( 14, 13) },
-   { S(-194,-109), S(-66,-89), S(-42,-50), S(-29,-13) }
+   { 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(-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(-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) }
@@ -93,8 +93,8 @@ const Score Bonus[][RANK_NB][int(FILE_NB) / 2] = {
    { 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( 87, 50), S(128, 99), S( 63,122), S( 20,139) },
+   { S( 63,  9), S( 88, 55), S( 47, 80), S(  0, 90) }
   }
 };
 
@@ -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];
       }
   }