X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpsqtab.h;h=57fb30b94f842bd1a78bc6376dd6aea11a6fc936;hp=f56ba9ccf168c8eab34d63bcd9a4c8daef84e90a;hb=27efc5ac996ffc679395317c8bbb16aca996296c;hpb=0fcda095df1caa860e8e3f3a714d5545ec9dc122 diff --git a/src/psqtab.h b/src/psqtab.h index f56ba9cc..57fb30b9 100644 --- a/src/psqtab.h +++ b/src/psqtab.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, 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,169 +17,82 @@ along with this program. If not, see . */ -#if !defined(PSQTAB_H_INCLUDED) +#ifndef PSQTAB_H_INCLUDED #define PSQTAB_H_INCLUDED #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; +/// PSQT[PieceType][Square] contains Piece-Square scores. For each piece type on +/// a given square a (middlegame, endgame) score pair is assigned. PSQT is defined +/// for the white side and the tables are symmetric for the black side. -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] = { +static const Score PSQT[][SQUARE_NB] = { { }, - {// 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(-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) }, - {// 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(-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) }, - {// 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(-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) }, - {// 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(-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) }, - {// 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(-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) }, - {// 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(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) } }; -} // namespace +#undef S -#endif // !defined(PSQTAB_H_INCLUDED) +#endif // #ifndef PSQTAB_H_INCLUDED