/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
// Polynomial material imbalance parameters
// pair pawn knight bishop rook queen
- const int Linear[6] = { 1852, -162, -1122, -183, 249, -154 };
+ const int Linear[6] = { 1667, -168, -1027, -166, 238, -138 };
const int QuadraticOurs[][PIECE_TYPE_NB] = {
// OUR PIECES
// pair pawn knight bishop rook queen
{ 0 }, // Bishop pair
- { 39, 2 }, // Pawn
- { 35, 271, -4 }, // Knight OUR PIECES
- { 0, 105, 4, 0 }, // Bishop
- { -27, -2, 46, 100, -141 }, // Rook
- {-177, 25, 129, 142, -137, 0 } // Queen
+ { 40, 2 }, // Pawn
+ { 32, 255, -3 }, // Knight OUR PIECES
+ { 0, 104, 4, 0 }, // Bishop
+ { -26, -2, 47, 105, -149 }, // Rook
+ {-185, 24, 122, 137, -134, 0 } // Queen
};
const int QuadraticTheirs[][PIECE_TYPE_NB] = {
// THEIR PIECES
// pair pawn knight bishop rook queen
{ 0 }, // Bishop pair
- { 37, 0 }, // Pawn
- { 10, 62, 0 }, // Knight OUR PIECES
- { 57, 64, 39, 0 }, // Bishop
- { 50, 40, 23, -22, 0 }, // Rook
- { 98, 105, -39, 141, 274, 0 } // Queen
+ { 36, 0 }, // Pawn
+ { 9, 63, 0 }, // Knight OUR PIECES
+ { 59, 65, 42, 0 }, // Bishop
+ { 46, 39, 24, -24, 0 }, // Rook
+ { 101, 100, -37, 141, 268, 0 } // Queen
};
// Endgame evaluation and scaling functions are accessed directly and not through
Endgame<KPsK> ScaleKPsK[] = { Endgame<KPsK>(WHITE), Endgame<KPsK>(BLACK) };
Endgame<KPKP> ScaleKPKP[] = { Endgame<KPKP>(WHITE), Endgame<KPKP>(BLACK) };
- // Helper templates used to detect a given material distribution
- template<Color Us> bool is_KXK(const Position& pos) {
- const Color Them = (Us == WHITE ? BLACK : WHITE);
- return !more_than_one(pos.pieces(Them))
- && pos.non_pawn_material(Us) >= RookValueMg;
+ // Helper used to detect a given material distribution
+ bool is_KXK(const Position& pos, Color us) {
+ return !more_than_one(pos.pieces(~us))
+ && pos.non_pawn_material(us) >= RookValueMg;
}
- template<Color Us> bool is_KBPsKs(const Position& pos) {
- return pos.non_pawn_material(Us) == BishopValueMg
- && pos.count<BISHOP>(Us) == 1
- && pos.count<PAWN >(Us) >= 1;
+ bool is_KBPsKs(const Position& pos, Color us) {
+ return pos.non_pawn_material(us) == BishopValueMg
+ && pos.count<BISHOP>(us) == 1
+ && pos.count<PAWN >(us) >= 1;
}
- template<Color Us> bool is_KQKRPs(const Position& pos) {
- const Color Them = (Us == WHITE ? BLACK : WHITE);
- return !pos.count<PAWN>(Us)
- && pos.non_pawn_material(Us) == QueenValueMg
- && pos.count<QUEEN>(Us) == 1
- && pos.count<ROOK>(Them) == 1
- && pos.count<PAWN>(Them) >= 1;
+ 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<ROOK>(~us) == 1
+ && pos.count<PAWN>(~us) >= 1;
}
/// imbalance() calculates the imbalance by comparing the piece count of each
/// piece type for both colors.
-
template<Color Us>
int imbalance(const int pieceCount[][PIECE_TYPE_NB]) {
// Let's look if we have a specialized evaluation function for this particular
// material configuration. Firstly we look for a fixed configuration one, then
// for a generic one if the previous search failed.
- if (pos.this_thread()->endgames.probe(key, e->evaluationFunction))
- return e;
-
- if (is_KXK<WHITE>(pos))
- {
- e->evaluationFunction = &EvaluateKXK[WHITE];
+ if ((e->evaluationFunction = pos.this_thread()->endgames.probe<Value>(key)) != nullptr)
return e;
- }
- if (is_KXK<BLACK>(pos))
- {
- e->evaluationFunction = &EvaluateKXK[BLACK];
- return e;
- }
+ for (Color c = WHITE; c <= BLACK; ++c)
+ if (is_KXK(pos, c))
+ {
+ e->evaluationFunction = &EvaluateKXK[c];
+ return e;
+ }
// OK, we didn't find any special evaluation function for the current material
// configuration. Is there a suitable specialized scaling function?
EndgameBase<ScaleFactor>* sf;
- if (pos.this_thread()->endgames.probe(key, sf))
+ if ((sf = pos.this_thread()->endgames.probe<ScaleFactor>(key)) != nullptr)
{
e->scalingFunction[sf->strong_side()] = sf; // Only strong color assigned
return e;
// We didn't find any specialized scaling function, so fall back on generic
// ones that refer to more than one material distribution. Note that in this
// case we don't return after setting the function.
- 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];
+ for (Color c = WHITE; c <= BLACK; ++c)
+ {
+ if (is_KBPsKs(pos, c))
+ e->scalingFunction[c] = &ScaleKBPsK[c];
- else if (is_KQKRPs<BLACK>(pos))
- e->scalingFunction[BLACK] = &ScaleKQKRPs[BLACK];
+ else if (is_KQKRPs(pos, c))
+ e->scalingFunction[c] = &ScaleKQKRPs[c];
+ }
Value npm_w = pos.non_pawn_material(WHITE);
Value npm_b = pos.non_pawn_material(BLACK);
// drawish scale factor for cases such as KRKBP and KmmKm (except for KBBKN).
if (!pos.count<PAWN>(WHITE) && npm_w - npm_b <= BishopValueMg)
e->factor[WHITE] = uint8_t(npm_w < RookValueMg ? SCALE_FACTOR_DRAW :
- npm_b <= BishopValueMg ? 4 : 12);
+ npm_b <= BishopValueMg ? 4 : 14);
if (!pos.count<PAWN>(BLACK) && npm_b - npm_w <= BishopValueMg)
e->factor[BLACK] = uint8_t(npm_b < RookValueMg ? SCALE_FACTOR_DRAW :
- npm_w <= BishopValueMg ? 4 : 12);
+ npm_w <= BishopValueMg ? 4 : 14);
if (pos.count<PAWN>(WHITE) == 1 && npm_w - npm_b <= BishopValueMg)
e->factor[WHITE] = (uint8_t) SCALE_FACTOR_ONEPAWN;