X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.cpp;h=5c33577445dc22e6e1e8a69c4ae9a081e6b77f22;hp=01e9632c2639fce3af989847f91123105165f42f;hb=2e21aba8d937bdf5eb0eedeac99ac2c2553e9d0d;hpb=52f92d05a9eae0cc68a3cd157f8df35802a98297 diff --git a/src/pawns.cpp b/src/pawns.cpp index 01e9632c..5c335774 100644 --- a/src/pawns.cpp +++ b/src/pawns.cpp @@ -88,8 +88,8 @@ namespace { template Score evaluate(const Position& pos, Pawns::Entry* e) { - const Color Them = (Us == WHITE ? BLACK : WHITE); - const Direction Up = (Us == WHITE ? NORTH : SOUTH); + const Color Them = (Us == WHITE ? BLACK : WHITE); + const Direction Up = (Us == WHITE ? NORTH : SOUTH); Bitboard b, neighbours, stoppers, doubled, supported, phalanx; Bitboard lever, leverPush; @@ -164,6 +164,9 @@ namespace { e->passedPawns[Us] |= s; } + if (e->passedPawns[Us] & s) + e->asymmetry++; + // Score this pawn if (supported | phalanx) score += Connected[opposed][bool(phalanx)][popcount(supported)][relative_rank(Us, s)]; @@ -220,10 +223,11 @@ Entry* probe(const Position& pos) { return e; e->key = key; + e->asymmetry = 0; 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]); + e->asymmetry += popcount(e->semiopenFiles[WHITE] ^ e->semiopenFiles[BLACK]); + e->openFiles = popcount(e->semiopenFiles[WHITE] & e->semiopenFiles[BLACK]); return e; }