X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpsqtab.h;h=4957fc7d8f646d1f6e3bdf5258ba2262ffa5c88f;hp=0607c2d33796dfc3c2ea3896b6a7c9237af063fc;hb=2d635f7b74fddccf82b7ca30442bbc2e3cd2f0b1;hpb=bb751d6c890f5c50c642366d601740366cfae8d0 diff --git a/src/psqtab.h b/src/psqtab.h index 0607c2d3..4957fc7d 100644 --- a/src/psqtab.h +++ b/src/psqtab.h @@ -1,17 +1,18 @@ /* - Glaurung, a UCI chess playing engine. - Copyright (C) 2004-2008 Tord Romstad + 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 - Glaurung is free software: you can redistribute it and/or modify + Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - - Glaurung is distributed in the hope that it will be useful, + + Stockfish is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -24,141 +25,139 @@ //// Includes //// -#include "position.h" +#include "value.h" //// -//// Variables +//// Values tuned by Joona Kiiski //// -static const int MgPST[][64] = { - { }, +static const int MgPST[][64] = { // [piece][square] + {}, { // Pawn - 0, 0, 0, 0, 0, 0, 0, 0, - 166, 192, 204, 216, 216, 204, 192, 166, - 166, 192, 210, 242, 242, 210, 192, 166, - 166, 192, 220, 268, 268, 220, 192, 166, - 166, 192, 220, 242, 242, 220, 192, 166, - 166, 192, 210, 216, 216, 210, 192, 166, - 166, 192, 204, 216, 216, 204, 192, 166, - 0, 0, 0, 0, 0, 0, 0, 0 - }, + 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 + }, { // Knight - 704, 730, 756, 768, 768, 756, 730, 704, - 743, 768, 794, 807, 807, 794, 768, 743, - 781, 807, 832, 844, 844, 832, 807, 781, - 807, 832, 857, 870, 870, 857, 832, 807, - 820, 844, 870, 883, 883, 870, 844, 820, - 820, 844, 870, 883, 883, 870, 844, 820, - 781, 807, 832, 844, 844, 832, 807, 781, - 650, 768, 794, 807, 807, 794, 768, 650 - }, + 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 + }, { // Bishop - 786, 786, 792, 797, 797, 792, 786, 786, - 812, 832, 827, 832, 832, 827, 832, 812, - 817, 827, 842, 837, 837, 842, 827, 817, - 822, 832, 837, 852, 852, 837, 832, 822, - 822, 832, 837, 852, 852, 837, 832, 822, - 817, 827, 842, 837, 837, 842, 827, 817, - 812, 832, 827, 832, 832, 827, 832, 812, - 812, 812, 817, 822, 822, 817, 812, 812 - }, + 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 + }, { // Rook - 1267, 1275, 1282, 1289, 1289, 1282, 1275, 1267, - 1267, 1275, 1282, 1289, 1289, 1282, 1275, 1267, - 1267, 1275, 1282, 1289, 1289, 1282, 1275, 1267, - 1267, 1275, 1282, 1289, 1289, 1282, 1275, 1267, - 1267, 1275, 1282, 1289, 1289, 1282, 1275, 1267, - 1267, 1275, 1282, 1289, 1289, 1282, 1275, 1267, - 1267, 1275, 1282, 1289, 1289, 1282, 1275, 1267, - 1267, 1275, 1282, 1289, 1289, 1282, 1275, 1267 - }, + 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 + }, { // Queen - 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, - 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, - 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, - 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, - 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, - 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, - 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560, - 2560, 2560, 2560, 2560, 2560, 2560, 2560, 2560 - }, + 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 + }, { // King - 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, + 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 } }; - -static const int EgPST[][64] = { - { }, +static const int EgPST[][64] = { // [piece][square] + {}, { // Pawn - 0, 0, 0, 0, 0, 0, 0, 0, - 256, 256, 256, 256, 256, 256, 256, 256, - 256, 256, 256, 256, 256, 256, 256, 256, - 256, 256, 256, 256, 256, 256, 256, 256, - 256, 256, 256, 256, 256, 256, 256, 256, - 256, 256, 256, 256, 256, 256, 256, 256, - 256, 256, 256, 256, 256, 256, 256, 256, - 0, 0, 0, 0, 0, 0, 0, 0 + 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 - 730, 756, 781, 794, 794, 781, 756, 730, - 756, 781, 807, 820, 820, 807, 781, 756, - 781, 807, 832, 844, 844, 832, 807, 781, - 794, 820, 844, 857, 857, 844, 820, 794, - 794, 820, 844, 857, 857, 844, 820, 794, - 781, 807, 832, 844, 844, 832, 807, 781, - 756, 781, 807, 820, 820, 807, 781, 756, - 730, 756, 781, 794, 794, 781, 756, 730 + 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 - 786, 802, 809, 817, 817, 809, 802, 786, - 802, 817, 825, 832, 832, 825, 817, 802, - 809, 825, 832, 839, 839, 832, 825, 809, - 817, 832, 839, 847, 847, 839, 832, 817, - 817, 832, 839, 847, 847, 839, 832, 817, - 809, 825, 832, 839, 839, 832, 825, 809, - 802, 817, 825, 832, 832, 825, 817, 802, - 786, 802, 809, 817, 817, 809, 802, 786 + 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 - 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, - 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, - 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, - 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, - 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, - 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, - 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, - 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282 + 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 - 2499, 2520, 2530, 2540, 2540, 2530, 2520, 2499, - 2520, 2540, 2550, 2560, 2560, 2550, 2540, 2520, - 2530, 2550, 2560, 2570, 2570, 2560, 2550, 2530, - 2540, 2560, 2570, 2580, 2580, 2570, 2560, 2540, - 2540, 2560, 2570, 2580, 2580, 2570, 2560, 2540, - 2530, 2550, 2560, 2570, 2570, 2560, 2550, 2530, - 2520, 2540, 2550, 2560, 2560, 2550, 2540, 2520, - 2499, 2520, 2530, 2540, 2540, 2530, 2520, 2499 + 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 - 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 + 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 } }; - #endif // !defined(PSQTAB_H_INCLUDED)