X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpsqt.cpp;h=c9065cbe37289cad176c4331f18f667ff42a4ba7;hp=32601c0a56cafbdaddc2f1f2e23f5582c0eb9eae;hb=8bb7a737087ca82cb97380bf06bbfa659dec1f73;hpb=578b21bbeedc41b6e0d1b2df46887b1636a78e2b
diff --git a/src/psqt.cpp b/src/psqt.cpp
index 32601c0a..c9065cbe 100644
--- a/src/psqt.cpp
+++ b/src/psqt.cpp
@@ -2,6 +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-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
@@ -17,97 +18,108 @@
along with this program. If not, see .
*/
+#include
+
#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 {
#define S(mg, eg) make_score(mg, eg)
-/// BaseTable[PieceType][Square] contains Piece-Square scores. For each piece
-/// type on a given square a (middlegame, endgame) score pair is assigned. Table
-/// is defined just for the white side; it is symmetric for the black side.
-const Score BaseTable[][SQUARE_NB] = {
+// 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.
+constexpr Score Bonus[][RANK_NB][int(FILE_NB) / 2] = {
{ },
{ // 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(-22, 4), S( 3,-6), S( 7, 8), S( 3,-1), S( 3,-1), S( 7, 8), S( 3,-6), S(-22, 4),
- S(-25,-3), S( -7,-4), S(18, 4), S(24, 5), S(24, 5), S(18, 4), S( -7,-4), S(-25,-3),
- S(-27, 1), S(-15, 2), S(15,-8), S(30,-2), S(30,-2), S(15,-8), S(-15, 2), S(-27, 1),
- S(-14, 7), S( 0,12), S(-2, 4), S(18,-3), S(18,-3), S(-2, 4), S( 0,12), S(-14, 7),
- S(-12, 8), S(-13,-5), S(-6, 1), S(-4, 7), S(-4, 7), S(-6, 1), S(-13,-5), S(-12, 8),
- S(-17, 1), S( 10,-9), S(-4, 1), S(-6,16), S(-6,16), S(-4, 1), S( 10,-9), S(-17, 1),
- 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, 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(-109,-83), S(-85,-51), S(-73,-16), S(-73,-16), S(-85,-51), S(-109,-83), S(-144,-98),
- S( -88,-68), S( -43,-53), S(-19,-21), S( -7, 14), S( -7, 14), S(-19,-21), S( -43,-53), S( -88,-68),
- S( -69,-53), S( -24,-38), S( 0, -6), S( 12, 29), S( 12, 29), S( 0, -6), S( -24,-38), S( -69,-53),
- S( -28,-42), S( 17,-27), S( 41, 5), S( 53, 40), S( 53, 40), S( 41, 5), S( 17,-27), S( -28,-42),
- S( -30,-42), S( 15,-27), S( 39, 5), S( 51, 40), S( 51, 40), S( 39, 5), S( 15,-27), S( -30,-42),
- S( -10,-53), S( 35,-38), S( 59, -6), S( 71, 29), S( 71, 29), S( 59, -6), S( 35,-38), S( -10,-53),
- S( -64,-68), S( -19,-53), S( 5,-21), S( 17, 14), S( 17, 14), S( 5,-21), S( -19,-53), S( -64,-68),
- S(-200,-98), S( -65,-83), S(-41,-51), S(-29,-16), S(-29,-16), S(-41,-51), S( -65,-83), S(-200,-98)
+ { 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(-54,-65), S(-27,-42), S(-34,-44), S(-43,-26), S(-43,-26), S(-34,-44), S(-27,-42), S(-54,-65),
- S(-29,-43), S( 8,-20), S( 1,-22), S( -8, -4), S( -8, -4), S( 1,-22), S( 8,-20), S(-29,-43),
- S(-20,-33), S( 17,-10), S( 10,-12), S( 1, 6), S( 1, 6), S( 10,-12), S( 17,-10), S(-20,-33),
- S(-19,-35), S( 18,-12), S( 11,-14), S( 2, 4), S( 2, 4), S( 11,-14), S( 18,-12), S(-19,-35),
- S(-22,-35), S( 15,-12), S( 8,-14), S( -1, 4), S( -1, 4), S( 8,-14), S( 15,-12), S(-22,-35),
- S(-28,-33), S( 9,-10), S( 2,-12), S( -7, 6), S( -7, 6), S( 2,-12), S( 9,-10), S(-28,-33),
- S(-32,-43), S( 5,-20), S( -2,-22), S(-11, -4), S(-11, -4), S( -2,-22), S( 5,-20), S(-32,-43),
- S(-49,-65), S(-22,-42), S(-29,-44), S(-38,-26), S(-38,-26), S(-29,-44), S(-22,-42), S(-49,-65)
+ { 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(-22, 3), S(-17, 3), S(-12, 3), S(-8, 3), S(-8, 3), S(-12, 3), S(-17, 3), S(-22, 3),
- S(-22, 3), S( -7, 3), S( -2, 3), S( 2, 3), S( 2, 3), S( -2, 3), S( -7, 3), S(-22, 3),
- S(-22, 3), S( -7, 3), S( -2, 3), S( 2, 3), S( 2, 3), S( -2, 3), S( -7, 3), S(-22, 3),
- S(-22, 3), S( -7, 3), S( -2, 3), S( 2, 3), S( 2, 3), S( -2, 3), S( -7, 3), S(-22, 3),
- S(-22, 3), S( -7, 3), S( -2, 3), S( 2, 3), S( 2, 3), S( -2, 3), S( -7, 3), S(-22, 3),
- S(-22, 3), S( -7, 3), S( -2, 3), S( 2, 3), S( 2, 3), S( -2, 3), S( -7, 3), S(-22, 3),
- S(-11, 3), S( 4, 3), S( 9, 3), S(13, 3), S(13, 3), S( 9, 3), S( 4, 3), S(-11, 3),
- S(-22, 3), S(-17, 3), S(-12, 3), S(-8, 3), S(-8, 3), S(-12, 3), S(-17, 3), S(-22, 3)
+ { 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) },
+ { 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) }
},
{ // Queen
- S(-2,-80), S(-2,-54), S(-2,-42), S(-2,-30), S(-2,-30), S(-2,-42), S(-2,-54), S(-2,-80),
- S(-2,-54), S( 8,-30), S( 8,-18), S( 8, -6), S( 8, -6), S( 8,-18), S( 8,-30), S(-2,-54),
- S(-2,-42), S( 8,-18), S( 8, -6), S( 8, 6), S( 8, 6), S( 8, -6), S( 8,-18), S(-2,-42),
- S(-2,-30), S( 8, -6), S( 8, 6), S( 8, 18), S( 8, 18), S( 8, 6), S( 8, -6), S(-2,-30),
- S(-2,-30), S( 8, -6), S( 8, 6), S( 8, 18), S( 8, 18), S( 8, 6), S( 8, -6), S(-2,-30),
- S(-2,-42), S( 8,-18), S( 8, -6), S( 8, 6), S( 8, 6), S( 8, -6), S( 8,-18), S(-2,-42),
- S(-2,-54), S( 8,-30), S( 8,-18), S( 8, -6), S( 8, -6), S( 8,-18), S( 8,-30), S(-2,-54),
- S(-2,-80), S(-2,-54), S(-2,-42), S(-2,-30), S(-2,-30), S(-2,-42), S(-2,-54), S(-2,-80)
+ { 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(298, 27), S(332, 81), S(273,108), S(225,116), S(225,116), S(273,108), S(332, 81), S(298, 27),
- S(287, 74), S(321,128), S(262,155), S(214,163), S(214,163), S(262,155), S(321,128), S(287, 74),
- S(224,111), S(258,165), S(199,192), S(151,200), S(151,200), S(199,192), S(258,165), S(224,111),
- S(196,135), S(230,189), S(171,216), S(123,224), S(123,224), S(171,216), S(230,189), S(196,135),
- S(173,135), S(207,189), S(148,216), S(100,224), S(100,224), S(148,216), S(207,189), S(173,135),
- S(146,111), S(180,165), S(121,192), S( 73,200), S( 73,200), S(121,192), S(180,165), S(146,111),
- S(119, 74), S(153,128), S( 94,155), S( 46,163), S( 46,163), S( 94,155), S(153,128), S(119, 74),
- S( 98, 27), S(132, 81), S( 73,108), S( 25,116), S( 25,116), S( 73,108), S(132, 81), S( 98, 27)
+ { 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) }
}
};
#undef S
-Score psq[COLOR_NB][PIECE_TYPE_NB][SQUARE_NB];
+Score psq[PIECE_NB][SQUARE_NB];
-// init() initializes piece square tables: the white halves of the tables are
-// copied from BaseTable[] adding the piece value, then the black halves of the
+// 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.
void init() {
- for (PieceType pt = PAWN; pt <= KING; ++pt)
+ for (Piece pc = W_PAWN; pc <= W_KING; ++pc)
{
- PieceValue[MG][make_piece(BLACK, pt)] = PieceValue[MG][pt];
- PieceValue[EG][make_piece(BLACK, pt)] = PieceValue[EG][pt];
+ PieceValue[MG][~pc] = PieceValue[MG][pc];
+ PieceValue[EG][~pc] = PieceValue[EG][pc];
- Score v = make_score(PieceValue[MG][pt], PieceValue[EG][pt]);
+ Score score = make_score(PieceValue[MG][pc], PieceValue[EG][pc]);
for (Square s = SQ_A1; s <= SQ_H8; ++s)
- psq[BLACK][pt][~s] = -(psq[WHITE][pt][ s] = (v + BaseTable[pt][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];
+ }
}
}