X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpsqtab.h;h=a2fb6611dd4efd47cfbc7da9ba55feaaa834efe1;hp=19d2d0ea30377aab84b2caf08f4aaaff1db920b7;hb=55bd27b8f08a151128d7065fa2819aa3e9605299;hpb=5c81602d14539f8259a715477315e28b5de7cb54 diff --git a/src/psqtab.h b/src/psqtab.h index 19d2d0ea..a2fb6611 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-2012 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) #define PSQTAB_H_INCLUDED -//// -//// Includes -//// - -#include "value.h" - +#include "types.h" -//// -//// Variables -//// +#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-38, MP-12, MP- 0, MP+12, MP+12, MP- 0, MP-12, MP-38, - MP-38, MP-12, MP+ 6, MP+38, MP+38, MP+ 6, MP-12, MP-38, - MP-38, MP-12, MP+16, MP+64, MP+64, MP+16, MP-12, MP-38, - MP-38, MP-12, MP+16, MP+38, MP+38, MP+16, MP-12, MP-38, - MP-38, MP-12, MP+ 6, MP+12, MP+12, MP+ 6, MP-12, MP-38, - MP-38, MP-12, MP- 0, MP+12, MP+12, MP- 0, MP-12, MP-38, - 0, 0, 0, 0, 0, 0, 0, 0 - }, - {// Knight - // A B C D E F G H - MK-128, MK-102, MK-76, MK-64, MK-64, MK-76, MK-102, MK-128, - MK- 89, MK- 64, MK-38, MK-25, MK-25, MK-38, MK- 64, MK- 89, - MK- 51, MK- 25, MK- 0, MK+12, MK+12, MK- 0, MK- 25, MK- 51, - MK- 25, MK- 0, MK+25, MK+38, MK+38, MK+25, MK- 0, MK- 25, - MK- 12, MK+ 12, MK+38, MK+51, MK+51, MK+38, MK+ 12, MK- 12, - MK- 12, MK+ 12, MK+38, MK+51, MK+51, MK+38, MK+ 12, MK- 12, - MK- 51, MK- 25, MK- 0, MK+12, MK+12, MK- 0, MK- 25, MK- 51, - MK-182, MK- 64, MK-38, MK-25, MK-25, MK-38, MK- 64, MK-182 - }, - {// Bishop - // A B C D E F G H - MB-46, MB-46, MB-40, MB-35, MB-35, MB-40, MB-46, MB-46, - MB-20, MB- 0, MB- 5, MB- 0, MB- 0, MB- 5, MB- 0, MB-20, - MB-15, MB- 5, MB+10, MB+ 5, MB+ 5, MB+10, MB- 5, MB-15, - MB-10, MB- 0, MB+ 5, MB+20, MB+20, MB+ 5, MB- 0, MB-10, - MB-10, MB- 0, MB+ 5, MB+20, MB+20, MB+ 5, MB- 0, MB-10, - MB-15, MB- 5, MB+10, MB+ 5, MB+ 5, MB+10, MB- 5, MB-15, - MB-20, MB- 0, MB- 5, MB- 0, MB- 0, MB- 5, MB- 0, MB-20, - MB-20, MB-20, MB-15, MB-10, MB-10, MB-15, MB-20, MB-20 - }, - {// Rook - // A B C D E F G H - MR-18, MR-10, MR-3, MR+4, MR+4, MR-3, MR-10, MR-18, - MR-18, MR-10, MR-3, MR+4, MR+4, MR-3, MR-10, MR-18, - MR-18, MR-10, MR-3, MR+4, MR+4, MR-3, MR-10, MR-18, - MR-18, MR-10, MR-3, MR+4, MR+4, MR-3, MR-10, MR-18, - MR-18, MR-10, MR-3, MR+4, MR+4, MR-3, MR-10, MR-18, - MR-18, MR-10, MR-3, MR+4, MR+4, MR-3, MR-10, MR-18, - MR-18, MR-10, MR-3, MR+4, MR+4, MR-3, MR-10, MR-18, - MR-18, MR-10, MR-3, MR+4, MR+4, MR-3, MR-10, MR-18 - }, - {// Queen - //A B C D E F G H - MQ, MQ, MQ, MQ, MQ, MQ, MQ, MQ, - MQ, MQ, MQ, MQ, MQ, MQ, MQ, MQ, - MQ, MQ, MQ, MQ, MQ, MQ, MQ, MQ, - MQ, MQ, MQ, MQ, MQ, MQ, MQ, MQ, - MQ, MQ, MQ, MQ, MQ, MQ, MQ, MQ, - MQ, MQ, MQ, MQ, MQ, MQ, MQ, MQ, - MQ, MQ, MQ, MQ, MQ, MQ, MQ, MQ, - MQ, MQ, MQ, MQ, MQ, MQ, MQ, MQ - }, - {// 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 (midgame, endgame) score pair is assigned. PSQT is defined +/// for white side, for black side the tables are symmetric. -static const int EgPST[][64] = { +static const Score PSQT[][64] = { { }, - {// Pawn - //A B C D E F G H - 0, 0, 0, 0, 0, 0, 0, 0, - EP, EP, EP, EP, EP, EP, EP, EP, - EP, EP, EP, EP, EP, EP, EP, EP, - EP, EP, EP, EP, EP, EP, EP, EP, - EP, EP, EP, EP, EP, EP, EP, EP, - EP, EP, EP, EP, EP, EP, EP, EP, - EP, EP, EP, EP, EP, EP, EP, EP, - 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-102, EK-76, EK-51, EK-38, EK-38, EK-51, EK-76, EK-102, - EK- 76, EK-51, EK-25, EK-12, EK-12, EK-25, EK-51, EK-76, - EK- 51, EK-25, EK- 0, EK+12, EK+12, EK- 0, EK-25, EK-51, - EK- 38, EK-12, EK+12, EK+25, EK+25, EK+12, EK-12, EK-38, - EK- 38, EK-12, EK+12, EK+25, EK+25, EK+12, EK-12, EK-38, - EK- 51, EK-25, EK- 0, EK+12, EK+12, EK- 0, EK-25, EK-51, - EK- 76, EK-51, EK-25, EK-12, EK-12, EK-25, EK-51, EK-76, - EK-102, EK-76, EK-51, EK-38, EK-38, EK-51, EK-76, EK-102 + { // 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-46, EB-30, EB-23, EB-15, EB-15, EB-23, EB-30, EB-46, - EB-30, EB-15, EB- 7, EB- 0, EB- 0, EB- 7, EB-15, EB-30, - EB-23, EB- 7, EB- 0, EB+ 7, EB+ 7, EB- 0, EB- 7, EB-23, - EB-15, EB- 0, EB+ 7, EB+15, EB+15, EB+ 7, EB- 0, EB-15, - EB-15, EB- 0, EB+ 7, EB+15, EB+15, EB+ 7, EB- 0, EB-15, - EB-23, EB- 7, EB- 0, EB+ 7, EB+ 7, EB- 0, EB- 7, EB-23, - EB-30, EB-15, EB- 7, EB- 0, EB- 0, EB- 7, EB-15, EB-30, - EB-46, EB-30, EB-23, EB-15, EB-15, EB-23, EB-30, EB-46 + { // 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-61, EQ-40, EQ-30, EQ-20, EQ-20, EQ-30, EQ-40, EQ-61, - EQ-40, EQ-20, EQ-10, EQ- 0, EQ- 0, EQ-10, EQ-20, EQ-40, - EQ-30, EQ-10, EQ- 0, EQ+10, EQ+10, EQ- 0, EQ-10, EQ-30, - EQ-20, EQ- 0, EQ+10, EQ+20, EQ+20, EQ+10, EQ- 0, EQ-20, - EQ-20, EQ- 0, EQ+10, EQ+20, EQ+20, EQ+10, EQ- 0, EQ-20, - EQ-30, EQ-10, EQ- 0, EQ+10, EQ+10, EQ- 0, EQ-10, EQ-30, - EQ-40, EQ-20, EQ-10, EQ- 0, EQ- 0, EQ-10, EQ-20, EQ-40, - EQ-61, EQ-40, EQ-30, EQ-20, EQ-20, EQ-30, EQ-40, EQ-61 + { // 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 - 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(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) } }; +#undef S #endif // !defined(PSQTAB_H_INCLUDED)