X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpsqtab.h;h=1b013c076c9bbbd63bd6bbe6e32d1f1f3be40b60;hp=4957fc7d8f646d1f6e3bdf5258ba2262ffa5c88f;hb=e304db9d1ecf6a2318708483c90fadecf4fac4ee;hpb=b24a2dfc728039a8baad47f23d8e793d61b5b8d5 diff --git a/src/psqtab.h b/src/psqtab.h index 4957fc7d..1b013c07 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-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,147 +17,82 @@ along with this program. If not, see . */ - #if !defined(PSQTAB_H_INCLUDED) #define PSQTAB_H_INCLUDED -//// -//// Includes -//// +#include "types.h" -#include "value.h" +#define S(mg, eg) make_score(mg, eg) -//// -//// Values tuned by Joona Kiiski -//// +/// 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 MgPST[][64] = { // [piece][square] - {}, +static const Score PSQT[][SQUARE_NB] = { + { }, { // Pawn - 4, 5, 7, 8, 8, 7, 5, 4, - 162, 183, 194, 204, 204, 194, 183, 162, - 164, 185, 201, 227, 227, 201, 185, 164, - 165, 186, 210, 247, 247, 210, 186, 165, - 166, 187, 211, 229, 229, 211, 187, 166, - 167, 188, 204, 209, 209, 204, 188, 167, - 168, 189, 200, 210, 210, 200, 189, 168, - 8, 9, 11, 12, 12, 11, 9, 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), + 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 - 675, 709, 742, 759, 759, 742, 709, 675, - 721, 752, 785, 802, 802, 785, 752, 721, - 765, 797, 827, 841, 841, 827, 797, 765, - 794, 823, 853, 869, 869, 853, 823, 794, - 808, 834, 865, 881, 881, 865, 834, 808, - 807, 833, 864, 879, 879, 864, 833, 807, - 764, 794, 823, 837, 837, 823, 794, 764, - 624, 752, 783, 799, 799, 783, 752, 624 + 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 - 795, 792, 796, 800, 800, 796, 792, 795, - 824, 845, 841, 844, 844, 841, 845, 824, - 830, 841, 855, 848, 848, 855, 841, 830, - 835, 844, 848, 867, 867, 848, 844, 835, - 834, 843, 847, 866, 866, 847, 843, 834, - 827, 838, 852, 845, 845, 852, 838, 827, - 821, 841, 837, 840, 840, 837, 841, 821, - 821, 820, 824, 830, 830, 824, 820, 821 + 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 - 1258, 1263, 1268, 1272, 1272, 1268, 1263, 1258, - 1258, 1263, 1268, 1272, 1272, 1268, 1263, 1258, - 1258, 1263, 1268, 1272, 1272, 1268, 1263, 1258, - 1258, 1263, 1268, 1272, 1272, 1268, 1263, 1258, - 1258, 1263, 1268, 1272, 1272, 1268, 1263, 1258, - 1258, 1263, 1268, 1272, 1272, 1268, 1263, 1258, - 1258, 1263, 1268, 1272, 1272, 1268, 1263, 1258, - 1258, 1263, 1268, 1272, 1272, 1268, 1263, 1258 + 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 - 2529, 2529, 2529, 2529, 2529, 2529, 2529, 2529, - 2529, 2529, 2529, 2529, 2529, 2529, 2529, 2529, - 2529, 2529, 2529, 2529, 2529, 2529, 2529, 2529, - 2529, 2529, 2529, 2529, 2529, 2529, 2529, 2529, - 2529, 2529, 2529, 2529, 2529, 2529, 2529, 2529, - 2529, 2529, 2529, 2529, 2529, 2529, 2529, 2529, - 2529, 2529, 2529, 2529, 2529, 2529, 2529, 2529, - 2529, 2529, 2529, 2529, 2529, 2529, 2529, 2529 + 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 - 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 + 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) } }; -static const int EgPST[][64] = { // [piece][square] - {}, - { // Pawn - 2, 0, -2, -4, -4, -2, 0, 2, - 253, 251, 249, 247, 247, 249, 251, 253, - 253, 251, 249, 247, 247, 249, 251, 253, - 253, 251, 249, 247, 247, 249, 251, 253, - 254, 252, 250, 248, 248, 250, 252, 254, - 254, 252, 250, 248, 248, 250, 252, 254, - 254, 252, 250, 248, 248, 250, 252, 254, - 4, 2, 0, -2, -2, 0, 2, 4 - }, - { // Knight - 741, 765, 791, 806, 806, 791, 765, 741, - 766, 790, 818, 834, 834, 818, 790, 766, - 790, 816, 844, 858, 858, 844, 816, 790, - 803, 830, 855, 873, 873, 855, 830, 803, - 803, 830, 855, 873, 873, 855, 830, 803, - 790, 816, 844, 858, 858, 844, 816, 790, - 766, 790, 818, 834, 834, 818, 790, 766, - 741, 765, 791, 806, 806, 791, 765, 741 - }, - { // Bishop - 798, 816, 826, 836, 836, 826, 816, 798, - 814, 831, 841, 849, 849, 841, 831, 814, - 820, 838, 847, 856, 856, 847, 838, 820, - 829, 845, 855, 865, 865, 855, 845, 829, - 830, 846, 856, 866, 866, 856, 846, 830, - 821, 840, 850, 859, 859, 850, 840, 821, - 815, 833, 844, 853, 853, 844, 833, 815, - 798, 817, 828, 839, 839, 828, 817, 798 - }, - { // Rook - 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, - 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, - 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, - 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, - 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, - 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, - 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, - 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281 - }, - { // Queen - 2478, 2504, 2516, 2528, 2528, 2516, 2504, 2478, - 2504, 2528, 2540, 2552, 2552, 2540, 2528, 2504, - 2516, 2540, 2552, 2564, 2564, 2552, 2540, 2516, - 2528, 2552, 2564, 2576, 2576, 2564, 2552, 2528, - 2528, 2552, 2564, 2576, 2576, 2564, 2552, 2528, - 2516, 2540, 2552, 2564, 2564, 2552, 2540, 2516, - 2504, 2528, 2540, 2552, 2552, 2540, 2528, 2504, - 2478, 2504, 2516, 2528, 2528, 2516, 2504, 2478 - }, - { // King - 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 - } -}; +#undef S #endif // !defined(PSQTAB_H_INCLUDED)