X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.cpp;h=5290efb2c70c2eb4fcd72cfe60ff774ced77000a;hp=16c902d127c85ac98f7cf3a44a378733d3d24ee7;hb=8463fa479ee2841f852fdf57374b08c87b61e227;hpb=d477a0d611ad6f4e11b0e137569eb4b09b349f0f diff --git a/src/pawns.cpp b/src/pawns.cpp index 16c902d1..5290efb2 100644 --- a/src/pawns.cpp +++ b/src/pawns.cpp @@ -45,10 +45,10 @@ namespace { // Backward pawn penalty by opposed flag and file const Score Backward[2][FILE_NB] = { - { S(30, 42), S(43, 46), S(49, 46), S(49, 46), - S(49, 46), S(49, 46), S(43, 46), S(30, 42) }, - { S(20, 28), S(29, 31), S(33, 31), S(33, 31), - S(33, 31), S(33, 31), S(29, 31), S(20, 28) } }; + { S(50, 52), S(63, 56), S(69, 56), S(69, 56), + S(69, 56), S(69, 56), S(63, 56), S(50, 52) }, + { S(40, 38), S(49, 41), S(53, 41), S(53, 41), + S(53, 41), S(53, 41), S(49, 41), S(40, 38) } }; // Connected pawn bonus by opposed, phalanx, twice supported and rank Score Connected[2][2][2][RANK_NB]; @@ -180,19 +180,17 @@ namespace { // Score this pawn if (isolated) score -= Isolated[opposed][f]; - - if (!supported && !isolated) - score -= UnsupportedPawnPenalty; - - if (doubled) - score -= Doubled[f] / distance(s, frontmost_sq(Us, doubled)); - - if (backward) + else if (backward) score -= Backward[opposed][f]; + else if (!supported) + score -= UnsupportedPawnPenalty; if (connected) score += Connected[opposed][!!phalanx][more_than_one(supported)][relative_rank(Us, s)]; - + + if (doubled) + score -= Doubled[f] / distance(s, frontmost_sq(Us, doubled)); + if (lever) score += Lever[relative_rank(Us, s)]; }