- if(phase < PHASE_MIDGAME && pos.opposite_colored_bishops()
- && ((factor[WHITE] == SCALE_FACTOR_NORMAL && ei.egValue > Value(0)) ||
- (factor[BLACK] == SCALE_FACTOR_NORMAL && ei.egValue < Value(0)))) {
- if(pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK) ==
- 2*BishopValueMidgame) {
- // Only the two bishops
- if(pos.pawn_count(WHITE) + pos.pawn_count(BLACK) == 1) {
- // KBP vs KB with only a single pawn; almost certainly a draw.
- if(factor[WHITE] == SCALE_FACTOR_NORMAL)
- factor[WHITE] = ScaleFactor(8);
- if(factor[BLACK] == SCALE_FACTOR_NORMAL)
- factor[BLACK] = ScaleFactor(8);
- }
- else {
- // At least two pawns
- if(factor[WHITE] == SCALE_FACTOR_NORMAL)
- factor[WHITE] = ScaleFactor(32);
- if(factor[BLACK] == SCALE_FACTOR_NORMAL)
- factor[BLACK] = ScaleFactor(32);
+ if ( phase < PHASE_MIDGAME
+ && pos.opposite_colored_bishops()
+ && ( (factor[WHITE] == SCALE_FACTOR_NORMAL && ei.egValue > Value(0))
+ || (factor[BLACK] == SCALE_FACTOR_NORMAL && ei.egValue < Value(0))))
+ {
+ ScaleFactor sf;
+
+ // Only the two bishops ?
+ if ( pos.non_pawn_material(WHITE) == BishopValueMidgame
+ && pos.non_pawn_material(BLACK) == BishopValueMidgame)
+ {
+ // Check for KBP vs KB with only a single pawn that is almost
+ // certainly a draw or at least two pawns.
+ bool one_pawn = (pos.pawn_count(WHITE) + pos.pawn_count(BLACK) == 1);
+ sf = one_pawn ? ScaleFactor(8) : ScaleFactor(32);