X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpsqtab.h;h=a88d31d6be660d28918d2f50e27fbc0a93a72292;hp=48d6f137f1b8890ba549d006983d7bcea90a76d4;hb=d9caede3249698440b7579e31d92aaa9984a128b;hpb=c7843f2f79c23144842b462c7dee7da2615b12ed diff --git a/src/psqtab.h b/src/psqtab.h index 48d6f137..a88d31d6 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-2009 Marco Costalba + Copyright (C) 2008-2014 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,172 +17,82 @@ along with this program. If not, see . */ - -#if !defined(PSQTAB_H_INCLUDED) +#ifndef PSQTAB_H_INCLUDED #define PSQTAB_H_INCLUDED -//// -//// Includes -//// - -#include "value.h" - +#include "types.h" -//// -//// Constants modified by Joona Kiiski -//// +#define S(mg, eg) make_score(mg, eg) -static const Value MP = PawnValueMidgame; -static const Value MK = KnightValueMidgame; -static const Value MB = BishopValueMidgame; -static const Value MR = RookValueMidgame; -static const Value MQ = QueenValueMidgame; - -static const int MgPST[][64] = { - { }, - {// Pawn - // A B C D E F G H - 0, 0, 0, 0, 0, 0, 0, 0, - MP-34, MP-12, MP- 2, MP+ 8, MP+ 8, MP- 2, MP-12, MP-34, - MP-34, MP-12, MP+ 3, MP+30, MP+30, MP+ 3, MP-12, MP-34, - MP-34, MP-12, MP+11, MP+52, MP+52, MP+11, MP-12, MP-34, - MP-34, MP-12, MP+11, MP+30, MP+30, MP+11, MP-12, MP-34, - MP-34, MP-12, MP+ 3, MP+ 8, MP+ 8, MP+ 3, MP-12, MP-34, - MP-34, MP-12, MP- 2, MP+ 8, MP+ 8, MP- 2, MP-12, MP-34, - 0, 0, 0, 0, 0, 0, 0, 0 - }, - {// Knight - // A B C D E F G H - MK-136, MK-108, MK-81, MK-68, MK-68, MK-81, MK-108, MK-136, - MK- 94, MK- 68, MK-40, MK-26, MK-26, MK-40, MK- 68, MK- 94, - MK- 54, MK- 26, MK+ 0, MK+12, MK+12, MK+ 0, MK- 26, MK- 54, - MK- 26, MK+ 0, MK+26, MK+40, MK+40, MK+26, MK+ 0, MK- 26, - MK- 12, MK+ 12, MK+40, MK+54, MK+54, MK+40, MK+ 12, MK- 12, - MK- 12, MK+ 12, MK+40, MK+54, MK+54, MK+40, MK+ 12, MK- 12, - MK- 54, MK- 26, MK+ 0, MK+12, MK+12, MK+ 0, MK- 26, MK- 54, - MK-194, MK- 68, MK-40, MK-26, MK-26, MK-40, MK- 68, MK-194 - }, - {// Bishop - // A B C D E F G H - MB-41, MB-41, MB-36, MB-31, MB-31, MB-36, MB-41, MB-41, - MB-18, MB- 1, MB- 5, MB- 1, MB- 1, MB- 5, MB- 1, MB-18, - MB-14, MB- 5, MB+ 7, MB+ 3, MB+ 3, MB+ 7, MB- 5, MB-14, - MB- 9, MB- 1, MB+ 3, MB+16, MB+16, MB+ 3, MB- 1, MB- 9, - MB- 9, MB- 1, MB+ 3, MB+16, MB+16, MB+ 3, MB- 1, MB- 9, - MB-14, MB- 5, MB+ 7, MB+ 3, MB+ 3, MB+ 7, MB- 5, MB-14, - MB-18, MB- 1, MB- 5, MB- 1, MB- 1, MB- 5, MB- 1, MB-18, - MB-18, MB-18, MB-14, MB- 9, MB- 9, MB-14, MB-18, MB-18 - }, - {// Rook - // A B C D E F G H - MR-14, MR-9, MR-4, MR-0, MR-0, MR-4, MR-9, MR-14, - MR-14, MR-9, MR-4, MR-0, MR-0, MR-4, MR-9, MR-14, - MR-14, MR-9, MR-4, MR-0, MR-0, MR-4, MR-9, MR-14, - MR-14, MR-9, MR-4, MR-0, MR-0, MR-4, MR-9, MR-14, - MR-14, MR-9, MR-4, MR-0, MR-0, MR-4, MR-9, MR-14, - MR-14, MR-9, MR-4, MR-0, MR-0, MR-4, MR-9, MR-14, - MR-14, MR-9, MR-4, MR-0, MR-0, MR-4, MR-9, MR-14, - MR-14, MR-9, MR-4, MR-0, MR-0, MR-4, MR-9, MR-14 - }, - {// Queen - // A B C D E F G H - MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, - MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, - MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, - MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, - MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, - MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, - MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, - MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, MQ+12, MQ+12 - }, - {// King - //A B C D E F G H - 302, 328, 276, 225, 225, 276, 328, 302, - 276, 302, 251, 200, 200, 251, 302, 276, - 225, 251, 200, 149, 149, 200, 251, 225, - 200, 225, 175, 124, 124, 175, 225, 200, - 175, 200, 149, 98, 98, 149, 200, 175, - 149, 175, 124, 72, 72, 124, 175, 149, - 124, 149, 98, 47, 47, 98, 149, 124, - 98, 124, 72, 21, 21, 72, 124, 98 - } -}; -static const Value EP = PawnValueEndgame; -static const Value EK = KnightValueEndgame; -static const Value EB = BishopValueEndgame; -static const Value ER = RookValueEndgame; -static const Value EQ = QueenValueEndgame; +/// 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. -static 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-7, EP-7, EP-7, EP-7, EP-7, EP-7, EP-7, EP-7, - EP-7, EP-7, EP-7, EP-7, EP-7, EP-7, EP-7, EP-7, - EP-7, EP-7, EP-7, EP-7, EP-7, EP-7, EP-7, EP-7, - EP-7, EP-7, EP-7, EP-7, EP-7, EP-7, EP-7, EP-7, - EP-7, EP-7, EP-7, EP-7, EP-7, EP-7, EP-7, EP-7, - EP-7, EP-7, EP-7, EP-7, EP-7, EP-7, EP-7, EP-7, - 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(-20, 0), S( 0, 0), S( 0, 0), S( 0, 0), S(0, 0), S( 0, 0), S( 0, 0), S(-20, 0), + S(-20, 0), S( 0, 0), S(10, 0), S(20, 0), S(20, 0), S(10, 0), S( 0, 0), S(-20, 0), + S(-20, 0), S( 0, 0), S(20, 0), S(40, 0), S(40, 0), S(20, 0), S( 0, 0), S(-20, 0), + S(-20, 0), S( 0, 0), S(10, 0), S(20, 0), S(20, 0), S(10, 0), S( 0, 0), S(-20, 0), + S(-20, 0), S( 0, 0), S( 0, 0), S( 0, 0), S(0, 0), S( 0, 0), S( 0, 0), S(-20, 0), + S(-20, 0), S( 0, 0), S( 0, 0), S( 0, 0), S(0, 0), S( 0, 0), S( 0, 0), S(-20, 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) }, - {// 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-56, EB-39, EB-32, EB-23, EB-23, EB-32, EB-39, EB-56, - EB-39, EB-23, EB-15, EB- 8, EB- 8, EB-15, EB-23, EB-39, - EB-32, EB-15, EB- 8, EB- 1, EB- 1, EB- 8, EB-15, EB-32, - EB-23, EB- 8, EB- 1, EB+ 7, EB+ 7, EB- 1, EB- 8, EB-23, - EB-23, EB- 8, EB- 1, EB+ 7, EB+ 7, EB- 1, EB- 8, EB-23, - EB-32, EB-15, EB- 8, EB- 1, EB- 1, EB- 8, EB-15, EB-32, - EB-39, EB-23, EB-15, EB- 8, EB- 8, EB-15, EB-23, EB-39, - EB-56, EB-39, EB-32, EB-23, EB-23, EB-32, EB-39, EB-56 + { // 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+1, ER+1, ER+1, ER+1, ER+1, ER+1, ER+1, ER+1, - ER+1, ER+1, ER+1, ER+1, ER+1, ER+1, ER+1, ER+1, - ER+1, ER+1, ER+1, ER+1, ER+1, ER+1, ER+1, ER+1, - ER+1, ER+1, ER+1, ER+1, ER+1, ER+1, ER+1, ER+1, - ER+1, ER+1, ER+1, ER+1, ER+1, ER+1, ER+1, ER+1, - ER+1, ER+1, ER+1, ER+1, ER+1, ER+1, ER+1, ER+1, - ER+1, ER+1, ER+1, ER+1, ER+1, ER+1, ER+1, ER+1, - ER+1, ER+1, ER+1, ER+1, ER+1, ER+1, ER+1, ER+1 + { // 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-77, EQ-51, EQ-39, EQ-27, EQ-27, EQ-39, EQ-51, EQ-77, - EQ-51, EQ-27, EQ-15, EQ- 3, EQ- 3, EQ-15, EQ-27, EQ-51, - EQ-39, EQ-15, EQ- 3, EQ+ 9, EQ+ 9, EQ- 3, EQ-15, EQ-39, - EQ-27, EQ- 3, EQ+ 9, EQ+21, EQ+21, EQ+ 9, EQ- 3, EQ-27, - EQ-27, EQ- 3, EQ+ 9, EQ+21, EQ+21, EQ+ 9, EQ- 3, EQ-27, - EQ-39, EQ-15, EQ- 3, EQ+ 9, EQ+ 9, EQ- 3, EQ-15, EQ-39, - EQ-51, EQ-27, EQ-15, EQ- 3, EQ- 3, EQ-15, EQ-27, EQ-51, - EQ-77, EQ-51, EQ-39, EQ-27, EQ-27, EQ-39, EQ-51, EQ-77 + { // 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 - 16, 78, 108, 139, 139, 108, 78, 16, - 78, 139, 170, 200, 200, 170, 139, 78, - 108, 170, 200, 230, 230, 200, 170, 108, - 139, 200, 230, 261, 261, 230, 200, 139, - 139, 200, 230, 261, 261, 230, 200, 139, - 108, 170, 200, 230, 230, 200, 170, 108, - 78, 139, 170, 200, 200, 170, 139, 78, - 16, 78, 108, 139, 139, 108, 78, 16 + { // 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) } }; +#undef S -#endif // !defined(PSQTAB_H_INCLUDED) +#endif // #ifndef PSQTAB_H_INCLUDED