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
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <algorithm>
+
#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)
// 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(-19, 5), S( 1,-4), S( 7, 8), S( 3,-2) },
- { S(-26,-6), S( -7,-5), S( 19, 5), S(24, 4) },
- { S(-25, 1), S(-14, 3), S( 16,-8), S(31,-3) },
- { S(-14, 6), S( 0, 9), S( -1, 7), S(17,-6) },
- { S(-14, 6), S(-13,-5), S(-10, 2), S(-6, 4) },
- { S(-12, 1), S( 15,-9), S( -8, 1), S(-4,18) },
- { 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(-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(-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) }
},
{ // Rook
{ S(-25, 0), S(-16, 0), S(-16, 0), S(-9, 0) },
{ 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(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) }
}
};
#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
+// 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)
{
- int edgeDistance = file_of(s) < FILE_E ? file_of(s) : FILE_H - file_of(s);
- psq[BLACK][pt][~s] = -(psq[WHITE][pt][s] = v + Bonus[pt][rank_of(s)][edgeDistance]);
+ 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];
}
}
}
projects / stockfish / blobdiff