X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fpawns.cpp;h=b4ff799da3e71731a13ebd718f49c680a631f7cf;hb=6c898a10be75bc2c295a7dca7f72e51e76ec8293;hp=ceacca82d53b8932fe8526fbbfdc97116ba3992e;hpb=2e11388581aca5232b54437a4338012bcf7a5ff7;p=stockfish diff --git a/src/pawns.cpp b/src/pawns.cpp index ceacca82..b4ff799d 100644 --- a/src/pawns.cpp +++ b/src/pawns.cpp @@ -46,14 +46,14 @@ namespace { // Weakness of our pawn shelter in front of the king by [isKingFile][distance from edge][rank]. // RANK_1 = 0 is used for files where we have no pawns or our pawn is behind our king. const Value ShelterWeakness[][int(FILE_NB) / 2][RANK_NB] = { - { { V( 97), V(17), V( 9), V(44), V( 84), V( 87), V( 99) }, // Not On King file - { V(106), V( 6), V(33), V(86), V( 87), V(104), V(112) }, - { V(101), V( 2), V(65), V(98), V( 58), V( 89), V(115) }, - { V( 73), V( 7), V(54), V(73), V( 84), V( 83), V(111) } }, - { { V(104), V(20), V( 6), V(27), V( 86), V( 93), V( 82) }, // On King file - { V(123), V( 9), V(34), V(96), V(112), V( 88), V( 75) }, - { V(120), V(25), V(65), V(91), V( 66), V( 78), V(117) }, - { V( 81), V( 2), V(47), V(63), V( 94), V( 93), V(104) } } + { { V( 98), V(20), V(11), V(42), V( 83), V( 84), V(101) }, // Not On King file + { V(103), V( 8), V(33), V(86), V( 87), V(105), V(113) }, + { V(100), V( 2), V(65), V(95), V( 59), V( 89), V(115) }, + { V( 72), V( 6), V(52), V(74), V( 83), V( 84), V(112) } }, + { { V(105), V(19), V( 3), V(27), V( 85), V( 93), V( 84) }, // On King file + { V(121), V( 7), V(33), V(95), V(112), V( 86), V( 72) }, + { V(121), V(26), V(65), V(90), V( 65), V( 76), V(117) }, + { V( 79), V( 0), V(45), V(65), V( 94), V( 92), V(105) } } }; // Danger of enemy pawns moving toward our king by [type][distance from edge][rank]. @@ -222,9 +222,11 @@ Entry* probe(const Position& pos) { return e; e->key = key; - e->score = evaluate(pos, e) - evaluate(pos, e); + e->scores[WHITE] = evaluate(pos, e); + e->scores[BLACK] = evaluate(pos, e); e->asymmetry = popcount(e->semiopenFiles[WHITE] ^ e->semiopenFiles[BLACK]); e->openFiles = popcount(e->semiopenFiles[WHITE] & e->semiopenFiles[BLACK]); + return e; }