- if ( pos.non_pawn_material(WHITE) == BishopValueMidgame
- && pos.piece_count(WHITE, BISHOP) == 1
- && pos.piece_count(WHITE, PAWN) >= 1)
- mi->scalingFunction[WHITE] = &ScaleKBPsK;
-
- if ( pos.non_pawn_material(BLACK) == BishopValueMidgame
- && pos.piece_count(BLACK, BISHOP) == 1
- && pos.piece_count(BLACK, PAWN) >= 1)
- mi->scalingFunction[BLACK] = &ScaleKKBPs;
-
- if ( pos.piece_count(WHITE, PAWN) == 0
- && pos.non_pawn_material(WHITE) == QueenValueMidgame
- && pos.piece_count(WHITE, QUEEN) == 1
- && pos.piece_count(BLACK, ROOK) == 1
- && pos.piece_count(BLACK, PAWN) >= 1)
- mi->scalingFunction[WHITE] = &ScaleKQKRPs;
-
- else if ( pos.piece_count(BLACK, PAWN) == 0
- && pos.non_pawn_material(BLACK) == QueenValueMidgame
- && pos.piece_count(BLACK, QUEEN) == 1
- && pos.piece_count(WHITE, ROOK) == 1
- && pos.piece_count(WHITE, PAWN) >= 1)
- mi->scalingFunction[BLACK] = &ScaleKRPsKQ;
-
- if (pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK) == Value(0))
+ if (is_KBPsKs<WHITE>(pos))
+ e->scalingFunction[WHITE] = &ScaleKBPsK[WHITE];
+
+ if (is_KBPsKs<BLACK>(pos))
+ e->scalingFunction[BLACK] = &ScaleKBPsK[BLACK];
+
+ if (is_KQKRPs<WHITE>(pos))
+ e->scalingFunction[WHITE] = &ScaleKQKRPs[WHITE];
+
+ else if (is_KQKRPs<BLACK>(pos))
+ e->scalingFunction[BLACK] = &ScaleKQKRPs[BLACK];
+
+ Value npm_w = pos.non_pawn_material(WHITE);
+ Value npm_b = pos.non_pawn_material(BLACK);
+
+ if (npm_w + npm_b == VALUE_ZERO)