X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpsqt.cpp;h=26f14625551047d4b5a203c01a25a6d0ff283008;hp=26cd1a0b46a24e1f48acc8f24379b99d19eaef23;hb=3acacf8471efd018e33e4743cbbb2aed8d59e855;hpb=ca6c9f85a5c3a45a248716b8fe68821b20eee201 diff --git a/src/psqt.cpp b/src/psqt.cpp index 26cd1a0b..26f14625 100644 --- a/src/psqt.cpp +++ b/src/psqt.cpp @@ -2,7 +2,7 @@ Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad - Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad + Copyright (C) 2015-2019 Marco Costalba, Joona Kiiski, Gary Linscott, 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 @@ -23,8 +23,9 @@ #include "types.h" Value PieceValue[PHASE_NB][PIECE_NB] = { -{ VALUE_ZERO, PawnValueMg, KnightValueMg, BishopValueMg, RookValueMg, QueenValueMg }, -{ VALUE_ZERO, PawnValueEg, KnightValueEg, BishopValueEg, RookValueEg, QueenValueEg } }; + { VALUE_ZERO, PawnValueMg, KnightValueMg, BishopValueMg, RookValueMg, QueenValueMg }, + { VALUE_ZERO, PawnValueEg, KnightValueEg, BishopValueEg, RookValueEg, QueenValueEg } +}; namespace PSQT { @@ -34,69 +35,72 @@ namespace PSQT { // type on a given square a (middlegame, endgame) score pair is assigned. Table // is defined for files A..D and white side: it is symmetric for black side and // second half of the files. -const Score Bonus[][RANK_NB][int(FILE_NB) / 2] = { +constexpr Score Bonus[][RANK_NB][int(FILE_NB) / 2] = { + { }, { }, - { // Pawn - { S( 0, 0), S( 0, 0), S( 0, 0), S( 0, 0) }, - { S(-16, 7), S( 1,-4), S( 7, 8), S( 3,-2) }, - { S(-23,-4), S( -7,-5), S( 19, 5), S(24, 4) }, - { S(-22, 3), S(-14, 3), S( 20,-8), S(35,-3) }, - { S(-11, 8), S( 0, 9), S( 3, 7), S(21,-6) }, - { S(-11, 8), S(-13,-5), S( -6, 2), S(-2, 4) }, - { S( -9, 3), S( 15,-9), S( -8, 1), S(-4,18) } - }, { // Knight - { S(-143, -97), S(-96,-82), S(-80,-46), S(-73,-14) }, - { S( -83, -69), S(-43,-55), S(-21,-17), S(-10, 9) }, - { S( -71, -50), S(-22,-39), S( 0, -8), S( 9, 28) }, - { S( -25, -41), S( 18,-25), S( 43, 7), S( 47, 38) }, - { S( -26, -46), S( 16,-25), S( 38, 2), S( 50, 41) }, - { S( -11, -55), S( 37,-38), S( 56, -8), S( 71, 27) }, - { S( -62, -64), S(-17,-50), S( 5,-24), S( 14, 13) }, - { S(-195,-110), S(-66,-90), S(-42,-50), S(-29,-13) } + { S(-169,-105), S(-96,-74), S(-80,-46), S(-79,-18) }, + { S( -79, -70), S(-39,-56), S(-24,-15), S( -9, 6) }, + { S( -64, -38), S(-20,-33), S( 4, -5), S( 19, 27) }, + { S( -28, -36), S( 5, 0), S( 41, 13), S( 47, 34) }, + { S( -29, -41), S( 13,-20), S( 42, 4), S( 52, 35) }, + { S( -11, -51), S( 28,-38), S( 63,-17), S( 55, 19) }, + { S( -67, -64), S(-21,-45), S( 6,-37), S( 37, 16) }, + { S(-200, -98), S(-80,-89), S(-53,-53), S(-32,-16) } }, { // Bishop - { S(-54,-68), S(-23,-40), S(-35,-46), S(-44,-28) }, - { S(-30,-43), S( 10,-17), S( 2,-23), S( -9, -5) }, - { S(-19,-32), S( 17, -9), S( 11,-13), S( 1, 8) }, - { S(-21,-36), S( 18,-13), S( 11,-15), S( 0, 7) }, - { S(-21,-36), S( 14,-14), S( 6,-17), S( -1, 3) }, - { S(-27,-35), S( 6,-13), S( 2,-10), S( -8, 1) }, - { S(-33,-44), S( 7,-21), S( -4,-22), S(-12, -4) }, - { S(-45,-65), S(-21,-42), S(-29,-46), S(-39,-27) } + { S(-44,-63), S( -4,-30), S(-11,-35), S(-28, -8) }, + { S(-18,-38), S( 7,-13), S( 14,-14), S( 3, 0) }, + { S( -8,-18), S( 24, 0), S( -3, -7), S( 15, 13) }, + { S( 1,-26), S( 8, -3), S( 26, 1), S( 37, 16) }, + { S( -7,-24), S( 30, -6), S( 23,-10), S( 28, 17) }, + { S(-17,-26), S( 4, 2), S( -1, 1), S( 8, 16) }, + { S(-21,-34), S(-19,-18), S( 10, -7), S( -6, 9) }, + { S(-48,-51), S( -3,-40), S(-12,-39), S(-25,-20) } }, { // Rook - { S(-25, 0), S(-16, 0), S(-16, 0), S(-9, 0) }, - { S(-21, 0), S( -8, 0), S( -3, 0), S( 0, 0) }, - { S(-21, 0), S( -9, 0), S( -4, 0), S( 2, 0) }, - { S(-22, 0), S( -6, 0), S( -1, 0), S( 2, 0) }, - { S(-22, 0), S( -7, 0), S( 0, 0), S( 1, 0) }, - { S(-21, 0), S( -7, 0), S( 0, 0), S( 2, 0) }, - { S(-12, 0), S( 4, 0), S( 8, 0), S(12, 0) }, - { S(-23, 0), S(-15, 0), S(-11, 0), S(-5, 0) } + { S(-24, -2), S(-13,-6), S( -7, -3), S( 2,-2) }, + { S(-18,-10), S(-10,-7), S( -5, 1), S( 9, 0) }, + { S(-21, 10), S( -7,-4), S( 3, 2), S(-1,-2) }, + { S(-13, -5), S( -5, 2), S( -4, -8), S(-6, 8) }, + { S(-24, -8), S(-12, 5), S( -1, 4), S( 6,-9) }, + { S(-24, 3), S( -4,-2), S( 4,-10), S(10, 7) }, + { S( -8, 1), S( 6, 2), S( 10, 17), S(12,-8) }, + { S(-22, 12), S(-24,-6), S( -6, 13), S( 4, 7) } }, { // Queen - { S( 0,-70), S(-3,-57), S(-4,-41), S(-1,-29) }, - { S(-4,-58), S( 6,-30), S( 9,-21), S( 8, -4) }, - { S(-2,-39), S( 6,-17), S( 9, -7), S( 9, 5) }, - { S(-1,-29), S( 8, -5), S(10, 9), S( 7, 17) }, - { S(-3,-27), S( 9, -5), S( 8, 10), S( 7, 23) }, - { S(-2,-40), S( 6,-16), S( 8,-11), S(10, 3) }, - { S(-2,-54), S( 7,-30), S( 7,-21), S( 6, -7) }, - { S(-1,-75), S(-4,-54), S(-1,-44), S( 0,-30) } + { S( 3,-69), S(-5,-57), S(-5,-47), S( 4,-26) }, + { S( -3,-55), S( 5,-31), S( 8,-22), S(12, -4) }, + { S( -3,-39), S( 6,-18), S(13, -9), S( 7, 3) }, + { S( 4,-23), S( 5, -3), S( 9, 13), S( 8, 24) }, + { S( 0,-29), S(14, -6), S(12, 9), S( 5, 21) }, + { S( -4,-38), S(10,-18), S( 6,-12), S( 8, 1) }, + { S( -5,-50), S( 6,-27), S(10,-24), S( 8, -8) }, + { S( -2,-75), S(-2,-52), S( 1,-43), S(-2,-36) } }, { // King - { S(291, 28), S(344, 76), S(294,103), S(219,112) }, - { S(289, 70), S(329,119), S(263,170), S(205,159) }, - { S(226,109), S(271,164), S(202,195), S(136,191) }, - { S(204,131), S(212,194), S(175,194), S(137,204) }, - { S(177,132), S(205,187), S(143,224), S( 94,227) }, - { S(147,118), S(188,178), S(113,199), S( 70,197) }, - { S(116, 72), S(158,121), S( 93,142), S( 48,161) }, - { S( 94, 30), S(120, 76), S( 78,101), S( 31,111) } + { S(272, 0), S(325, 41), S(273, 80), S(190, 93) }, + { S(277, 57), S(305, 98), S(241,138), S(183,131) }, + { S(198, 86), S(253,138), S(168,165), S(120,173) }, + { S(169,103), S(191,152), S(136,168), S(108,169) }, + { S(145, 98), S(176,166), S(112,197), S(69, 194) }, + { S(122, 87), S(159,164), S(85, 174), S(36, 189) }, + { S(87, 40), S(120, 99), S(64, 128), S(25, 141) }, + { S(64, 5), S(87, 60), S(49, 75), S(0, 75) } } }; +constexpr Score PBonus[RANK_NB][FILE_NB] = + { // Pawn (asymmetric distribution) + { }, + { S( 0,-10), S( -5,-3), S( 10, 7), S( 13, -1), S( 21, 7), S( 17, 6), S( 6, 1), S( -3,-20) }, + { S(-11, -6), S(-10,-6), S( 15, -1), S( 22, -1), S( 26, -1), S( 28, 2), S( 4, -2), S(-24, -5) }, + { S( -9, 4), S(-18,-5), S( 8, -4), S( 22, -5), S( 33, -6), S( 25,-13), S( -4, -3), S(-16, -7) }, + { S( 6, 18), S( -3, 2), S(-10, 2), S( 1, -9), S( 12,-13), S( 6, -8), S(-12, 11), S( 1, 9) }, + { S( -6, 25), S( -8,17), S( 5, 19), S( 11, 29), S(-14, 29), S( 0, 8), S(-12, 4), S(-14, 12) }, + { S(-10, -1), S( 6,-6), S( -5, 18), S(-11, 22), S( -2, 22), S(-14, 17), S( 12, 2), S( -1, 9) } + }; + #undef S Score psq[PIECE_NB][SQUARE_NB]; @@ -111,12 +115,13 @@ void init() { PieceValue[MG][~pc] = PieceValue[MG][pc]; PieceValue[EG][~pc] = PieceValue[EG][pc]; - Score v = make_score(PieceValue[MG][pc], PieceValue[EG][pc]); + Score score = make_score(PieceValue[MG][pc], PieceValue[EG][pc]); for (Square s = SQ_A1; s <= SQ_H8; ++s) { - File f = std::min(file_of(s), FILE_H - file_of(s)); - psq[ pc][ s] = v + Bonus[pc][rank_of(s)][f]; + File f = std::min(file_of(s), ~file_of(s)); + psq[ pc][ s] = score + (type_of(pc) == PAWN ? PBonus[rank_of(s)][file_of(s)] + : Bonus[pc][rank_of(s)][f]); psq[~pc][~s] = -psq[pc][s]; } }