X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpsqt.cpp;h=655eb993663d127b2ae5b987265b856094c62bd4;hp=e822b3234ef6b9e82550e435bdcffc212d73ba5f;hb=6f3796adaf44c48cf1353181d386a61a57859b67;hpb=4bef7aa5cd682617502cacfa4413c0d2c78401ca diff --git a/src/psqt.cpp b/src/psqt.cpp index e822b323..655eb993 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-2018 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 @@ -37,67 +37,70 @@ namespace PSQT { // second half of the files. constexpr Score Bonus[][RANK_NB][int(FILE_NB) / 2] = { { }, - { // Pawn - { S( 0, 0), S( 0, 0), S( 0, 0), S( 0, 0) }, - { S(-11, 7), S( 6,-4), S( 7, 8), S( 3,-2) }, - { S(-18,-4), S( -2,-5), S( 19, 5), S(24, 4) }, - { S(-17, 3), S( -9, 3), S( 20,-8), S(35,-3) }, - { S( -6, 8), S( 5, 9), S( 3, 7), S(21,-6) }, - { S( -6, 8), S( -8,-5), S( -6, 2), S(-2, 4) }, - { S( -4, 3), S( 20,-9), S( -8, 1), S(-4,18) } - }, + { }, { // Knight - { S(-161,-105), S(-96,-82), S(-80,-46), S(-73,-14) }, - { S( -83, -69), S(-43,-54), S(-21,-17), S(-10, 9) }, - { S( -71, -50), S(-22,-39), S( 0, -7), S( 9, 28) }, - { S( -25, -41), S( 18,-25), S( 43, 6), S( 47, 38) }, - { S( -26, -46), S( 16,-25), S( 38, 3), S( 50, 40) }, - { S( -11, -54), S( 37,-38), S( 56, -7), S( 65, 27) }, - { S( -63, -65), S(-19,-50), S( 5,-24), S( 14, 13) }, - { S(-195,-109), S(-67,-89), 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(-49,-58), S(- 7,-31), S(-10,-37), S(-34,-19) }, - { S(-24,-34), S( 9, -9), S( 15,-14), S( 1, 4) }, - { S( -9,-23), S( 22, 0), S( -3, -3), S( 12, 16) }, - { S( 4,-26), S( 9, -3), S( 18, -5), S( 40, 16) }, - { S( -8,-26), S( 27, -4), S( 13, -7), S( 30, 14) }, - { S(-17,-24), S( 14, -2), S( -6, 0), S( 6, 13) }, - { S(-19,-34), S(-13,-10), S( 7,-12), S(-11, 6) }, - { S(-47,-55), S( -7,-32), S(-17,-36), S(-29,-17) } + { 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(-31, -9), S(-20,-13), S(-14,-10), S(-5, -9) }, + { S(-21,-12), S(-13, -9), S( -8, -1), S( 6, -2) }, + { S(-25, 6), S(-11, -8), S( -1, -2), S( 3, -6) }, + { S(-13, -6), S( -5, 1), S( -4, -9), S(-6, 7) }, + { S(-27, -5), S(-15, 8), S( -4, 7), S( 3, -6) }, + { S(-22, 6), S( -2, 1), S( 6, -7), S(12, 10) }, + { S( -2, 4), S( 12, 5), S( 16, 20), S(18, -5) }, + { S(-17, 18), S(-19, 0), S( -1, 19), S( 9, 13) } }, { // Queen - { S( 0,-71), S(-4,-56), S(-3,-42), S(-1,-29) }, - { S(-4,-56), S( 6,-30), S( 9,-21), S( 8, -5) }, - { S(-2,-39), S( 6,-17), S( 9, -8), S( 9, 5) }, - { S(-1,-29), S( 8, -5), S(10, 9), S( 7, 19) }, - { S(-3,-27), S( 9, -5), S( 8, 10), S( 7, 21) }, - { S(-2,-40), S( 6,-16), S( 8,-10), S(10, 3) }, - { S(-2,-55), S( 7,-30), S( 7,-21), S( 6, -6) }, - { S(-1,-74), S(-4,-55), S(-1,-43), 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(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) } + { 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( 3,-10), S( 3, -6), S( 10, 10), S( 19, 0), S( 16, 14), S( 19, 7), S( 7, -5), S( -5,-19) }, + { S( -9,-10), S(-15,-10), S( 11,-10), S( 15, 4), S( 32, 4), S( 22, 3), S( 5, -6), S(-22, -4) }, + { S( -8, 6), S(-23, -2), S( 6, -8), S( 20, -4), S( 40,-13), S( 17,-12), S( 4,-10), S(-12, -9) }, + { S( 13, 9), S( 0, 4), S(-13, 3), S( 1,-12), S( 11,-12), S( -2, -6), S(-13, 13), S( 5, 8) }, + { S( -5, 28), S(-12, 20), S( -7, 21), S( 22, 28), S( -8, 30), S( -5, 7), S(-15, 6), S(-18, 13) }, + { S( -7, 0), S( 7,-11), S( -3, 12), S(-13, 21), S( 5, 25), S(-16, 19), S( 10, 4), S( -8, 7) } + }; + #undef S Score psq[PIECE_NB][SQUARE_NB]; @@ -116,8 +119,9 @@ void init() { for (Square s = SQ_A1; s <= SQ_H8; ++s) { - File f = std::min(file_of(s), ~file_of(s)); - psq[ pc][ s] = score + Bonus[pc][rank_of(s)][f]; + File f = map_to_queenside(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]; } }