X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fevaluate.cpp;h=652fb386683c13deeef0e82cd134f6403661b157;hb=2a98042c21fa2f3f5630c41a16b91539d7da3b87;hp=25d3ed03310b95d6b7b616ea1f105f1ff128db7a;hpb=764229a2e24c6c396e3c9f3f291b5857428ccc32;p=stockfish
diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index 25d3ed03..652fb386 100644
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -1,7 +1,7 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2009 Marco Costalba
+ Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, 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
@@ -17,38 +17,83 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
-
#include
-#include
+#include
+#include
+#include
#include "bitcount.h"
#include "evaluate.h"
#include "material.h"
#include "pawns.h"
-#include "scale.h"
#include "thread.h"
#include "ucioption.h"
+namespace {
+
+ enum ExtendedPieceType { // Used for tracing
+ PST = 8, IMBALANCE, MOBILITY, THREAT, PASSED, UNSTOPPABLE, SPACE, TOTAL
+ };
-////
-//// Local definitions
-////
+ namespace Tracing {
-namespace {
+ Score scores[COLOR_NB][TOTAL + 1];
+ std::stringstream stream;
+
+ void add(int idx, Score term_w, Score term_b = SCORE_ZERO);
+ void row(const char* name, int idx);
+ std::string do_trace(const Position& pos);
+ }
- const int Sign[2] = { 1, -1 };
+ // Struct EvalInfo contains various information computed and collected
+ // by the evaluation functions.
+ struct EvalInfo {
+
+ // Pointers to material and pawn hash table entries
+ Material::Entry* mi;
+ Pawns::Entry* pi;
+
+ // attackedBy[color][piece type] is a bitboard representing all squares
+ // attacked by a given color and piece type, attackedBy[color][ALL_PIECES]
+ // contains all squares attacked by the given color.
+ Bitboard attackedBy[COLOR_NB][PIECE_TYPE_NB];
+
+ // kingRing[color] is the zone around the king which is considered
+ // by the king safety evaluation. This consists of the squares directly
+ // adjacent to the king, and the three (or two, for a king on an edge file)
+ // squares two ranks in front of the king. For instance, if black's king
+ // is on g8, kingRing[BLACK] is a bitboard containing the squares f8, h8,
+ // f7, g7, h7, f6, g6 and h6.
+ Bitboard kingRing[COLOR_NB];
+
+ // kingAttackersCount[color] is the number of pieces of the given color
+ // which attack a square in the kingRing of the enemy king.
+ int kingAttackersCount[COLOR_NB];
+
+ // kingAttackersWeight[color] is the sum of the "weight" of the pieces of the
+ // given color which attack a square in the kingRing of the enemy king. The
+ // weights of the individual piece types are given by the variables
+ // QueenAttackWeight, RookAttackWeight, BishopAttackWeight and
+ // KnightAttackWeight in evaluate.cpp
+ int kingAttackersWeight[COLOR_NB];
+
+ // kingAdjacentZoneAttacksCount[color] is the number of attacks to squares
+ // directly adjacent to the king of the given color. Pieces which attack
+ // more than one square are counted multiple times. For instance, if black's
+ // king is on g8 and there's a white knight on g5, this knight adds
+ // 2 to kingAdjacentZoneAttacksCount[BLACK].
+ int kingAdjacentZoneAttacksCount[COLOR_NB];
+ };
// Evaluation grain size, must be a power of 2
- const int GrainSize = 8;
+ const int GrainSize = 4;
// Evaluation weights, initialized from UCI options
- Score WeightMobility, WeightPawnStructure;
- Score WeightPassedPawns, WeightSpace;
- Score WeightKingSafety[2];
+ enum { Mobility, PawnStructure, PassedPawns, Space, KingDangerUs, KingDangerThem };
+ Score Weights[6];
+
+ typedef Value V;
+ #define S(mg, eg) make_score(mg, eg)
// Internal evaluation weights. These are applied on top of the evaluation
// weights read from UCI parameters. The purpose is to be able to change
@@ -56,188 +101,118 @@ namespace {
// parameters at 100, which looks prettier.
//
// Values modified by Joona Kiiski
- const Score WeightMobilityInternal = make_score(248, 271);
- const Score WeightPawnStructureInternal = make_score(233, 201);
- const Score WeightPassedPawnsInternal = make_score(252, 259);
- const Score WeightSpaceInternal = make_score( 46, 0);
- const Score WeightKingSafetyInternal = make_score(247, 0);
- const Score WeightKingOppSafetyInternal = make_score(259, 0);
-
- // Mobility and outposts bonus modified by Joona Kiiski
- //
- // Visually better to define tables constants
- typedef Value V;
- #define S(mg, eg) make_score(mg, eg)
-
- CACHE_LINE_ALIGNMENT
-
- // Knight mobility bonus in middle game and endgame, indexed by the number
- // of attacked squares not occupied by friendly piecess.
- const Score KnightMobilityBonus[16] = {
- 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 Score BishopMobilityBonus[16] = {
- 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 Score RookMobilityBonus[16] = {
- 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 Score QueenMobilityBonus[32] = {
- 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 Score WeightsInternal[] = {
+ S(289, 344), S(233, 201), S(221, 273), S(46, 0), S(271, 0), S(307, 0)
};
- // Pointers table to access mobility tables through piece type
- const Score* MobilityBonus[8] = { 0, 0, KnightMobilityBonus, BishopMobilityBonus,
- RookMobilityBonus, QueenMobilityBonus, 0, 0 };
-
- // Outpost bonuses for knights and bishops, indexed by square (from white's
- // point of view).
- const Value KnightOutpostBonus[64] = {
- // A B C D E F G H
- V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), // 1
- V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), // 2
- V(0), V(0), V(4), V(8), V(8), V(4), V(0), V(0), // 3
- V(0), V(4),V(17),V(26),V(26),V(17), V(4), V(0), // 4
- V(0), V(8),V(26),V(35),V(35),V(26), V(8), V(0), // 5
- V(0), V(4),V(17),V(17),V(17),V(17), V(4), V(0), // 6
- V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), // 7
- V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0) // 8
+ // MobilityBonus[PieceType][attacked] contains bonuses for middle and end
+ // game, indexed by piece type and number of attacked squares not occupied by
+ // friendly pieces.
+ const Score MobilityBonus[][32] = {
+ {}, {},
+ { S(-35,-30), S(-22,-20), S(-9,-10), S( 3, 0), S(15, 10), S(27, 20), // Knights
+ S( 37, 28), S( 42, 31), S(44, 33) },
+ { S(-22,-27), S( -8,-13), S( 6, 1), S(20, 15), S(34, 29), S(48, 43), // Bishops
+ S( 60, 55), S( 68, 63), S(74, 68), S(77, 72), S(80, 75), S(82, 77),
+ S( 84, 79), S( 86, 81), S(87, 82), S(87, 82) },
+ { S(-17,-33), S(-11,-16), S(-5, 0), S( 1, 16), S( 7, 32), S(13, 48), // Rooks
+ S( 18, 64), S( 22, 80), S(26, 96), S(29,109), S(31,115), S(33,119),
+ S( 35,122), S( 36,123), S(37,124), S(38,124) },
+ { S(-12,-20), S( -8,-13), S(-5, -7), S(-2, -1), S( 1, 5), S( 4, 11), // Queens
+ S( 7, 17), S( 10, 23), S(13, 29), S(16, 34), S(18, 38), S(20, 40),
+ S( 22, 41), S( 23, 41), S(24, 41), S(25, 41), S(25, 41), S(25, 41),
+ S( 25, 41), S( 25, 41), S(25, 41), S(25, 41), S(25, 41), S(25, 41),
+ S( 25, 41), S( 25, 41), S(25, 41), S(25, 41), S(25, 41), S(25, 41),
+ S( 25, 41), S( 25, 41) }
};
- const Value BishopOutpostBonus[64] = {
+ // Outpost[PieceType][Square] contains bonuses of knights and bishops, indexed
+ // by piece type and square (from white's point of view).
+ const Value Outpost[][SQUARE_NB] = {
+ {
// A B C D E F G H
- V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), // 1
- V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), // 2
- V(0), V(0), V(5), V(5), V(5), V(5), V(0), V(0), // 3
- V(0), V(5),V(10),V(10),V(10),V(10), V(5), V(0), // 4
- V(0),V(10),V(21),V(21),V(21),V(21),V(10), V(0), // 5
- V(0), V(5), V(8), V(8), V(8), V(8), V(5), V(0), // 6
- V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), // 7
- V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0) // 8
+ V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), // Knights
+ V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0),
+ V(0), V(0), V(4), V(8), V(8), V(4), V(0), V(0),
+ V(0), V(4),V(17),V(26),V(26),V(17), V(4), V(0),
+ V(0), V(8),V(26),V(35),V(35),V(26), V(8), V(0),
+ V(0), V(4),V(17),V(17),V(17),V(17), V(4), V(0) },
+ {
+ V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), // Bishops
+ V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0),
+ V(0), V(0), V(5), V(5), V(5), V(5), V(0), V(0),
+ V(0), V(5),V(10),V(10),V(10),V(10), V(5), V(0),
+ V(0),V(10),V(21),V(21),V(21),V(21),V(10), V(0),
+ V(0), V(5), V(8), V(8), V(8), V(8), V(5), V(0) }
};
- // ThreatBonus[][] contains bonus according to which piece type
- // attacks which one.
- #define Z make_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
+ // Threat[attacking][attacked] contains bonuses according to which piece
+ // type attacks which one.
+ const Score Threat[][PIECE_TYPE_NB] = {
+ {}, {},
+ { S(0, 0), S( 7, 39), S( 0, 0), S(24, 49), S(41,100), S(41,100) }, // KNIGHT
+ { S(0, 0), S( 7, 39), S(24, 49), S( 0, 0), S(41,100), S(41,100) }, // BISHOP
+ { S(0, 0), S( 0, 22), S(15, 49), S(15, 49), S( 0, 0), S(24, 49) }, // ROOK
+ { S(0, 0), S(15, 39), S(15, 39), S(15, 39), S(15, 39), S( 0, 0) } // QUEEN
};
- // ThreatedByPawnPenalty[] contains a penalty according to which piece
+ // ThreatenedByPawn[PieceType] contains a penalty according to which piece
// type is attacked by an enemy pawn.
- const Score ThreatedByPawnPenalty[8] = {
- Z, Z, S(56, 70), S(56, 70), S(76, 99), S(86, 118), Z, Z
+ const Score ThreatenedByPawn[] = {
+ S(0, 0), S(0, 0), S(56, 70), S(56, 70), S(76, 99), S(86, 118)
};
- #undef Z
#undef S
- // Bonus for unstoppable passed pawns
- const Value UnstoppablePawnValue = Value(0x500);
-
- // Rooks and queens on the 7th rank (modified by Joona Kiiski)
- const Score RookOn7thBonus = make_score(47, 98);
- const Score QueenOn7thBonus = make_score(27, 54);
-
- // Rooks on open files (modified by Joona Kiiski)
- const Score RookOpenFileBonus = make_score(43, 43);
- const Score RookHalfOpenFileBonus = make_score(19, 19);
-
- // Penalty for rooks trapped inside a friendly king which has lost the
- // right to castle.
- const Value TrappedRookPenalty = Value(180);
-
- // Penalty for a bishop on a7/h7 (a2/h2 for black) which is trapped by
- // enemy pawns.
- const Score TrappedBishopA7H7Penalty = make_score(300, 300);
-
- // Bitboard masks for detecting trapped bishops on a7/h7 (a2/h2 for black)
- const Bitboard MaskA7H7[2] = {
- ((1ULL << SQ_A7) | (1ULL << SQ_H7)),
- ((1ULL << SQ_A2) | (1ULL << SQ_H2))
- };
+ const Score Tempo = make_score(24, 11);
+ const Score BishopPin = make_score(66, 11);
+ const Score RookOn7th = make_score(11, 20);
+ const Score QueenOn7th = make_score( 3, 8);
+ const Score RookOnPawn = make_score(10, 28);
+ const Score QueenOnPawn = make_score( 4, 20);
+ const Score RookOpenFile = make_score(43, 21);
+ const Score RookSemiopenFile = make_score(19, 10);
+ const Score BishopPawns = make_score( 8, 12);
+ const Score UndefendedMinor = make_score(25, 10);
+ const Score TrappedRook = make_score(90, 0);
// 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 Score TrappedBishopA1H1Penalty = make_score(100, 100);
-
- // Bitboard masks for detecting trapped bishops on a1/h1 (a8/h8 for black)
- const Bitboard MaskA1H1[2] = {
- ((1ULL << SQ_A1) | (1ULL << SQ_H1)),
- ((1ULL << SQ_A8) | (1ULL << SQ_H8))
- };
+ const Score TrappedBishopA1H1 = make_score(50, 50);
- // The SpaceMask[color] contains the area of the board which is considered
+ // The SpaceMask[Color] contains the area of the board which is considered
// by the space evaluation. In the middle game, each side is given a bonus
// based on how many squares inside this area are safe and available for
// friendly minor pieces.
- const Bitboard SpaceMask[2] = {
- (1ULL<
+ Value do_evaluate(const Position& pos, Value& margin);
- // Pawn and material hash tables, indexed by the current thread id
- PawnInfoTable* PawnTable[8] = {0, 0, 0, 0, 0, 0, 0, 0};
- MaterialInfoTable* MaterialTable[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+ template
+ void init_eval_info(const Position& pos, EvalInfo& ei);
- // Sizes of pawn and material hash tables
- const int PawnTableSize = 16384;
- const int MaterialTableSize = 1024;
+ template
+ Score evaluate_pieces_of_color(const Position& pos, EvalInfo& ei, Score& mobility);
- // Function prototypes
- template
- Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID);
+ template
+ Score evaluate_king(const Position& pos, EvalInfo& ei, Value margins[]);
- template
- void evaluate_pieces_of_color(const Position& pos, EvalInfo& ei);
+ template
+ Score evaluate_threats(const Position& pos, EvalInfo& ei);
- template
- void evaluate_king(const Position& pos, EvalInfo& ei);
+ template
+ Score evaluate_passed_pawns(const Position& pos, EvalInfo& ei);
template
- void evaluate_threats(const Position& pos, EvalInfo& ei);
+ int evaluate_space(const Position& pos, EvalInfo& ei);
- template
- void evaluate_space(const Position& pos, EvalInfo& ei);
+ Score evaluate_unstoppable_pawns(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 Score apply_weight(Score v, Score weight);
- Value scale_by_game_phase(const Score& v, Phase ph, const ScaleFactor sf[]);
+ Value interpolate(const Score& v, Phase ph, ScaleFactor sf);
+ Score apply_weight(Score v, Score w);
Score weight_option(const std::string& mgOpt, const std::string& egOpt, Score internalWeight);
- void init_safety();
+ double to_cp(Value v);
}
-////
-//// Functions
-////
+namespace Eval {
-/// evaluate() is the main evaluation function. It always computes two
-/// values, an endgame score and a middle game score, and interpolates
-/// between them based on the remaining material.
-Value evaluate(const Position& pos, EvalInfo& ei, int threadID) {
+ /// evaluate() is the main evaluation function. It always computes two
+ /// values, an endgame score and a middle game score, and interpolates
+ /// between them based on the remaining material.
+
+ Value evaluate(const Position& pos, Value& margin) {
+ return do_evaluate(pos, margin);
+ }
+
+
+ /// trace() is like evaluate() but instead of a value returns a string suitable
+ /// to be print on stdout with the detailed descriptions and values of each
+ /// evaluation term. Used mainly for debugging.
+ std::string trace(const Position& pos) {
+ return Tracing::do_trace(pos);
+ }
+
+
+ /// init() computes evaluation weights from the corresponding UCI parameters
+ /// and setup king tables.
+
+ void init() {
+
+ Weights[Mobility] = weight_option("Mobility (Midgame)", "Mobility (Endgame)", WeightsInternal[Mobility]);
+ Weights[PawnStructure] = weight_option("Pawn Structure (Midgame)", "Pawn Structure (Endgame)", WeightsInternal[PawnStructure]);
+ Weights[PassedPawns] = weight_option("Passed Pawns (Midgame)", "Passed Pawns (Endgame)", WeightsInternal[PassedPawns]);
+ Weights[Space] = weight_option("Space", "Space", WeightsInternal[Space]);
+ Weights[KingDangerUs] = weight_option("Cowardice", "Cowardice", WeightsInternal[KingDangerUs]);
+ Weights[KingDangerThem] = weight_option("Aggressiveness", "Aggressiveness", WeightsInternal[KingDangerThem]);
+
+ const int MaxSlope = 30;
+ const int Peak = 1280;
+
+ for (int t = 0, i = 1; i < 100; i++)
+ {
+ t = std::min(Peak, std::min(int(0.4 * i * i), t + MaxSlope));
+
+ KingDanger[1][i] = apply_weight(make_score(t, 0), Weights[KingDangerUs]);
+ KingDanger[0][i] = apply_weight(make_score(t, 0), Weights[KingDangerThem]);
+ }
+ }
+
+} // namespace Eval
- return CpuHasPOPCNT ? do_evaluate(pos, ei, threadID)
- : do_evaluate(pos, ei, threadID);
-}
namespace {
-template
-Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID) {
+template
+Value do_evaluate(const Position& pos, Value& margin) {
- assert(pos.is_ok());
- assert(threadID >= 0 && threadID < THREAD_MAX);
- assert(!pos.is_check());
+ assert(!pos.checkers());
- memset(&ei, 0, sizeof(EvalInfo));
+ EvalInfo ei;
+ Value margins[COLOR_NB];
+ Score score, mobilityWhite, mobilityBlack;
+ Thread* th = pos.this_thread();
- // Initialize by reading the incrementally updated scores included in the
- // position object (material + piece square tables)
- ei.value = pos.value();
+ // margins[] store the uncertainty estimation of position's evaluation
+ // that typically is used by the search for pruning decisions.
+ margins[WHITE] = margins[BLACK] = VALUE_ZERO;
+
+ // Initialize score by reading the incrementally updated scores included
+ // in the position object (material + piece square tables) and adding
+ // Tempo bonus. Score is computed from the point of view of white.
+ score = pos.psq_score() + (pos.side_to_move() == WHITE ? Tempo : -Tempo);
// Probe the material hash table
- ei.mi = MaterialTable[threadID]->get_material_info(pos);
- ei.value += ei.mi->material_value();
+ ei.mi = Material::probe(pos, th->materialTable, th->endgames);
+ score += ei.mi->material_value();
// If we have a specialized evaluation function for the current material
- // configuration, call it and return
+ // configuration, call it and return.
if (ei.mi->specialized_eval_exists())
+ {
+ margin = VALUE_ZERO;
return ei.mi->evaluate(pos);
-
- // After get_material_info() call that modifies them
- ScaleFactor factor[2];
- factor[WHITE] = ei.mi->scale_factor(pos, WHITE);
- factor[BLACK] = ei.mi->scale_factor(pos, BLACK);
+ }
// Probe the pawn hash table
- ei.pi = PawnTable[threadID]->get_pawn_info(pos);
- 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(pos.king_square(WHITE));
- ei.attackedBy[BLACK][KING] = pos.attacks_from(pos.king_square(BLACK));
- ei.kingZone[WHITE] = ei.attackedBy[BLACK][KING] | (ei.attackedBy[BLACK][KING] >> 8);
- ei.kingZone[BLACK] = ei.attackedBy[WHITE][KING] | (ei.attackedBy[WHITE][KING] << 8);
-
- // Initialize pawn attack bitboards for both sides
- ei.attackedBy[WHITE][PAWN] = ei.pi->pawn_attacks(WHITE);
- ei.attackedBy[BLACK][PAWN] = ei.pi->pawn_attacks(BLACK);
- Bitboard b1 = ei.attackedBy[WHITE][PAWN] & ei.attackedBy[BLACK][KING];
- Bitboard b2 = ei.attackedBy[BLACK][PAWN] & ei.attackedBy[WHITE][KING];
- if (b1)
- ei.kingAttackersCount[WHITE] = count_1s_max_15(b1)/2;
-
- if (b2)
- ei.kingAttackersCount[BLACK] = count_1s_max_15(b2)/2;
-
- // Evaluate pieces
- evaluate_pieces_of_color(pos, ei);
- evaluate_pieces_of_color(pos, ei);
-
- // Kings. Kings are evaluated after all other pieces for both sides,
- // because we need complete attack information for all pieces when computing
- // the king safety evaluation.
- evaluate_king(pos, ei);
- evaluate_king(pos, ei);
-
- // Evaluate tactical threats, we need full attack info
- evaluate_threats(pos, ei);
- evaluate_threats(pos, ei);
-
- // Evaluate passed pawns. We evaluate passed pawns for both sides at once,
- // because we need to know which side promotes first in positions where
- // both sides have an unstoppable passed pawn. To be called after all attacks
- // are computed, included king.
- if (ei.pi->passed_pawns())
- evaluate_passed_pawns(pos, ei);
-
- Phase phase = pos.game_phase();
-
- // Middle-game specific evaluation terms
- if (phase > PHASE_ENDGAME)
- {
- // Pawn storms in positions with opposite castling.
- if ( square_file(pos.king_square(WHITE)) >= FILE_E
- && square_file(pos.king_square(BLACK)) <= FILE_D)
+ ei.pi = Pawns::probe(pos, th->pawnsTable);
+ score += apply_weight(ei.pi->pawns_value(), Weights[PawnStructure]);
- ei.value += make_score(ei.pi->queenside_storm_value(WHITE) - ei.pi->kingside_storm_value(BLACK), 0);
+ // Initialize attack and king safety bitboards
+ init_eval_info(pos, ei);
+ init_eval_info(pos, ei);
- else if ( square_file(pos.king_square(WHITE)) <= FILE_D
- && square_file(pos.king_square(BLACK)) >= FILE_E)
+ // Evaluate pieces and mobility
+ score += evaluate_pieces_of_color(pos, ei, mobilityWhite)
+ - evaluate_pieces_of_color(pos, ei, mobilityBlack);
- ei.value += make_score(ei.pi->kingside_storm_value(WHITE) - ei.pi->queenside_storm_value(BLACK), 0);
+ score += apply_weight(mobilityWhite - mobilityBlack, Weights[Mobility]);
- // Evaluate space for both sides
- if (ei.mi->space_weight() > 0)
- {
- evaluate_space(pos, ei);
- evaluate_space(pos, ei);
- }
+ // Evaluate kings after all other pieces because we need complete attack
+ // information when computing the king safety evaluation.
+ score += evaluate_king(pos, ei, margins)
+ - evaluate_king(pos, ei, margins);
+
+ // Evaluate tactical threats, we need full attack information including king
+ score += evaluate_threats(pos, ei)
+ - evaluate_threats(pos, ei);
+
+ // Evaluate passed pawns, we need full attack information including king
+ score += evaluate_passed_pawns(pos, ei)
+ - evaluate_passed_pawns(pos, ei);
+
+ // If one side has only a king, check whether exists any unstoppable passed pawn
+ if (!pos.non_pawn_material(WHITE) || !pos.non_pawn_material(BLACK))
+ score += evaluate_unstoppable_pawns(pos, ei);
+
+ // Evaluate space for both sides, only in middle-game.
+ if (ei.mi->space_weight())
+ {
+ int s = evaluate_space(pos, ei) - evaluate_space(pos, ei);
+ score += apply_weight(make_score(s * ei.mi->space_weight(), 0), Weights[Space]);
}
- // Mobility
- ei.value += apply_weight(ei.mobility, WeightMobility);
+ // Scale winning side if position is more drawish that what it appears
+ ScaleFactor sf = eg_value(score) > VALUE_DRAW ? ei.mi->scale_factor(pos, WHITE)
+ : ei.mi->scale_factor(pos, BLACK);
// 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 && eg_value(ei.value) > Value(0))
- || (factor[BLACK] == SCALE_FACTOR_NORMAL && eg_value(ei.value) < Value(0))))
+ // colored bishop endgames, and use a lower scale for those.
+ if ( ei.mi->game_phase() < PHASE_MIDGAME
+ && pos.opposite_bishops()
+ && sf == SCALE_FACTOR_NORMAL)
{
- ScaleFactor sf;
-
// Only the two bishops ?
- if ( pos.non_pawn_material(WHITE) == BishopValueMidgame
- && pos.non_pawn_material(BLACK) == BishopValueMidgame)
+ if ( pos.non_pawn_material(WHITE) == BishopValueMg
+ && pos.non_pawn_material(BLACK) == BishopValueMg)
{
// Check for KBP vs KB with only a single pawn that is almost
// certainly a draw or at least two pawns.
@@ -419,577 +398,459 @@ Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID) {
// Endgame with opposite-colored bishops, but also other pieces. Still
// a bit drawish, but not as drawish as with only the two bishops.
sf = ScaleFactor(50);
-
- if (factor[WHITE] == SCALE_FACTOR_NORMAL)
- factor[WHITE] = sf;
- if (factor[BLACK] == SCALE_FACTOR_NORMAL)
- factor[BLACK] = 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.value, phase, factor);
-
- return (ei.mateThreat[stm] == MOVE_NONE ? v : 8 * QueenValueMidgame - v);
-}
-
-} // namespace
-
-/// quick_evaluate() does a very approximate evaluation of the current position.
-/// It currently considers only material and piece square table scores. Perhaps
-/// we should add scores from the pawn and material hash tables?
-
-Value quick_evaluate(const Position &pos) {
-
- assert(pos.is_ok());
-
- static const
- ScaleFactor sf[2] = {SCALE_FACTOR_NORMAL, SCALE_FACTOR_NORMAL};
-
- Phase ph = pos.game_phase();
- Color stm = pos.side_to_move();
-
- return Sign[stm] * scale_by_game_phase(pos.value(), ph, sf);
-}
-
-
-/// init_eval() initializes various tables used by the evaluation function
-
-void init_eval(int threads) {
+ margin = margins[pos.side_to_move()];
+ Value v = interpolate(score, ei.mi->game_phase(), sf);
- assert(threads <= THREAD_MAX);
-
- for (int i = 0; i < THREAD_MAX; i++)
+ // In case of tracing add all single evaluation contributions for both white and black
+ if (Trace)
{
- if (i >= threads)
- {
- delete PawnTable[i];
- delete MaterialTable[i];
- PawnTable[i] = NULL;
- MaterialTable[i] = NULL;
- continue;
- }
- if (!PawnTable[i])
- PawnTable[i] = new PawnInfoTable(PawnTableSize);
- if (!MaterialTable[i])
- MaterialTable[i] = new MaterialInfoTable(MaterialTableSize);
+ Tracing::add(PST, pos.psq_score());
+ Tracing::add(IMBALANCE, ei.mi->material_value());
+ Tracing::add(PAWN, ei.pi->pawns_value());
+ Tracing::add(UNSTOPPABLE, evaluate_unstoppable_pawns(pos, ei));
+ Score w = make_score(ei.mi->space_weight() * evaluate_space(pos, ei), 0);
+ Score b = make_score(ei.mi->space_weight() * evaluate_space(pos, ei), 0);
+ Tracing::add(SPACE, apply_weight(w, Weights[Space]), apply_weight(b, Weights[Space]));
+ Tracing::add(TOTAL, score);
+ Tracing::stream << "\nUncertainty margin: White: " << to_cp(margins[WHITE])
+ << ", Black: " << to_cp(margins[BLACK])
+ << "\nScaling: " << std::noshowpos
+ << std::setw(6) << 100.0 * ei.mi->game_phase() / 128.0 << "% MG, "
+ << std::setw(6) << 100.0 * (1.0 - ei.mi->game_phase() / 128.0) << "% * "
+ << std::setw(6) << (100.0 * sf) / SCALE_FACTOR_NORMAL << "% EG.\n"
+ << "Total evaluation: " << to_cp(v);
}
-}
-
-/// quit_eval() releases heap-allocated memory at program termination
-
-void quit_eval() {
-
- for (int i = 0; i < THREAD_MAX; i++)
- {
- delete PawnTable[i];
- delete MaterialTable[i];
- PawnTable[i] = NULL;
- MaterialTable[i] = NULL;
- }
+ return pos.side_to_move() == WHITE ? v : -v;
}
-/// read_weights() reads evaluation weights from the corresponding UCI parameters
+ // init_eval_info() initializes king bitboards for given color adding
+ // pawn attacks. To be done at the beginning of the evaluation.
-void read_weights(Color us) {
+ template
+ void init_eval_info(const Position& pos, EvalInfo& ei) {
- Color them = opposite_color(us);
+ const Color Them = (Us == WHITE ? BLACK : WHITE);
- 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);
+ Bitboard b = ei.attackedBy[Them][KING] = pos.attacks_from(pos.king_square(Them));
+ ei.attackedBy[Us][PAWN] = ei.pi->pawn_attacks(Us);
- // 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.
- if (get_option_value_bool("UCI_AnalyseMode"))
- {
- WeightKingSafety[us] = (WeightKingSafety[us] + WeightKingSafety[them]) / 2;
- WeightKingSafety[them] = WeightKingSafety[us];
+ // Init king safety tables only if we are going to use them
+ if ( pos.piece_count(Us, QUEEN)
+ && pos.non_pawn_material(Us) > QueenValueMg + PawnValueMg)
+ {
+ ei.kingRing[Them] = (b | (Us == WHITE ? b >> 8 : b << 8));
+ b &= ei.attackedBy[Us][PAWN];
+ ei.kingAttackersCount[Us] = b ? popcount(b) / 2 : 0;
+ ei.kingAdjacentZoneAttacksCount[Us] = ei.kingAttackersWeight[Us] = 0;
+ } else
+ ei.kingRing[Them] = ei.kingAttackersCount[Us] = 0;
}
- init_safety();
-}
-namespace {
-
// evaluate_outposts() evaluates bishop and knight outposts squares
template
- void evaluate_outposts(const Position& pos, EvalInfo& ei, Square s) {
+ Score evaluate_outposts(const Position& pos, EvalInfo& ei, Square s) {
const Color Them = (Us == WHITE ? BLACK : WHITE);
+ assert (Piece == BISHOP || Piece == KNIGHT);
+
// Initial bonus based on square
- Value bonus = (Piece == BISHOP ? BishopOutpostBonus[relative_square(Us, s)]
- : KnightOutpostBonus[relative_square(Us, s)]);
+ Value bonus = Outpost[Piece == BISHOP][relative_square(Us, s)];
// Increase bonus if supported by pawn, especially if the opponent has
- // no minor piece which can exchange the outpost piece
- if (bonus && bit_is_set(ei.attackedBy[Us][PAWN], s))
+ // no minor piece which can exchange the outpost piece.
+ if (bonus && (ei.attackedBy[Us][PAWN] & s))
{
- if ( pos.pieces(KNIGHT, Them) == EmptyBoardBB
- && (SquaresByColorBB[square_color(s)] & pos.pieces(BISHOP, Them)) == EmptyBoardBB)
+ if ( !pos.pieces(Them, KNIGHT)
+ && !(same_color_squares(s) & pos.pieces(Them, BISHOP)))
bonus += bonus + bonus / 2;
else
bonus += bonus / 2;
}
- ei.value += Sign[Us] * make_score(bonus, bonus);
+ return make_score(bonus, bonus);
}
// evaluate_pieces<>() assigns bonuses and penalties to the pieces of a given color
- template
- void evaluate_pieces(const Position& pos, EvalInfo& ei, Bitboard no_mob_area) {
+ template
+ Score evaluate_pieces(const Position& pos, EvalInfo& ei, Score& mobility, Bitboard mobilityArea) {
Bitboard b;
- Square s, ksq;
- int mob;
- File f;
+ Square s;
+ Score score = SCORE_ZERO;
const Color Them = (Us == WHITE ? BLACK : WHITE);
- const Square* ptr = pos.piece_list_begin(Us, Piece);
+ const Square* pl = pos.piece_list(Us, Piece);
+
+ ei.attackedBy[Us][Piece] = 0;
- while ((s = *ptr++) != SQ_NONE)
+ while ((s = *pl++) != SQ_NONE)
{
// Find attacked squares, including x-ray attacks for bishops and rooks
- if (Piece == KNIGHT || Piece == QUEEN)
- b = pos.attacks_from(s);
- else if (Piece == BISHOP)
- b = bishop_attacks_bb(s, pos.occupied_squares() & ~pos.pieces(QUEEN, Us));
- else if (Piece == ROOK)
- b = rook_attacks_bb(s, pos.occupied_squares() & ~pos.pieces(ROOK, QUEEN, Us));
- else
- assert(false);
+ b = Piece == BISHOP ? attacks_bb(s, pos.pieces() ^ pos.pieces(Us, QUEEN))
+ : Piece == ROOK ? attacks_bb< ROOK>(s, pos.pieces() ^ pos.pieces(Us, ROOK, QUEEN))
+ : pos.attacks_from(s);
- // Update attack info
ei.attackedBy[Us][Piece] |= b;
- // King attacks
- if (b & ei.kingZone[Us])
+ if (b & ei.kingRing[Them])
{
ei.kingAttackersCount[Us]++;
- ei.kingAttackersWeight[Us] += AttackWeight[Piece];
+ ei.kingAttackersWeight[Us] += KingAttackWeights[Piece];
Bitboard bb = (b & ei.attackedBy[Them][KING]);
if (bb)
- ei.kingAdjacentZoneAttacksCount[Us] += count_1s_max_15(bb);
+ ei.kingAdjacentZoneAttacksCount[Us] += popcount(bb);
}
- // Mobility
- mob = (Piece != QUEEN ? count_1s_max_15(b & no_mob_area)
- : count_1s(b & no_mob_area));
-
- ei.mobility += Sign[Us] * MobilityBonus[Piece][mob];
+ int mob = popcount(b & mobilityArea);
+ mobility += MobilityBonus[Piece][mob];
// 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.value -= Sign[Us] * ThreatedByPawnPenalty[Piece];
+ if (ei.attackedBy[Them][PAWN] & s)
+ score -= ThreatenedByPawn[Piece];
- // Bishop and knight outposts squares
- if ((Piece == BISHOP || Piece == KNIGHT) && pos.square_is_weak(s, Them))
- evaluate_outposts(pos, ei, s);
+ // Otherwise give a bonus if we are a bishop and can pin a piece or can
+ // give a discovered check through an x-ray attack.
+ else if ( Piece == BISHOP
+ && (PseudoAttacks[Piece][pos.king_square(Them)] & s)
+ && !more_than_one(BetweenBB[s][pos.king_square(Them)] & pos.pieces()))
+ score += BishopPin;
- // Special patterns: trapped bishops on a7/h7/a2/h2
- // and trapped bishops on a1/h1/a8/h8 in Chess960.
+ // Penalty for bishop with same coloured pawns
if (Piece == BISHOP)
- {
- if (bit_is_set(MaskA7H7[Us], s))
- evaluate_trapped_bishop_a7h7(pos, s, Us, ei);
+ score -= BishopPawns * ei.pi->pawns_on_same_color_squares(Us, s);
- if (Chess960 && bit_is_set(MaskA1H1[Us], s))
- evaluate_trapped_bishop_a1h1(pos, s, Us, ei);
- }
+ // Bishop and knight outposts squares
+ if ( (Piece == BISHOP || Piece == KNIGHT)
+ && !(pos.pieces(Them, PAWN) & attack_span_mask(Us, s)))
+ score += evaluate_outposts(pos, ei, s);
- // Queen or rook on 7th rank
if ( (Piece == ROOK || Piece == QUEEN)
- && relative_rank(Us, s) == RANK_7
- && relative_rank(Us, pos.king_square(Them)) == RANK_8)
+ && relative_rank(Us, s) >= RANK_5)
{
- ei.value += Sign[Us] * (Piece == ROOK ? RookOn7thBonus : QueenOn7thBonus);
+ // Major piece on 7th rank and enemy king trapped on 8th
+ if ( relative_rank(Us, s) == RANK_7
+ && relative_rank(Us, pos.king_square(Them)) == RANK_8)
+ score += Piece == ROOK ? RookOn7th : QueenOn7th;
+
+ // Major piece attacking enemy pawns on the same rank
+ Bitboard pawns = pos.pieces(Them, PAWN) & rank_bb(s);
+ if (pawns)
+ score += popcount(pawns) * (Piece == ROOK ? RookOnPawn : QueenOnPawn);
}
// Special extra evaluation for rooks
if (Piece == ROOK)
{
- // Open and half-open files
- f = square_file(s);
- if (ei.pi->file_is_half_open(Us, f))
- {
- if (ei.pi->file_is_half_open(Them, f))
- ei.value += Sign[Us] * RookOpenFileBonus;
- else
- ei.value += Sign[Us] * RookHalfOpenFileBonus;
- }
+ // Give a bonus for a rook on a open or semi-open file
+ if (ei.pi->semiopen(Us, file_of(s)))
+ score += ei.pi->semiopen(Them, file_of(s)) ? RookOpenFile : RookSemiopenFile;
- // Penalize rooks which are trapped inside a king. Penalize more if
- // king has lost right to castle.
- if (mob > 6 || ei.pi->file_is_half_open(Us, f))
+ if (mob > 6 || ei.pi->semiopen(Us, file_of(s)))
continue;
- ksq = pos.king_square(Us);
+ Square ksq = pos.king_square(Us);
- if ( square_file(ksq) >= FILE_E
- && square_file(s) > square_file(ksq)
- && (relative_rank(Us, ksq) == RANK_1 || square_rank(ksq) == square_rank(s)))
- {
- // 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.value -= Sign[Us] * make_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)
- && (relative_rank(Us, ksq) == RANK_1 || square_rank(ksq) == square_rank(s)))
- {
- // 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.value -= Sign[Us] * make_score(pos.can_castle(Us) ? (TrappedRookPenalty - mob * 16) / 2
- : (TrappedRookPenalty - mob * 16), 0);
- }
+ // Penalize rooks which are trapped inside a king. Penalize more if
+ // king has lost right to castle.
+ if ( ((file_of(ksq) < FILE_E) == (file_of(s) < file_of(ksq)))
+ && (rank_of(ksq) == rank_of(s) || relative_rank(Us, ksq) == RANK_1)
+ && !ei.pi->semiopen_on_side(Us, file_of(ksq), file_of(ksq) < FILE_E))
+ score -= (TrappedRook - make_score(mob * 8, 0)) * (pos.can_castle(Us) ? 1 : 2);
+ }
+
+ // An important Chess960 pattern: A cornered bishop blocked by a friendly
+ // pawn diagonally in front of it is a very serious problem, especially
+ // when that pawn is also blocked.
+ if ( Piece == BISHOP
+ && pos.is_chess960()
+ && (s == relative_square(Us, SQ_A1) || s == relative_square(Us, SQ_H1)))
+ {
+ const enum Piece P = make_piece(Us, PAWN);
+ Square d = pawn_push(Us) + (file_of(s) == FILE_A ? DELTA_E : DELTA_W);
+ if (pos.piece_on(s + d) == P)
+ score -= !pos.is_empty(s + d + pawn_push(Us)) ? TrappedBishopA1H1 * 4
+ : pos.piece_on(s + d + d) == P ? TrappedBishopA1H1 * 2
+ : TrappedBishopA1H1;
}
}
+
+ if (Trace)
+ Tracing::scores[Us][Piece] = score;
+
+ return score;
}
// evaluate_threats<>() assigns bonuses according to the type of attacking piece
// and the type of attacked one.
- template
- void evaluate_threats(const Position& pos, EvalInfo& ei) {
+ template
+ Score evaluate_threats(const Position& pos, EvalInfo& ei) {
const Color Them = (Us == WHITE ? BLACK : WHITE);
- Bitboard b;
- Score bonus = make_score(0, 0);
+ Bitboard b, undefendedMinors, weakEnemies;
+ Score score = SCORE_ZERO;
+
+ // Undefended minors get penalized even if not under attack
+ undefendedMinors = pos.pieces(Them, BISHOP, KNIGHT)
+ & ~ei.attackedBy[Them][ALL_PIECES];
+
+ if (undefendedMinors)
+ score += UndefendedMinor;
// Enemy pieces not defended by a pawn and under our attack
- Bitboard weakEnemies = pos.pieces_of_color(Them)
- & ~ei.attackedBy[Them][PAWN]
- & ei.attackedBy[Us][0];
- if (!weakEnemies)
- return;
+ weakEnemies = pos.pieces(Them)
+ & ~ei.attackedBy[Them][PAWN]
+ & ei.attackedBy[Us][ALL_PIECES];
- // Add bonus according to type of attacked enemy pieces and to the
+ // Add bonus according to type of attacked enemy piece and to the
// type of attacking piece, from knights to queens. Kings are not
- // considered because are already special handled in king evaluation.
- for (PieceType pt1 = KNIGHT; pt1 < KING; pt1++)
- {
- b = ei.attackedBy[Us][pt1] & weakEnemies;
- if (b)
- for (PieceType pt2 = PAWN; pt2 < KING; pt2++)
- if (b & pos.pieces(pt2))
- bonus += ThreatBonus[pt1][pt2];
- }
- ei.value += Sign[Us] * bonus;
+ // considered because are already handled in king evaluation.
+ if (weakEnemies)
+ for (PieceType pt1 = KNIGHT; pt1 < KING; pt1++)
+ {
+ b = ei.attackedBy[Us][pt1] & weakEnemies;
+ if (b)
+ for (PieceType pt2 = PAWN; pt2 < KING; pt2++)
+ if (b & pos.pieces(pt2))
+ score += Threat[pt1][pt2];
+ }
+
+ if (Trace)
+ Tracing::scores[Us][THREAT] = score;
+
+ return score;
}
// evaluate_pieces_of_color<>() assigns bonuses and penalties to all the
// pieces of a given color.
- template
- void evaluate_pieces_of_color(const Position& pos, EvalInfo& ei) {
+ template
+ Score evaluate_pieces_of_color(const Position& pos, EvalInfo& ei, Score& mobility) {
const Color Them = (Us == WHITE ? BLACK : WHITE);
+ Score score = mobility = SCORE_ZERO;
+
// Do not include in mobility squares protected by enemy pawns or occupied by our pieces
- const Bitboard no_mob_area = ~(ei.attackedBy[Them][PAWN] | pos.pieces_of_color(Us));
+ const Bitboard mobilityArea = ~(ei.attackedBy[Them][PAWN] | pos.pieces(Us, PAWN, KING));
- evaluate_pieces(pos, ei, no_mob_area);
- evaluate_pieces(pos, ei, no_mob_area);
- evaluate_pieces(pos, ei, no_mob_area);
- evaluate_pieces(pos, ei, no_mob_area);
+ score += evaluate_pieces(pos, ei, mobility, mobilityArea);
+ score += evaluate_pieces(pos, ei, mobility, mobilityArea);
+ score += evaluate_pieces(pos, ei, mobility, mobilityArea);
+ score += evaluate_pieces(pos, ei, mobility, mobilityArea);
// Sum up all attacked squares
- ei.attackedBy[Us][0] = ei.attackedBy[Us][PAWN] | ei.attackedBy[Us][KNIGHT]
- | ei.attackedBy[Us][BISHOP] | ei.attackedBy[Us][ROOK]
- | ei.attackedBy[Us][QUEEN] | ei.attackedBy[Us][KING];
+ ei.attackedBy[Us][ALL_PIECES] = ei.attackedBy[Us][PAWN] | ei.attackedBy[Us][KNIGHT]
+ | ei.attackedBy[Us][BISHOP] | ei.attackedBy[Us][ROOK]
+ | ei.attackedBy[Us][QUEEN] | ei.attackedBy[Us][KING];
+ if (Trace)
+ Tracing::scores[Us][MOBILITY] = apply_weight(mobility, Weights[Mobility]);
+
+ return score;
}
// evaluate_king<>() assigns bonuses and penalties to a king of a given color
- template
- void evaluate_king(const Position& pos, EvalInfo& ei) {
+ template
+ Score evaluate_king(const Position& pos, EvalInfo& ei, Value margins[]) {
const Color Them = (Us == WHITE ? BLACK : WHITE);
- const Square s = pos.king_square(Us);
- int shelter = 0;
- // King shelter
- if (relative_rank(Us, s) <= RANK_4)
- {
- shelter = ei.pi->get_king_shelter(pos, Us, s);
- ei.value += Sign[Us] * make_score(shelter, 0);
- }
+ Bitboard undefended, b, b1, b2, safe;
+ int attackUnits;
+ const Square ksq = pos.king_square(Us);
+
+ // King shelter and enemy pawns storm
+ Score score = ei.pi->king_safety(pos, ksq);
// King safety. This is quite complicated, and is almost certainly far
// from optimally tuned.
- if ( pos.piece_count(Them, QUEEN) >= 1
- && ei.kingAttackersCount[Them] >= 2
- && pos.non_pawn_material(Them) >= QueenValueMidgame + RookValueMidgame
+ if ( ei.kingAttackersCount[Them] >= 2
&& ei.kingAdjacentZoneAttacksCount[Them])
{
- // Is it the attackers turn to move?
- bool sente = (Them == pos.side_to_move());
-
- // Find the attacked squares around the king which has no defenders
- // apart from the king itself
- Bitboard undefended =
- ei.attacked_by(Them) & ~ei.attacked_by(Us, PAWN)
- & ~ei.attacked_by(Us, KNIGHT) & ~ei.attacked_by(Us, BISHOP)
- & ~ei.attacked_by(Us, ROOK) & ~ei.attacked_by(Us, QUEEN)
- & ei.attacked_by(Us, KING);
-
- Bitboard occ = pos.occupied_squares(), b, b2;
-
- // Initialize the 'attackUnits' variable, which is used later on as an
- // index to the SafetyTable[] array. The initial value is based on the
- // number and types of the attacking pieces, the number of attacked and
- // undefended squares around the king, the square of the king, and the
- // quality of the pawn shelter.
- int attackUnits =
- Min((ei.kingAttackersCount[Them] * ei.kingAttackersWeight[Them]) / 2, 25)
- + (ei.kingAdjacentZoneAttacksCount[Them] + count_1s_max_15(undefended)) * 3
- + InitKingDanger[relative_square(Us, s)] - (shelter >> 5);
-
- // Analyse safe queen contact checks
- b = undefended & ei.attacked_by(Them, QUEEN) & ~pos.pieces_of_color(Them);
- if (b)
- {
- Bitboard attackedByOthers =
- ei.attacked_by(Them, PAWN) | ei.attacked_by(Them, KNIGHT)
- | ei.attacked_by(Them, BISHOP) | ei.attacked_by(Them, ROOK);
-
- b &= attackedByOthers;
+ // Find the attacked squares around the king which has no defenders
+ // apart from the king itself
+ undefended = ei.attackedBy[Them][ALL_PIECES] & ei.attackedBy[Us][KING];
+ undefended &= ~( ei.attackedBy[Us][PAWN] | ei.attackedBy[Us][KNIGHT]
+ | ei.attackedBy[Us][BISHOP] | ei.attackedBy[Us][ROOK]
+ | ei.attackedBy[Us][QUEEN]);
+
+ // Initialize the 'attackUnits' variable, which is used later on as an
+ // index to the KingDanger[] array. The initial value is based on the
+ // number and types of the enemy's attacking pieces, the number of
+ // attacked and undefended squares around our king, the square of the
+ // king, and the quality of the pawn shelter.
+ attackUnits = std::min(25, (ei.kingAttackersCount[Them] * ei.kingAttackersWeight[Them]) / 2)
+ + 3 * (ei.kingAdjacentZoneAttacksCount[Them] + popcount(undefended))
+ + KingExposed[relative_square(Us, ksq)]
+ - mg_value(score) / 32;
+
+ // Analyse enemy's safe queen contact checks. First find undefended
+ // squares around the king attacked by enemy queen...
+ b = undefended & ei.attackedBy[Them][QUEEN] & ~pos.pieces(Them);
if (b)
{
- // The bitboard b now contains the squares available for safe queen
- // contact checks.
- int count = count_1s_max_15(b);
- attackUnits += QueenContactCheckBonus * count * (sente ? 2 : 1);
-
- // Is there a mate threat?
- if (QueenContactMates && !pos.is_check())
- {
- Bitboard escapeSquares =
- pos.attacks_from(s) & ~pos.pieces_of_color(Us) & ~attackedByOthers;
-
- while (b)
- {
- Square from, to = pop_1st_bit(&b);
- if (!(escapeSquares & ~queen_attacks_bb(to, occ & ClearMaskBB[s])))
- {
- // We have a mate, unless the queen is pinned or there
- // is an X-ray attack through the queen.
- for (int i = 0; i < pos.piece_count(Them, QUEEN); i++)
- {
- from = pos.piece_list(Them, QUEEN, i);
- if ( bit_is_set(pos.attacks_from(from), to)
- && !bit_is_set(pos.pinned_pieces(Them), from)
- && !(rook_attacks_bb(to, occ & ClearMaskBB[from]) & pos.pieces(ROOK, QUEEN, Us))
- && !(bishop_attacks_bb(to, occ & ClearMaskBB[from]) & pos.pieces(BISHOP, QUEEN, Us)))
-
- ei.mateThreat[Them] = make_move(from, to);
- }
- }
- }
- }
+ // ...then remove squares not supported by another enemy piece
+ b &= ( ei.attackedBy[Them][PAWN] | ei.attackedBy[Them][KNIGHT]
+ | ei.attackedBy[Them][BISHOP] | ei.attackedBy[Them][ROOK]);
+ if (b)
+ attackUnits += QueenContactCheck
+ * popcount(b)
+ * (Them == pos.side_to_move() ? 2 : 1);
}
- }
- // Analyse safe distance checks
- if (QueenCheckBonus > 0 || RookCheckBonus > 0)
- {
- b = pos.attacks_from(s) & ~pos.pieces_of_color(Them) & ~ei.attacked_by(Us);
+ // Analyse enemy's safe rook contact checks. First find undefended
+ // squares around the king attacked by enemy rooks...
+ b = undefended & ei.attackedBy[Them][ROOK] & ~pos.pieces(Them);
- // Queen checks
- b2 = b & ei.attacked_by(Them, QUEEN);
- if (b2)
- attackUnits += QueenCheckBonus * count_1s_max_15(b2);
+ // Consider only squares where the enemy rook gives check
+ b &= PseudoAttacks[ROOK][ksq];
- // Rook checks
- b2 = b & ei.attacked_by(Them, ROOK);
- if (b2)
- attackUnits += RookCheckBonus * count_1s_max_15(b2);
- }
- if (QueenCheckBonus > 0 || BishopCheckBonus > 0)
- {
- b = pos.attacks_from(s) & ~pos.pieces_of_color(Them) & ~ei.attacked_by(Us);
+ if (b)
+ {
+ // ...then remove squares not supported by another enemy piece
+ b &= ( ei.attackedBy[Them][PAWN] | ei.attackedBy[Them][KNIGHT]
+ | ei.attackedBy[Them][BISHOP] | ei.attackedBy[Them][QUEEN]);
+ if (b)
+ attackUnits += RookContactCheck
+ * popcount(b)
+ * (Them == pos.side_to_move() ? 2 : 1);
+ }
- // Queen checks
- b2 = b & ei.attacked_by(Them, QUEEN);
- if (b2)
- attackUnits += QueenCheckBonus * count_1s_max_15(b2);
+ // Analyse enemy's safe distance checks for sliders and knights
+ safe = ~(pos.pieces(Them) | ei.attackedBy[Us][ALL_PIECES]);
- // Bishop checks
- b2 = b & ei.attacked_by(Them, BISHOP);
- if (b2)
- attackUnits += BishopCheckBonus * count_1s_max_15(b2);
- }
- if (KnightCheckBonus > 0)
- {
- b = pos.attacks_from(s) & ~pos.pieces_of_color(Them) & ~ei.attacked_by(Us);
+ b1 = pos.attacks_from(ksq) & safe;
+ b2 = pos.attacks_from(ksq) & safe;
- // Knight checks
- b2 = b & ei.attacked_by(Them, KNIGHT);
- if (b2)
- attackUnits += KnightCheckBonus * count_1s_max_15(b2);
- }
+ // Enemy queen safe checks
+ b = (b1 | b2) & ei.attackedBy[Them][QUEEN];
+ if (b)
+ attackUnits += QueenCheck * popcount(b);
- // Analyse discovered checks (only for non-pawns right now, consider
- // adding pawns later).
- if (DiscoveredCheckBonus)
- {
- b = pos.discovered_check_candidates(Them) & ~pos.pieces(PAWN);
+ // Enemy rooks safe checks
+ b = b1 & ei.attackedBy[Them][ROOK];
if (b)
- attackUnits += DiscoveredCheckBonus * count_1s_max_15(b) * (sente ? 2 : 1);
- }
+ attackUnits += RookCheck * popcount(b);
- // Has a mate threat been found? We don't do anything here if the
- // side with the mating move is the side to move, because in that
- // case the mating side will get a huge bonus at the end of the main
- // evaluation function instead.
- if (ei.mateThreat[Them] != MOVE_NONE)
- attackUnits += MateThreatBonus;
-
- // Ensure that attackUnits is between 0 and 99, in order to avoid array
- // out of bounds errors:
- if (attackUnits < 0)
- attackUnits = 0;
-
- if (attackUnits >= 100)
- attackUnits = 99;
-
- // Finally, extract the king safety score from the SafetyTable[] array.
- // Add the score to the evaluation, and also to ei.futilityMargin. The
- // reason for adding the king safety score to the futility margin is
- // 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.
- Score v = apply_weight(make_score(SafetyTable[attackUnits], 0), WeightKingSafety[Us]);
-
- ei.value -= Sign[Us] * v;
-
- if (Us == pos.side_to_move())
- ei.futilityMargin += mg_value(v);
+ // Enemy bishops safe checks
+ b = b2 & ei.attackedBy[Them][BISHOP];
+ if (b)
+ attackUnits += BishopCheck * popcount(b);
+
+ // Enemy knights safe checks
+ b = pos.attacks_from(ksq) & ei.attackedBy[Them][KNIGHT] & safe;
+ if (b)
+ attackUnits += KnightCheck * popcount(b);
+
+ // To index KingDanger[] attackUnits must be in [0, 99] range
+ attackUnits = std::min(99, std::max(0, attackUnits));
+
+ // Finally, extract the king danger score from the KingDanger[]
+ // array and subtract the score from evaluation. Set also margins[]
+ // value that will be used for pruning because this value can sometimes
+ // be very big, and so capturing a single attacking piece can therefore
+ // result in a score change far bigger than the value of the captured piece.
+ score -= KingDanger[Us == Search::RootColor][attackUnits];
+ margins[Us] += mg_value(KingDanger[Us == Search::RootColor][attackUnits]);
}
+
+ if (Trace)
+ Tracing::scores[Us][KING] = score;
+
+ return score;
}
- // evaluate_passed_pawns() evaluates the passed pawns of the given color
+ // evaluate_passed_pawns<>() evaluates the passed pawns of the given color
- template
- void evaluate_passed_pawns_of_color(const Position& pos, int movesToGo[], Square pawnToGo[], EvalInfo& ei) {
+ template
+ Score evaluate_passed_pawns(const Position& pos, EvalInfo& ei) {
const Color Them = (Us == WHITE ? BLACK : WHITE);
- Bitboard b2, b3, b4;
- Square ourKingSq = pos.king_square(Us);
- Square theirKingSq = pos.king_square(Them);
- Bitboard b = ei.pi->passed_pawns() & pos.pieces(PAWN, Us);
+ Bitboard b, squaresToQueen, defendedSquares, unsafeSquares, supportingPawns;
+ Score score = SCORE_ZERO;
+
+ b = ei.pi->passed_pawns(Us);
while (b)
{
- Square s = pop_1st_bit(&b);
+ Square s = pop_lsb(&b);
- assert(pos.piece_on(s) == piece_of_color_and_type(Us, PAWN));
assert(pos.pawn_is_passed(Us, s));
int r = int(relative_rank(Us, s) - RANK_2);
- int tr = Max(0, r * (r - 1));
+ int rr = r * (r - 1);
// Base bonus based on rank
- Value mbonus = Value(20 * tr);
- Value ebonus = Value(10 + r * r * 10);
+ Value mbonus = Value(17 * rr);
+ Value ebonus = Value(7 * (rr + r + 1));
- // Adjust bonus based on king proximity
- if (tr)
+ if (rr)
{
Square blockSq = s + pawn_push(Us);
- ebonus -= Value(square_distance(ourKingSq, blockSq) * 3 * tr);
- ebonus -= Value(square_distance(ourKingSq, blockSq + pawn_push(Us)) * 1 * tr);
- ebonus += Value(square_distance(theirKingSq, blockSq) * 6 * tr);
+ // Adjust bonus based on kings proximity
+ ebonus += Value(square_distance(pos.king_square(Them), blockSq) * 5 * rr);
+ ebonus -= Value(square_distance(pos.king_square(Us), blockSq) * 2 * rr);
+
+ // If blockSq is not the queening square then consider also a second push
+ if (rank_of(blockSq) != (Us == WHITE ? RANK_8 : RANK_1))
+ ebonus -= Value(square_distance(pos.king_square(Us), blockSq + pawn_push(Us)) * rr);
// If the pawn is free to advance, increase bonus
- if (pos.square_is_empty(blockSq))
+ if (pos.is_empty(blockSq))
{
- // There are no enemy pawns in the pawn's path
- b2 = squares_in_front_of(Us, s);
-
- assert((b2 & pos.pieces(PAWN, Them)) == EmptyBoardBB);
-
- // Squares attacked by us
- b4 = b2 & ei.attacked_by(Us);
-
- // Squares attacked or occupied by enemy pieces
- b3 = b2 & (ei.attacked_by(Them) | pos.pieces_of_color(Them));
+ squaresToQueen = forward_bb(Us, s);
+ defendedSquares = squaresToQueen & ei.attackedBy[Us][ALL_PIECES];
// If there is an enemy rook or queen attacking the pawn from behind,
- // add all X-ray attacks by the rook or queen.
- if ( (squares_behind(Us, s) & pos.pieces(ROOK, QUEEN, Them))
- && (squares_behind(Us, s) & pos.pieces(ROOK, QUEEN, Them) & pos.attacks_from(s)))
- b3 = b2;
-
- // Are any of the squares in the pawn's path attacked or occupied by the enemy?
- if (b3 == EmptyBoardBB)
- // No enemy attacks or pieces, huge bonus!
- // Even bigger if we protect the pawn's path
- ebonus += Value(tr * (b2 == b4 ? 17 : 15));
+ // add all X-ray attacks by the rook or queen. Otherwise consider only
+ // the squares in the pawn's path attacked or occupied by the enemy.
+ if ( (forward_bb(Them, s) & pos.pieces(Them, ROOK, QUEEN))
+ && (forward_bb(Them, s) & pos.pieces(Them, ROOK, QUEEN) & pos.attacks_from(s)))
+ unsafeSquares = squaresToQueen;
else
- // OK, there are enemy attacks or pieces (but not pawns). Are those
- // squares which are attacked by the enemy also attacked by us ?
- // If yes, big bonus (but smaller than when there are no enemy attacks),
- // if no, somewhat smaller bonus.
- ebonus += Value(tr * ((b3 & b4) == b3 ? 13 : 8));
-
- // At last, add a small bonus when there are no *friendly* pieces
- // in the pawn's path.
- if ((b2 & pos.pieces_of_color(Us)) == EmptyBoardBB)
- ebonus += Value(tr);
- }
- } // tr != 0
+ unsafeSquares = squaresToQueen & (ei.attackedBy[Them][ALL_PIECES] | pos.pieces(Them));
- // If the pawn is supported by a friendly pawn, increase bonus
- b2 = pos.pieces(PAWN, Us) & neighboring_files_bb(s);
- if (b2 & rank_bb(s))
- ebonus += Value(r * 20);
- else if (pos.attacks_from(s, Them) & b2)
- ebonus += Value(r * 12);
+ // If there aren't enemy attacks huge bonus, a bit smaller if at
+ // least block square is not attacked, otherwise smallest bonus.
+ int k = !unsafeSquares ? 15 : !(unsafeSquares & blockSq) ? 9 : 3;
- // If the other side has only a king, check whether the pawn is
- // unstoppable
- if (pos.non_pawn_material(Them) == Value(0))
- {
- Square qsq;
- int d;
+ // Big bonus if the path to queen is fully defended, a bit less
+ // if at least block square is defended.
+ if (defendedSquares == squaresToQueen)
+ k += 6;
- qsq = relative_square(Us, make_square(square_file(s), RANK_8));
- d = square_distance(s, qsq)
- - square_distance(theirKingSq, qsq)
- + (Us != pos.side_to_move());
+ else if (defendedSquares & blockSq)
+ k += (unsafeSquares & defendedSquares) == unsafeSquares ? 4 : 2;
- if (d < 0)
- {
- int mtg = RANK_8 - relative_rank(Us, s);
- int blockerCount = count_1s_max_15(squares_in_front_of(Us,s) & pos.occupied_squares());
- mtg += blockerCount;
- d += blockerCount;
- if (d < 0 && (!movesToGo[Us] || movesToGo[Us] > mtg))
- {
- movesToGo[Us] = mtg;
- pawnToGo[Us] = s;
- }
+ mbonus += Value(k * rr), ebonus += Value(k * rr);
}
- }
+ } // rr != 0
+
+ // Increase the bonus if the passed pawn is supported by a friendly pawn
+ // on the same rank and a bit smaller if it's on the previous rank.
+ supportingPawns = pos.pieces(Us, PAWN) & adjacent_files_bb(file_of(s));
+ if (supportingPawns & rank_bb(s))
+ ebonus += Value(r * 20);
+
+ else if (supportingPawns & rank_bb(s - pawn_push(Us)))
+ ebonus += Value(r * 12);
// Rook pawns are a special case: They are sometimes worse, and
// sometimes better than other passed pawns. It is difficult to find
@@ -997,144 +858,183 @@ namespace {
// we try the following: Increase the value for rook pawns if the
// other side has no pieces apart from a knight, and decrease the
// value if the other side has a rook or queen.
- if (square_file(s) == FILE_A || square_file(s) == FILE_H)
+ if (file_of(s) == FILE_A || file_of(s) == FILE_H)
{
- if ( pos.non_pawn_material(Them) <= KnightValueMidgame
- && pos.piece_count(Them, KNIGHT) <= 1)
+ if (pos.non_pawn_material(Them) <= KnightValueMg)
ebonus += ebonus / 4;
- else if (pos.pieces(ROOK, QUEEN, Them))
+ else if (pos.pieces(Them, ROOK, QUEEN))
ebonus -= ebonus / 4;
}
+ score += make_score(mbonus, ebonus);
- // Add the scores for this pawn to the middle game and endgame eval.
- ei.value += Sign[Us] * apply_weight(make_score(mbonus, ebonus), WeightPassedPawns);
+ }
+
+ if (Trace)
+ Tracing::scores[Us][PASSED] = apply_weight(score, Weights[PassedPawns]);
- } // while
+ // Add the scores to the middle game and endgame eval
+ return apply_weight(score, Weights[PassedPawns]);
}
- // evaluate_passed_pawns() evaluates the passed pawns for both sides
+ // evaluate_unstoppable_pawns() evaluates the unstoppable passed pawns for both sides, this is quite
+ // conservative and returns a winning score only when we are very sure that the pawn is winning.
- void evaluate_passed_pawns(const Position& pos, EvalInfo& ei) {
+ Score evaluate_unstoppable_pawns(const Position& pos, EvalInfo& ei) {
- int movesToGo[2] = {0, 0};
- Square pawnToGo[2] = {SQ_NONE, SQ_NONE};
+ Bitboard b, b2, blockers, supporters, queeningPath, candidates;
+ Square s, blockSq, queeningSquare;
+ Color c, winnerSide, loserSide;
+ bool pathDefended, opposed;
+ int pliesToGo, movesToGo, oppMovesToGo, sacptg, blockersCount, minKingDist, kingptg, d;
+ int pliesToQueen[] = { 256, 256 };
- // Evaluate pawns for each color
- evaluate_passed_pawns_of_color(pos, movesToGo, pawnToGo, ei);
- evaluate_passed_pawns_of_color(pos, movesToGo, pawnToGo, ei);
+ // Step 1. Hunt for unstoppable passed pawns. If we find at least one,
+ // record how many plies are required for promotion.
+ for (c = WHITE; c <= BLACK; c++)
+ {
+ // Skip if other side has non-pawn pieces
+ if (pos.non_pawn_material(~c))
+ continue;
- // Neither side has an unstoppable passed pawn?
- if (!(movesToGo[WHITE] | movesToGo[BLACK]))
- return;
+ b = ei.pi->passed_pawns(c);
- // Does only one side have an unstoppable passed pawn?
- if (!movesToGo[WHITE] || !movesToGo[BLACK])
- {
- Color winnerSide = movesToGo[WHITE] ? WHITE : BLACK;
- ei.value += make_score(0, Sign[winnerSide] * (UnstoppablePawnValue - Value(0x40 * movesToGo[winnerSide])));
- }
- else
- { // Both sides have unstoppable pawns! Try to find out who queens
- // first. We begin by transforming 'movesToGo' to the number of
- // plies until the pawn queens for both sides.
- movesToGo[WHITE] *= 2;
- movesToGo[BLACK] *= 2;
- movesToGo[pos.side_to_move()]--;
-
- Color winnerSide = movesToGo[WHITE] < movesToGo[BLACK] ? WHITE : BLACK;
- Color loserSide = opposite_color(winnerSide);
-
- // If one side queens at least three plies before the other, that side wins
- if (movesToGo[winnerSide] <= movesToGo[loserSide] - 3)
- ei.value += Sign[winnerSide] * make_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
- // where the opponent's king could move somewhere before first pawn queens we
- // consider only free paths to queen for both pawns.
- else if ( !(squares_in_front_of(WHITE, pawnToGo[WHITE]) & pos.occupied_squares())
- && !(squares_in_front_of(BLACK, pawnToGo[BLACK]) & pos.occupied_squares()))
+ while (b)
{
- assert(movesToGo[loserSide] - movesToGo[winnerSide] == 1);
+ s = pop_lsb(&b);
+ queeningSquare = relative_square(c, file_of(s) | RANK_8);
+ queeningPath = forward_bb(c, s);
+
+ // Compute plies to queening and check direct advancement
+ movesToGo = rank_distance(s, queeningSquare) - int(relative_rank(c, s) == RANK_2);
+ oppMovesToGo = square_distance(pos.king_square(~c), queeningSquare) - int(c != pos.side_to_move());
+ pathDefended = ((ei.attackedBy[c][ALL_PIECES] & queeningPath) == queeningPath);
+
+ if (movesToGo >= oppMovesToGo && !pathDefended)
+ continue;
- Square winnerQSq = relative_square(winnerSide, make_square(square_file(pawnToGo[winnerSide]), RANK_8));
- Square loserQSq = relative_square(loserSide, make_square(square_file(pawnToGo[loserSide]), RANK_8));
+ // Opponent king cannot block because path is defended and position
+ // is not in check. So only friendly pieces can be blockers.
+ assert(!pos.checkers());
+ assert((queeningPath & pos.pieces()) == (queeningPath & pos.pieces(c)));
- Bitboard b = pos.occupied_squares();
- clear_bit(&b, pawnToGo[winnerSide]);
- clear_bit(&b, pawnToGo[loserSide]);
- b = queen_attacks_bb(winnerQSq, b);
+ // Add moves needed to free the path from friendly pieces and retest condition
+ movesToGo += popcount(queeningPath & pos.pieces(c));
- if ( (b & pos.pieces(KING, loserSide))
- ||(bit_is_set(b, loserQSq) && !bit_is_set(ei.attacked_by(loserSide), loserQSq)))
- ei.value += Sign[winnerSide] * make_score(0, UnstoppablePawnValue - Value(0x40 * (movesToGo[winnerSide]/2)));
+ if (movesToGo >= oppMovesToGo && !pathDefended)
+ continue;
+
+ pliesToGo = 2 * movesToGo - int(c == pos.side_to_move());
+ pliesToQueen[c] = std::min(pliesToQueen[c], pliesToGo);
}
}
- }
+ // Step 2. If either side cannot promote at least three plies before the other side then situation
+ // becomes too complex and we give up. Otherwise we determine the possibly "winning side"
+ if (abs(pliesToQueen[WHITE] - pliesToQueen[BLACK]) < 3)
+ return SCORE_ZERO;
- // evaluate_trapped_bishop_a7h7() determines whether a bishop on a7/h7
- // (a2/h2 for black) is trapped by enemy pawns, and assigns a penalty
- // if it is.
+ winnerSide = (pliesToQueen[WHITE] < pliesToQueen[BLACK] ? WHITE : BLACK);
+ loserSide = ~winnerSide;
- void evaluate_trapped_bishop_a7h7(const Position& pos, Square s, Color us, EvalInfo &ei) {
+ // Step 3. Can the losing side possibly create a new passed pawn and thus prevent the loss?
+ b = candidates = pos.pieces(loserSide, PAWN);
- assert(square_is_ok(s));
- assert(pos.piece_on(s) == piece_of_color_and_type(us, BISHOP));
+ while (b)
+ {
+ s = pop_lsb(&b);
- Square b6 = relative_square(us, (square_file(s) == FILE_A) ? SQ_B6 : SQ_G6);
- Square b8 = relative_square(us, (square_file(s) == FILE_A) ? SQ_B8 : SQ_G8);
+ // Compute plies from queening
+ queeningSquare = relative_square(loserSide, file_of(s) | RANK_8);
+ movesToGo = rank_distance(s, queeningSquare) - int(relative_rank(loserSide, s) == RANK_2);
+ pliesToGo = 2 * movesToGo - int(loserSide == pos.side_to_move());
- if ( pos.piece_on(b6) == piece_of_color_and_type(opposite_color(us), PAWN)
- && pos.see(s, b6) < 0
- && pos.see(s, b8) < 0)
- {
- ei.value -= Sign[us] * TrappedBishopA7H7Penalty;
+ // Check if (without even considering any obstacles) we're too far away or doubled
+ if ( pliesToQueen[winnerSide] + 3 <= pliesToGo
+ || (forward_bb(loserSide, s) & pos.pieces(loserSide, PAWN)))
+ candidates ^= s;
}
- }
+ // If any candidate is already a passed pawn it _may_ promote in time. We give up.
+ if (candidates & ei.pi->passed_pawns(loserSide))
+ return SCORE_ZERO;
- // evaluate_trapped_bishop_a1h1() determines whether a bishop on a1/h1
- // (a8/h8 for black) is trapped by a friendly pawn on b2/g2 (b7/g7 for
- // black), and assigns a penalty if it is. This pattern can obviously
- // only occur in Chess960 games.
+ // Step 4. Check new passed pawn creation through king capturing and pawn sacrifices
+ b = candidates;
- void evaluate_trapped_bishop_a1h1(const Position& pos, Square s, Color us, EvalInfo& ei) {
+ while (b)
+ {
+ s = pop_lsb(&b);
+ sacptg = blockersCount = 0;
+ minKingDist = kingptg = 256;
- Piece pawn = piece_of_color_and_type(us, PAWN);
- Square b2, b3, c3;
+ // Compute plies from queening
+ queeningSquare = relative_square(loserSide, file_of(s) | RANK_8);
+ movesToGo = rank_distance(s, queeningSquare) - int(relative_rank(loserSide, s) == RANK_2);
+ pliesToGo = 2 * movesToGo - int(loserSide == pos.side_to_move());
- assert(Chess960);
- assert(square_is_ok(s));
- assert(pos.piece_on(s) == piece_of_color_and_type(us, BISHOP));
+ // Generate list of blocking pawns and supporters
+ supporters = adjacent_files_bb(file_of(s)) & candidates;
+ opposed = forward_bb(loserSide, s) & pos.pieces(winnerSide, PAWN);
+ blockers = passed_pawn_mask(loserSide, s) & pos.pieces(winnerSide, PAWN);
- if (square_file(s) == FILE_A)
- {
- b2 = relative_square(us, SQ_B2);
- b3 = relative_square(us, SQ_B3);
- c3 = relative_square(us, SQ_C3);
- }
- else
- {
- b2 = relative_square(us, SQ_G2);
- b3 = relative_square(us, SQ_G3);
- c3 = relative_square(us, SQ_F3);
- }
+ assert(blockers);
- if (pos.piece_on(b2) == pawn)
- {
- Score penalty;
+ // How many plies does it take to remove all the blocking pawns?
+ while (blockers)
+ {
+ blockSq = pop_lsb(&blockers);
+ movesToGo = 256;
- if (!pos.square_is_empty(b3))
- penalty = 2 * TrappedBishopA1H1Penalty;
- else if (pos.piece_on(c3) == pawn)
- penalty = TrappedBishopA1H1Penalty;
- else
- penalty = TrappedBishopA1H1Penalty / 2;
+ // Check pawns that can give support to overcome obstacle, for instance
+ // black pawns: a4, b4 white: b2 then pawn in b4 is giving support.
+ if (!opposed)
+ {
+ b2 = supporters & in_front_bb(winnerSide, blockSq + pawn_push(winnerSide));
+
+ while (b2) // This while-loop could be replaced with LSB/MSB (depending on color)
+ {
+ d = square_distance(blockSq, pop_lsb(&b2)) - 2;
+ movesToGo = std::min(movesToGo, d);
+ }
+ }
+
+ // Check pawns that can be sacrificed against the blocking pawn
+ b2 = attack_span_mask(winnerSide, blockSq) & candidates & ~(1ULL << s);
+
+ while (b2) // This while-loop could be replaced with LSB/MSB (depending on color)
+ {
+ d = square_distance(blockSq, pop_lsb(&b2)) - 2;
+ movesToGo = std::min(movesToGo, d);
+ }
+
+ // If obstacle can be destroyed with an immediate pawn exchange / sacrifice,
+ // it's not a real obstacle and we have nothing to add to pliesToGo.
+ if (movesToGo <= 0)
+ continue;
+
+ // Plies needed to sacrifice against all the blocking pawns
+ sacptg += movesToGo * 2;
+ blockersCount++;
+
+ // Plies needed for the king to capture all the blocking pawns
+ d = square_distance(pos.king_square(loserSide), blockSq);
+ minKingDist = std::min(minKingDist, d);
+ kingptg = (minKingDist + blockersCount) * 2;
+ }
+
+ // Check if pawn sacrifice plan _may_ save the day
+ if (pliesToQueen[winnerSide] + 3 > pliesToGo + sacptg)
+ return SCORE_ZERO;
- ei.value -= Sign[us] * penalty;
+ // Check if king capture plan _may_ save the day (contains some false positives)
+ if (pliesToQueen[winnerSide] + 3 > pliesToGo + kingptg)
+ return SCORE_ZERO;
}
+
+ // Winning pawn is unstoppable and will promote as first, return big score
+ Score score = make_score(0, (Value) 1280 - 32 * pliesToQueen[winnerSide]);
+ return winnerSide == WHITE ? score : -score;
}
@@ -1143,114 +1043,135 @@ namespace {
// available for minor pieces on the central four files on ranks 2--4. Safe
// squares one, two or three squares behind a friendly pawn are counted
// twice. Finally, the space bonus is scaled by a weight taken from the
- // material hash table.
- template
- void evaluate_space(const Position& pos, EvalInfo& ei) {
+ // material hash table. The aim is to improve play on game opening.
+ template
+ int evaluate_space(const Position& pos, EvalInfo& ei) {
const Color Them = (Us == WHITE ? BLACK : WHITE);
// Find the safe squares for our pieces inside the area defined by
- // SpaceMask[us]. A square is unsafe if it is attacked by an enemy
+ // SpaceMask[]. A square is unsafe if it is attacked by an enemy
// pawn, or if it is undefended and attacked by an enemy piece.
+ Bitboard safe = SpaceMask[Us]
+ & ~pos.pieces(Us, PAWN)
+ & ~ei.attackedBy[Them][PAWN]
+ & (ei.attackedBy[Us][ALL_PIECES] | ~ei.attackedBy[Them][ALL_PIECES]);
- Bitboard safeSquares = SpaceMask[Us]
- & ~pos.pieces(PAWN, Us)
- & ~ei.attacked_by(Them, PAWN)
- & ~(~ei.attacked_by(Us) & ei.attacked_by(Them));
-
- // Find all squares which are at most three squares behind some friendly
- // pawn.
- Bitboard behindFriendlyPawns = pos.pieces(PAWN, Us);
- behindFriendlyPawns |= (Us == WHITE ? behindFriendlyPawns >> 8 : behindFriendlyPawns << 8);
- behindFriendlyPawns |= (Us == WHITE ? behindFriendlyPawns >> 16 : behindFriendlyPawns << 16);
-
- int space = count_1s_max_15(safeSquares)
- + count_1s_max_15(behindFriendlyPawns & safeSquares);
-
- ei.value += Sign[Us] * apply_weight(make_score(space * ei.mi->space_weight(), 0), WeightSpace);
- }
+ // Find all squares which are at most three squares behind some friendly pawn
+ Bitboard behind = pos.pieces(Us, PAWN);
+ behind |= (Us == WHITE ? behind >> 8 : behind << 8);
+ behind |= (Us == WHITE ? behind >> 16 : behind << 16);
+ // Since SpaceMask[Us] is fully on our half of the board
+ assert(unsigned(safe >> (Us == WHITE ? 32 : 0)) == 0);
- // apply_weight() applies an evaluation weight to a value trying to prevent overflow
-
- inline Score apply_weight(Score v, Score w) {
- return make_score((int(mg_value(v)) * mg_value(w)) / 0x100, (int(eg_value(v)) * eg_value(w)) / 0x100);
+ // Count safe + (behind & safe) with a single popcount
+ return popcount((Us == WHITE ? safe << 32 : safe >> 32) | (behind & safe));
}
- // scale_by_game_phase() interpolates between a middle game and an endgame
- // score, based on game phase. It also scales the return value by a
- // ScaleFactor array.
+ // interpolate() interpolates between a middle game and an endgame score,
+ // based on game phase. It also scales the return value by a ScaleFactor array.
- Value scale_by_game_phase(const Score& v, Phase ph, const ScaleFactor sf[]) {
+ Value interpolate(const Score& v, Phase ph, ScaleFactor sf) {
assert(mg_value(v) > -VALUE_INFINITE && mg_value(v) < VALUE_INFINITE);
assert(eg_value(v) > -VALUE_INFINITE && eg_value(v) < VALUE_INFINITE);
assert(ph >= PHASE_ENDGAME && ph <= PHASE_MIDGAME);
- Value ev = apply_scale_factor(eg_value(v), sf[(eg_value(v) > Value(0) ? WHITE : BLACK)]);
-
- int result = (mg_value(v) * ph + ev * (128 - ph)) / 128;
- return Value(result & ~(GrainSize - 1));
+ int ev = (eg_value(v) * int(sf)) / SCALE_FACTOR_NORMAL;
+ int result = (mg_value(v) * int(ph) + ev * int(128 - ph)) / 128;
+ return Value((result + GrainSize / 2) & ~(GrainSize - 1));
}
+ // apply_weight() weights score v by score w trying to prevent overflow
+ Score apply_weight(Score v, Score w) {
+ return make_score((int(mg_value(v)) * mg_value(w)) / 0x100,
+ (int(eg_value(v)) * eg_value(w)) / 0x100);
+ }
// weight_option() computes the value of an evaluation weight, by combining
// two UCI-configurable weights (midgame and endgame) with an internal weight.
Score weight_option(const std::string& mgOpt, const std::string& egOpt, Score internalWeight) {
- Score uciWeight = make_score(get_option_value_int(mgOpt), get_option_value_int(egOpt));
-
- // Convert to integer to prevent overflow
- int mg = mg_value(uciWeight);
- int eg = eg_value(uciWeight);
+ // Scale option value from 100 to 256
+ int mg = Options[mgOpt] * 256 / 100;
+ int eg = Options[egOpt] * 256 / 100;
- mg = (mg * 0x100) / 100;
- eg = (eg * 0x100) / 100;
- mg = (mg * mg_value(internalWeight)) / 0x100;
- eg = (eg * eg_value(internalWeight)) / 0x100;
- return make_score(mg, eg);
+ return apply_weight(make_score(mg, eg), internalWeight);
}
- // init_safety() initizes the king safety evaluation, based on UCI
- // parameters. It is called from read_weights().
- void init_safety() {
+ // Tracing functions definitions
- QueenContactCheckBonus = get_option_value_int("Queen Contact Check Bonus");
- QueenCheckBonus = get_option_value_int("Queen Check Bonus");
- RookCheckBonus = get_option_value_int("Rook Check Bonus");
- BishopCheckBonus = get_option_value_int("Bishop Check Bonus");
- KnightCheckBonus = get_option_value_int("Knight Check Bonus");
- DiscoveredCheckBonus = get_option_value_int("Discovered Check Bonus");
- MateThreatBonus = get_option_value_int("Mate Threat Bonus");
+ double to_cp(Value v) { return double(v) / double(PawnValueMg); }
- int maxSlope = get_option_value_int("King Safety Max Slope");
- int peak = get_option_value_int("King Safety Max Value") * 256 / 100;
- double a = get_option_value_int("King Safety Coefficient") / 100.0;
- double b = get_option_value_int("King Safety X Intercept");
- bool quad = (get_option_value_string("King Safety Curve") == "Quadratic");
- bool linear = (get_option_value_string("King Safety Curve") == "Linear");
+ void Tracing::add(int idx, Score wScore, Score bScore) {
- for (int i = 0; i < 100; i++)
- {
- if (i < b)
- SafetyTable[i] = Value(0);
- else if (quad)
- SafetyTable[i] = Value((int)(a * (i - b) * (i - b)));
- else if (linear)
- SafetyTable[i] = Value((int)(100 * a * (i - b)));
+ scores[WHITE][idx] = wScore;
+ scores[BLACK][idx] = bScore;
+ }
+
+ void Tracing::row(const char* name, int idx) {
+
+ Score wScore = scores[WHITE][idx];
+ Score bScore = scores[BLACK][idx];
+
+ switch (idx) {
+ case PST: case IMBALANCE: case PAWN: case UNSTOPPABLE: case TOTAL:
+ stream << std::setw(20) << name << " | --- --- | --- --- | "
+ << std::setw(6) << to_cp(mg_value(wScore)) << " "
+ << std::setw(6) << to_cp(eg_value(wScore)) << " \n";
+ break;
+ default:
+ stream << std::setw(20) << name << " | " << std::noshowpos
+ << std::setw(5) << to_cp(mg_value(wScore)) << " "
+ << std::setw(5) << to_cp(eg_value(wScore)) << " | "
+ << std::setw(5) << to_cp(mg_value(bScore)) << " "
+ << std::setw(5) << to_cp(eg_value(bScore)) << " | "
+ << std::showpos
+ << std::setw(6) << to_cp(mg_value(wScore - bScore)) << " "
+ << std::setw(6) << to_cp(eg_value(wScore - bScore)) << " \n";
}
+ }
- for (int i = 0; i < 100; i++)
- {
- if (SafetyTable[i+1] - SafetyTable[i] > maxSlope)
- for (int j = i + 1; j < 100; j++)
- SafetyTable[j] = SafetyTable[j-1] + Value(maxSlope);
+ std::string Tracing::do_trace(const Position& pos) {
- if (SafetyTable[i] > Value(peak))
- SafetyTable[i] = Value(peak);
- }
+ Search::RootColor = pos.side_to_move();
+
+ stream.str("");
+ stream << std::showpoint << std::showpos << std::fixed << std::setprecision(2);
+ memset(scores, 0, 2 * (TOTAL + 1) * sizeof(Score));
+
+ Value margin;
+ do_evaluate(pos, margin);
+
+ std::string totals = stream.str();
+ stream.str("");
+
+ stream << std::setw(21) << "Eval term " << "| White | Black | Total \n"
+ << " | MG EG | MG EG | MG EG \n"
+ << "---------------------+-------------+-------------+---------------\n";
+
+ row("Material, PST, Tempo", PST);
+ row("Material imbalance", IMBALANCE);
+ row("Pawns", PAWN);
+ row("Knights", KNIGHT);
+ row("Bishops", BISHOP);
+ row("Rooks", ROOK);
+ row("Queens", QUEEN);
+ row("Mobility", MOBILITY);
+ row("King safety", KING);
+ row("Threats", THREAT);
+ row("Passed pawns", PASSED);
+ row("Unstoppable pawns", UNSTOPPABLE);
+ row("Space", SPACE);
+
+ stream << "---------------------+-------------+-------------+---------------\n";
+ row("Total", TOTAL);
+ stream << totals;
+
+ return stream.str();
}
}