From: Marco Costalba Date: Fri, 21 Oct 2011 05:45:20 +0000 (+0100) Subject: Convert PST tables to relative values X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=c555e1aa962a6a0230be42b87a3486b3c14ada4d Convert PST tables to relative values This is a prerequisite to allow changing piece values at runtime, needed for tuning. Also use scores instead of separated midgame and endgame values. No functional change. Signed-off-by: Marco Costalba --- diff --git a/src/position.cpp b/src/position.cpp index 8408a8a3..93e34453 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -1715,11 +1715,15 @@ void Position::init() { zobExclusion = rk.rand(); for (Piece p = WP; p <= WK; p++) + { + Score ps = make_score(piece_value_midgame(p), piece_value_endgame(p)); + for (Square s = SQ_A1; s <= SQ_H8; s++) { - pieceSquareTable[p][s] = make_score(MgPST[p][s], EgPST[p][s]); + pieceSquareTable[p][s] = ps + PSQT[p][s]; pieceSquareTable[p+8][flip(s)] = -pieceSquareTable[p][s]; } + } } diff --git a/src/psqtab.h b/src/psqtab.h index f56ba9cc..cfbf4a4d 100644 --- a/src/psqtab.h +++ b/src/psqtab.h @@ -22,164 +22,75 @@ #include "types.h" -namespace { +#define S(mg, eg) make_score(mg, eg) -//// -//// Constants modified by Joona Kiiski -//// - -const Value MP = PawnValueMidgame; -const Value MK = KnightValueMidgame; -const Value MB = BishopValueMidgame; -const Value MR = RookValueMidgame; -const Value MQ = QueenValueMidgame; - -const Value EP = PawnValueEndgame; -const Value EK = KnightValueEndgame; -const Value EB = BishopValueEndgame; -const Value ER = RookValueEndgame; -const Value EQ = QueenValueEndgame; - -const int MgPST[][64] = { - { }, - {// Pawn - // A B C D E F G H - 0, 0, 0, 0, 0, 0, 0, 0, - MP-28, MP-6, MP+ 4, MP+14, MP+14, MP+ 4, MP-6, MP-28, - MP-28, MP-6, MP+ 9, MP+36, MP+36, MP+ 9, MP-6, MP-28, - MP-28, MP-6, MP+17, MP+58, MP+58, MP+17, MP-6, MP-28, - MP-28, MP-6, MP+17, MP+36, MP+36, MP+17, MP-6, MP-28, - MP-28, MP-6, MP+ 9, MP+14, MP+14, MP+ 9, MP-6, MP-28, - MP-28, MP-6, MP+ 4, MP+14, MP+14, MP+ 4, MP-6, MP-28, - 0, 0, 0, 0, 0, 0, 0, 0 - }, - {// Knight - // A B C D E F G H - MK-135, MK-107, MK-80, MK-67, MK-67, MK-80, MK-107, MK-135, - MK- 93, MK- 67, MK-39, MK-25, MK-25, MK-39, MK- 67, MK- 93, - MK- 53, MK- 25, MK+ 1, MK+13, MK+13, MK+ 1, MK- 25, MK- 53, - MK- 25, MK+ 1, MK+27, MK+41, MK+41, MK+27, MK+ 1, MK- 25, - MK- 11, MK+ 13, MK+41, MK+55, MK+55, MK+41, MK+ 13, MK- 11, - MK- 11, MK+ 13, MK+41, MK+55, MK+55, MK+41, MK+ 13, MK- 11, - MK- 53, MK- 25, MK+ 1, MK+13, MK+13, MK+ 1, MK- 25, MK- 53, - MK-193, MK- 67, MK-39, MK-25, MK-25, MK-39, MK- 67, MK-193 - }, - {// Bishop - // A B C D E F G H - MB-40, MB-40, MB-35, MB-30, MB-30, MB-35, MB-40, MB-40, - MB-17, MB+ 0, MB- 4, MB+ 0, MB+ 0, MB- 4, MB+ 0, MB-17, - MB-13, MB- 4, MB+ 8, MB+ 4, MB+ 4, MB+ 8, MB- 4, MB-13, - MB- 8, MB+ 0, MB+ 4, MB+17, MB+17, MB+ 4, MB+ 0, MB- 8, - MB- 8, MB+ 0, MB+ 4, MB+17, MB+17, MB+ 4, MB+ 0, MB- 8, - MB-13, MB- 4, MB+ 8, MB+ 4, MB+ 4, MB+ 8, MB- 4, MB-13, - MB-17, MB+ 0, MB- 4, MB+ 0, MB+ 0, MB- 4, MB+ 0, MB-17, - MB-17, MB-17, MB-13, MB- 8, MB- 8, MB-13, MB-17, MB-17 - }, - {// Rook - // A B C D E F G H - MR-12, MR-7, MR-2, MR+2, MR+2, MR-2, MR-7, MR-12, - MR-12, MR-7, MR-2, MR+2, MR+2, MR-2, MR-7, MR-12, - MR-12, MR-7, MR-2, MR+2, MR+2, MR-2, MR-7, MR-12, - MR-12, MR-7, MR-2, MR+2, MR+2, MR-2, MR-7, MR-12, - MR-12, MR-7, MR-2, MR+2, MR+2, MR-2, MR-7, MR-12, - MR-12, MR-7, MR-2, MR+2, MR+2, MR-2, MR-7, MR-12, - MR-12, MR-7, MR-2, MR+2, MR+2, MR-2, MR-7, MR-12, - MR-12, MR-7, MR-2, MR+2, MR+2, MR-2, MR-7, MR-12 - }, - {// Queen - // A B C D E F G H - MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, - MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, - MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, - MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, - MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, - MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, - MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, - MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, MQ+8, MQ+8 - }, - {// King - //A B C D E F G H - 287, 311, 262, 214, 214, 262, 311, 287, - 262, 287, 238, 190, 190, 238, 287, 262, - 214, 238, 190, 142, 142, 190, 238, 214, - 190, 214, 167, 119, 119, 167, 214, 190, - 167, 190, 142, 94, 94, 142, 190, 167, - 142, 167, 119, 69, 69, 119, 167, 142, - 119, 142, 94, 46, 46, 94, 142, 119, - 94, 119, 69, 21, 21, 69, 119, 94 - } -}; - -const int EgPST[][64] = { +// PSQT[PieceType][Square] contains Piece-Square scores. For each piece type on a +// given square a (midgame, endgame) score pair is assigned. PSQT is defined for +// white side, for black side the tables are symmetric. +static const Score PSQT[][64] = { { }, - {// Pawn - // A B C D E F G H - 0, 0, 0, 0, 0, 0, 0, 0, - EP-8, EP-8, EP-8, EP-8, EP-8, EP-8, EP-8, EP-8, - EP-8, EP-8, EP-8, EP-8, EP-8, EP-8, EP-8, EP-8, - EP-8, EP-8, EP-8, EP-8, EP-8, EP-8, EP-8, EP-8, - EP-8, EP-8, EP-8, EP-8, EP-8, EP-8, EP-8, EP-8, - EP-8, EP-8, EP-8, EP-8, EP-8, EP-8, EP-8, EP-8, - EP-8, EP-8, EP-8, EP-8, EP-8, EP-8, EP-8, EP-8, - 0, 0, 0, 0, 0, 0, 0, 0 + { // 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(-28,-8), S(-6,-8), S( 4,-8), S(14,-8), S(14,-8), S( 4,-8), S(-6,-8), S(-28,-8), + S(-28,-8), S(-6,-8), S( 9,-8), S(36,-8), S(36,-8), S( 9,-8), S(-6,-8), S(-28,-8), + S(-28,-8), S(-6,-8), S(17,-8), S(58,-8), S(58,-8), S(17,-8), S(-6,-8), S(-28,-8), + S(-28,-8), S(-6,-8), S(17,-8), S(36,-8), S(36,-8), S(17,-8), S(-6,-8), S(-28,-8), + S(-28,-8), S(-6,-8), S( 9,-8), S(14,-8), S(14,-8), S( 9,-8), S(-6,-8), S(-28,-8), + S(-28,-8), S(-6,-8), S( 4,-8), S(14,-8), S(14,-8), S( 4,-8), S(-6,-8), S(-28,-8), + S( 0, 0), S( 0, 0), S( 0, 0), S( 0, 0), S(0, 0), S( 0, 0), S( 0, 0), S( 0, 0) }, - {// Knight - // A B C D E F G H - EK-104, EK-79, EK-55, EK-42, EK-42, EK-55, EK-79, EK-104, - EK- 79, EK-55, EK-30, EK-17, EK-17, EK-30, EK-55, EK- 79, - EK- 55, EK-30, EK- 6, EK+ 5, EK+ 5, EK- 6, EK-30, EK- 55, - EK- 42, EK-17, EK+ 5, EK+18, EK+18, EK+ 5, EK-17, EK- 42, - EK- 42, EK-17, EK+ 5, EK+18, EK+18, EK+ 5, EK-17, EK- 42, - EK- 55, EK-30, EK- 6, EK+ 5, EK+ 5, EK- 6, EK-30, EK- 55, - EK- 79, EK-55, EK-30, EK-17, EK-17, EK-30, EK-55, EK- 79, - EK-104, EK-79, EK-55, EK-42, EK-42, EK-55, EK-79, EK-104 + { // Knight + S(-135,-104), S(-107,-79), S(-80,-55), S(-67,-42), S(-67,-42), S(-80,-55), S(-107,-79), S(-135,-104), + S( -93, -79), S( -67,-55), S(-39,-30), S(-25,-17), S(-25,-17), S(-39,-30), S( -67,-55), S( -93, -79), + S( -53, -55), S( -25,-30), S( 1, -6), S( 13, 5), S( 13, 5), S( 1, -6), S( -25,-30), S( -53, -55), + S( -25, -42), S( 1,-17), S( 27, 5), S( 41, 18), S( 41, 18), S( 27, 5), S( 1,-17), S( -25, -42), + S( -11, -42), S( 13,-17), S( 41, 5), S( 55, 18), S( 55, 18), S( 41, 5), S( 13,-17), S( -11, -42), + S( -11, -55), S( 13,-30), S( 41, -6), S( 55, 5), S( 55, 5), S( 41, -6), S( 13,-30), S( -11, -55), + S( -53, -79), S( -25,-55), S( 1,-30), S( 13,-17), S( 13,-17), S( 1,-30), S( -25,-55), S( -53, -79), + S(-193,-104), S( -67,-79), S(-39,-55), S(-25,-42), S(-25,-42), S(-39,-55), S( -67,-79), S(-193,-104) }, - {// Bishop - // A B C D E F G H - EB-59, EB-42, EB-35, EB-26, EB-26, EB-35, EB-42, EB-59, - EB-42, EB-26, EB-18, EB-11, EB-11, EB-18, EB-26, EB-42, - EB-35, EB-18, EB-11, EB- 4, EB- 4, EB-11, EB-18, EB-35, - EB-26, EB-11, EB- 4, EB+ 4, EB+ 4, EB- 4, EB-11, EB-26, - EB-26, EB-11, EB- 4, EB+ 4, EB+ 4, EB- 4, EB-11, EB-26, - EB-35, EB-18, EB-11, EB- 4, EB- 4, EB-11, EB-18, EB-35, - EB-42, EB-26, EB-18, EB-11, EB-11, EB-18, EB-26, EB-42, - EB-59, EB-42, EB-35, EB-26, EB-26, EB-35, EB-42, EB-59 + { // Bishop + S(-40,-59), S(-40,-42), S(-35,-35), S(-30,-26), S(-30,-26), S(-35,-35), S(-40,-42), S(-40,-59), + S(-17,-42), S( 0,-26), S( -4,-18), S( 0,-11), S( 0,-11), S( -4,-18), S( 0,-26), S(-17,-42), + S(-13,-35), S( -4,-18), S( 8,-11), S( 4, -4), S( 4, -4), S( 8,-11), S( -4,-18), S(-13,-35), + S( -8,-26), S( 0,-11), S( 4, -4), S( 17, 4), S( 17, 4), S( 4, -4), S( 0,-11), S( -8,-26), + S( -8,-26), S( 0,-11), S( 4, -4), S( 17, 4), S( 17, 4), S( 4, -4), S( 0,-11), S( -8,-26), + S(-13,-35), S( -4,-18), S( 8,-11), S( 4, -4), S( 4, -4), S( 8,-11), S( -4,-18), S(-13,-35), + S(-17,-42), S( 0,-26), S( -4,-18), S( 0,-11), S( 0,-11), S( -4,-18), S( 0,-26), S(-17,-42), + S(-17,-59), S(-17,-42), S(-13,-35), S( -8,-26), S( -8,-26), S(-13,-35), S(-17,-42), S(-17,-59) }, - {// Rook - // A B C D E F G H - ER+3, ER+3, ER+3, ER+3, ER+3, ER+3, ER+3, ER+3, - ER+3, ER+3, ER+3, ER+3, ER+3, ER+3, ER+3, ER+3, - ER+3, ER+3, ER+3, ER+3, ER+3, ER+3, ER+3, ER+3, - ER+3, ER+3, ER+3, ER+3, ER+3, ER+3, ER+3, ER+3, - ER+3, ER+3, ER+3, ER+3, ER+3, ER+3, ER+3, ER+3, - ER+3, ER+3, ER+3, ER+3, ER+3, ER+3, ER+3, ER+3, - ER+3, ER+3, ER+3, ER+3, ER+3, ER+3, ER+3, ER+3, - ER+3, ER+3, ER+3, ER+3, ER+3, ER+3, ER+3, ER+3 + { // Rook + S(-12, 3), S(-7, 3), S(-2, 3), S(2, 3), S(2, 3), S(-2, 3), S(-7, 3), S(-12, 3), + S(-12, 3), S(-7, 3), S(-2, 3), S(2, 3), S(2, 3), S(-2, 3), S(-7, 3), S(-12, 3), + S(-12, 3), S(-7, 3), S(-2, 3), S(2, 3), S(2, 3), S(-2, 3), S(-7, 3), S(-12, 3), + S(-12, 3), S(-7, 3), S(-2, 3), S(2, 3), S(2, 3), S(-2, 3), S(-7, 3), S(-12, 3), + S(-12, 3), S(-7, 3), S(-2, 3), S(2, 3), S(2, 3), S(-2, 3), S(-7, 3), S(-12, 3), + S(-12, 3), S(-7, 3), S(-2, 3), S(2, 3), S(2, 3), S(-2, 3), S(-7, 3), S(-12, 3), + S(-12, 3), S(-7, 3), S(-2, 3), S(2, 3), S(2, 3), S(-2, 3), S(-7, 3), S(-12, 3), + S(-12, 3), S(-7, 3), S(-2, 3), S(2, 3), S(2, 3), S(-2, 3), S(-7, 3), S(-12, 3) }, - {// Queen - // A B C D E F G H - EQ-80, EQ-54, EQ-42, EQ-30, EQ-30, EQ-42, EQ-54, EQ-80, - EQ-54, EQ-30, EQ-18, EQ- 6, EQ- 6, EQ-18, EQ-30, EQ-54, - EQ-42, EQ-18, EQ- 6, EQ+ 6, EQ+ 6, EQ- 6, EQ-18, EQ-42, - EQ-30, EQ- 6, EQ+ 6, EQ+18, EQ+18, EQ+ 6, EQ- 6, EQ-30, - EQ-30, EQ- 6, EQ+ 6, EQ+18, EQ+18, EQ+ 6, EQ- 6, EQ-30, - EQ-42, EQ-18, EQ- 6, EQ+ 6, EQ+ 6, EQ- 6, EQ-18, EQ-42, - EQ-54, EQ-30, EQ-18, EQ- 6, EQ- 6, EQ-18, EQ-30, EQ-54, - EQ-80, EQ-54, EQ-42, EQ-30, EQ-30, EQ-42, EQ-54, EQ-80 + { // Queen + S(8,-80), S(8,-54), S(8,-42), S(8,-30), S(8,-30), S(8,-42), S(8,-54), S(8,-80), + S(8,-54), S(8,-30), S(8,-18), S(8, -6), S(8, -6), S(8,-18), S(8,-30), S(8,-54), + S(8,-42), S(8,-18), S(8, -6), S(8, 6), S(8, 6), S(8, -6), S(8,-18), S(8,-42), + S(8,-30), S(8, -6), S(8, 6), S(8, 18), S(8, 18), S(8, 6), S(8, -6), S(8,-30), + S(8,-30), S(8, -6), S(8, 6), S(8, 18), S(8, 18), S(8, 6), S(8, -6), S(8,-30), + S(8,-42), S(8,-18), S(8, -6), S(8, 6), S(8, 6), S(8, -6), S(8,-18), S(8,-42), + S(8,-54), S(8,-30), S(8,-18), S(8, -6), S(8, -6), S(8,-18), S(8,-30), S(8,-54), + S(8,-80), S(8,-54), S(8,-42), S(8,-30), S(8,-30), S(8,-42), S(8,-54), S(8,-80) }, - {// King - //A B C D E F G H - 18, 77, 105, 135, 135, 105, 77, 18, - 77, 135, 165, 193, 193, 165, 135, 77, - 105, 165, 193, 222, 222, 193, 165, 105, - 135, 193, 222, 251, 251, 222, 193, 135, - 135, 193, 222, 251, 251, 222, 193, 135, - 105, 165, 193, 222, 222, 193, 165, 105, - 77, 135, 165, 193, 193, 165, 135, 77, - 18, 77, 105, 135, 135, 105, 77, 18 + { // King + S(287, 18), S(311, 77), S(262,105), S(214,135), S(214,135), S(262,105), S(311, 77), S(287, 18), + S(262, 77), S(287,135), S(238,165), S(190,193), S(190,193), S(238,165), S(287,135), S(262, 77), + S(214,105), S(238,165), S(190,193), S(142,222), S(142,222), S(190,193), S(238,165), S(214,105), + S(190,135), S(214,193), S(167,222), S(119,251), S(119,251), S(167,222), S(214,193), S(190,135), + S(167,135), S(190,193), S(142,222), S( 94,251), S( 94,251), S(142,222), S(190,193), S(167,135), + S(142,105), S(167,165), S(119,193), S( 69,222), S( 69,222), S(119,193), S(167,165), S(142,105), + S(119, 77), S(142,135), S( 94,165), S( 46,193), S( 46,193), S( 94,165), S(142,135), S(119, 77), + S(94, 18), S(119, 77), S( 69,105), S( 21,135), S( 21,135), S( 69,105), S(119, 77), S( 94, 18) } }; -} // namespace +#undef S #endif // !defined(PSQTAB_H_INCLUDED)