X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpsqt.cpp;h=cfade2951ff9b5d53aa7a4b8b681433f9401a973;hp=cbdce81a26ed4da3c9b03f4cba5ed93f5c7325d9;hb=5ebdc40f8301745b4f8023e595ca2ddde74aa647;hpb=96362fe3df141eeead4bdb863d2bb2d891886abf
diff --git a/src/psqt.cpp b/src/psqt.cpp
index cbdce81a..cfade295 100644
--- a/src/psqt.cpp
+++ b/src/psqt.cpp
@@ -1,8 +1,6 @@
/*
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-2018 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+ Copyright (C) 2004-2021 The Stockfish developers (see AUTHORS file)
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,108 +16,112 @@
along with this program. If not, see .
*/
+
+#include "psqt.h"
+
#include
+#include "bitboard.h"
#include "types.h"
-Value PieceValue[PHASE_NB][PIECE_NB] = {
- { VALUE_ZERO, PawnValueMg, KnightValueMg, BishopValueMg, RookValueMg, QueenValueMg },
- { VALUE_ZERO, PawnValueEg, KnightValueEg, BishopValueEg, RookValueEg, QueenValueEg }
-};
-namespace PSQT {
+namespace
+{
-#define S(mg, eg) make_score(mg, eg)
+auto constexpr S = make_score;
-// Bonus[PieceType][Square / 2] contains Piece-Square scores. For each piece
-// 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] = {
+// 'Bonus' contains Piece-Square parameters.
+// Scores are explicit for files A to D, implicitly mirrored for E to H.
+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) }
- },
{ // Knight
- { 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) }
+ { S(-175, -96), S(-92,-65), S(-74,-49), S(-73,-21) },
+ { S( -77, -67), S(-41,-54), S(-27,-18), S(-15, 8) },
+ { S( -61, -40), S(-17,-27), S( 6, -8), S( 12, 29) },
+ { S( -35, -35), S( 8, -2), S( 40, 13), S( 49, 28) },
+ { S( -34, -45), S( 13,-16), S( 44, 9), S( 51, 39) },
+ { S( -9, -51), S( 22,-44), S( 58,-16), S( 53, 17) },
+ { S( -67, -69), S(-27,-50), S( 4,-51), S( 37, 12) },
+ { S(-201,-100), S(-83,-88), S(-56,-56), S(-26,-17) }
},
{ // 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( 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) }
+ { S(-37,-40), S(-4 ,-21), S( -6,-26), S(-16, -8) },
+ { S(-11,-26), S( 6, -9), S( 13,-12), S( 3, 1) },
+ { S(-5 ,-11), S( 15, -1), S( -4, -1), S( 12, 7) },
+ { S(-4 ,-14), S( 8, -4), S( 18, 0), S( 27, 12) },
+ { S(-8 ,-12), S( 20, -1), S( 15,-10), S( 22, 11) },
+ { S(-11,-21), S( 4, 4), S( 1, 3), S( 8, 4) },
+ { S(-12,-22), S(-10,-14), S( 4, -1), S( 0, 1) },
+ { S(-34,-32), S( 1,-29), S(-10,-26), S(-16,-17) }
},
{ // Rook
- { S(-25, 0), S(-16, 0), S(-16, 0), S(-9, 0) },
- { 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) },
- { S(-22, 0), S( -7, 0), S( 0, 0), S( 1, 0) },
- { S(-21, 0), S( -7, 0), S( 0, 0), S( 2, 0) },
- { S(-12, 0), S( 4, 0), S( 8, 0), S(12, 0) },
- { S(-23, 0), S(-15, 0), S(-11, 0), S(-5, 0) }
+ { S(-31, -9), S(-20,-13), S(-14,-10), S(-5, -9) },
+ { S(-21,-12), S(-13, -9), S( -8, -1), S( 6, -2) },
+ { S(-25, 6), S(-11, -8), S( -1, -2), S( 3, -6) },
+ { S(-13, -6), S( -5, 1), S( -4, -9), S(-6, 7) },
+ { S(-27, -5), S(-15, 8), S( -4, 7), S( 3, -6) },
+ { S(-22, 6), S( -2, 1), S( 6, -7), S(12, 10) },
+ { S( -2, 4), S( 12, 5), S( 16, 20), S(18, -5) },
+ { S(-17, 18), S(-19, 0), S( -1, 19), S( 9, 13) }
},
{ // Queen
- { 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) }
+ { S( 3,-69), S(-5,-57), S(-5,-47), S( 4,-26) },
+ { S(-3,-54), 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,-11), S( 8, 1) },
+ { S(-5,-50), S( 6,-27), S(10,-24), S( 8, -8) },
+ { S(-2,-74), S(-2,-52), S( 1,-43), S(-2,-34) }
},
{ // 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( 87, 50), S(128, 99), S( 63,122), S( 20,139) },
- { S( 63, 9), S( 88, 55), S( 47, 80), S( 0, 90) }
+ { S(271, 1), S(327, 45), S(271, 85), S(198, 76) },
+ { S(278, 53), S(303,100), S(234,133), S(179,135) },
+ { S(195, 88), S(258,130), S(169,169), S(120,175) },
+ { S(164,103), S(190,156), S(138,172), S( 98,172) },
+ { S(154, 96), S(179,166), S(105,199), S( 70,199) },
+ { S(123, 92), S(145,172), S( 81,184), S( 31,191) },
+ { S( 88, 47), S(120,121), S( 65,116), S( 33,131) },
+ { S( 59, 11), S( 89, 59), S( 45, 73), S( -1, 78) }
}
};
-#undef S
+constexpr Score PBonus[RANK_NB][FILE_NB] =
+ { // Pawn (asymmetric distribution)
+ { },
+ { S( 2, -8), S( 4, -6), S( 11, 9), S( 18, 5), S( 16, 16), S( 21, 6), S( 9, -6), S( -3,-18) },
+ { S( -9, -9), S(-15, -7), S( 11,-10), S( 15, 5), S( 31, 2), S( 23, 3), S( 6, -8), S(-20, -5) },
+ { S( -3, 7), S(-20, 1), S( 8, -8), S( 19, -2), S( 39,-14), S( 17,-13), S( 2,-11), S( -5, -6) },
+ { S( 11, 12), S( -4, 6), S(-11, 2), S( 2, -6), S( 11, -5), S( 0, -4), S(-12, 14), S( 5, 9) },
+ { S( 3, 27), S(-11, 18), S( -6, 19), S( 22, 29), S( -8, 30), S( -5, 9), S(-14, 8), S(-11, 14) },
+ { S( -7, -1), S( 6,-14), S( -2, 13), S(-11, 22), S( 4, 24), S(-14, 17), S( 10, 7), S( -9, 7) }
+ };
+
+} // namespace
+
+
+namespace PSQT
+{
Score psq[PIECE_NB][SQUARE_NB];
-// init() initializes piece-square tables: the white halves of the tables are
-// copied from Bonus[] adding the piece value, then the black halves of the
-// tables are initialized by flipping and changing the sign of the white scores.
+// PSQT::init() initializes piece-square tables: the white halves of the tables are
+// copied from Bonus[] and PBonus[], adding the piece value, then the black halves of
+// the tables are initialized by flipping and changing the sign of the white scores.
void init() {
- for (Piece pc = W_PAWN; pc <= W_KING; ++pc)
+ for (Piece pc : {W_PAWN, W_KNIGHT, W_BISHOP, W_ROOK, W_QUEEN, W_KING})
{
- PieceValue[MG][~pc] = PieceValue[MG][pc];
- PieceValue[EG][~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_of(s));
- psq[ pc][ s] = score + Bonus[pc][rank_of(s)][f];
- psq[~pc][~s] = -psq[pc][s];
- }
+ Score score = make_score(PieceValue[MG][pc], PieceValue[EG][pc]);
+
+ for (Square s = SQ_A1; s <= SQ_H8; ++s)
+ {
+ File f = File(edge_distance(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][flip_rank(s)] = -psq[pc][s];
+ }
}
}