constexpr int QuadraticOurs[][PIECE_TYPE_NB] = {
// OUR PIECES
// pair pawn knight bishop rook queen
- {1667 }, // Bishop pair
- { 40, 0 }, // Pawn
- { 32, 255, -3 }, // Knight OUR PIECES
+ {1438 }, // Bishop pair
+ { 40, 38 }, // Pawn
+ { 32, 255, -62 }, // Knight OUR PIECES
{ 0, 104, 4, 0 }, // Bishop
- { -26, -2, 47, 105, -149 }, // Rook
- {-189, 24, 117, 133, -134, -10 } // Queen
+ { -26, -2, 47, 105, -208 }, // Rook
+ {-189, 24, 117, 133, -134, -6 } // Queen
};
constexpr int QuadraticTheirs[][PIECE_TYPE_NB] = {
bool is_KQKRPs(const Position& pos, Color us) {
return !pos.count<PAWN>(us)
&& pos.non_pawn_material(us) == QueenValueMg
- && pos.count<QUEEN>(us) == 1
+ && pos.count<QUEEN>(us) == 1
&& pos.count<ROOK>(~us) == 1
&& pos.count<PAWN>(~us) >= 1;
}
// OK, we didn't find any special evaluation function for the current material
// configuration. Is there a suitable specialized scaling function?
- EndgameBase<ScaleFactor>* sf;
+ const EndgameBase<ScaleFactor>* sf;
if ((sf = pos.this_thread()->endgames.probe<ScaleFactor>(key)) != nullptr)
{
e->factor[BLACK] = uint8_t(npm_b < RookValueMg ? SCALE_FACTOR_DRAW :
npm_w <= BishopValueMg ? 4 : 14);
- if (pos.count<PAWN>(WHITE) == 1 && npm_w - npm_b <= BishopValueMg)
- e->factor[WHITE] = (uint8_t) SCALE_FACTOR_ONEPAWN;
-
- if (pos.count<PAWN>(BLACK) == 1 && npm_b - npm_w <= BishopValueMg)
- e->factor[BLACK] = (uint8_t) SCALE_FACTOR_ONEPAWN;
-
// Evaluate the material imbalance. We use PIECE_TYPE_NONE as a place holder
// for the bishop pair "extended piece", which allows us to be more flexible
// in defining bishop pair bonuses.