// ...count safe + (behind & safe) with a single popcount
int bonus = popcount((Us == WHITE ? safe << 32 : safe >> 32) | (behind & safe));
- int weight = pos.count<KNIGHT>(Us) + pos.count<BISHOP>(Us)
- + pos.count<KNIGHT>(Them) + pos.count<BISHOP>(Them);
+ bonus = std::min(16, bonus);
+ int weight = pos.count<ALL_PIECES>(Us);
- return make_score(bonus * weight * weight * 2 / 11, 0);
+ return make_score(bonus * weight * weight / 22, 0);
}
// Endings where weaker side can place his king in front of the opponent's
// pawns are drawish.
else if ( abs(eg) <= BishopValueEg
- && ei.pi->pawn_span(strongSide) <= 1
+ && pos.count<PAWN>(strongSide) <= 2
&& !pos.pawn_passed(~strongSide, pos.square<KING>(~strongSide)))
- sf = ei.pi->pawn_span(strongSide) ? ScaleFactor(51) : ScaleFactor(37);
+ sf = ScaleFactor(37 + 7 * pos.count<PAWN>(strongSide));
}
return sf;