const int GrainSize = 8;
// Evaluation weights, initialized from UCI options
- int WeightMobilityMidgame, WeightMobilityEndgame;
- int WeightPawnStructureMidgame, WeightPawnStructureEndgame;
- int WeightPassedPawnsMidgame, WeightPassedPawnsEndgame;
- int WeightKingSafety[2];
- int WeightSpace;
+ Score WeightMobility, WeightPawnStructure;
+ Score WeightPassedPawns, WeightSpace;
+ Score WeightKingSafety[2];
// Internal evaluation weights. These are applied on top of the evaluation
// weights read from UCI parameters. The purpose is to be able to change
// parameters at 100, which looks prettier.
//
// Values modified by Joona Kiiski
- const int WeightMobilityMidgameInternal = 248;
- const int WeightMobilityEndgameInternal = 271;
- const int WeightPawnStructureMidgameInternal = 233;
- const int WeightPawnStructureEndgameInternal = 201;
- const int WeightPassedPawnsMidgameInternal = 252;
- const int WeightPassedPawnsEndgameInternal = 259;
- const int WeightKingSafetyInternal = 247;
- const int WeightKingOppSafetyInternal = 259;
- const int WeightSpaceInternal = 46;
+ const Score WeightMobilityInternal = Score(248, 271);
+ const Score WeightPawnStructureInternal = Score(233, 201);
+ const Score WeightPassedPawnsInternal = Score(252, 259);
+ const Score WeightSpaceInternal = Score( 46, 0);
+ const Score WeightKingSafetyInternal = Score(247, 0);
+ const Score WeightKingOppSafetyInternal = Score(259, 0);
// Mobility and outposts bonus modified by Joona Kiiski
//
// Visually better to define tables constants
typedef Value V;
+ typedef Score S;
// Knight mobility bonus in middle game and endgame, indexed by the number
// of attacked squares not occupied by friendly piecess.
- const Value MidgameKnightMobilityBonus[] = {
- // 0 1 2 3 4 5 6 7 8
- V(-38), V(-25),V(-12), V(0), V(12), V(25), V(31), V(38), V(38)
- };
-
- const Value EndgameKnightMobilityBonus[] = {
- // 0 1 2 3 4 5 6 7 8
- V(-33), V(-23),V(-13), V(-3), V(7), V(17), V(22), V(27), V(27)
+ const Score KnightMobilityBonus[] = {
+ S(-38,-33), S(-25,-23), S(-12,-13), S( 0,-3),
+ S( 12, 7), S( 25, 17), S( 31, 22), S(38, 27), S(38, 27)
};
// Bishop mobility bonus in middle game and endgame, indexed by the number
// of attacked squares not occupied by friendly pieces. X-ray attacks through
// queens are also included.
- const Value MidgameBishopMobilityBonus[] = {
- // 0 1 2 3 4 5 6 7
- V(-25), V(-11), V(3), V(17), V(31), V(45), V(57), V(65),
- // 8 9 10 11 12 13 14 15
- V( 71), V( 74), V(76), V(78), V(79), V(80), V(81), V(81)
- };
-
- const Value EndgameBishopMobilityBonus[] = {
- // 0 1 2 3 4 5 6 7
- V(-30), V(-16), V(-2), V(12), V(26), V(40), V(52), V(60),
- // 8 9 10 11 12 13 14 15
- V( 65), V( 69), V(71), V(73), V(74), V(75), V(76), V(76)
+ const Score BishopMobilityBonus[] = {
+ S(-25,-30), S(-11,-16), S( 3, -2), S(17, 12),
+ S( 31, 26), S( 45, 40), S(57, 52), S(65, 60),
+ S( 71, 65), S( 74, 69), S(76, 71), S(78, 73),
+ S( 79, 74), S( 80, 75), S(81, 76), S(81, 76)
};
// Rook mobility bonus in middle game and endgame, indexed by the number
// of attacked squares not occupied by friendly pieces. X-ray attacks through
// queens and rooks are also included.
- const Value MidgameRookMobilityBonus[] = {
- // 0 1 2 3 4 5 6 7
- V(-20), V(-14), V(-8), V(-2), V(4), V(10), V(14), V(19),
- // 8 9 10 11 12 13 14 15
- V( 23), V( 26), V(27), V(28), V(29), V(30), V(31), V(32)
- };
-
- const Value EndgameRookMobilityBonus[] = {
- // 0 1 2 3 4 5 6 7
- V(-36), V(-19), V(-3), V(13), V(29), V(46), V(62), V(79),
- // 8 9 10 11 12 13 14 15
- V( 95), V(106),V(111),V(114),V(116),V(117),V(118),V(118)
+ const Score RookMobilityBonus[] = {
+ S(-20,-36), S(-14,-19), S(-8, -3), S(-2, 13),
+ S( 4, 29), S( 10, 46), S(14, 62), S(19, 79),
+ S( 23, 95), S( 26,106), S(27,111), S(28,114),
+ S( 29,116), S( 30,117), S(31,118), S(32,118)
};
// Queen mobility bonus in middle game and endgame, indexed by the number
// of attacked squares not occupied by friendly pieces.
- const Value MidgameQueenMobilityBonus[] = {
- // 0 1 2 3 4 5 6 7
- V(-10), V(-8), V(-6), V(-3), V(-1), V( 1), V( 3), V( 5),
- // 8 9 10 11 12 13 14 15
- V( 8), V(10), V(12), V(15), V(16), V(17), V(18), V(20),
- // 16 17 18 19 20 21 22 23
- V( 20), V(20), V(20), V(20), V(20), V(20), V(20), V(20),
- // 24 25 26 27 28 29 30 31
- V( 20), V(20), V(20), V(20), V(20), V(20), V(20), V(20)
+ const Score QueenMobilityBonus[] = {
+ S(-10,-18), S(-8,-13), S(-6, -7), S(-3, -2), S(-1, 3), S( 1, 8),
+ S( 3, 13), S( 5, 19), S( 8, 23), S(10, 27), S(12, 32), S(15, 34),
+ S( 16, 35), S(17, 35), S(18, 35), S(20, 35), S(20, 35), S(20, 35),
+ S( 20, 35), S(20, 35), S(20, 35), S(20, 35), S(20, 35), S(20, 35),
+ S( 20, 35), S(20, 35), S(20, 35), S(20, 35), S(20, 35), S(20, 35),
+ S( 20, 35), S(20, 35)
};
- const Value EndgameQueenMobilityBonus[] = {
- // 0 1 2 3 4 5 6 7
- V(-18),V(-13), V(-7), V(-2), V( 3), V (8), V(13), V(19),
- // 8 9 10 11 12 13 14 15
- V( 23), V(27), V(32), V(34), V(35), V(35), V(35), V(35),
- // 16 17 18 19 20 21 22 23
- V( 35), V(35), V(35), V(35), V(35), V(35), V(35), V(35),
- // 24 25 26 27 28 29 30 31
- V( 35), V(35), V(35), V(35), V(35), V(35), V(35), V(35)
- };
+ // Pointers table to access mobility tables through piece type
+ const Score* MobilityBonus[] = { 0, 0, KnightMobilityBonus, BishopMobilityBonus, RookMobilityBonus, QueenMobilityBonus };
// Outpost bonuses for knights and bishops, indexed by square (from white's
// point of view).
const Value UnstoppablePawnValue = Value(0x500);
// Rooks and queens on the 7th rank (modified by Joona Kiiski)
- const Value MidgameRookOn7thBonus = Value(47);
- const Value EndgameRookOn7thBonus = Value(98);
- const Value MidgameQueenOn7thBonus = Value(27);
- const Value EndgameQueenOn7thBonus = Value(54);
+ const Score RookOn7thBonus = Score(47, 98);
+ const Score QueenOn7thBonus = Score(27, 54);
// Rooks on open files (modified by Joona Kiiski)
- const Value RookOpenFileBonus = Value(43);
- const Value RookHalfOpenFileBonus = Value(19);
+ const Score RookOpenFileBonus = Score(43, 43);
+ const Score RookHalfOpenFileBonus = Score(19, 19);
// Penalty for rooks trapped inside a friendly king which has lost the
// right to castle.
// Penalty for a bishop on a7/h7 (a2/h2 for black) which is trapped by
// enemy pawns.
- const Value TrappedBishopA7H7Penalty = Value(300);
+ const Score TrappedBishopA7H7Penalty = Score(300, 300);
// Bitboard masks for detecting trapped bishops on a7/h7 (a2/h2 for black)
const Bitboard MaskA7H7[2] = {
// Penalty for a bishop on a1/h1 (a8/h8 for black) which is trapped by
// a friendly pawn on b2/g2 (b7/g7 for black). This can obviously only
// happen in Chess960 games.
- const Value TrappedBishopA1H1Penalty = Value(100);
+ const Score TrappedBishopA1H1Penalty = Score(100, 100);
// Bitboard masks for detecting trapped bishops on a1/h1 (a8/h8 for black)
const Bitboard MaskA1H1[2] = {
/// the strength of the attack are added up into an integer, which is used
/// as an index to SafetyTable[].
- // Attack weights for each piece type
+ // Attack weights for each piece type and table indexed on piece type
const int QueenAttackWeight = 5;
const int RookAttackWeight = 3;
const int BishopAttackWeight = 2;
const int KnightAttackWeight = 2;
+ const int AttackWeight[] = { 0, 0, KnightAttackWeight, BishopAttackWeight, RookAttackWeight, QueenAttackWeight };
+
// Bonuses for safe checks, initialized from UCI options
int QueenContactCheckBonus, DiscoveredCheckBonus;
int QueenCheckBonus, RookCheckBonus, BishopCheckBonus, KnightCheckBonus;
// ThreatBonus[][] contains bonus according to which piece type
// attacks which one.
- const Value MidgameThreatBonus[8][8] = {
- V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), // not used
- V(0),V(30), V(0),V(50), V(70), V(70), V(0), V(0), // KNIGHT attacks
- V(0),V(30),V(50), V(0), V(70), V(70), V(0), V(0), // BISHOP attacks
- V(0),V(20),V(40),V(40), V(0), V(50), V(0), V(0), // ROOK attacks
- V(0),V(40),V(40),V(40), V(40), V(0), V(0), V(0), // QUEEN attacks
- V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), // not used
- V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), // not used
- V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0) // not used
- };
-
- const Value EndgameThreatBonus[8][8] = {
- V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), // not used
- V(0),V(40), V(0),V(50),V(100),V(100), V(0), V(0), // KNIGHT attacks
- V(0),V(40),V(50), V(0),V(100),V(100), V(0), V(0), // BISHOP attacks
- V(0),V(30),V(50),V(50), V(0), V(50), V(0), V(0), // ROOK attacks
- V(0),V(40),V(40),V(40), V(40), V(0), V(0), V(0), // QUEEN attacks
- V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), // not used
- V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), // not used
- V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0) // not used
+ #define Z Score(0, 0)
+
+ const Score ThreatBonus[8][8] = {
+ { Z, Z, Z, Z, Z, Z, Z, Z }, // not used
+ { Z, S(18,37), Z, S(37,47), S(55,97), S(55,97), Z, Z }, // KNIGHT attacks
+ { Z, S(18,37), S(37,47), Z, S(55,97), S(55,97), Z, Z }, // BISHOP attacks
+ { Z, S( 9,27), S(27,47), S(27,47), Z, S(37,47), Z, Z }, // ROOK attacks
+ { Z, S(27,37), S(27,37), S(27,37), S(27,37), Z, Z, Z }, // QUEEN attacks
+ { Z, Z, Z, Z, Z, Z, Z, Z }, // not used
+ { Z, Z, Z, Z, Z, Z, Z, Z }, // not used
+ { Z, Z, Z, Z, Z, Z, Z, Z } // not used
};
// ThreatedByPawnPenalty[] contains a penalty according to which piece
// type is attacked by an enemy pawn.
- const Value MidgameThreatedByPawnPenalty[8] = {
- V(0), V(0), V(50), V(50), V(70), V(80), V(0), V(0)
+ const Score ThreatedByPawnPenalty[8] = {
+ Z, Z, S(56, 70), S(56, 70), S(76, 99), S(86, 118), Z, Z
};
- const Value EndgameThreatedByPawnPenalty[8] = {
- V(0), V(0), V(70), V(70), V(100), V(120), V(0), V(0)
- };
+ #undef Z
// InitKingDanger[] contains bonuses based on the position of the defending
// king.
template<Color Us, bool HasPopCnt>
void evaluate_king(const Position& pos, EvalInfo& ei);
+ template<Color Us>
+ void evaluate_threats(const Position& pos, EvalInfo& ei);
+
template<Color Us, bool HasPopCnt>
void evaluate_space(const Position& pos, EvalInfo& ei);
void evaluate_passed_pawns(const Position& pos, EvalInfo& ei);
void evaluate_trapped_bishop_a7h7(const Position& pos, Square s, Color us, EvalInfo& ei);
void evaluate_trapped_bishop_a1h1(const Position& pos, Square s, Color us, EvalInfo& ei);
- inline Value apply_weight(Value v, int w);
- Value scale_by_game_phase(Value mv, Value ev, Phase ph, const ScaleFactor sf[]);
- int weight_option(const std::string& opt, int weight);
+ inline Score apply_weight(Score v, Score weight);
+ Value scale_by_game_phase(const Score& v, Phase ph, const ScaleFactor sf[]);
+ Score weight_option(const std::string& mgOpt, const std::string& egOpt, Score internalWeight);
void init_safety();
}
// Initialize by reading the incrementally updated scores included in the
// position object (material + piece square tables)
- ei.mgValue = pos.mg_value();
- ei.egValue = pos.eg_value();
+ ei.value = pos.value();
// Probe the material hash table
ei.mi = MaterialTable[threadID]->get_material_info(pos);
- ei.mgValue += ei.mi->material_value();
- ei.egValue += ei.mi->material_value();
+ ei.value += ei.mi->material_value();
// If we have a specialized evaluation function for the current material
// configuration, call it and return
// Probe the pawn hash table
ei.pi = PawnTable[threadID]->get_pawn_info(pos);
- ei.mgValue += apply_weight(ei.pi->mg_value(), WeightPawnStructureMidgame);
- ei.egValue += apply_weight(ei.pi->eg_value(), WeightPawnStructureEndgame);
+ ei.value += apply_weight(ei.pi->value(), WeightPawnStructure);
// Initialize king attack bitboards and king attack zones for both sides
ei.attackedBy[WHITE][KING] = pos.attacks_from<KING>(pos.king_square(WHITE));
if ( square_file(pos.king_square(WHITE)) >= FILE_E
&& square_file(pos.king_square(BLACK)) <= FILE_D)
- ei.mgValue += ei.pi->queenside_storm_value(WHITE)
- - ei.pi->kingside_storm_value(BLACK);
+ ei.value += Score(ei.pi->queenside_storm_value(WHITE) - ei.pi->kingside_storm_value(BLACK), 0);
else if ( square_file(pos.king_square(WHITE)) <= FILE_D
&& square_file(pos.king_square(BLACK)) >= FILE_E)
- ei.mgValue += ei.pi->kingside_storm_value(WHITE)
- - ei.pi->queenside_storm_value(BLACK);
+ ei.value += Score(ei.pi->kingside_storm_value(WHITE) - ei.pi->queenside_storm_value(BLACK), 0);
// Evaluate space for both sides
if (ei.mi->space_weight() > 0)
}
// Mobility
- ei.mgValue += apply_weight(ei.mgMobility, WeightMobilityMidgame);
- ei.egValue += apply_weight(ei.egMobility, WeightMobilityEndgame);
+ ei.value += apply_weight(ei.mobility, WeightMobility);
// If we don't already have an unusual scale factor, check for opposite
// colored bishop endgames, and use a lower scale for those
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))))
+ && ( (factor[WHITE] == SCALE_FACTOR_NORMAL && ei.value.eg() > Value(0))
+ || (factor[BLACK] == SCALE_FACTOR_NORMAL && ei.value.eg() < Value(0))))
{
ScaleFactor sf;
// Interpolate between the middle game and the endgame score
Color stm = pos.side_to_move();
- Value v = Sign[stm] * scale_by_game_phase(ei.mgValue, ei.egValue, phase, factor);
+ Value v = Sign[stm] * scale_by_game_phase(ei.value, phase, factor);
return (ei.mateThreat[stm] == MOVE_NONE ? v : 8 * QueenValueMidgame - v);
}
static const
ScaleFactor sf[2] = {SCALE_FACTOR_NORMAL, SCALE_FACTOR_NORMAL};
- Value mgv = pos.mg_value();
- Value egv = pos.eg_value();
Phase ph = pos.game_phase();
Color stm = pos.side_to_move();
- return Sign[stm] * scale_by_game_phase(mgv, egv, ph, sf);
+ return Sign[stm] * scale_by_game_phase(pos.value(), ph, sf);
}
Color them = opposite_color(us);
- WeightMobilityMidgame = weight_option("Mobility (Middle Game)", WeightMobilityMidgameInternal);
- WeightMobilityEndgame = weight_option("Mobility (Endgame)", WeightMobilityEndgameInternal);
- WeightPawnStructureMidgame = weight_option("Pawn Structure (Middle Game)", WeightPawnStructureMidgameInternal);
- WeightPawnStructureEndgame = weight_option("Pawn Structure (Endgame)", WeightPawnStructureEndgameInternal);
- WeightPassedPawnsMidgame = weight_option("Passed Pawns (Middle Game)", WeightPassedPawnsMidgameInternal);
- WeightPassedPawnsEndgame = weight_option("Passed Pawns (Endgame)", WeightPassedPawnsEndgameInternal);
- WeightSpace = weight_option("Space", WeightSpaceInternal);
- WeightKingSafety[us] = weight_option("Cowardice", WeightKingSafetyInternal);
- WeightKingSafety[them] = weight_option("Aggressiveness", WeightKingOppSafetyInternal);
+ WeightMobility = weight_option("Mobility (Middle Game)", "Mobility (Endgame)", WeightMobilityInternal);
+ WeightPawnStructure = weight_option("Pawn Structure (Middle Game)", "Pawn Structure (Endgame)", WeightPawnStructureInternal);
+ WeightPassedPawns = weight_option("Passed Pawns (Middle Game)", "Passed Pawns (Endgame)", WeightPassedPawnsInternal);
+ WeightSpace = weight_option("Space", "Space", WeightSpaceInternal);
+ WeightKingSafety[us] = weight_option("Cowardice", "Cowardice", WeightKingSafetyInternal);
+ WeightKingSafety[them] = weight_option("Aggressiveness", "Aggressiveness", WeightKingOppSafetyInternal);
// If running in analysis mode, make sure we use symmetrical king safety. We do this
// by replacing both WeightKingSafety[us] and WeightKingSafety[them] by their average.
int evaluate_mobility(Bitboard b, Bitboard mob_area, EvalInfo& ei) {
const Color Them = (Us == WHITE ? BLACK : WHITE);
- static const int AttackWeight[] = { 0, 0, KnightAttackWeight, BishopAttackWeight, RookAttackWeight, QueenAttackWeight };
- static const Value* MgBonus[] = { 0, 0, MidgameKnightMobilityBonus, MidgameBishopMobilityBonus, MidgameRookMobilityBonus, MidgameQueenMobilityBonus };
- static const Value* EgBonus[] = { 0, 0, EndgameKnightMobilityBonus, EndgameBishopMobilityBonus, EndgameRookMobilityBonus, EndgameQueenMobilityBonus };
// Update attack info
ei.attackedBy[Us][Piece] |= b;
int mob = (Piece != QUEEN ? count_1s_max_15<HasPopCnt>(b & mob_area)
: count_1s<HasPopCnt>(b & mob_area));
- ei.mgMobility += Sign[Us] * MgBonus[Piece][mob];
- ei.egMobility += Sign[Us] * EgBonus[Piece][mob];
+ ei.mobility += Sign[Us] * MobilityBonus[Piece][mob];
return mob;
}
else
bonus += bonus / 2;
}
- ei.mgValue += Sign[Us] * bonus;
- ei.egValue += Sign[Us] * bonus;
+ ei.value += Sign[Us] * Score(bonus, bonus);
}
// Decrease score if we are attacked by an enemy pawn. Remaining part
// of threat evaluation must be done later when we have full attack info.
if (bit_is_set(ei.attackedBy[Them][PAWN], s))
- {
- ei.mgValue -= Sign[Us] * MidgameThreatedByPawnPenalty[Piece];
- ei.egValue -= Sign[Us] * EndgameThreatedByPawnPenalty[Piece];
- }
+ ei.value -= Sign[Us] * ThreatedByPawnPenalty[Piece];
// Bishop and knight outposts squares
if ((Piece == BISHOP || Piece == KNIGHT) && pos.square_is_weak(s, Them))
if ( relative_rank(Us, s) == RANK_7
&& relative_rank(Us, pos.king_square(Them)) == RANK_8)
{
- ei.mgValue += Sign[Us] * (Piece == ROOK ? MidgameRookOn7thBonus : MidgameQueenOn7thBonus);
- ei.egValue += Sign[Us] * (Piece == ROOK ? EndgameRookOn7thBonus : EndgameQueenOn7thBonus);
+ ei.value += Sign[Us] * (Piece == ROOK ? RookOn7thBonus : QueenOn7thBonus);
}
}
if (ei.pi->file_is_half_open(Us, f))
{
if (ei.pi->file_is_half_open(Them, f))
- {
- ei.mgValue += Sign[Us] * RookOpenFileBonus;
- ei.egValue += Sign[Us] * RookOpenFileBonus;
- }
+ ei.value += Sign[Us] * RookOpenFileBonus;
else
- {
- ei.mgValue += Sign[Us] * RookHalfOpenFileBonus;
- ei.egValue += Sign[Us] * RookHalfOpenFileBonus;
- }
+ ei.value += Sign[Us] * RookHalfOpenFileBonus;
}
// Penalize rooks which are trapped inside a king. Penalize more if
{
// Is there a half-open file between the king and the edge of the board?
if (!ei.pi->has_open_file_to_right(Us, square_file(ksq)))
- ei.mgValue -= pos.can_castle(Us)? Sign[Us] * ((TrappedRookPenalty - mob * 16) / 2)
- : Sign[Us] * (TrappedRookPenalty - mob * 16);
+ ei.value -= Sign[Us] * Score(pos.can_castle(Us) ? (TrappedRookPenalty - mob * 16) / 2
+ : (TrappedRookPenalty - mob * 16), 0);
}
else if ( square_file(ksq) <= FILE_D
&& square_file(s) < square_file(ksq)
{
// Is there a half-open file between the king and the edge of the board?
if (!ei.pi->has_open_file_to_left(Us, square_file(ksq)))
- ei.mgValue -= pos.can_castle(Us)? Sign[Us] * ((TrappedRookPenalty - mob * 16) / 2)
- : Sign[Us] * (TrappedRookPenalty - mob * 16);
+ ei.value -= Sign[Us] * Score(pos.can_castle(Us) ? (TrappedRookPenalty - mob * 16) / 2
+ : (TrappedRookPenalty - mob * 16), 0);
}
}
}
const Color Them = (Us == WHITE ? BLACK : WHITE);
Bitboard b;
- Value mgBonus = Value(0);
- Value egBonus = Value(0);
+ Score bonus(0, 0);
// Enemy pieces not defended by a pawn and under our attack
Bitboard weakEnemies = pos.pieces_of_color(Them)
if (b)
for (PieceType pt2 = PAWN; pt2 < KING; pt2++)
if (b & pos.pieces(pt2))
- {
- mgBonus += MidgameThreatBonus[pt1][pt2];
- egBonus += EndgameThreatBonus[pt1][pt2];
- }
+ bonus += ThreatBonus[pt1][pt2];
}
- ei.mgValue += Sign[Us] * mgBonus;
- ei.egValue += Sign[Us] * egBonus;
+ ei.value += Sign[Us] * bonus;
}
if (relative_rank(Us, s) <= RANK_4)
{
shelter = ei.pi->get_king_shelter(pos, Us, s);
- ei.mgValue += Sign[Us] * Value(shelter);
+ ei.value += Sign[Us] * Score(shelter, 0);
}
// King safety. This is quite complicated, and is almost certainly far
// that the king safety scores can sometimes be very big, and that
// capturing a single attacking piece can therefore result in a score
// change far bigger than the value of the captured piece.
- Value v = apply_weight(SafetyTable[attackUnits], WeightKingSafety[Us]);
+ Score v = apply_weight(Score(SafetyTable[attackUnits], 0), WeightKingSafety[Us]);
- ei.mgValue -= Sign[Us] * v;
+ ei.value -= Sign[Us] * v;
if (Us == pos.side_to_move())
- ei.futilityMargin += v;
+ ei.futilityMargin += v.mg();
}
}
}
// Add the scores for this pawn to the middle game and endgame eval.
- ei.mgValue += apply_weight(Sign[Us] * mbonus, WeightPassedPawnsMidgame);
- ei.egValue += apply_weight(Sign[Us] * ebonus, WeightPassedPawnsEndgame);
+ ei.value += Sign[Us] * apply_weight(Score(mbonus, ebonus), WeightPassedPawns);
} // while
}
if (!movesToGo[WHITE] || !movesToGo[BLACK])
{
Color winnerSide = movesToGo[WHITE] ? WHITE : BLACK;
- ei.egValue += Sign[winnerSide] * (UnstoppablePawnValue - Value(0x40 * movesToGo[winnerSide]));
+ ei.value += Score(0, Sign[winnerSide] * (UnstoppablePawnValue - Value(0x40 * movesToGo[winnerSide])));
}
else
{ // Both sides have unstoppable pawns! Try to find out who queens
// If one side queens at least three plies before the other, that side wins
if (movesToGo[winnerSide] <= movesToGo[loserSide] - 3)
- ei.egValue += Sign[winnerSide] * (UnstoppablePawnValue - Value(0x40 * (movesToGo[winnerSide]/2)));
+ ei.value += Sign[winnerSide] * Score(0, UnstoppablePawnValue - Value(0x40 * (movesToGo[winnerSide]/2)));
// If one side queens one ply before the other and checks the king or attacks
// the undefended opponent's queening square, that side wins. To avoid cases
if ( (b & pos.pieces(KING, loserSide))
||(bit_is_set(b, loserQSq) && !bit_is_set(ei.attacked_by(loserSide), loserQSq)))
- ei.egValue += Sign[winnerSide] * (UnstoppablePawnValue - Value(0x40 * (movesToGo[winnerSide]/2)));
+ ei.value += Sign[winnerSide] * Score(0, UnstoppablePawnValue - Value(0x40 * (movesToGo[winnerSide]/2)));
}
}
}
&& pos.see(s, b6) < 0
&& pos.see(s, b8) < 0)
{
- ei.mgValue -= Sign[us] * TrappedBishopA7H7Penalty;
- ei.egValue -= Sign[us] * TrappedBishopA7H7Penalty;
+ ei.value -= Sign[us] * TrappedBishopA7H7Penalty;
}
}
if (pos.piece_on(b2) == pawn)
{
- Value penalty;
+ Score penalty;
if (!pos.square_is_empty(b3))
- penalty = 2*TrappedBishopA1H1Penalty;
+ penalty = 2 * TrappedBishopA1H1Penalty;
else if (pos.piece_on(c3) == pawn)
penalty = TrappedBishopA1H1Penalty;
else
penalty = TrappedBishopA1H1Penalty / 2;
- ei.mgValue -= Sign[us] * penalty;
- ei.egValue -= Sign[us] * penalty;
+ ei.value -= Sign[us] * penalty;
}
}
int space = count_1s_max_15<HasPopCnt>(safeSquares)
+ count_1s_max_15<HasPopCnt>(behindFriendlyPawns & safeSquares);
- ei.mgValue += Sign[Us] * apply_weight(Value(space * ei.mi->space_weight()), WeightSpace);
+ ei.value += Sign[Us] * apply_weight(Score(space * ei.mi->space_weight(), 0), WeightSpace);
}
// apply_weight() applies an evaluation weight to a value
- inline Value apply_weight(Value v, int w) {
- return (v*w) / 0x100;
+ inline Score apply_weight(Score v, Score w) {
+ return v * w / 0x100;
}
// score, based on game phase. It also scales the return value by a
// ScaleFactor array.
- Value scale_by_game_phase(Value mv, Value ev, Phase ph, const ScaleFactor sf[]) {
+ Value scale_by_game_phase(const Score& v, Phase ph, const ScaleFactor sf[]) {
- assert(mv > -VALUE_INFINITE && mv < VALUE_INFINITE);
- assert(ev > -VALUE_INFINITE && ev < VALUE_INFINITE);
+ assert(v.mg() > -VALUE_INFINITE && v.mg() < VALUE_INFINITE);
+ assert(v.eg() > -VALUE_INFINITE && v.eg() < VALUE_INFINITE);
assert(ph >= PHASE_ENDGAME && ph <= PHASE_MIDGAME);
- ev = apply_scale_factor(ev, sf[(ev > Value(0) ? WHITE : BLACK)]);
+ Value ev = apply_scale_factor(v.eg(), sf[(v.eg() > Value(0) ? WHITE : BLACK)]);
- Value result = Value(int((mv * ph + ev * (128 - ph)) / 128));
+ Value result = Value(int((v.mg() * ph + ev * (128 - ph)) / 128));
return Value(int(result) & ~(GrainSize - 1));
}
// weight_option() computes the value of an evaluation weight, by combining
- // an UCI-configurable weight with an internal weight.
+ // two UCI-configurable weights (midgame and endgame) with an internal weight.
- int weight_option(const std::string& opt, int internalWeight) {
+ Score weight_option(const std::string& mgOpt, const std::string& egOpt, Score internalWeight) {
- int uciWeight = get_option_value_int(opt);
+ Score uciWeight(get_option_value_int(mgOpt), get_option_value_int(egOpt));
uciWeight = (uciWeight * 0x100) / 100;
return (uciWeight * internalWeight) / 0x100;
}
}
}
}
+
+std::ostream& operator<<(std::ostream &os, Score s) {
+
+ return os << "(" << s.mg() << ", " << s.eg() << ")";
+}
projects / stockfish / blobdiff