2008-08-31 23:59:13 -06:00
|
|
|
/*
|
2008-10-19 10:56:28 -06:00
|
|
|
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
|
|
|
|
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
|
2016-01-02 02:43:25 -07:00
|
|
|
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
|
|
|
|
Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
|
2008-08-31 23:59:13 -06:00
|
|
|
|
2008-10-19 10:56:28 -06:00
|
|
|
Stockfish is free software: you can redistribute it and/or modify
|
2008-08-31 23:59:13 -06:00
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
|
|
(at your option) any later version.
|
2008-09-23 16:32:53 -06:00
|
|
|
|
2008-10-19 10:56:28 -06:00
|
|
|
Stockfish is distributed in the hope that it will be useful,
|
2008-08-31 23:59:13 -06:00
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
2008-09-23 16:32:53 -06:00
|
|
|
|
2008-08-31 23:59:13 -06:00
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
|
2014-05-03 04:09:56 -06:00
|
|
|
#include <algorithm>
|
2008-08-31 23:59:13 -06:00
|
|
|
#include <cassert>
|
2014-12-30 02:31:50 -07:00
|
|
|
#include <cstring> // For std::memset
|
2011-02-26 06:09:58 -07:00
|
|
|
#include <iomanip>
|
|
|
|
#include <sstream>
|
2008-08-31 23:59:13 -06:00
|
|
|
|
2009-05-21 07:29:28 -06:00
|
|
|
#include "bitcount.h"
|
2008-08-31 23:59:13 -06:00
|
|
|
#include "evaluate.h"
|
2013-04-28 16:54:08 -06:00
|
|
|
#include "material.h"
|
|
|
|
#include "pawns.h"
|
2008-08-31 23:59:13 -06:00
|
|
|
|
2013-04-25 04:43:55 -06:00
|
|
|
namespace {
|
2010-08-25 12:56:01 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
namespace Trace {
|
2015-02-27 01:52:56 -07:00
|
|
|
|
2016-01-16 14:34:29 -07:00
|
|
|
enum Term { // The first 8 entries are for PieceType
|
2015-02-27 01:52:56 -07:00
|
|
|
MATERIAL = 8, IMBALANCE, MOBILITY, THREAT, PASSED, SPACE, TOTAL, TERM_NB
|
|
|
|
};
|
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
double scores[TERM_NB][COLOR_NB][PHASE_NB];
|
2015-02-27 01:52:56 -07:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
double to_cp(Value v) { return double(v) / PawnValueEg; }
|
2015-02-27 01:52:56 -07:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
void add(int idx, Color c, Score s) {
|
|
|
|
scores[idx][c][MG] = to_cp(mg_value(s));
|
|
|
|
scores[idx][c][EG] = to_cp(eg_value(s));
|
|
|
|
}
|
|
|
|
|
|
|
|
void add(int idx, Score w, Score b = SCORE_ZERO) {
|
|
|
|
add(idx, WHITE, w); add(idx, BLACK, b);
|
|
|
|
}
|
|
|
|
|
|
|
|
std::ostream& operator<<(std::ostream& os, Term t) {
|
|
|
|
|
|
|
|
if (t == MATERIAL || t == IMBALANCE || t == Term(PAWN) || t == TOTAL)
|
|
|
|
os << " --- --- | --- --- | ";
|
|
|
|
else
|
|
|
|
os << std::setw(5) << scores[t][WHITE][MG] << " "
|
|
|
|
<< std::setw(5) << scores[t][WHITE][EG] << " | "
|
|
|
|
<< std::setw(5) << scores[t][BLACK][MG] << " "
|
|
|
|
<< std::setw(5) << scores[t][BLACK][EG] << " | ";
|
|
|
|
|
|
|
|
os << std::setw(5) << scores[t][WHITE][MG] - scores[t][BLACK][MG] << " "
|
|
|
|
<< std::setw(5) << scores[t][WHITE][EG] - scores[t][BLACK][EG] << " \n";
|
|
|
|
|
|
|
|
return os;
|
|
|
|
}
|
2015-02-27 01:52:56 -07:00
|
|
|
}
|
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
using namespace Trace;
|
2015-02-27 01:52:56 -07:00
|
|
|
|
2013-04-28 16:54:08 -06:00
|
|
|
// Struct EvalInfo contains various information computed and collected
|
|
|
|
// by the evaluation functions.
|
|
|
|
struct EvalInfo {
|
|
|
|
|
|
|
|
// attackedBy[color][piece type] is a bitboard representing all squares
|
2015-08-25 09:12:51 -06:00
|
|
|
// attacked by a given color and piece type (can be also ALL_PIECES).
|
2013-04-28 16:54:08 -06:00
|
|
|
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];
|
|
|
|
|
2016-01-16 14:34:29 -07:00
|
|
|
// kingAttackersWeight[color] is the sum of the "weights" of the pieces of the
|
2013-04-28 16:54:08 -06:00
|
|
|
// given color which attack a square in the kingRing of the enemy king. The
|
2014-11-18 15:39:17 -07:00
|
|
|
// weights of the individual piece types are given by the elements in the
|
|
|
|
// KingAttackWeights array.
|
2013-04-28 16:54:08 -06:00
|
|
|
int kingAttackersWeight[COLOR_NB];
|
|
|
|
|
2015-02-19 13:33:07 -07:00
|
|
|
// kingAdjacentZoneAttacksCount[color] is the number of attacks by the given
|
|
|
|
// color to squares directly adjacent to the enemy king. Pieces which attack
|
|
|
|
// more than one square are counted multiple times. For instance, if there is
|
|
|
|
// a white knight on g5 and black's king is on g8, this white knight adds 2
|
|
|
|
// to kingAdjacentZoneAttacksCount[WHITE].
|
2013-04-28 16:54:08 -06:00
|
|
|
int kingAdjacentZoneAttacksCount[COLOR_NB];
|
2013-11-07 11:59:11 -07:00
|
|
|
|
|
|
|
Bitboard pinnedPieces[COLOR_NB];
|
2015-11-28 02:57:45 -07:00
|
|
|
Material::Entry* me;
|
2015-08-25 09:12:51 -06:00
|
|
|
Pawns::Entry* pi;
|
2013-04-28 16:54:08 -06:00
|
|
|
};
|
|
|
|
|
2014-12-27 02:47:21 -07:00
|
|
|
#define V(v) Value(v)
|
2010-05-06 01:58:04 -06:00
|
|
|
#define S(mg, eg) make_score(mg, eg)
|
2008-08-31 23:59:13 -06:00
|
|
|
|
2013-06-01 03:48:38 -06:00
|
|
|
// MobilityBonus[PieceType][attacked] contains bonuses for middle and end
|
New mobility bonus
Tuned the global mobility factor for each piece, as well as some +- delta,
The master mobility factor was {266,334} and tuning gave
{267, 362} +S(-2,-2) for the Knight
{249, 328} +S( 0,-2) for the Bishop
{298, 353} +S(1,1) for the Rook
{265, 358} +S(2,-1) for the Queen
Passed STC
LLR: 2.95 (-2.94,2.94) [0.00,4.00]
Total: 49402 W: 9367 L: 9037 D: 30998
and LTC
LLR: 2.97 (-2.94,2.94) [0.00,5.00]
Total: 26831 W: 3871 L: 3658 D: 19302
Bench: 8355485
Resolves #536
2015-12-22 03:00:04 -07:00
|
|
|
// game, indexed by piece type and number of attacked squares in the MobilityArea.
|
2010-08-24 04:29:44 -06:00
|
|
|
const Score MobilityBonus[][32] = {
|
2014-02-15 05:27:16 -07:00
|
|
|
{}, {},
|
New mobility bonus
Tuned the global mobility factor for each piece, as well as some +- delta,
The master mobility factor was {266,334} and tuning gave
{267, 362} +S(-2,-2) for the Knight
{249, 328} +S( 0,-2) for the Bishop
{298, 353} +S(1,1) for the Rook
{265, 358} +S(2,-1) for the Queen
Passed STC
LLR: 2.95 (-2.94,2.94) [0.00,4.00]
Total: 49402 W: 9367 L: 9037 D: 30998
and LTC
LLR: 2.97 (-2.94,2.94) [0.00,5.00]
Total: 26831 W: 3871 L: 3658 D: 19302
Bench: 8355485
Resolves #536
2015-12-22 03:00:04 -07:00
|
|
|
{ S(-75,-76), S(-56,-54), S(- 9,-26), S( -2,-10), S( 6, 5), S( 15, 11), // Knights
|
|
|
|
S( 22, 26), S( 30, 28), S( 36, 29) },
|
|
|
|
{ S(-48,-58), S(-21,-19), S( 16, -2), S( 26, 12), S( 37, 22), S( 51, 42), // Bishops
|
|
|
|
S( 54, 54), S( 63, 58), S( 65, 63), S( 71, 70), S( 79, 74), S( 81, 86),
|
|
|
|
S( 92, 90), S( 97, 94) },
|
|
|
|
{ S(-56,-78), S(-25,-18), S(-11, 26), S( -5, 55), S( -4, 70), S( -1, 81), // Rooks
|
|
|
|
S( 8,109), S( 14,120), S( 21,128), S( 23,143), S( 31,154), S( 32,160),
|
|
|
|
S( 43,165), S( 49,168), S( 59,169) },
|
|
|
|
{ S(-40,-35), S(-25,-12), S( 2, 7), S( 4, 19), S( 14, 37), S( 24, 55), // Queens
|
|
|
|
S( 25, 62), S( 40, 76), S( 43, 79), S( 47, 87), S( 54, 94), S( 56,102),
|
|
|
|
S( 60,111), S( 70,116), S( 72,118), S( 73,122), S( 75,128), S( 77,130),
|
|
|
|
S( 85,133), S( 94,136), S( 99,140), S(108,157), S(112,158), S(113,161),
|
|
|
|
S(118,174), S(119,177), S(123,191), S(128,199) }
|
2008-08-31 23:59:13 -06:00
|
|
|
};
|
|
|
|
|
2015-08-15 07:55:14 -06:00
|
|
|
// Outpost[knight/bishop][supported by pawn] contains bonuses for knights and
|
|
|
|
// bishops outposts, bigger if outpost piece is supported by a pawn.
|
2015-06-17 08:02:02 -06:00
|
|
|
const Score Outpost[][2] = {
|
2015-09-18 16:28:26 -06:00
|
|
|
{ S(42,11), S(63,17) }, // Knights
|
|
|
|
{ S(18, 5), S(27, 8) } // Bishops
|
2015-06-17 08:02:02 -06:00
|
|
|
};
|
2008-08-31 23:59:13 -06:00
|
|
|
|
2015-11-28 02:57:45 -07:00
|
|
|
// ReachableOutpost[knight/bishop][supported by pawn] contains bonuses for
|
|
|
|
// knights and bishops which can reach an outpost square in one move, bigger
|
|
|
|
// if outpost square is supported by a pawn.
|
2015-11-14 07:30:50 -07:00
|
|
|
const Score ReachableOutpost[][2] = {
|
|
|
|
{ S(21, 5), S(31, 8) }, // Knights
|
|
|
|
{ S( 8, 2), S(13, 4) } // Bishops
|
|
|
|
};
|
|
|
|
|
2015-12-30 04:29:25 -07:00
|
|
|
// RookOnFile[semiopen/open] contains bonuses for each rook when there is no
|
|
|
|
// friendly pawn on the rook file.
|
|
|
|
const Score RookOnFile[2] = { S(19, 10), S(43, 21) };
|
|
|
|
|
|
|
|
// ThreatBySafePawn[PieceType] contains bonuses according to which piece
|
2016-01-16 14:34:29 -07:00
|
|
|
// type is attacked by a pawn which is protected or is not attacked.
|
2015-12-30 04:29:25 -07:00
|
|
|
const Score ThreatBySafePawn[PIECE_TYPE_NB] = {
|
|
|
|
S(0, 0), S(0, 0), S(176, 139), S(131, 127), S(217, 218), S(203, 215) };
|
2016-01-16 14:34:29 -07:00
|
|
|
|
2015-12-30 04:29:25 -07:00
|
|
|
// Threat[by minor/by rook][attacked PieceType] contains
|
2014-11-09 01:24:06 -07:00
|
|
|
// bonuses according to which piece type attacks which one.
|
2016-01-16 14:34:29 -07:00
|
|
|
// Attacks on lesser pieces which are pawn-defended are not considered.
|
2015-12-30 04:29:25 -07:00
|
|
|
const Score Threat[][PIECE_TYPE_NB] = {
|
|
|
|
{ S(0, 0), S(0, 33), S(45, 43), S(46, 47), S(72,107), S(48,118) }, // by Minor
|
|
|
|
{ S(0, 0), S(0, 25), S(40, 62), S(40, 59), S( 0, 34), S(35, 48) } // by Rook
|
2009-11-12 09:42:43 -07:00
|
|
|
};
|
|
|
|
|
2015-12-30 04:29:25 -07:00
|
|
|
// ThreatByKing[on one/on many] contains bonuses for King attacks on
|
2016-01-16 14:34:29 -07:00
|
|
|
// pawns or pieces which are not pawn-defended.
|
2015-12-30 04:29:25 -07:00
|
|
|
const Score ThreatByKing[2] = { S(3, 62), S(9, 138) };
|
2009-11-12 09:42:43 -07:00
|
|
|
|
2015-11-28 02:57:45 -07:00
|
|
|
// Passed[mg/eg][Rank] contains midgame and endgame bonuses for passed pawns.
|
2015-08-15 07:55:14 -06:00
|
|
|
// We don't use a Score because we process the two components independently.
|
|
|
|
const Value Passed[][RANK_NB] = {
|
2016-02-25 15:59:16 -07:00
|
|
|
{ V(5), V( 5), V(31), V(73), V(166), V(252) },
|
2016-03-27 13:21:13 -06:00
|
|
|
{ V(7), V(14), V(38), V(73), V(166), V(252) }
|
2015-08-09 11:25:41 -06:00
|
|
|
};
|
|
|
|
|
2015-12-30 04:29:25 -07:00
|
|
|
// PassedFile[File] contains a bonus according to the file of a passed pawn
|
|
|
|
const Score PassedFile[FILE_NB] = {
|
2016-02-07 13:58:20 -07:00
|
|
|
S( 9, 10), S( 2, 10), S( 1, -8), S(-20,-12),
|
|
|
|
S(-20,-12), S( 1, -8), S( 2, 10), S( 9, 10)
|
2015-10-03 04:46:53 -06:00
|
|
|
};
|
|
|
|
|
2014-09-20 02:19:21 -06:00
|
|
|
// Assorted bonuses and penalties used by evaluation
|
2015-12-30 04:29:25 -07:00
|
|
|
const Score MinorBehindPawn = S(16, 0);
|
|
|
|
const Score BishopPawns = S( 8, 12);
|
|
|
|
const Score RookOnPawn = S( 7, 27);
|
|
|
|
const Score TrappedRook = S(92, 0);
|
|
|
|
const Score Checked = S(20, 20);
|
|
|
|
const Score ThreatByHangingPawn = S(70, 63);
|
2016-03-27 13:54:39 -06:00
|
|
|
const Score LooseEnemies = S( 0, 25);
|
2015-12-30 04:29:25 -07:00
|
|
|
const Score Hanging = S(48, 28);
|
|
|
|
const Score ThreatByPawnPush = S(31, 19);
|
|
|
|
const Score Unstoppable = S( 0, 20);
|
2013-04-19 01:41:28 -06:00
|
|
|
|
2011-01-03 14:32:57 -07:00
|
|
|
// 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.
|
2014-09-20 02:19:21 -06:00
|
|
|
const Score TrappedBishopA1H1 = S(50, 50);
|
|
|
|
|
|
|
|
#undef S
|
2014-12-27 02:47:21 -07:00
|
|
|
#undef V
|
2012-03-21 06:19:21 -06:00
|
|
|
|
2014-12-27 02:47:21 -07:00
|
|
|
// King danger constants and variables. The king danger scores are looked-up
|
|
|
|
// in KingDanger[]. Various little "meta-bonuses" measuring the strength
|
2013-12-04 23:18:12 -07:00
|
|
|
// of the enemy attack are added up into an integer, which is used as an
|
|
|
|
// index to KingDanger[].
|
2015-02-27 01:52:56 -07:00
|
|
|
Score KingDanger[512];
|
|
|
|
|
2010-08-24 06:48:40 -06:00
|
|
|
// KingAttackWeights[PieceType] contains king attack weights by piece type
|
2015-02-13 03:54:46 -07:00
|
|
|
const int KingAttackWeights[PIECE_TYPE_NB] = { 0, 0, 7, 5, 4, 1 };
|
2009-11-07 07:02:10 -07:00
|
|
|
|
2015-02-27 01:52:56 -07:00
|
|
|
// Penalties for enemy's safe checks
|
2015-01-28 14:00:09 -07:00
|
|
|
const int QueenContactCheck = 89;
|
2015-02-02 13:00:52 -07:00
|
|
|
const int QueenCheck = 50;
|
2015-10-07 02:48:54 -06:00
|
|
|
const int RookCheck = 45;
|
2015-02-02 13:00:52 -07:00
|
|
|
const int BishopCheck = 6;
|
|
|
|
const int KnightCheck = 14;
|
2013-06-01 03:48:38 -06:00
|
|
|
|
|
|
|
|
2016-01-16 14:34:29 -07:00
|
|
|
// eval_init() initializes king and attack bitboards for a given color
|
2015-11-28 02:57:45 -07:00
|
|
|
// adding pawn attacks. To be done at the beginning of the evaluation.
|
2010-05-15 06:29:21 -06:00
|
|
|
|
2011-12-30 03:30:26 -07:00
|
|
|
template<Color Us>
|
2015-11-28 02:57:45 -07:00
|
|
|
void eval_init(const Position& pos, EvalInfo& ei) {
|
2010-05-15 06:29:21 -06:00
|
|
|
|
2015-02-13 03:54:46 -07:00
|
|
|
const Color Them = (Us == WHITE ? BLACK : WHITE);
|
2013-06-16 02:08:44 -06:00
|
|
|
const Square Down = (Us == WHITE ? DELTA_S : DELTA_N);
|
2010-05-15 06:29:21 -06:00
|
|
|
|
2013-11-07 11:59:11 -07:00
|
|
|
ei.pinnedPieces[Us] = pos.pinned_pieces(Us);
|
2015-08-04 01:00:52 -06:00
|
|
|
Bitboard b = ei.attackedBy[Them][KING] = pos.attacks_from<KING>(pos.square<KING>(Them));
|
2015-08-25 09:12:51 -06:00
|
|
|
ei.attackedBy[Them][ALL_PIECES] |= b;
|
|
|
|
ei.attackedBy[Us][ALL_PIECES] |= ei.attackedBy[Us][PAWN] = ei.pi->pawn_attacks(Us);
|
2010-10-06 01:11:27 -06:00
|
|
|
|
|
|
|
// Init king safety tables only if we are going to use them
|
2014-11-06 11:00:07 -07:00
|
|
|
if (pos.non_pawn_material(Us) >= QueenValueMg)
|
2010-09-12 07:02:33 -06:00
|
|
|
{
|
2013-06-16 02:08:44 -06:00
|
|
|
ei.kingRing[Them] = b | shift_bb<Down>(b);
|
2010-09-12 07:02:33 -06:00
|
|
|
b &= ei.attackedBy[Us][PAWN];
|
2013-12-23 12:50:28 -07:00
|
|
|
ei.kingAttackersCount[Us] = b ? popcount<Max15>(b) : 0;
|
2010-10-06 01:11:27 -06:00
|
|
|
ei.kingAdjacentZoneAttacksCount[Us] = ei.kingAttackersWeight[Us] = 0;
|
2013-10-18 09:42:52 -06:00
|
|
|
}
|
|
|
|
else
|
2011-10-01 03:47:43 -06:00
|
|
|
ei.kingRing[Them] = ei.kingAttackersCount[Us] = 0;
|
2010-05-15 06:29:21 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-11-28 02:57:45 -07:00
|
|
|
// evaluate_pieces() assigns bonuses and penalties to the pieces of a given
|
|
|
|
// color and type.
|
2008-09-24 01:49:18 -06:00
|
|
|
|
2015-11-28 02:57:45 -07:00
|
|
|
template<bool DoTrace, Color Us = WHITE, PieceType Pt = KNIGHT>
|
|
|
|
Score evaluate_pieces(const Position& pos, EvalInfo& ei, Score* mobility,
|
|
|
|
const Bitboard* mobilityArea) {
|
2015-11-14 07:30:50 -07:00
|
|
|
Bitboard b, bb;
|
2013-05-11 01:29:02 -06:00
|
|
|
Square s;
|
2011-05-02 01:43:16 -06:00
|
|
|
Score score = SCORE_ZERO;
|
2009-09-28 03:46:55 -06:00
|
|
|
|
2014-04-12 00:32:52 -06:00
|
|
|
const PieceType NextPt = (Us == WHITE ? Pt : PieceType(Pt + 1));
|
2009-09-28 03:46:55 -06:00
|
|
|
const Color Them = (Us == WHITE ? BLACK : WHITE);
|
2015-11-28 02:57:45 -07:00
|
|
|
const Bitboard OutpostRanks = (Us == WHITE ? Rank4BB | Rank5BB | Rank6BB
|
|
|
|
: Rank5BB | Rank4BB | Rank3BB);
|
2015-08-04 01:00:52 -06:00
|
|
|
const Square* pl = pos.squares<Pt>(Us);
|
2008-08-31 23:59:13 -06:00
|
|
|
|
2014-02-15 05:27:16 -07:00
|
|
|
ei.attackedBy[Us][Pt] = 0;
|
2010-08-24 07:59:24 -06:00
|
|
|
|
2011-06-28 08:16:43 -06:00
|
|
|
while ((s = *pl++) != SQ_NONE)
|
2009-03-06 08:29:46 -07:00
|
|
|
{
|
2009-11-12 09:42:43 -07:00
|
|
|
// Find attacked squares, including x-ray attacks for bishops and rooks
|
2014-02-15 05:27:16 -07:00
|
|
|
b = Pt == BISHOP ? attacks_bb<BISHOP>(s, pos.pieces() ^ pos.pieces(Us, QUEEN))
|
|
|
|
: Pt == ROOK ? attacks_bb< ROOK>(s, pos.pieces() ^ pos.pieces(Us, ROOK, QUEEN))
|
|
|
|
: pos.attacks_from<Pt>(s);
|
2009-05-09 15:21:26 -06:00
|
|
|
|
2013-11-07 11:59:11 -07:00
|
|
|
if (ei.pinnedPieces[Us] & s)
|
2015-08-04 01:00:52 -06:00
|
|
|
b &= LineBB[pos.square<KING>(Us)][s];
|
2013-11-07 11:59:11 -07:00
|
|
|
|
2014-04-11 00:38:09 -06:00
|
|
|
ei.attackedBy[Us][ALL_PIECES] |= ei.attackedBy[Us][Pt] |= b;
|
2009-11-11 13:17:38 -07:00
|
|
|
|
2011-10-01 03:47:43 -06:00
|
|
|
if (b & ei.kingRing[Them])
|
2009-11-11 13:17:38 -07:00
|
|
|
{
|
2013-10-18 09:42:52 -06:00
|
|
|
ei.kingAttackersCount[Us]++;
|
2014-02-15 05:27:16 -07:00
|
|
|
ei.kingAttackersWeight[Us] += KingAttackWeights[Pt];
|
2015-11-14 07:30:50 -07:00
|
|
|
bb = b & ei.attackedBy[Them][KING];
|
2009-11-11 13:17:38 -07:00
|
|
|
if (bb)
|
2011-12-31 01:46:43 -07:00
|
|
|
ei.kingAdjacentZoneAttacksCount[Us] += popcount<Max15>(bb);
|
2009-11-11 13:17:38 -07:00
|
|
|
}
|
|
|
|
|
2014-04-08 13:50:01 -06:00
|
|
|
if (Pt == QUEEN)
|
|
|
|
b &= ~( ei.attackedBy[Them][KNIGHT]
|
|
|
|
| ei.attackedBy[Them][BISHOP]
|
|
|
|
| ei.attackedBy[Them][ROOK]);
|
|
|
|
|
2015-02-27 01:52:56 -07:00
|
|
|
int mob = popcount<Pt == QUEEN ? Full : Max15>(b & mobilityArea[Us]);
|
2013-07-13 15:07:24 -06:00
|
|
|
|
2014-02-15 05:27:16 -07:00
|
|
|
mobility[Us] += MobilityBonus[Pt][mob];
|
2009-10-25 01:16:34 -06:00
|
|
|
|
2014-02-15 05:27:16 -07:00
|
|
|
if (Pt == BISHOP || Pt == KNIGHT)
|
2013-08-13 06:19:42 -06:00
|
|
|
{
|
2015-11-14 07:30:50 -07:00
|
|
|
// Bonus for outpost squares
|
2015-11-28 02:57:45 -07:00
|
|
|
bb = OutpostRanks & ~ei.pi->pawn_attacks_span(Them);
|
2015-11-14 07:30:50 -07:00
|
|
|
if (bb & s)
|
2015-06-07 02:49:01 -06:00
|
|
|
score += Outpost[Pt == BISHOP][!!(ei.attackedBy[Us][PAWN] & s)];
|
2015-11-14 07:30:50 -07:00
|
|
|
else
|
|
|
|
{
|
|
|
|
bb &= b & ~pos.pieces(Us);
|
|
|
|
if (bb)
|
|
|
|
score += ReachableOutpost[Pt == BISHOP][!!(ei.attackedBy[Us][PAWN] & bb)];
|
|
|
|
}
|
2013-08-13 06:19:42 -06:00
|
|
|
|
2014-12-27 02:47:21 -07:00
|
|
|
// Bonus when behind a pawn
|
2013-08-13 06:19:42 -06:00
|
|
|
if ( relative_rank(Us, s) < RANK_5
|
|
|
|
&& (pos.pieces(PAWN) & (s + pawn_push(Us))))
|
2013-08-17 03:05:55 -06:00
|
|
|
score += MinorBehindPawn;
|
2014-12-27 02:47:21 -07:00
|
|
|
|
2016-01-16 14:34:29 -07:00
|
|
|
// Penalty for pawns on the same color square as the bishop
|
2014-12-27 02:47:21 -07:00
|
|
|
if (Pt == BISHOP)
|
|
|
|
score -= BishopPawns * ei.pi->pawns_on_same_color_squares(Us, s);
|
|
|
|
|
|
|
|
// 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 ( Pt == BISHOP
|
|
|
|
&& pos.is_chess960()
|
|
|
|
&& (s == relative_square(Us, SQ_A1) || s == relative_square(Us, SQ_H1)))
|
|
|
|
{
|
|
|
|
Square d = pawn_push(Us) + (file_of(s) == FILE_A ? DELTA_E : DELTA_W);
|
|
|
|
if (pos.piece_on(s + d) == make_piece(Us, PAWN))
|
|
|
|
score -= !pos.empty(s + d + pawn_push(Us)) ? TrappedBishopA1H1 * 4
|
|
|
|
: pos.piece_on(s + d + d) == make_piece(Us, PAWN) ? TrappedBishopA1H1 * 2
|
|
|
|
: TrappedBishopA1H1;
|
|
|
|
}
|
2013-08-13 06:19:42 -06:00
|
|
|
}
|
2008-08-31 23:59:13 -06:00
|
|
|
|
Remove QueenOn7th and QueenOnPawn
Small simplification.
Passed SPRT(-3,1) both at STC:
LLR: 2.95 (-2.94,2.94) [-3.00,1.00]
Total: 17051 W: 3132 L: 3005 D: 10914
and LTC:
LLR: 4.55 (-2.94,2.94) [-3.00,1.00]
Total: 24890 W: 3842 L: 3646 D: 17402
The rationale behind this is that I've never managed to add a
Queen on 7th rank bonus in DiscoCheck, because it never showed
to be positive (evne slightly) in testing. The only thing that
worked is Rook on 7th rank.
In terms of SF code, it seemed natural to group it with QueenOnPawn
as well as those are done together. I know you're against groupping
in general, but when it comes to non regression test, you are being
more conservative by groupping. If the group passes SPRT(-3,1) it's
safer to commit, than test every component in SPRT(-3,1) and end up
with the risk of commiting several -1 elo regression instead of just
one -1 elo regression.
In chess terms, perhaps it's just easier to manouver a Queen (which
can more also diagonaly) than a Rook. Therefore you can let the search
do its job without needing eval ad-hoc terms to guide it. For the Rook
which takes more moves to manouver such eval terms can be (marginally)
useful.
bench: 7473314
2014-04-03 07:31:42 -06:00
|
|
|
if (Pt == ROOK)
|
2009-03-06 08:29:46 -07:00
|
|
|
{
|
2014-12-27 02:47:21 -07:00
|
|
|
// Bonus for aligning with enemy pawns on the same rank/file
|
Remove QueenOn7th and QueenOnPawn
Small simplification.
Passed SPRT(-3,1) both at STC:
LLR: 2.95 (-2.94,2.94) [-3.00,1.00]
Total: 17051 W: 3132 L: 3005 D: 10914
and LTC:
LLR: 4.55 (-2.94,2.94) [-3.00,1.00]
Total: 24890 W: 3842 L: 3646 D: 17402
The rationale behind this is that I've never managed to add a
Queen on 7th rank bonus in DiscoCheck, because it never showed
to be positive (evne slightly) in testing. The only thing that
worked is Rook on 7th rank.
In terms of SF code, it seemed natural to group it with QueenOnPawn
as well as those are done together. I know you're against groupping
in general, but when it comes to non regression test, you are being
more conservative by groupping. If the group passes SPRT(-3,1) it's
safer to commit, than test every component in SPRT(-3,1) and end up
with the risk of commiting several -1 elo regression instead of just
one -1 elo regression.
In chess terms, perhaps it's just easier to manouver a Queen (which
can more also diagonaly) than a Rook. Therefore you can let the search
do its job without needing eval ad-hoc terms to guide it. For the Rook
which takes more moves to manouver such eval terms can be (marginally)
useful.
bench: 7473314
2014-04-03 07:31:42 -06:00
|
|
|
if (relative_rank(Us, s) >= RANK_5)
|
|
|
|
{
|
2014-12-27 02:47:21 -07:00
|
|
|
Bitboard alignedPawns = pos.pieces(Them, PAWN) & PseudoAttacks[ROOK][s];
|
|
|
|
if (alignedPawns)
|
2015-12-30 04:29:25 -07:00
|
|
|
score += RookOnPawn * popcount<Max15>(alignedPawns);
|
Remove QueenOn7th and QueenOnPawn
Small simplification.
Passed SPRT(-3,1) both at STC:
LLR: 2.95 (-2.94,2.94) [-3.00,1.00]
Total: 17051 W: 3132 L: 3005 D: 10914
and LTC:
LLR: 4.55 (-2.94,2.94) [-3.00,1.00]
Total: 24890 W: 3842 L: 3646 D: 17402
The rationale behind this is that I've never managed to add a
Queen on 7th rank bonus in DiscoCheck, because it never showed
to be positive (evne slightly) in testing. The only thing that
worked is Rook on 7th rank.
In terms of SF code, it seemed natural to group it with QueenOnPawn
as well as those are done together. I know you're against groupping
in general, but when it comes to non regression test, you are being
more conservative by groupping. If the group passes SPRT(-3,1) it's
safer to commit, than test every component in SPRT(-3,1) and end up
with the risk of commiting several -1 elo regression instead of just
one -1 elo regression.
In chess terms, perhaps it's just easier to manouver a Queen (which
can more also diagonaly) than a Rook. Therefore you can let the search
do its job without needing eval ad-hoc terms to guide it. For the Rook
which takes more moves to manouver such eval terms can be (marginally)
useful.
bench: 7473314
2014-04-03 07:31:42 -06:00
|
|
|
}
|
2011-01-03 14:32:57 -07:00
|
|
|
|
2014-12-27 02:47:21 -07:00
|
|
|
// Bonus when on an open or semi-open file
|
2014-04-13 05:35:58 -06:00
|
|
|
if (ei.pi->semiopen_file(Us, file_of(s)))
|
2015-12-30 04:29:25 -07:00
|
|
|
score += RookOnFile[!!ei.pi->semiopen_file(Them, file_of(s))];
|
2008-09-24 08:45:19 -06:00
|
|
|
|
2016-01-16 14:34:29 -07:00
|
|
|
// Penalize when trapped by the king, even more if the king cannot castle
|
2015-12-30 04:29:25 -07:00
|
|
|
else if (mob <= 3)
|
2014-12-27 02:47:21 -07:00
|
|
|
{
|
2015-08-04 01:00:52 -06:00
|
|
|
Square ksq = pos.square<KING>(Us);
|
2013-05-11 01:29:02 -06:00
|
|
|
|
2014-12-27 02:47:21 -07:00
|
|
|
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_side(Us, file_of(ksq), file_of(s) < file_of(ksq)))
|
|
|
|
score -= (TrappedRook - make_score(mob * 22, 0)) * (1 + !pos.can_castle(Us));
|
|
|
|
}
|
2008-08-31 23:59:13 -06:00
|
|
|
}
|
2008-09-24 08:45:19 -06:00
|
|
|
}
|
2011-02-26 06:09:58 -07:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
if (DoTrace)
|
|
|
|
Trace::add(Pt, Us, score);
|
2011-02-26 06:09:58 -07:00
|
|
|
|
2016-01-16 14:34:29 -07:00
|
|
|
// Recursively call evaluate_pieces() of next piece type until KING is excluded
|
2015-11-28 02:57:45 -07:00
|
|
|
return score - evaluate_pieces<DoTrace, Them, NextPt>(pos, ei, mobility, mobilityArea);
|
2009-09-28 03:46:55 -06:00
|
|
|
}
|
2008-08-31 23:59:13 -06:00
|
|
|
|
2014-04-10 11:45:18 -06:00
|
|
|
template<>
|
2015-11-28 02:57:45 -07:00
|
|
|
Score evaluate_pieces<false, WHITE, KING>(const Position&, EvalInfo&, Score*, const Bitboard*) { return SCORE_ZERO; }
|
2014-04-10 11:45:18 -06:00
|
|
|
template<>
|
2015-11-28 02:57:45 -07:00
|
|
|
Score evaluate_pieces< true, WHITE, KING>(const Position&, EvalInfo&, Score*, const Bitboard*) { return SCORE_ZERO; }
|
2014-04-10 11:45:18 -06:00
|
|
|
|
2009-09-28 05:27:05 -06:00
|
|
|
|
2013-10-18 09:42:52 -06:00
|
|
|
// evaluate_king() assigns bonuses and penalties to a king of a given color
|
2008-09-23 16:32:53 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
template<Color Us, bool DoTrace>
|
2013-11-08 03:42:22 -07:00
|
|
|
Score evaluate_king(const Position& pos, const EvalInfo& ei) {
|
2008-09-23 16:32:53 -06:00
|
|
|
|
2009-09-28 03:46:55 -06:00
|
|
|
const Color Them = (Us == WHITE ? BLACK : WHITE);
|
2009-11-12 11:01:44 -07:00
|
|
|
|
2010-05-07 01:39:28 -06:00
|
|
|
Bitboard undefended, b, b1, b2, safe;
|
2010-08-21 11:57:52 -06:00
|
|
|
int attackUnits;
|
2015-08-04 01:00:52 -06:00
|
|
|
const Square ksq = pos.square<KING>(Us);
|
2008-08-31 23:59:13 -06:00
|
|
|
|
2012-03-28 04:44:41 -06:00
|
|
|
// King shelter and enemy pawns storm
|
|
|
|
Score score = ei.pi->king_safety<Us>(pos, ksq);
|
2008-08-31 23:59:13 -06:00
|
|
|
|
2013-10-18 09:42:52 -06:00
|
|
|
// Main king safety evaluation
|
2013-12-22 04:00:09 -07:00
|
|
|
if (ei.kingAttackersCount[Them])
|
2008-09-25 08:43:37 -06:00
|
|
|
{
|
2013-12-02 11:04:09 -07:00
|
|
|
// Find the attacked squares around the king which have no defenders
|
2015-11-28 02:57:45 -07:00
|
|
|
// apart from the king itself.
|
2013-10-18 09:42:52 -06:00
|
|
|
undefended = ei.attackedBy[Them][ALL_PIECES]
|
|
|
|
& ei.attackedBy[Us][KING]
|
|
|
|
& ~( ei.attackedBy[Us][PAWN] | ei.attackedBy[Us][KNIGHT]
|
2010-08-25 07:28:08 -06:00
|
|
|
| ei.attackedBy[Us][BISHOP] | ei.attackedBy[Us][ROOK]
|
|
|
|
| ei.attackedBy[Us][QUEEN]);
|
2010-05-06 12:10:04 -06:00
|
|
|
|
|
|
|
// Initialize the 'attackUnits' variable, which is used later on as an
|
2014-12-27 02:47:21 -07:00
|
|
|
// index into the KingDanger[] array. The initial value is based on the
|
2013-06-01 03:48:38 -06:00
|
|
|
// number and types of the enemy's attacking pieces, the number of
|
2013-12-30 00:13:39 -07:00
|
|
|
// attacked and undefended squares around our king and the quality of
|
|
|
|
// the pawn shelter (current 'score' value).
|
2015-10-05 20:48:47 -06:00
|
|
|
attackUnits = std::min(72, ei.kingAttackersCount[Them] * ei.kingAttackersWeight[Them])
|
|
|
|
+ 9 * ei.kingAdjacentZoneAttacksCount[Them]
|
|
|
|
+ 27 * popcount<Max15>(undefended)
|
2015-08-25 09:12:51 -06:00
|
|
|
+ 11 * !!ei.pinnedPieces[Us]
|
2015-10-05 20:48:47 -06:00
|
|
|
- 64 * !pos.count<QUEEN>(Them)
|
2015-08-25 09:12:51 -06:00
|
|
|
- mg_value(score) / 8;
|
2010-05-06 12:10:04 -06:00
|
|
|
|
2013-12-02 11:04:09 -07:00
|
|
|
// Analyse the enemy's safe queen contact checks. Firstly, find the
|
2014-12-27 02:47:21 -07:00
|
|
|
// undefended squares around the king reachable by the enemy queen...
|
2011-06-28 07:36:39 -06:00
|
|
|
b = undefended & ei.attackedBy[Them][QUEEN] & ~pos.pieces(Them);
|
2008-09-25 08:43:37 -06:00
|
|
|
if (b)
|
|
|
|
{
|
2013-12-02 11:04:09 -07:00
|
|
|
// ...and then remove squares not supported by another enemy piece
|
2014-12-27 02:47:21 -07:00
|
|
|
b &= ei.attackedBy[Them][PAWN] | ei.attackedBy[Them][KNIGHT]
|
2015-10-20 20:46:06 -06:00
|
|
|
| ei.attackedBy[Them][BISHOP] | ei.attackedBy[Them][ROOK]
|
|
|
|
| ei.attackedBy[Them][KING];
|
2014-02-15 05:27:16 -07:00
|
|
|
|
2010-05-06 12:10:04 -06:00
|
|
|
if (b)
|
2014-12-27 02:47:21 -07:00
|
|
|
attackUnits += QueenContactCheck * popcount<Max15>(b);
|
2008-08-31 23:59:13 -06:00
|
|
|
}
|
2008-12-22 04:07:00 -07:00
|
|
|
|
2013-12-02 11:04:09 -07:00
|
|
|
// Analyse the enemy's safe distance checks for sliders and knights
|
2014-12-27 02:47:21 -07:00
|
|
|
safe = ~(ei.attackedBy[Us][ALL_PIECES] | pos.pieces(Them));
|
2010-05-06 12:10:04 -06:00
|
|
|
|
2014-12-27 02:47:21 -07:00
|
|
|
b1 = pos.attacks_from<ROOK >(ksq) & safe;
|
2010-05-06 12:10:04 -06:00
|
|
|
b2 = pos.attacks_from<BISHOP>(ksq) & safe;
|
|
|
|
|
2010-05-07 01:39:28 -06:00
|
|
|
// Enemy queen safe checks
|
2016-03-14 21:49:25 -06:00
|
|
|
if ((b1 | b2) & ei.attackedBy[Them][QUEEN])
|
|
|
|
attackUnits += QueenCheck, score -= Checked;
|
2010-05-07 01:39:28 -06:00
|
|
|
|
2010-05-06 12:10:04 -06:00
|
|
|
// Enemy rooks safe checks
|
2016-03-14 21:49:25 -06:00
|
|
|
if (b1 & ei.attackedBy[Them][ROOK])
|
|
|
|
attackUnits += RookCheck, score -= Checked;
|
2010-05-06 12:10:04 -06:00
|
|
|
|
|
|
|
// Enemy bishops safe checks
|
2016-03-14 21:49:25 -06:00
|
|
|
if (b2 & ei.attackedBy[Them][BISHOP])
|
|
|
|
attackUnits += BishopCheck, score -= Checked;
|
2010-05-06 12:10:04 -06:00
|
|
|
|
|
|
|
// Enemy knights safe checks
|
2016-03-14 21:49:25 -06:00
|
|
|
if (pos.attacks_from<KNIGHT>(ksq) & ei.attackedBy[Them][KNIGHT] & safe)
|
|
|
|
attackUnits += KnightCheck, score -= Checked;
|
2010-05-06 12:10:04 -06:00
|
|
|
|
2013-06-01 03:48:38 -06:00
|
|
|
// Finally, extract the king danger score from the KingDanger[]
|
2016-01-16 14:34:29 -07:00
|
|
|
// array and subtract the score from the evaluation.
|
2015-01-03 13:34:20 -07:00
|
|
|
score -= KingDanger[std::max(std::min(attackUnits, 399), 0)];
|
2010-08-25 13:16:27 -06:00
|
|
|
}
|
2011-02-26 06:09:58 -07:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
if (DoTrace)
|
|
|
|
Trace::add(KING, Us, score);
|
2011-02-26 06:09:58 -07:00
|
|
|
|
2011-05-02 01:43:16 -06:00
|
|
|
return score;
|
2008-08-31 23:59:13 -06:00
|
|
|
}
|
|
|
|
|
2014-10-23 11:10:11 -06:00
|
|
|
|
2016-03-13 01:35:03 -07:00
|
|
|
// evaluate_threats() assigns bonuses according to the types of the attacking
|
2016-01-16 14:34:29 -07:00
|
|
|
// and the attacked pieces.
|
2013-10-18 09:42:52 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
template<Color Us, bool DoTrace>
|
2013-10-18 09:42:52 -06:00
|
|
|
Score evaluate_threats(const Position& pos, const EvalInfo& ei) {
|
|
|
|
|
2015-02-02 20:16:50 -07:00
|
|
|
const Color Them = (Us == WHITE ? BLACK : WHITE);
|
|
|
|
const Square Up = (Us == WHITE ? DELTA_N : DELTA_S);
|
|
|
|
const Square Left = (Us == WHITE ? DELTA_NW : DELTA_SE);
|
|
|
|
const Square Right = (Us == WHITE ? DELTA_NE : DELTA_SW);
|
|
|
|
const Bitboard TRank2BB = (Us == WHITE ? Rank2BB : Rank7BB);
|
|
|
|
const Bitboard TRank7BB = (Us == WHITE ? Rank7BB : Rank2BB);
|
2013-10-18 09:42:52 -06:00
|
|
|
|
2015-10-05 20:32:26 -06:00
|
|
|
enum { Minor, Rook };
|
2014-11-09 01:24:06 -07:00
|
|
|
|
2015-03-29 01:24:17 -06:00
|
|
|
Bitboard b, weak, defended, safeThreats;
|
2013-10-18 09:42:52 -06:00
|
|
|
Score score = SCORE_ZERO;
|
|
|
|
|
2016-03-27 13:54:39 -06:00
|
|
|
// Small bonus if the opponent has loose pawns or pieces
|
|
|
|
if ( (pos.pieces(Them) ^ pos.pieces(Them, QUEEN, KING))
|
|
|
|
& ~(ei.attackedBy[Us][ALL_PIECES] | ei.attackedBy[Them][ALL_PIECES]))
|
|
|
|
score += LooseEnemies;
|
|
|
|
|
2015-03-29 01:24:17 -06:00
|
|
|
// Non-pawn enemies attacked by a pawn
|
|
|
|
weak = (pos.pieces(Them) ^ pos.pieces(Them, PAWN)) & ei.attackedBy[Us][PAWN];
|
2015-03-29 01:54:25 -06:00
|
|
|
|
2015-03-29 01:24:17 -06:00
|
|
|
if (weak)
|
2015-03-28 17:27:43 -06:00
|
|
|
{
|
2015-03-29 01:24:17 -06:00
|
|
|
b = pos.pieces(Us, PAWN) & ( ~ei.attackedBy[Them][ALL_PIECES]
|
|
|
|
| ei.attackedBy[Us][ALL_PIECES]);
|
2015-03-28 17:27:43 -06:00
|
|
|
|
2015-03-29 01:24:17 -06:00
|
|
|
safeThreats = (shift_bb<Right>(b) | shift_bb<Left>(b)) & weak;
|
|
|
|
|
|
|
|
if (weak ^ safeThreats)
|
2015-12-30 04:29:25 -07:00
|
|
|
score += ThreatByHangingPawn;
|
2015-03-28 17:27:43 -06:00
|
|
|
|
2015-03-29 01:24:17 -06:00
|
|
|
while (safeThreats)
|
2015-12-30 04:29:25 -07:00
|
|
|
score += ThreatBySafePawn[type_of(pos.piece_on(pop_lsb(&safeThreats)))];
|
2015-03-28 17:27:43 -06:00
|
|
|
}
|
|
|
|
|
2014-11-21 14:46:59 -07:00
|
|
|
// Non-pawn enemies defended by a pawn
|
2015-02-27 01:52:56 -07:00
|
|
|
defended = (pos.pieces(Them) ^ pos.pieces(Them, PAWN)) & ei.attackedBy[Them][PAWN];
|
2014-06-30 08:55:10 -06:00
|
|
|
|
2014-04-26 17:35:46 -06:00
|
|
|
// Enemies not defended by a pawn and under our attack
|
2014-11-09 01:24:06 -07:00
|
|
|
weak = pos.pieces(Them)
|
|
|
|
& ~ei.attackedBy[Them][PAWN]
|
|
|
|
& ei.attackedBy[Us][ALL_PIECES];
|
2013-10-18 09:42:52 -06:00
|
|
|
|
2014-11-09 01:24:06 -07:00
|
|
|
// Add a bonus according to the kind of attacking pieces
|
2015-10-18 20:17:37 -06:00
|
|
|
if (defended | weak)
|
2013-12-18 12:00:01 -07:00
|
|
|
{
|
2015-10-18 20:17:37 -06:00
|
|
|
b = (defended | weak) & (ei.attackedBy[Us][KNIGHT] | ei.attackedBy[Us][BISHOP]);
|
2014-11-04 08:40:37 -07:00
|
|
|
while (b)
|
2015-10-18 20:17:37 -06:00
|
|
|
score += Threat[Minor][type_of(pos.piece_on(pop_lsb(&b)))];
|
2013-12-18 12:00:01 -07:00
|
|
|
|
2015-10-18 20:17:37 -06:00
|
|
|
b = (pos.pieces(Them, QUEEN) | weak) & ei.attackedBy[Us][ROOK];
|
2014-11-04 08:40:37 -07:00
|
|
|
while (b)
|
2015-10-18 20:17:37 -06:00
|
|
|
score += Threat[Rook ][type_of(pos.piece_on(pop_lsb(&b)))];
|
2014-04-26 17:35:46 -06:00
|
|
|
|
2014-11-09 01:24:06 -07:00
|
|
|
b = weak & ~ei.attackedBy[Them][ALL_PIECES];
|
2014-04-26 17:35:46 -06:00
|
|
|
if (b)
|
Remove a useless optimization
This optimization is aimed at old hardware only (withouth popcount), and even on
non popcount compile (ARCH=x86-64), it provides no mesurable speedup:
stat test master diff
mean 2,341,779 2,354,699 -12,920
stdev 12,910 14,770 18,150
speedup -0.55%
P(speedup>0) 23.8%
No functional change.
Resolves #187
2015-01-03 04:29:00 -07:00
|
|
|
score += Hanging * popcount<Max15>(b);
|
2014-09-19 08:33:42 -06:00
|
|
|
|
2014-11-09 01:24:06 -07:00
|
|
|
b = weak & ei.attackedBy[Us][KING];
|
2014-09-19 08:33:42 -06:00
|
|
|
if (b)
|
2015-12-30 04:29:25 -07:00
|
|
|
score += ThreatByKing[more_than_one(b)];
|
2014-09-21 11:27:34 -06:00
|
|
|
}
|
2013-10-18 09:42:52 -06:00
|
|
|
|
2015-08-17 12:30:17 -06:00
|
|
|
// Bonus if some pawns can safely push and attack an enemy piece
|
2015-02-02 20:16:50 -07:00
|
|
|
b = pos.pieces(Us, PAWN) & ~TRank7BB;
|
|
|
|
b = shift_bb<Up>(b | (shift_bb<Up>(b & TRank2BB) & ~pos.pieces()));
|
|
|
|
|
|
|
|
b &= ~pos.pieces()
|
|
|
|
& ~ei.attackedBy[Them][PAWN]
|
2015-02-13 14:33:00 -07:00
|
|
|
& (ei.attackedBy[Us][ALL_PIECES] | ~ei.attackedBy[Them][ALL_PIECES]);
|
2015-02-14 07:55:11 -07:00
|
|
|
|
2015-02-02 20:16:50 -07:00
|
|
|
b = (shift_bb<Left>(b) | shift_bb<Right>(b))
|
|
|
|
& pos.pieces(Them)
|
|
|
|
& ~ei.attackedBy[Us][PAWN];
|
|
|
|
|
2015-02-07 03:15:38 -07:00
|
|
|
if (b)
|
2015-12-30 04:29:25 -07:00
|
|
|
score += ThreatByPawnPush * popcount<Max15>(b);
|
2015-02-02 20:16:50 -07:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
if (DoTrace)
|
2015-12-14 11:04:20 -07:00
|
|
|
Trace::add(THREAT, Us, score);
|
2013-10-18 09:42:52 -06:00
|
|
|
|
2015-12-14 11:04:20 -07:00
|
|
|
return score;
|
2013-10-18 09:42:52 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// evaluate_passed_pawns() evaluates the passed pawns of the given color
|
2008-08-31 23:59:13 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
template<Color Us, bool DoTrace>
|
2013-08-16 01:57:16 -06:00
|
|
|
Score evaluate_passed_pawns(const Position& pos, const EvalInfo& ei) {
|
2009-01-06 07:49:33 -07:00
|
|
|
|
2009-10-10 03:31:43 -06:00
|
|
|
const Color Them = (Us == WHITE ? BLACK : WHITE);
|
2008-08-31 23:59:13 -06:00
|
|
|
|
2014-04-17 00:43:40 -06:00
|
|
|
Bitboard b, squaresToQueen, defendedSquares, unsafeSquares;
|
2011-05-02 01:43:16 -06:00
|
|
|
Score score = SCORE_ZERO;
|
|
|
|
|
|
|
|
b = ei.pi->passed_pawns(Us);
|
2009-10-10 03:31:43 -06:00
|
|
|
|
2013-05-25 03:57:18 -06:00
|
|
|
while (b)
|
|
|
|
{
|
2012-07-08 01:30:37 -06:00
|
|
|
Square s = pop_lsb(&b);
|
2008-08-31 23:59:13 -06:00
|
|
|
|
2013-09-28 06:43:50 -06:00
|
|
|
assert(pos.pawn_passed(Us, s));
|
2009-01-06 07:49:33 -07:00
|
|
|
|
2014-04-27 04:02:36 -06:00
|
|
|
int r = relative_rank(Us, s) - RANK_2;
|
|
|
|
int rr = r * (r - 1);
|
2009-01-06 07:49:33 -07:00
|
|
|
|
2015-08-15 07:55:14 -06:00
|
|
|
Value mbonus = Passed[MG][r], ebonus = Passed[EG][r];
|
2009-01-06 07:49:33 -07:00
|
|
|
|
2010-08-26 00:27:57 -06:00
|
|
|
if (rr)
|
2009-10-10 03:31:43 -06:00
|
|
|
{
|
2009-10-11 03:12:53 -06:00
|
|
|
Square blockSq = s + pawn_push(Us);
|
|
|
|
|
2013-12-02 11:04:09 -07:00
|
|
|
// Adjust bonus based on the king's proximity
|
2015-08-04 01:00:52 -06:00
|
|
|
ebonus += distance(pos.square<KING>(Them), blockSq) * 5 * rr
|
|
|
|
- distance(pos.square<KING>(Us ), blockSq) * 2 * rr;
|
2011-04-30 06:02:56 -06:00
|
|
|
|
|
|
|
// If blockSq is not the queening square then consider also a second push
|
2013-09-09 13:12:15 -06:00
|
|
|
if (relative_rank(Us, blockSq) != RANK_8)
|
2015-08-04 01:00:52 -06:00
|
|
|
ebonus -= distance(pos.square<KING>(Us), blockSq + pawn_push(Us)) * rr;
|
2009-01-06 07:49:33 -07:00
|
|
|
|
2013-12-02 11:04:09 -07:00
|
|
|
// If the pawn is free to advance, then increase the bonus
|
2013-09-28 06:43:50 -06:00
|
|
|
if (pos.empty(blockSq))
|
2009-01-06 07:49:33 -07:00
|
|
|
{
|
2014-07-14 07:15:07 -06:00
|
|
|
// If there is a rook or queen attacking/defending the pawn from behind,
|
|
|
|
// consider all the squaresToQueen. Otherwise consider only the squares
|
|
|
|
// in the pawn's path attacked or occupied by the enemy.
|
|
|
|
defendedSquares = unsafeSquares = squaresToQueen = forward_bb(Us, s);
|
|
|
|
|
|
|
|
Bitboard bb = forward_bb(Them, s) & pos.pieces(ROOK, QUEEN) & pos.attacks_from<ROOK>(s);
|
|
|
|
|
|
|
|
if (!(pos.pieces(Us) & bb))
|
|
|
|
defendedSquares &= ei.attackedBy[Us][ALL_PIECES];
|
|
|
|
|
|
|
|
if (!(pos.pieces(Them) & bb))
|
|
|
|
unsafeSquares &= ei.attackedBy[Them][ALL_PIECES] | pos.pieces(Them);
|
2013-08-22 08:19:58 -06:00
|
|
|
|
2014-04-17 22:41:22 -06:00
|
|
|
// If there aren't any enemy attacks, assign a big bonus. Otherwise
|
|
|
|
// assign a smaller bonus if the block square isn't attacked.
|
2015-10-05 20:48:47 -06:00
|
|
|
int k = !unsafeSquares ? 18 : !(unsafeSquares & blockSq) ? 8 : 0;
|
2014-04-17 22:41:22 -06:00
|
|
|
|
2016-01-16 14:34:29 -07:00
|
|
|
// If the path to the queen is fully defended, assign a big bonus.
|
2014-04-17 22:41:22 -06:00
|
|
|
// Otherwise assign a smaller bonus if the block square is defended.
|
2013-05-08 15:06:21 -06:00
|
|
|
if (defendedSquares == squaresToQueen)
|
|
|
|
k += 6;
|
2013-05-05 11:12:04 -06:00
|
|
|
|
2013-05-08 15:06:21 -06:00
|
|
|
else if (defendedSquares & blockSq)
|
2014-04-17 22:41:22 -06:00
|
|
|
k += 4;
|
2013-05-05 11:12:04 -06:00
|
|
|
|
2016-02-25 15:59:16 -07:00
|
|
|
mbonus += k * rr, ebonus += k * rr;
|
2009-01-06 07:49:33 -07:00
|
|
|
}
|
2014-09-30 01:05:20 -06:00
|
|
|
else if (pos.pieces(Us) & blockSq)
|
2016-02-25 15:59:16 -07:00
|
|
|
mbonus += rr + r * 2, ebonus += rr + r * 2;
|
2010-08-26 00:27:57 -06:00
|
|
|
} // rr != 0
|
2009-10-10 03:31:43 -06:00
|
|
|
|
2013-10-22 09:27:58 -06:00
|
|
|
if (pos.count<PAWN>(Us) < pos.count<PAWN>(Them))
|
2013-09-12 07:20:53 -06:00
|
|
|
ebonus += ebonus / 4;
|
|
|
|
|
2015-10-03 04:46:53 -06:00
|
|
|
score += make_score(mbonus, ebonus) + PassedFile[file_of(s)];
|
2013-05-25 03:57:18 -06:00
|
|
|
}
|
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
if (DoTrace)
|
2016-02-07 13:58:20 -07:00
|
|
|
Trace::add(PASSED, Us, score);
|
2009-10-10 03:31:43 -06:00
|
|
|
|
2013-12-04 23:18:12 -07:00
|
|
|
// Add the scores to the middlegame and endgame eval
|
2016-02-07 13:58:20 -07:00
|
|
|
return score;
|
2009-10-10 03:31:43 -06:00
|
|
|
}
|
|
|
|
|
2011-05-01 00:11:58 -06:00
|
|
|
|
2008-12-21 08:26:36 -07:00
|
|
|
// evaluate_space() computes the space evaluation for a given side. The
|
|
|
|
// space evaluation is a simple bonus based on the number of safe squares
|
|
|
|
// 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
|
2014-12-31 02:41:20 -07:00
|
|
|
// twice. Finally, the space bonus is multiplied by a weight. The aim is to
|
|
|
|
// improve play on game opening.
|
2011-12-30 03:30:26 -07:00
|
|
|
template<Color Us>
|
2014-12-31 02:41:20 -07:00
|
|
|
Score evaluate_space(const Position& pos, const EvalInfo& ei) {
|
2008-12-21 08:26:36 -07:00
|
|
|
|
2014-04-21 12:54:55 -06:00
|
|
|
const Color Them = (Us == WHITE ? BLACK : WHITE);
|
2015-11-28 02:57:45 -07:00
|
|
|
const Bitboard SpaceMask =
|
|
|
|
Us == WHITE ? (FileCBB | FileDBB | FileEBB | FileFBB) & (Rank2BB | Rank3BB | Rank4BB)
|
|
|
|
: (FileCBB | FileDBB | FileEBB | FileFBB) & (Rank7BB | Rank6BB | Rank5BB);
|
2008-12-21 08:26:36 -07:00
|
|
|
|
|
|
|
// Find the safe squares for our pieces inside the area defined by
|
2015-11-28 02:57:45 -07:00
|
|
|
// SpaceMask. A square is unsafe if it is attacked by an enemy
|
2008-12-21 08:26:36 -07:00
|
|
|
// pawn, or if it is undefended and attacked by an enemy piece.
|
2015-11-28 02:57:45 -07:00
|
|
|
Bitboard safe = SpaceMask
|
2012-05-01 05:01:38 -06:00
|
|
|
& ~pos.pieces(Us, PAWN)
|
2010-08-25 07:28:08 -06:00
|
|
|
& ~ei.attackedBy[Them][PAWN]
|
2013-03-20 23:07:25 -06:00
|
|
|
& (ei.attackedBy[Us][ALL_PIECES] | ~ei.attackedBy[Them][ALL_PIECES]);
|
2008-12-21 08:26:36 -07:00
|
|
|
|
2010-05-11 02:07:17 -06:00
|
|
|
// Find all squares which are at most three squares behind some friendly pawn
|
2012-05-01 05:01:38 -06:00
|
|
|
Bitboard behind = pos.pieces(Us, PAWN);
|
2014-04-21 12:54:55 -06:00
|
|
|
behind |= (Us == WHITE ? behind >> 8 : behind << 8);
|
|
|
|
behind |= (Us == WHITE ? behind >> 16 : behind << 16);
|
2008-12-21 08:26:36 -07:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
// Since SpaceMask[Us] is fully on our half of the board...
|
2012-12-31 03:26:12 -07:00
|
|
|
assert(unsigned(safe >> (Us == WHITE ? 32 : 0)) == 0);
|
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
// ...count safe + (behind & safe) with a single popcount
|
2014-12-31 02:41:20 -07:00
|
|
|
int bonus = popcount<Full>((Us == WHITE ? safe << 32 : safe >> 32) | (behind & safe));
|
|
|
|
int weight = pos.count<KNIGHT>(Us) + pos.count<BISHOP>(Us)
|
|
|
|
+ pos.count<KNIGHT>(Them) + pos.count<BISHOP>(Them);
|
|
|
|
|
2016-02-07 13:58:20 -07:00
|
|
|
return make_score(bonus * weight * weight * 2 / 11, 0);
|
2008-12-21 08:26:36 -07:00
|
|
|
}
|
|
|
|
|
2015-10-15 22:27:52 -06:00
|
|
|
|
2015-10-18 20:17:37 -06:00
|
|
|
// evaluate_initiative() computes the initiative correction value for the
|
2016-01-16 14:34:29 -07:00
|
|
|
// position, i.e., second order bonus/malus based on the known attacking/defending
|
2015-10-18 20:17:37 -06:00
|
|
|
// status of the players.
|
2015-10-23 23:27:24 -06:00
|
|
|
Score evaluate_initiative(const Position& pos, int asymmetry, Value eg) {
|
2015-10-15 22:27:52 -06:00
|
|
|
|
2016-03-13 01:35:03 -07:00
|
|
|
int kingDistance = distance<File>(pos.square<KING>(WHITE), pos.square<KING>(BLACK))
|
|
|
|
- distance<Rank>(pos.square<KING>(WHITE), pos.square<KING>(BLACK));
|
2015-10-23 23:27:24 -06:00
|
|
|
int pawns = pos.count<PAWN>(WHITE) + pos.count<PAWN>(BLACK);
|
2015-10-15 22:27:52 -06:00
|
|
|
|
|
|
|
// Compute the initiative bonus for the attacking side
|
2016-03-13 01:35:03 -07:00
|
|
|
int initiative = 8 * (asymmetry + kingDistance - 15) + 12 * pawns;
|
2015-10-15 22:27:52 -06:00
|
|
|
|
2015-10-23 23:27:24 -06:00
|
|
|
// Now apply the bonus: note that we find the attacking side by extracting
|
|
|
|
// the sign of the endgame value, and that we carefully cap the bonus so
|
|
|
|
// that the endgame score will never be divided by more than two.
|
|
|
|
int value = ((eg > 0) - (eg < 0)) * std::max(initiative, -abs(eg / 2));
|
2015-10-15 22:27:52 -06:00
|
|
|
|
2015-10-18 20:17:37 -06:00
|
|
|
return make_score(0, value);
|
2015-10-15 22:27:52 -06:00
|
|
|
}
|
|
|
|
|
2015-11-28 02:57:45 -07:00
|
|
|
|
|
|
|
// evaluate_scale_factor() computes the scale factor for the winning side
|
2016-02-25 11:38:35 -07:00
|
|
|
ScaleFactor evaluate_scale_factor(const Position& pos, const EvalInfo& ei, Value eg) {
|
2015-11-28 02:57:45 -07:00
|
|
|
|
2016-02-25 11:38:35 -07:00
|
|
|
Color strongSide = eg > VALUE_DRAW ? WHITE : BLACK;
|
2015-11-28 02:57:45 -07:00
|
|
|
ScaleFactor sf = ei.me->scale_factor(pos, strongSide);
|
|
|
|
|
|
|
|
// If we don't already have an unusual scale factor, check for certain
|
|
|
|
// types of endgames, and use a lower scale for those.
|
|
|
|
if ( ei.me->game_phase() < PHASE_MIDGAME
|
|
|
|
&& (sf == SCALE_FACTOR_NORMAL || sf == SCALE_FACTOR_ONEPAWN))
|
|
|
|
{
|
|
|
|
if (pos.opposite_bishops())
|
|
|
|
{
|
|
|
|
// Endgame with opposite-colored bishops and no other pieces (ignoring pawns)
|
2016-01-16 14:34:29 -07:00
|
|
|
// is almost a draw, in case of KBP vs KB, it is even more a draw.
|
2015-11-28 02:57:45 -07:00
|
|
|
if ( pos.non_pawn_material(WHITE) == BishopValueMg
|
|
|
|
&& pos.non_pawn_material(BLACK) == BishopValueMg)
|
|
|
|
sf = more_than_one(pos.pieces(PAWN)) ? ScaleFactor(31) : ScaleFactor(9);
|
|
|
|
|
|
|
|
// Endgame with opposite-colored bishops, but also other pieces. Still
|
|
|
|
// a bit drawish, but not as drawish as with only the two bishops.
|
|
|
|
else
|
|
|
|
sf = ScaleFactor(46 * sf / SCALE_FACTOR_NORMAL);
|
|
|
|
}
|
|
|
|
// Endings where weaker side can place his king in front of the opponent's
|
|
|
|
// pawns are drawish.
|
2016-02-25 11:38:35 -07:00
|
|
|
else if ( abs(eg) <= BishopValueEg
|
2015-11-28 02:57:45 -07:00
|
|
|
&& ei.pi->pawn_span(strongSide) <= 1
|
|
|
|
&& !pos.pawn_passed(~strongSide, pos.square<KING>(~strongSide)))
|
|
|
|
sf = ei.pi->pawn_span(strongSide) ? ScaleFactor(51) : ScaleFactor(37);
|
|
|
|
}
|
|
|
|
|
|
|
|
return sf;
|
|
|
|
}
|
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
} // namespace
|
2008-12-21 08:26:36 -07:00
|
|
|
|
2014-04-12 00:32:52 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
/// evaluate() is the main evaluation function. It returns a static evaluation
|
2015-11-28 02:57:45 -07:00
|
|
|
/// of the position from the point of view of the side to move.
|
2014-04-12 00:32:52 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
template<bool DoTrace>
|
|
|
|
Value Eval::evaluate(const Position& pos) {
|
2014-04-12 00:32:52 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
assert(!pos.checkers());
|
MobilityArea (simplified)
Based off of Pull request #383:
Include squares occupied by some pawns in the MobilityArea
a) not blocked
b) on rank 4 and above
c) or captures
Passed STC
LLR: 2.95 (-2.94,2.94) [-1.50,4.50]
Total: 8157 W: 1644 L: 1516 D: 4997
And LTC
LLR: 2.97 (-2.94,2.94) [0.00,6.00]
Total: 26086 W: 4274 L: 4051 D: 17761
-----------
Then, a simplification test failed, trying to remove b and c)
LLR: -2.95 (-2.94,2.94) [-3.00,1.00]
Total: 6048 W: 1117 L: 1288 D: 3643
Another simplification test, was run to remove just (c)
Passed STC
LLR: 2.96 (-2.94,2.94) [-3.00,1.00]
Total: 28073 W: 5364 L: 5255 D: 17454
And LTC
LLR: 2.96 (-2.94,2.94) [-3.00,1.00]
Total: 34652 W: 5448 L: 5348 D: 23856
A parameter tweak test showed that changing b) for "on rank 3 and above"
does not work
LLR: -2.95 (-2.94,2.94) [0.00,4.00]
Total: 5233 W: 937 L: 1077 D: 3219
Finally, a small rewrite, and we have this version
Include squares occupied by some pawns in the MobilityArea which are
a) not blocked
b) on rank 4 and above
Bench: 8977899
Resolves #385
2015-07-29 10:47:51 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
EvalInfo ei;
|
New mobility bonus
Tuned the global mobility factor for each piece, as well as some +- delta,
The master mobility factor was {266,334} and tuning gave
{267, 362} +S(-2,-2) for the Knight
{249, 328} +S( 0,-2) for the Bishop
{298, 353} +S(1,1) for the Rook
{265, 358} +S(2,-1) for the Queen
Passed STC
LLR: 2.95 (-2.94,2.94) [0.00,4.00]
Total: 49402 W: 9367 L: 9037 D: 30998
and LTC
LLR: 2.97 (-2.94,2.94) [0.00,5.00]
Total: 26831 W: 3871 L: 3658 D: 19302
Bench: 8355485
Resolves #536
2015-12-22 03:00:04 -07:00
|
|
|
Score score, mobility[COLOR_NB] = { SCORE_ZERO, SCORE_ZERO };
|
2014-04-12 00:32:52 -06:00
|
|
|
|
2015-11-28 02:57:45 -07:00
|
|
|
// Initialize score by reading the incrementally updated scores included in
|
|
|
|
// the position object (material + piece square tables). Score is computed
|
|
|
|
// internally from the white point of view.
|
2015-08-25 09:12:51 -06:00
|
|
|
score = pos.psq_score();
|
2014-04-12 00:32:52 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
// Probe the material hash table
|
2015-11-28 02:57:45 -07:00
|
|
|
ei.me = Material::probe(pos);
|
|
|
|
score += ei.me->imbalance();
|
2014-04-12 00:32:52 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
// If we have a specialized evaluation function for the current material
|
|
|
|
// configuration, call it and return.
|
2015-11-28 02:57:45 -07:00
|
|
|
if (ei.me->specialized_eval_exists())
|
|
|
|
return ei.me->evaluate(pos);
|
2014-04-12 00:32:52 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
// Probe the pawn hash table
|
|
|
|
ei.pi = Pawns::probe(pos);
|
2016-02-07 13:58:20 -07:00
|
|
|
score += ei.pi->pawns_score();
|
2014-04-12 00:32:52 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
// Initialize attack and king safety bitboards
|
|
|
|
ei.attackedBy[WHITE][ALL_PIECES] = ei.attackedBy[BLACK][ALL_PIECES] = 0;
|
2015-11-28 02:57:45 -07:00
|
|
|
eval_init<WHITE>(pos, ei);
|
|
|
|
eval_init<BLACK>(pos, ei);
|
2014-12-27 02:47:21 -07:00
|
|
|
|
2015-11-28 02:57:45 -07:00
|
|
|
// Pawns blocked or on ranks 2 and 3 will be excluded from the mobility area
|
2015-08-25 09:12:51 -06:00
|
|
|
Bitboard blockedPawns[] = {
|
|
|
|
pos.pieces(WHITE, PAWN) & (shift_bb<DELTA_S>(pos.pieces()) | Rank2BB | Rank3BB),
|
|
|
|
pos.pieces(BLACK, PAWN) & (shift_bb<DELTA_N>(pos.pieces()) | Rank7BB | Rank6BB)
|
|
|
|
};
|
2014-04-12 00:32:52 -06:00
|
|
|
|
2015-11-28 02:57:45 -07:00
|
|
|
// Do not include in mobility area squares protected by enemy pawns, or occupied
|
2015-08-25 09:12:51 -06:00
|
|
|
// by our blocked pawns or king.
|
|
|
|
Bitboard mobilityArea[] = {
|
|
|
|
~(ei.attackedBy[BLACK][PAWN] | blockedPawns[WHITE] | pos.square<KING>(WHITE)),
|
|
|
|
~(ei.attackedBy[WHITE][PAWN] | blockedPawns[BLACK] | pos.square<KING>(BLACK))
|
|
|
|
};
|
2009-03-15 09:44:12 -06:00
|
|
|
|
2015-11-28 02:57:45 -07:00
|
|
|
// Evaluate all pieces but king and pawns
|
|
|
|
score += evaluate_pieces<DoTrace>(pos, ei, mobility, mobilityArea);
|
New mobility bonus
Tuned the global mobility factor for each piece, as well as some +- delta,
The master mobility factor was {266,334} and tuning gave
{267, 362} +S(-2,-2) for the Knight
{249, 328} +S( 0,-2) for the Bishop
{298, 353} +S(1,1) for the Rook
{265, 358} +S(2,-1) for the Queen
Passed STC
LLR: 2.95 (-2.94,2.94) [0.00,4.00]
Total: 49402 W: 9367 L: 9037 D: 30998
and LTC
LLR: 2.97 (-2.94,2.94) [0.00,5.00]
Total: 26831 W: 3871 L: 3658 D: 19302
Bench: 8355485
Resolves #536
2015-12-22 03:00:04 -07:00
|
|
|
score += mobility[WHITE] - mobility[BLACK];
|
2014-02-15 05:27:16 -07:00
|
|
|
|
2015-11-28 02:57:45 -07:00
|
|
|
// Evaluate kings after all other pieces because we need full attack
|
2015-08-25 09:12:51 -06:00
|
|
|
// information when computing the king safety evaluation.
|
|
|
|
score += evaluate_king<WHITE, DoTrace>(pos, ei)
|
|
|
|
- evaluate_king<BLACK, DoTrace>(pos, ei);
|
2009-03-15 09:44:12 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
// Evaluate tactical threats, we need full attack information including king
|
|
|
|
score += evaluate_threats<WHITE, DoTrace>(pos, ei)
|
|
|
|
- evaluate_threats<BLACK, DoTrace>(pos, ei);
|
2014-04-28 02:30:06 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
// Evaluate passed pawns, we need full attack information including king
|
|
|
|
score += evaluate_passed_pawns<WHITE, DoTrace>(pos, ei)
|
|
|
|
- evaluate_passed_pawns<BLACK, DoTrace>(pos, ei);
|
2008-08-31 23:59:13 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
// If both sides have only pawns, score for potential unstoppable pawns
|
|
|
|
if (!pos.non_pawn_material(WHITE) && !pos.non_pawn_material(BLACK))
|
|
|
|
{
|
|
|
|
Bitboard b;
|
|
|
|
if ((b = ei.pi->passed_pawns(WHITE)) != 0)
|
2015-12-30 04:29:25 -07:00
|
|
|
score += Unstoppable * int(relative_rank(WHITE, frontmost_sq(WHITE, b)));
|
2009-01-06 07:59:08 -07:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
if ((b = ei.pi->passed_pawns(BLACK)) != 0)
|
2015-12-30 04:29:25 -07:00
|
|
|
score -= Unstoppable * int(relative_rank(BLACK, frontmost_sq(BLACK, b)));
|
2009-11-07 14:21:50 -07:00
|
|
|
}
|
2008-08-31 23:59:13 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
// Evaluate space for both sides, only during opening
|
2015-10-05 20:48:47 -06:00
|
|
|
if (pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK) >= 12222)
|
2016-02-07 13:58:20 -07:00
|
|
|
score += evaluate_space<WHITE>(pos, ei)
|
|
|
|
- evaluate_space<BLACK>(pos, ei);
|
2015-10-18 20:17:37 -06:00
|
|
|
|
2015-10-23 23:27:24 -06:00
|
|
|
// Evaluate position potential for the winning side
|
|
|
|
score += evaluate_initiative(pos, ei.pi->pawn_asymmetry(), eg_value(score));
|
2015-08-25 09:12:51 -06:00
|
|
|
|
2015-11-28 02:57:45 -07:00
|
|
|
// Evaluate scale factor for the winning side
|
2016-02-25 11:38:35 -07:00
|
|
|
ScaleFactor sf = evaluate_scale_factor(pos, ei, eg_value(score));
|
2011-05-02 01:43:16 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
// Interpolate between a middlegame and a (scaled by 'sf') endgame score
|
2015-11-28 02:57:45 -07:00
|
|
|
Value v = mg_value(score) * int(ei.me->game_phase())
|
|
|
|
+ eg_value(score) * int(PHASE_MIDGAME - ei.me->game_phase()) * sf / SCALE_FACTOR_NORMAL;
|
2015-08-25 09:12:51 -06:00
|
|
|
|
|
|
|
v /= int(PHASE_MIDGAME);
|
|
|
|
|
2015-11-28 02:57:45 -07:00
|
|
|
// In case of tracing add all remaining individual evaluation terms
|
2015-08-25 09:12:51 -06:00
|
|
|
if (DoTrace)
|
|
|
|
{
|
|
|
|
Trace::add(MATERIAL, pos.psq_score());
|
2015-11-28 02:57:45 -07:00
|
|
|
Trace::add(IMBALANCE, ei.me->imbalance());
|
2016-02-07 13:58:20 -07:00
|
|
|
Trace::add(PAWN, ei.pi->pawns_score());
|
New mobility bonus
Tuned the global mobility factor for each piece, as well as some +- delta,
The master mobility factor was {266,334} and tuning gave
{267, 362} +S(-2,-2) for the Knight
{249, 328} +S( 0,-2) for the Bishop
{298, 353} +S(1,1) for the Rook
{265, 358} +S(2,-1) for the Queen
Passed STC
LLR: 2.95 (-2.94,2.94) [0.00,4.00]
Total: 49402 W: 9367 L: 9037 D: 30998
and LTC
LLR: 2.97 (-2.94,2.94) [0.00,5.00]
Total: 26831 W: 3871 L: 3658 D: 19302
Bench: 8355485
Resolves #536
2015-12-22 03:00:04 -07:00
|
|
|
Trace::add(MOBILITY, mobility[WHITE], mobility[BLACK]);
|
2016-02-07 13:58:20 -07:00
|
|
|
Trace::add(SPACE, evaluate_space<WHITE>(pos, ei)
|
|
|
|
, evaluate_space<BLACK>(pos, ei));
|
2015-08-25 09:12:51 -06:00
|
|
|
Trace::add(TOTAL, score);
|
|
|
|
}
|
2015-02-13 03:54:46 -07:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
return (pos.side_to_move() == WHITE ? v : -v) + Eval::Tempo; // Side to move point of view
|
|
|
|
}
|
2015-02-13 03:54:46 -07:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
// Explicit template instantiations
|
|
|
|
template Value Eval::evaluate<true >(const Position&);
|
|
|
|
template Value Eval::evaluate<false>(const Position&);
|
2015-02-13 03:54:46 -07:00
|
|
|
|
2013-06-01 03:48:38 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
/// trace() is like evaluate(), but instead of returning a value, it returns
|
|
|
|
/// a string (suitable for outputting to stdout) that contains the detailed
|
|
|
|
/// descriptions and values of each evaluation term. Useful for debugging.
|
2014-04-12 00:32:52 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
std::string Eval::trace(const Position& pos) {
|
2014-04-12 00:32:52 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
std::memset(scores, 0, sizeof(scores));
|
2014-04-12 00:32:52 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
Value v = evaluate<true>(pos);
|
|
|
|
v = pos.side_to_move() == WHITE ? v : -v; // White's point of view
|
2014-04-12 00:32:52 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
std::stringstream ss;
|
|
|
|
ss << std::showpoint << std::noshowpos << std::fixed << std::setprecision(2)
|
|
|
|
<< " Eval term | White | Black | Total \n"
|
|
|
|
<< " | MG EG | MG EG | MG EG \n"
|
|
|
|
<< "----------------+-------------+-------------+-------------\n"
|
|
|
|
<< " Material | " << Term(MATERIAL)
|
|
|
|
<< " Imbalance | " << Term(IMBALANCE)
|
|
|
|
<< " Pawns | " << Term(PAWN)
|
|
|
|
<< " Knights | " << Term(KNIGHT)
|
|
|
|
<< " Bishop | " << Term(BISHOP)
|
|
|
|
<< " Rooks | " << Term(ROOK)
|
|
|
|
<< " Queens | " << Term(QUEEN)
|
|
|
|
<< " Mobility | " << Term(MOBILITY)
|
|
|
|
<< " King safety | " << Term(KING)
|
|
|
|
<< " Threats | " << Term(THREAT)
|
|
|
|
<< " Passed pawns | " << Term(PASSED)
|
|
|
|
<< " Space | " << Term(SPACE)
|
|
|
|
<< "----------------+-------------+-------------+-------------\n"
|
|
|
|
<< " Total | " << Term(TOTAL);
|
2014-04-12 00:32:52 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
ss << "\nTotal Evaluation: " << to_cp(v) << " (white side)\n";
|
2014-04-12 00:32:52 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
return ss.str();
|
|
|
|
}
|
2014-04-12 00:32:52 -06:00
|
|
|
|
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
/// init() computes evaluation weights, usually at startup
|
2014-04-12 00:32:52 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
void Eval::init() {
|
2014-04-12 00:32:52 -06:00
|
|
|
|
2016-02-07 13:58:20 -07:00
|
|
|
const int MaxSlope = 322;
|
|
|
|
const int Peak = 47410;
|
2015-08-25 09:12:51 -06:00
|
|
|
int t = 0;
|
2014-04-12 00:32:52 -06:00
|
|
|
|
2015-08-25 09:12:51 -06:00
|
|
|
for (int i = 0; i < 400; ++i)
|
|
|
|
{
|
2016-02-07 13:58:20 -07:00
|
|
|
t = std::min(Peak, std::min(i * i - 16, t + MaxSlope));
|
|
|
|
KingDanger[i] = make_score(t * 268 / 7700, 0);
|
2014-04-12 00:32:52 -06:00
|
|
|
}
|
2015-08-25 09:12:51 -06:00
|
|
|
}
|