diff --git a/DroidFish/build_copy_exe.xml b/DroidFish/build_copy_exe.xml
index 58788c0..5b180d6 100644
--- a/DroidFish/build_copy_exe.xml
+++ b/DroidFish/build_copy_exe.xml
@@ -6,8 +6,6 @@
-
-
diff --git a/DroidFish/jni/Application.mk b/DroidFish/jni/Application.mk
index 1d41207..2d75cf7 100644
--- a/DroidFish/jni/Application.mk
+++ b/DroidFish/jni/Application.mk
@@ -1,5 +1,5 @@
APP_PLATFORM := 11
-APP_ABI := all
+APP_ABI := arm64-v8a armeabi-v7a armeabi mips64 x86 x86_64
APP_STL := gnustl_static
APP_OPTIM := release
NDK_TOOLCHAIN_VERSION := 4.9
diff --git a/DroidFish/jni/stockfish/benchmark.cpp b/DroidFish/jni/stockfish/benchmark.cpp
index f2d1f06..75c7d1a 100644
--- a/DroidFish/jni/stockfish/benchmark.cpp
+++ b/DroidFish/jni/stockfish/benchmark.cpp
@@ -2,7 +2,7 @@
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
- Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+ Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -23,23 +23,20 @@
#include
#include
-#include "misc.h"
#include "position.h"
-#include "search.h"
-#include "thread.h"
-#include "uci.h"
using namespace std;
namespace {
const vector Defaults = {
+ "setoption name UCI_Chess960 value false",
"rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1",
"r3k2r/p1ppqpb1/bn2pnp1/3PN3/1p2P3/2N2Q1p/PPPBBPPP/R3K2R w KQkq - 0 10",
"8/2p5/3p4/KP5r/1R3p1k/8/4P1P1/8 w - - 0 11",
"4rrk1/pp1n3p/3q2pQ/2p1pb2/2PP4/2P3N1/P2B2PP/4RRK1 b - - 7 19",
- "rq3rk1/ppp2ppp/1bnpb3/3N2B1/3NP3/7P/PPPQ1PP1/2KR3R w - - 7 14",
- "r1bq1r1k/1pp1n1pp/1p1p4/4p2Q/4Pp2/1BNP4/PPP2PPP/3R1RK1 w - - 2 14",
+ "rq3rk1/ppp2ppp/1bnpb3/3N2B1/3NP3/7P/PPPQ1PP1/2KR3R w - - 7 14 moves d4e6",
+ "r1bq1r1k/1pp1n1pp/1p1p4/4p2Q/4Pp2/1BNP4/PPP2PPP/3R1RK1 w - - 2 14 moves g2g4",
"r3r1k1/2p2ppp/p1p1bn2/8/1q2P3/2NPQN2/PPP3PP/R4RK1 b - - 2 15",
"r1bbk1nr/pp3p1p/2n5/1N4p1/2Np1B2/8/PPP2PPP/2KR1B1R w kq - 0 13",
"r1bq1rk1/ppp1nppp/4n3/3p3Q/3P4/1BP1B3/PP1N2PP/R4RK1 w - - 1 16",
@@ -52,7 +49,7 @@ const vector Defaults = {
"3q2k1/pb3p1p/4pbp1/2r5/PpN2N2/1P2P2P/5PP1/Q2R2K1 b - - 4 26",
"6k1/6p1/6Pp/ppp5/3pn2P/1P3K2/1PP2P2/3N4 b - - 0 1",
"3b4/5kp1/1p1p1p1p/pP1PpP1P/P1P1P3/3KN3/8/8 w - - 0 1",
- "2K5/p7/7P/5pR1/8/5k2/r7/8 w - - 0 1",
+ "2K5/p7/7P/5pR1/8/5k2/r7/8 w - - 0 1 moves g5g6 f3e3 g6g5 e3f3",
"8/6pk/1p6/8/PP3p1p/5P2/4KP1q/3Q4 w - - 0 1",
"7k/3p2pp/4q3/8/4Q3/5Kp1/P6b/8 w - - 0 1",
"8/2p5/8/2kPKp1p/2p4P/2P5/3P4/8 w - - 0 1",
@@ -79,28 +76,35 @@ const vector Defaults = {
"8/R7/2q5/8/6k1/8/1P5p/K6R w - - 0 124", // Draw
// Mate and stalemate positions
+ "6k1/3b3r/1p1p4/p1n2p2/1PPNpP1q/P3Q1p1/1R1RB1P1/5K2 b - - 0 1",
+ "r2r1n2/pp2bk2/2p1p2p/3q4/3PN1QP/2P3R1/P4PP1/5RK1 w - - 0 1",
"8/8/8/8/8/6k1/6p1/6K1 w - -",
- "5k2/5P2/5K2/8/8/8/8/8 b - -",
- "8/8/8/8/8/4k3/4p3/4K3 w - -",
- "8/8/8/8/8/5K2/8/3Q1k2 b - -",
- "7k/7P/6K1/8/3B4/8/8/8 b - -"
+ "7k/7P/6K1/8/3B4/8/8/8 b - -",
+
+ // Chess 960
+ "setoption name UCI_Chess960 value true",
+ "bbqnnrkr/pppppppp/8/8/8/8/PPPPPPPP/BBQNNRKR w KQkq - 0 1 moves g2g3 d7d5 d2d4 c8h3 c1g5 e8d6 g5e7 f7f6",
+ "setoption name UCI_Chess960 value false"
};
} // namespace
-/// benchmark() runs a simple benchmark by letting Stockfish analyze a set
-/// of positions for a given limit each. There are five parameters: the
-/// transposition table size, the number of search threads that should
-/// be used, the limit value spent for each position (optional, default is
-/// depth 13), an optional file name where to look for positions in FEN
-/// format (defaults are the positions defined above) and the type of the
-/// limit value: depth (default), time in millisecs or number of nodes.
+/// setup_bench() builds a list of UCI commands to be run by bench. There
+/// are five parameters: TT size in MB, number of search threads that
+/// should be used, the limit value spent for each position, a file name
+/// where to look for positions in FEN format and the type of the limit:
+/// depth, perft, nodes and movetime (in millisecs).
+///
+/// bench -> search default positions up to depth 13
+/// bench 64 1 15 -> search default positions up to depth 15 (TT = 64MB)
+/// bench 64 4 5000 current movetime -> search current position with 4 threads for 5 sec
+/// bench 64 1 100000 default nodes -> search default positions for 100K nodes each
+/// bench 16 1 5 default perft -> run a perft 5 on default positions
-void benchmark(const Position& current, istream& is) {
+vector setup_bench(const Position& current, istream& is) {
- string token;
- vector fens;
- Search::LimitsType limits;
+ vector fens, list;
+ string go, token;
// Assign default values to missing arguments
string ttSize = (is >> token) ? token : "16";
@@ -109,21 +113,7 @@ void benchmark(const Position& current, istream& is) {
string fenFile = (is >> token) ? token : "default";
string limitType = (is >> token) ? token : "depth";
- Options["Hash"] = ttSize;
- Options["Threads"] = threads;
- Search::clear();
-
- if (limitType == "time")
- limits.movetime = stoi(limit); // movetime is in millisecs
-
- else if (limitType == "nodes")
- limits.nodes = stoi(limit);
-
- else if (limitType == "mate")
- limits.mate = stoi(limit);
-
- else
- limits.depth = stoi(limit);
+ go = "go " + limitType + " " + limit;
if (fenFile == "default")
fens = Defaults;
@@ -139,7 +129,7 @@ void benchmark(const Position& current, istream& is) {
if (!file.is_open())
{
cerr << "Unable to open file " << fenFile << endl;
- return;
+ exit(EXIT_FAILURE);
}
while (getline(file, fen))
@@ -149,35 +139,18 @@ void benchmark(const Position& current, istream& is) {
file.close();
}
- uint64_t nodes = 0;
- TimePoint elapsed = now();
- Position pos;
-
- for (size_t i = 0; i < fens.size(); ++i)
- {
- StateListPtr states(new std::deque(1));
- pos.set(fens[i], Options["UCI_Chess960"], &states->back(), Threads.main());
-
- cerr << "\nPosition: " << i + 1 << '/' << fens.size() << endl;
-
- if (limitType == "perft")
- nodes += Search::perft(pos, limits.depth * ONE_PLY);
+ list.emplace_back("ucinewgame");
+ list.emplace_back("setoption name Threads value " + threads);
+ list.emplace_back("setoption name Hash value " + ttSize);
+ for (const string& fen : fens)
+ if (fen.find("setoption") != string::npos)
+ list.emplace_back(fen);
else
{
- limits.startTime = now();
- Threads.start_thinking(pos, states, limits);
- Threads.main()->wait_for_search_finished();
- nodes += Threads.nodes_searched();
+ list.emplace_back("position fen " + fen);
+ list.emplace_back(go);
}
- }
- elapsed = now() - elapsed + 1; // Ensure positivity to avoid a 'divide by zero'
-
- dbg_print(); // Just before exiting
-
- cerr << "\n==========================="
- << "\nTotal time (ms) : " << elapsed
- << "\nNodes searched : " << nodes
- << "\nNodes/second : " << 1000 * nodes / elapsed << endl;
+ return list;
}
diff --git a/DroidFish/jni/stockfish/bitbase.cpp b/DroidFish/jni/stockfish/bitbase.cpp
index 4170952..d206210 100644
--- a/DroidFish/jni/stockfish/bitbase.cpp
+++ b/DroidFish/jni/stockfish/bitbase.cpp
@@ -2,7 +2,7 @@
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
- Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+ Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -117,7 +117,7 @@ namespace {
if ( distance(ksq[WHITE], ksq[BLACK]) <= 1
|| ksq[WHITE] == psq
|| ksq[BLACK] == psq
- || (us == WHITE && (StepAttacksBB[PAWN][psq] & ksq[BLACK])))
+ || (us == WHITE && (PawnAttacks[WHITE][psq] & ksq[BLACK])))
result = INVALID;
// Immediate win if a pawn can be promoted without getting captured
@@ -125,13 +125,13 @@ namespace {
&& rank_of(psq) == RANK_7
&& ksq[us] != psq + NORTH
&& ( distance(ksq[~us], psq + NORTH) > 1
- || (StepAttacksBB[KING][ksq[us]] & (psq + NORTH))))
+ || (PseudoAttacks[KING][ksq[us]] & (psq + NORTH))))
result = WIN;
// Immediate draw if it is a stalemate or a king captures undefended pawn
else if ( us == BLACK
- && ( !(StepAttacksBB[KING][ksq[us]] & ~(StepAttacksBB[KING][ksq[~us]] | StepAttacksBB[PAWN][psq]))
- || (StepAttacksBB[KING][ksq[us]] & psq & ~StepAttacksBB[KING][ksq[~us]])))
+ && ( !(PseudoAttacks[KING][ksq[us]] & ~(PseudoAttacks[KING][ksq[~us]] | PawnAttacks[~us][psq]))
+ || (PseudoAttacks[KING][ksq[us]] & psq & ~PseudoAttacks[KING][ksq[~us]])))
result = DRAW;
// Position will be classified later
@@ -157,7 +157,7 @@ namespace {
const Result Bad = (Us == WHITE ? DRAW : WIN);
Result r = INVALID;
- Bitboard b = StepAttacksBB[KING][ksq[Us]];
+ Bitboard b = PseudoAttacks[KING][ksq[Us]];
while (b)
r |= Us == WHITE ? db[index(Them, ksq[Them] , pop_lsb(&b), psq)]
diff --git a/DroidFish/jni/stockfish/bitboard.cpp b/DroidFish/jni/stockfish/bitboard.cpp
index e329ab5..e3c9140 100644
--- a/DroidFish/jni/stockfish/bitboard.cpp
+++ b/DroidFish/jni/stockfish/bitboard.cpp
@@ -2,7 +2,7 @@
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
- Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+ Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -26,29 +26,22 @@
uint8_t PopCnt16[1 << 16];
int SquareDistance[SQUARE_NB][SQUARE_NB];
-Bitboard RookMasks [SQUARE_NB];
-Bitboard RookMagics [SQUARE_NB];
-Bitboard* RookAttacks[SQUARE_NB];
-unsigned RookShifts [SQUARE_NB];
-
-Bitboard BishopMasks [SQUARE_NB];
-Bitboard BishopMagics [SQUARE_NB];
-Bitboard* BishopAttacks[SQUARE_NB];
-unsigned BishopShifts [SQUARE_NB];
-
Bitboard SquareBB[SQUARE_NB];
Bitboard FileBB[FILE_NB];
Bitboard RankBB[RANK_NB];
Bitboard AdjacentFilesBB[FILE_NB];
-Bitboard InFrontBB[COLOR_NB][RANK_NB];
-Bitboard StepAttacksBB[PIECE_NB][SQUARE_NB];
+Bitboard ForwardRanksBB[COLOR_NB][RANK_NB];
Bitboard BetweenBB[SQUARE_NB][SQUARE_NB];
Bitboard LineBB[SQUARE_NB][SQUARE_NB];
Bitboard DistanceRingBB[SQUARE_NB][8];
-Bitboard ForwardBB[COLOR_NB][SQUARE_NB];
+Bitboard ForwardFileBB[COLOR_NB][SQUARE_NB];
Bitboard PassedPawnMask[COLOR_NB][SQUARE_NB];
Bitboard PawnAttackSpan[COLOR_NB][SQUARE_NB];
Bitboard PseudoAttacks[PIECE_TYPE_NB][SQUARE_NB];
+Bitboard PawnAttacks[COLOR_NB][SQUARE_NB];
+
+Magic RookMagics[SQUARE_NB];
+Magic BishopMagics[SQUARE_NB];
namespace {
@@ -61,10 +54,7 @@ namespace {
Bitboard RookTable[0x19000]; // To store rook attacks
Bitboard BishopTable[0x1480]; // To store bishop attacks
- typedef unsigned (Fn)(Square, Bitboard);
-
- void init_magics(Bitboard table[], Bitboard* attacks[], Bitboard magics[],
- Bitboard masks[], unsigned shifts[], Square deltas[], Fn index);
+ void init_magics(Bitboard table[], Magic magics[], Square deltas[]);
// bsf_index() returns the index into BSFTable[] to look up the bitscan. Uses
// Matt Taylor's folding for 32 bit case, extended to 64 bit by Kim Walisch.
@@ -173,14 +163,14 @@ void Bitboards::init() {
AdjacentFilesBB[f] = (f > FILE_A ? FileBB[f - 1] : 0) | (f < FILE_H ? FileBB[f + 1] : 0);
for (Rank r = RANK_1; r < RANK_8; ++r)
- InFrontBB[WHITE][r] = ~(InFrontBB[BLACK][r + 1] = InFrontBB[BLACK][r] | RankBB[r]);
+ ForwardRanksBB[WHITE][r] = ~(ForwardRanksBB[BLACK][r + 1] = ForwardRanksBB[BLACK][r] | RankBB[r]);
for (Color c = WHITE; c <= BLACK; ++c)
for (Square s = SQ_A1; s <= SQ_H8; ++s)
{
- ForwardBB[c][s] = InFrontBB[c][rank_of(s)] & FileBB[file_of(s)];
- PawnAttackSpan[c][s] = InFrontBB[c][rank_of(s)] & AdjacentFilesBB[file_of(s)];
- PassedPawnMask[c][s] = ForwardBB[c][s] | PawnAttackSpan[c][s];
+ ForwardFileBB [c][s] = ForwardRanksBB[c][rank_of(s)] & FileBB[file_of(s)];
+ PawnAttackSpan[c][s] = ForwardRanksBB[c][rank_of(s)] & AdjacentFilesBB[file_of(s)];
+ PassedPawnMask[c][s] = ForwardFileBB [c][s] | PawnAttackSpan[c][s];
}
for (Square s1 = SQ_A1; s1 <= SQ_H8; ++s1)
@@ -191,39 +181,43 @@ void Bitboards::init() {
DistanceRingBB[s1][SquareDistance[s1][s2] - 1] |= s2;
}
- int steps[][9] = { {}, { 7, 9 }, { 17, 15, 10, 6, -6, -10, -15, -17 },
- {}, {}, {}, { 9, 7, -7, -9, 8, 1, -1, -8 } };
+ int steps[][5] = { {}, { 7, 9 }, { 6, 10, 15, 17 }, {}, {}, {}, { 1, 7, 8, 9 } };
for (Color c = WHITE; c <= BLACK; ++c)
- for (PieceType pt = PAWN; pt <= KING; ++pt)
+ for (PieceType pt : { PAWN, KNIGHT, KING })
for (Square s = SQ_A1; s <= SQ_H8; ++s)
for (int i = 0; steps[pt][i]; ++i)
{
Square to = s + Square(c == WHITE ? steps[pt][i] : -steps[pt][i]);
if (is_ok(to) && distance(s, to) < 3)
- StepAttacksBB[make_piece(c, pt)][s] |= to;
+ {
+ if (pt == PAWN)
+ PawnAttacks[c][s] |= to;
+ else
+ PseudoAttacks[pt][s] |= to;
+ }
}
- Square RookDeltas[] = { NORTH, EAST, SOUTH, WEST };
+ Square RookDeltas[] = { NORTH, EAST, SOUTH, WEST };
Square BishopDeltas[] = { NORTH_EAST, SOUTH_EAST, SOUTH_WEST, NORTH_WEST };
- init_magics(RookTable, RookAttacks, RookMagics, RookMasks, RookShifts, RookDeltas, magic_index);
- init_magics(BishopTable, BishopAttacks, BishopMagics, BishopMasks, BishopShifts, BishopDeltas, magic_index);
+ init_magics(RookTable, RookMagics, RookDeltas);
+ init_magics(BishopTable, BishopMagics, BishopDeltas);
for (Square s1 = SQ_A1; s1 <= SQ_H8; ++s1)
{
PseudoAttacks[QUEEN][s1] = PseudoAttacks[BISHOP][s1] = attacks_bb(s1, 0);
PseudoAttacks[QUEEN][s1] |= PseudoAttacks[ ROOK][s1] = attacks_bb< ROOK>(s1, 0);
- for (Piece pc = W_BISHOP; pc <= W_ROOK; ++pc)
+ for (PieceType pt : { BISHOP, ROOK })
for (Square s2 = SQ_A1; s2 <= SQ_H8; ++s2)
{
- if (!(PseudoAttacks[pc][s1] & s2))
+ if (!(PseudoAttacks[pt][s1] & s2))
continue;
- LineBB[s1][s2] = (attacks_bb(pc, s1, 0) & attacks_bb(pc, s2, 0)) | s1 | s2;
- BetweenBB[s1][s2] = attacks_bb(pc, s1, SquareBB[s2]) & attacks_bb(pc, s2, SquareBB[s1]);
+ LineBB[s1][s2] = (attacks_bb(pt, s1, 0) & attacks_bb(pt, s2, 0)) | s1 | s2;
+ BetweenBB[s1][s2] = attacks_bb(pt, s1, SquareBB[s2]) & attacks_bb(pt, s2, SquareBB[s1]);
}
}
}
@@ -255,17 +249,14 @@ namespace {
// chessprogramming.wikispaces.com/Magic+Bitboards. In particular, here we
// use the so called "fancy" approach.
- void init_magics(Bitboard table[], Bitboard* attacks[], Bitboard magics[],
- Bitboard masks[], unsigned shifts[], Square deltas[], Fn index) {
+ void init_magics(Bitboard table[], Magic magics[], Square deltas[]) {
+ // Optimal PRNG seeds to pick the correct magics in the shortest time
int seeds[][RANK_NB] = { { 8977, 44560, 54343, 38998, 5731, 95205, 104912, 17020 },
{ 728, 10316, 55013, 32803, 12281, 15100, 16645, 255 } };
Bitboard occupancy[4096], reference[4096], edges, b;
- int age[4096] = {0}, current = 0, i, size;
-
- // attacks[s] is a pointer to the beginning of the attacks table for square 's'
- attacks[SQ_A1] = table;
+ int epoch[4096] = {}, cnt = 0, size = 0;
for (Square s = SQ_A1; s <= SQ_H8; ++s)
{
@@ -277,8 +268,13 @@ namespace {
// all the attacks for each possible subset of the mask and so is 2 power
// the number of 1s of the mask. Hence we deduce the size of the shift to
// apply to the 64 or 32 bits word to get the index.
- masks[s] = sliding_attack(deltas, s, 0) & ~edges;
- shifts[s] = (Is64Bit ? 64 : 32) - popcount(masks[s]);
+ Magic& m = magics[s];
+ m.mask = sliding_attack(deltas, s, 0) & ~edges;
+ m.shift = (Is64Bit ? 64 : 32) - popcount(m.mask);
+
+ // Set the offset for the attacks table of the square. We have individual
+ // table sizes for each square with "Fancy Magic Bitboards".
+ m.attacks = s == SQ_A1 ? table : magics[s - 1].attacks + size;
// Use Carry-Rippler trick to enumerate all subsets of masks[s] and
// store the corresponding sliding attack bitboard in reference[].
@@ -288,17 +284,12 @@ namespace {
reference[size] = sliding_attack(deltas, s, b);
if (HasPext)
- attacks[s][pext(b, masks[s])] = reference[size];
+ m.attacks[pext(b, m.mask)] = reference[size];
size++;
- b = (b - masks[s]) & masks[s];
+ b = (b - m.mask) & m.mask;
} while (b);
- // Set the offset for the table of the next square. We have individual
- // table sizes for each square with "Fancy Magic Bitboards".
- if (s < SQ_H8)
- attacks[s + 1] = attacks[s] + size;
-
if (HasPext)
continue;
@@ -306,28 +297,30 @@ namespace {
// Find a magic for square 's' picking up an (almost) random number
// until we find the one that passes the verification test.
- do {
- do
- magics[s] = rng.sparse_rand();
- while (popcount((magics[s] * masks[s]) >> 56) < 6);
+ for (int i = 0; i < size; )
+ {
+ for (m.magic = 0; popcount((m.magic * m.mask) >> 56) < 6; )
+ m.magic = rng.sparse_rand();
// A good magic must map every possible occupancy to an index that
// looks up the correct sliding attack in the attacks[s] database.
// Note that we build up the database for square 's' as a side
- // effect of verifying the magic.
- for (++current, i = 0; i < size; ++i)
+ // effect of verifying the magic. Keep track of the attempt count
+ // and save it in epoch[], little speed-up trick to avoid resetting
+ // m.attacks[] after every failed attempt.
+ for (++cnt, i = 0; i < size; ++i)
{
- unsigned idx = index(s, occupancy[i]);
+ unsigned idx = m.index(occupancy[i]);
- if (age[idx] < current)
+ if (epoch[idx] < cnt)
{
- age[idx] = current;
- attacks[s][idx] = reference[i];
+ epoch[idx] = cnt;
+ m.attacks[idx] = reference[i];
}
- else if (attacks[s][idx] != reference[i])
+ else if (m.attacks[idx] != reference[i])
break;
}
- } while (i < size);
+ }
}
}
}
diff --git a/DroidFish/jni/stockfish/bitboard.h b/DroidFish/jni/stockfish/bitboard.h
index 715f6c4..c9f199e 100644
--- a/DroidFish/jni/stockfish/bitboard.h
+++ b/DroidFish/jni/stockfish/bitboard.h
@@ -2,7 +2,7 @@
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
- Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+ Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -39,6 +39,7 @@ const std::string pretty(Bitboard b);
}
+const Bitboard AllSquares = ~Bitboard(0);
const Bitboard DarkSquares = 0xAA55AA55AA55AA55ULL;
const Bitboard FileABB = 0x0101010101010101ULL;
@@ -65,15 +66,41 @@ extern Bitboard SquareBB[SQUARE_NB];
extern Bitboard FileBB[FILE_NB];
extern Bitboard RankBB[RANK_NB];
extern Bitboard AdjacentFilesBB[FILE_NB];
-extern Bitboard InFrontBB[COLOR_NB][RANK_NB];
-extern Bitboard StepAttacksBB[PIECE_NB][SQUARE_NB];
+extern Bitboard ForwardRanksBB[COLOR_NB][RANK_NB];
extern Bitboard BetweenBB[SQUARE_NB][SQUARE_NB];
extern Bitboard LineBB[SQUARE_NB][SQUARE_NB];
extern Bitboard DistanceRingBB[SQUARE_NB][8];
-extern Bitboard ForwardBB[COLOR_NB][SQUARE_NB];
+extern Bitboard ForwardFileBB[COLOR_NB][SQUARE_NB];
extern Bitboard PassedPawnMask[COLOR_NB][SQUARE_NB];
extern Bitboard PawnAttackSpan[COLOR_NB][SQUARE_NB];
extern Bitboard PseudoAttacks[PIECE_TYPE_NB][SQUARE_NB];
+extern Bitboard PawnAttacks[COLOR_NB][SQUARE_NB];
+
+
+/// Magic holds all magic bitboards relevant data for a single square
+struct Magic {
+ Bitboard mask;
+ Bitboard magic;
+ Bitboard* attacks;
+ unsigned shift;
+
+ // Compute the attack's index using the 'magic bitboards' approach
+ unsigned index(Bitboard occupied) const {
+
+ if (HasPext)
+ return unsigned(pext(occupied, mask));
+
+ if (Is64Bit)
+ return unsigned(((occupied & mask) * magic) >> shift);
+
+ unsigned lo = unsigned(occupied) & unsigned(mask);
+ unsigned hi = unsigned(occupied >> 32) & unsigned(mask >> 32);
+ return (lo * unsigned(magic) ^ hi * unsigned(magic >> 32)) >> shift;
+ }
+};
+
+extern Magic RookMagics[SQUARE_NB];
+extern Magic BishopMagics[SQUARE_NB];
/// Overloads of bitwise operators between a Bitboard and a Square for testing
@@ -153,28 +180,28 @@ inline Bitboard between_bb(Square s1, Square s2) {
}
-/// in_front_bb() returns a bitboard representing all the squares on all the ranks
+/// forward_ranks_bb() returns a bitboard representing all the squares on all the ranks
/// in front of the given one, from the point of view of the given color. For
-/// instance, in_front_bb(BLACK, RANK_3) will return the squares on ranks 1 and 2.
+/// instance, forward_ranks_bb(BLACK, SQ_D3) will return the 16 squares on ranks 1 and 2.
-inline Bitboard in_front_bb(Color c, Rank r) {
- return InFrontBB[c][r];
+inline Bitboard forward_ranks_bb(Color c, Square s) {
+ return ForwardRanksBB[c][rank_of(s)];
}
-/// forward_bb() returns a bitboard representing all the squares along the line
+/// forward_file_bb() returns a bitboard representing all the squares along the line
/// in front of the given one, from the point of view of the given color:
-/// ForwardBB[c][s] = in_front_bb(c, s) & file_bb(s)
+/// ForwardFileBB[c][s] = forward_ranks_bb(c, s) & file_bb(s)
-inline Bitboard forward_bb(Color c, Square s) {
- return ForwardBB[c][s];
+inline Bitboard forward_file_bb(Color c, Square s) {
+ return ForwardFileBB[c][s];
}
/// pawn_attack_span() returns a bitboard representing all the squares that can be
/// attacked by a pawn of the given color when it moves along its file, starting
/// from the given square:
-/// PawnAttackSpan[c][s] = in_front_bb(c, s) & adjacent_files_bb(s);
+/// PawnAttackSpan[c][s] = forward_ranks_bb(c, s) & adjacent_files_bb(file_of(s));
inline Bitboard pawn_attack_span(Color c, Square s) {
return PawnAttackSpan[c][s];
@@ -183,7 +210,7 @@ inline Bitboard pawn_attack_span(Color c, Square s) {
/// passed_pawn_mask() returns a bitboard mask which can be used to test if a
/// pawn of the given color and on the given square is a passed pawn:
-/// PassedPawnMask[c][s] = pawn_attack_span(c, s) | forward_bb(c, s)
+/// PassedPawnMask[c][s] = pawn_attack_span(c, s) | forward_file_bb(c, s)
inline Bitboard passed_pawn_mask(Color c, Square s) {
return PassedPawnMask[c][s];
@@ -210,50 +237,25 @@ template<> inline int distance(Square x, Square y) { return distance(rank_
/// attacks_bb() returns a bitboard representing all the squares attacked by a
-/// piece of type Pt (bishop or rook) placed on 's'. The helper magic_index()
-/// looks up the index using the 'magic bitboards' approach.
-template
-inline unsigned magic_index(Square s, Bitboard occupied) {
-
- extern Bitboard RookMasks[SQUARE_NB];
- extern Bitboard RookMagics[SQUARE_NB];
- extern unsigned RookShifts[SQUARE_NB];
- extern Bitboard BishopMasks[SQUARE_NB];
- extern Bitboard BishopMagics[SQUARE_NB];
- extern unsigned BishopShifts[SQUARE_NB];
-
- Bitboard* const Masks = Pt == ROOK ? RookMasks : BishopMasks;
- Bitboard* const Magics = Pt == ROOK ? RookMagics : BishopMagics;
- unsigned* const Shifts = Pt == ROOK ? RookShifts : BishopShifts;
-
- if (HasPext)
- return unsigned(pext(occupied, Masks[s]));
-
- if (Is64Bit)
- return unsigned(((occupied & Masks[s]) * Magics[s]) >> Shifts[s]);
-
- unsigned lo = unsigned(occupied) & unsigned(Masks[s]);
- unsigned hi = unsigned(occupied >> 32) & unsigned(Masks[s] >> 32);
- return (lo * unsigned(Magics[s]) ^ hi * unsigned(Magics[s] >> 32)) >> Shifts[s];
-}
+/// piece of type Pt (bishop or rook) placed on 's'.
template
inline Bitboard attacks_bb(Square s, Bitboard occupied) {
- extern Bitboard* RookAttacks[SQUARE_NB];
- extern Bitboard* BishopAttacks[SQUARE_NB];
-
- return (Pt == ROOK ? RookAttacks : BishopAttacks)[s][magic_index(s, occupied)];
+ const Magic& m = Pt == ROOK ? RookMagics[s] : BishopMagics[s];
+ return m.attacks[m.index(occupied)];
}
-inline Bitboard attacks_bb(Piece pc, Square s, Bitboard occupied) {
+inline Bitboard attacks_bb(PieceType pt, Square s, Bitboard occupied) {
- switch (type_of(pc))
+ assert(pt != PAWN);
+
+ switch (pt)
{
case BISHOP: return attacks_bb(s, occupied);
- case ROOK : return attacks_bb(s, occupied);
+ case ROOK : return attacks_bb< ROOK>(s, occupied);
case QUEEN : return attacks_bb(s, occupied) | attacks_bb(s, occupied);
- default : return StepAttacksBB[pc][s];
+ default : return PseudoAttacks[pt][s];
}
}
@@ -291,7 +293,7 @@ inline Square lsb(Bitboard b) {
inline Square msb(Bitboard b) {
assert(b);
- return Square(63 - __builtin_clzll(b));
+ return Square(63 ^ __builtin_clzll(b));
}
#elif defined(_WIN64) && defined(_MSC_VER)
diff --git a/DroidFish/jni/stockfish/bitcount.h b/DroidFish/jni/stockfish/bitcount.h
deleted file mode 100644
index 7609da4..0000000
--- a/DroidFish/jni/stockfish/bitcount.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- Stockfish, a UCI chess playing engine derived from Glaurung 2.1
- Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
- Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
-
- Stockfish is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- Stockfish is distributed in the hope that it will be useful,
- 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.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
-*/
-
-#ifndef BITCOUNT_H_INCLUDED
-#define BITCOUNT_H_INCLUDED
-
-#include
-
-#include "types.h"
-
-enum BitCountType {
- CNT_64,
- CNT_64_MAX15,
- CNT_32,
- CNT_32_MAX15,
- CNT_HW_POPCNT
-};
-
-/// Determine at compile time the best popcount<> specialization according to
-/// whether the platform is 32 or 64 bit, the maximum number of non-zero
-/// bits to count and if the hardware popcnt instruction is available.
-const BitCountType Full = HasPopCnt ? CNT_HW_POPCNT : Is64Bit ? CNT_64 : CNT_32;
-const BitCountType Max15 = HasPopCnt ? CNT_HW_POPCNT : Is64Bit ? CNT_64_MAX15 : CNT_32_MAX15;
-
-
-/// popcount() counts the number of non-zero bits in a bitboard
-template inline int popcount(Bitboard);
-
-template<>
-inline int popcount(Bitboard b) {
- b -= (b >> 1) & 0x5555555555555555ULL;
- b = ((b >> 2) & 0x3333333333333333ULL) + (b & 0x3333333333333333ULL);
- b = ((b >> 4) + b) & 0x0F0F0F0F0F0F0F0FULL;
- return (b * 0x0101010101010101ULL) >> 56;
-}
-
-template<>
-inline int popcount(Bitboard b) {
- b -= (b >> 1) & 0x5555555555555555ULL;
- b = ((b >> 2) & 0x3333333333333333ULL) + (b & 0x3333333333333333ULL);
- return (b * 0x1111111111111111ULL) >> 60;
-}
-
-template<>
-inline int popcount(Bitboard b) {
- unsigned w = unsigned(b >> 32), v = unsigned(b);
- v -= (v >> 1) & 0x55555555; // 0-2 in 2 bits
- w -= (w >> 1) & 0x55555555;
- v = ((v >> 2) & 0x33333333) + (v & 0x33333333); // 0-4 in 4 bits
- w = ((w >> 2) & 0x33333333) + (w & 0x33333333);
- v = ((v >> 4) + v + (w >> 4) + w) & 0x0F0F0F0F;
- return (v * 0x01010101) >> 24;
-}
-
-template<>
-inline int popcount(Bitboard b) {
- unsigned w = unsigned(b >> 32), v = unsigned(b);
- v -= (v >> 1) & 0x55555555; // 0-2 in 2 bits
- w -= (w >> 1) & 0x55555555;
- v = ((v >> 2) & 0x33333333) + (v & 0x33333333); // 0-4 in 4 bits
- w = ((w >> 2) & 0x33333333) + (w & 0x33333333);
- return ((v + w) * 0x11111111) >> 28;
-}
-
-template<>
-inline int popcount(Bitboard b) {
-
-#ifndef USE_POPCNT
-
- assert(false);
- return b != 0; // Avoid 'b not used' warning
-
-#elif defined(_MSC_VER) && defined(__INTEL_COMPILER)
-
- return _mm_popcnt_u64(b);
-
-#elif defined(_MSC_VER)
-
- return (int)__popcnt64(b);
-
-#else // Assumed gcc or compatible compiler
-
- return __builtin_popcountll(b);
-
-#endif
-}
-
-#endif // #ifndef BITCOUNT_H_INCLUDED
diff --git a/DroidFish/jni/stockfish/endgame.cpp b/DroidFish/jni/stockfish/endgame.cpp
index cbca34b..ca17f6a 100644
--- a/DroidFish/jni/stockfish/endgame.cpp
+++ b/DroidFish/jni/stockfish/endgame.cpp
@@ -2,7 +2,7 @@
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
- Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+ Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -83,26 +83,6 @@ namespace {
return sq;
}
- // Get the material key of Position out of the given endgame key code
- // like "KBPKN". The trick here is to first forge an ad-hoc FEN string
- // and then let a Position object do the work for us.
- Key key(const string& code, Color c) {
-
- assert(code.length() > 0 && code.length() < 8);
- assert(code[0] == 'K');
-
- string sides[] = { code.substr(code.find('K', 1)), // Weak
- code.substr(0, code.find('K', 1)) }; // Strong
-
- std::transform(sides[c].begin(), sides[c].end(), sides[c].begin(), tolower);
-
- string fen = sides[0] + char(8 - sides[0].length() + '0') + "/8/8/8/8/8/8/"
- + sides[1] + char(8 - sides[1].length() + '0') + " w - - 0 10";
-
- StateInfo st;
- return Position().set(fen, false, &st, nullptr).material_key();
- }
-
} // namespace
@@ -130,13 +110,6 @@ Endgames::Endgames() {
}
-template
-void Endgames::add(const string& code) {
- map()[key(code, WHITE)] = std::unique_ptr>(new Endgame(WHITE));
- map()[key(code, BLACK)] = std::unique_ptr>(new Endgame(BLACK));
-}
-
-
/// Mate with KX vs K. This function is used to evaluate positions with
/// king and plenty of material vs a lone king. It simply gives the
/// attacking side a bonus for driving the defending king towards the edge
@@ -162,8 +135,8 @@ Value Endgame::operator()(const Position& pos) const {
if ( pos.count(strongSide)
|| pos.count(strongSide)
||(pos.count(strongSide) && pos.count(strongSide))
- ||(pos.count(strongSide) > 1 && opposite_colors(pos.squares(strongSide)[0],
- pos.squares(strongSide)[1])))
+ || ( (pos.pieces(strongSide, BISHOP) & ~DarkSquares)
+ && (pos.pieces(strongSide, BISHOP) & DarkSquares)))
result = std::min(result + VALUE_KNOWN_WIN, VALUE_MATE_IN_MAX_PLY - 1);
return strongSide == pos.side_to_move() ? result : -result;
@@ -625,7 +598,7 @@ ScaleFactor Endgame::operator()(const Position& pos) const {
// If all pawns are ahead of the king, on a single rook file and
// the king is within one file of the pawns, it's a draw.
- if ( !(pawns & ~in_front_bb(weakSide, rank_of(ksq)))
+ if ( !(pawns & ~forward_ranks_bb(weakSide, ksq))
&& !((pawns & ~FileABB) && (pawns & ~FileHBB))
&& distance(ksq, lsb(pawns)) <= 1)
return SCALE_FACTOR_DRAW;
@@ -671,17 +644,15 @@ ScaleFactor Endgame::operator()(const Position& pos) const {
if (relative_rank(strongSide, pawnSq) <= RANK_5)
return SCALE_FACTOR_DRAW;
- else
- {
- Bitboard path = forward_bb(strongSide, pawnSq);
- if (path & pos.pieces(weakSide, KING))
- return SCALE_FACTOR_DRAW;
+ Bitboard path = forward_file_bb(strongSide, pawnSq);
- if ( (pos.attacks_from(weakBishopSq) & path)
- && distance(weakBishopSq, pawnSq) >= 3)
- return SCALE_FACTOR_DRAW;
- }
+ if (path & pos.pieces(weakSide, KING))
+ return SCALE_FACTOR_DRAW;
+
+ if ( (pos.attacks_from(weakBishopSq) & path)
+ && distance(weakBishopSq, pawnSq) >= 3)
+ return SCALE_FACTOR_DRAW;
}
return SCALE_FACTOR_NONE;
}
@@ -809,7 +780,7 @@ ScaleFactor Endgame::operator()(const Position& pos) const {
// King needs to get close to promoting pawn to prevent knight from blocking.
// Rules for this are very tricky, so just approximate.
- if (forward_bb(strongSide, pawnSq) & pos.attacks_from(bishopSq))
+ if (forward_file_bb(strongSide, pawnSq) & pos.attacks_from(bishopSq))
return ScaleFactor(distance(weakKingSq, pawnSq));
return SCALE_FACTOR_NONE;
diff --git a/DroidFish/jni/stockfish/endgame.h b/DroidFish/jni/stockfish/endgame.h
index 5f6b4bb..3d61207 100644
--- a/DroidFish/jni/stockfish/endgame.h
+++ b/DroidFish/jni/stockfish/endgame.h
@@ -2,7 +2,7 @@
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
- Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+ Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -31,12 +31,11 @@
#include "types.h"
-/// EndgameType lists all supported endgames
+/// EndgameCode lists all supported endgame functions by corresponding codes
-enum EndgameType {
-
- // Evaluation functions
+enum EndgameCode {
+ EVALUATION_FUNCTIONS,
KNNK, // KNN vs K
KXK, // Generic "mate lone king" eval
KBNK, // KBN vs K
@@ -47,10 +46,7 @@ enum EndgameType {
KQKP, // KQ vs KP
KQKR, // KQ vs KR
-
- // Scaling functions
SCALING_FUNCTIONS,
-
KBPsK, // KB and pawns vs K
KQKRPs, // KQ vs KR and pawns
KRPKR, // KRP vs KR
@@ -68,30 +64,28 @@ enum EndgameType {
/// Endgame functions can be of two types depending on whether they return a
/// Value or a ScaleFactor.
-template using
+template using
eg_type = typename std::conditional<(E < SCALING_FUNCTIONS), Value, ScaleFactor>::type;
-/// Base and derived templates for endgame evaluation and scaling functions
+/// Base and derived functors for endgame evaluation and scaling functions
template
struct EndgameBase {
+ explicit EndgameBase(Color c) : strongSide(c), weakSide(~c) {}
virtual ~EndgameBase() = default;
- virtual Color strong_side() const = 0;
virtual T operator()(const Position&) const = 0;
+
+ const Color strongSide, weakSide;
};
-template>
+template>
struct Endgame : public EndgameBase {
- explicit Endgame(Color c) : strongSide(c), weakSide(~c) {}
- Color strong_side() const { return strongSide; }
- T operator()(const Position&) const;
-
-private:
- Color strongSide, weakSide;
+ explicit Endgame(Color c) : EndgameBase(c) {}
+ T operator()(const Position&) const override;
};
@@ -101,16 +95,22 @@ private:
class Endgames {
- template using Map = std::map>>;
-
- template>
- void add(const std::string& code);
+ template using Ptr = std::unique_ptr>;
+ template using Map = std::map>;
template
Map& map() {
return std::get::value>(maps);
}
+ template, typename P = Ptr>
+ void add(const std::string& code) {
+
+ StateInfo st;
+ map()[Position().set(code, WHITE, &st).material_key()] = P(new Endgame(WHITE));
+ map()[Position().set(code, BLACK, &st).material_key()] = P(new Endgame(BLACK));
+ }
+
std::pair, Map> maps;
public:
diff --git a/DroidFish/jni/stockfish/evaluate.cpp b/DroidFish/jni/stockfish/evaluate.cpp
index 434ebd6..7ee3652 100644
--- a/DroidFish/jni/stockfish/evaluate.cpp
+++ b/DroidFish/jni/stockfish/evaluate.cpp
@@ -2,7 +2,7 @@
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
- Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+ Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -33,6 +33,8 @@ namespace {
namespace Trace {
+ enum Tracing {NO_TRACE, TRACE};
+
enum Term { // The first 8 entries are for PieceType
MATERIAL = 8, IMBALANCE, MOBILITY, THREAT, PASSED, SPACE, TOTAL, TERM_NB
};
@@ -69,9 +71,35 @@ namespace {
using namespace Trace;
- // Struct EvalInfo contains various information computed and collected
+ // Evaluation class contains various information computed and collected
// by the evaluation functions.
- struct EvalInfo {
+ template
+ class Evaluation {
+
+ public:
+ Evaluation() = delete;
+ Evaluation(const Position& p) : pos(p) {}
+ Evaluation& operator=(const Evaluation&) = delete;
+
+ Value value();
+
+ private:
+ // Evaluation helpers (used when calling value())
+ template void initialize();
+ template Score evaluate_king();
+ template Score evaluate_threats();
+ template Score evaluate_passed_pawns();
+ template Score evaluate_space();
+ template Score evaluate_pieces();
+ ScaleFactor evaluate_scale_factor(Value eg);
+ Score evaluate_initiative(Value eg);
+
+ // Data members
+ const Position& pos;
+ Material::Entry* me;
+ Pawns::Entry* pe;
+ Bitboard mobilityArea[COLOR_NB];
+ Score mobility[COLOR_NB] = { SCORE_ZERO, SCORE_ZERO };
// attackedBy[color][piece type] is a bitboard representing all squares
// attacked by a given color and piece type (can be also ALL_PIECES).
@@ -84,7 +112,7 @@ namespace {
// 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)
+ // adjacent to the king, and (only for a king on its first rank) the
// 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.
@@ -106,70 +134,56 @@ namespace {
// a white knight on g5 and black's king is on g8, this white knight adds 2
// to kingAdjacentZoneAttacksCount[WHITE].
int kingAdjacentZoneAttacksCount[COLOR_NB];
-
- Bitboard pinnedPieces[COLOR_NB];
- Material::Entry* me;
- Pawns::Entry* pi;
};
#define V(v) Value(v)
#define S(mg, eg) make_score(mg, eg)
- // MobilityBonus[PieceType][attacked] contains bonuses for middle and end
- // game, indexed by piece type and number of attacked squares in the MobilityArea.
+ // MobilityBonus[PieceType-2][attacked] contains bonuses for middle and end game,
+ // indexed by piece type and number of attacked squares in the mobility area.
const Score MobilityBonus[][32] = {
- {}, {},
- { 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) }
+ { S(-75,-76), S(-57,-54), S( -9,-28), S( -2,-10), S( 6, 5), S( 14, 12), // Knights
+ S( 22, 26), S( 29, 29), S( 36, 29) },
+ { S(-48,-59), S(-20,-23), S( 16, -3), S( 26, 13), S( 38, 24), S( 51, 42), // Bishops
+ S( 55, 54), S( 63, 57), S( 63, 65), S( 68, 73), S( 81, 78), S( 81, 86),
+ S( 91, 88), S( 98, 97) },
+ { S(-58,-76), S(-27,-18), S(-15, 28), S(-10, 55), S( -5, 69), S( -2, 82), // Rooks
+ S( 9,112), S( 16,118), S( 30,132), S( 29,142), S( 32,155), S( 38,165),
+ S( 46,166), S( 48,169), S( 58,171) },
+ { S(-39,-36), S(-21,-15), S( 3, 8), S( 3, 18), S( 14, 34), S( 22, 54), // Queens
+ S( 28, 61), S( 41, 73), S( 43, 79), S( 48, 92), S( 56, 94), S( 60,104),
+ S( 60,113), S( 66,120), S( 67,123), S( 70,126), S( 71,133), S( 73,136),
+ S( 79,140), S( 88,143), S( 88,148), S( 99,166), S(102,170), S(102,175),
+ S(106,184), S(109,191), S(113,206), S(116,212) }
};
- // Outpost[knight/bishop][supported by pawn] contains bonuses for knights and
- // bishops outposts, bigger if outpost piece is supported by a pawn.
+ // Outpost[knight/bishop][supported by pawn] contains bonuses for minor
+ // pieces if they can reach an outpost square, bigger if that square is
+ // supported by a pawn. If the minor piece occupies an outpost square
+ // then score is doubled.
const Score Outpost[][2] = {
- { S(43,11), S(65,20) }, // Knights
- { S(20, 3), S(29, 8) } // Bishops
- };
-
- // 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.
- const Score ReachableOutpost[][2] = {
- { S(21, 5), S(35, 8) }, // Knights
- { S( 8, 0), S(14, 4) } // Bishops
+ { S(22, 6), S(33, 9) }, // Knight
+ { S( 9, 2), S(14, 4) } // Bishop
};
// RookOnFile[semiopen/open] contains bonuses for each rook when there is no
// friendly pawn on the rook file.
- const Score RookOnFile[2] = { S(20, 7), S(45, 20) };
+ const Score RookOnFile[] = { S(20, 7), S(45, 20) };
- // ThreatBySafePawn[PieceType] contains bonuses according to which piece
- // type is attacked by a pawn which is protected or is not attacked.
- const Score ThreatBySafePawn[PIECE_TYPE_NB] = {
- S(0, 0), S(0, 0), S(176, 139), S(131, 127), S(217, 218), S(203, 215)
+ // ThreatByMinor/ByRook[attacked PieceType] contains bonuses according to
+ // which piece type attacks which one. Attacks on lesser pieces which are
+ // pawn-defended are not considered.
+ const Score ThreatByMinor[PIECE_TYPE_NB] = {
+ S(0, 0), S(0, 33), S(45, 43), S(46, 47), S(72, 107), S(48, 118)
};
- // Threat[by minor/by rook][attacked PieceType] contains
- // bonuses according to which piece type attacks which one.
- // Attacks on lesser pieces which are pawn-defended are not considered.
- 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
+ const Score ThreatByRook[PIECE_TYPE_NB] = {
+ S(0, 0), S(0, 25), S(40, 62), S(40, 59), S(0, 34), S(35, 48)
};
- // ThreatByKing[on one/on many] contains bonuses for King attacks on
+ // ThreatByKing[on one/on many] contains bonuses for king attacks on
// pawns or pieces which are not pawn-defended.
- const Score ThreatByKing[2] = { S(3, 62), S(9, 138) };
+ const Score ThreatByKing[] = { S(3, 62), S(9, 138) };
// Passed[mg/eg][Rank] contains midgame and endgame bonuses for passed pawns.
// We don't use a Score because we process the two components independently.
@@ -181,30 +195,28 @@ namespace {
// PassedFile[File] contains a bonus according to the file of a passed pawn
const Score PassedFile[FILE_NB] = {
S( 9, 10), S( 2, 10), S( 1, -8), S(-20,-12),
- S(-20,-12), S( 1, -8), S( 2, 10), S( 9, 10)
+ S(-20,-12), S( 1, -8), S( 2, 10), S( 9, 10)
};
- // Assorted bonuses and penalties used by evaluation
- const Score MinorBehindPawn = S(16, 0);
- const Score BishopPawns = S( 8, 12);
- const Score RookOnPawn = S( 8, 24);
- const Score TrappedRook = S(92, 0);
- const Score CloseEnemies = S( 7, 0);
- const Score SafeCheck = S(20, 20);
- const Score OtherCheck = S(10, 10);
- const Score ThreatByHangingPawn = S(71, 61);
- const Score LooseEnemies = S( 0, 25);
- const Score WeakQueen = S(35, 0);
- const Score Hanging = S(48, 27);
- const Score ThreatByPawnPush = S(38, 22);
- const Score Unstoppable = S( 0, 20);
- const Score PawnlessFlank = S(20, 80);
- const Score HinderPassedPawn = S( 7, 0);
+ // KingProtector[PieceType-2] contains a bonus according to distance from king
+ const Score KingProtector[] = { S(-3, -5), S(-4, -3), S(-3, 0), S(-1, 1) };
- // 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 TrappedBishopA1H1 = S(50, 50);
+ // Assorted bonuses and penalties used by evaluation
+ const Score MinorBehindPawn = S( 16, 0);
+ const Score BishopPawns = S( 8, 12);
+ const Score RookOnPawn = S( 8, 24);
+ const Score TrappedRook = S( 92, 0);
+ const Score WeakQueen = S( 50, 10);
+ const Score OtherCheck = S( 10, 10);
+ const Score CloseEnemies = S( 7, 0);
+ const Score PawnlessFlank = S( 20, 80);
+ const Score ThreatByHangingPawn = S( 71, 61);
+ const Score ThreatBySafePawn = S(182,175);
+ const Score ThreatByRank = S( 16, 3);
+ const Score Hanging = S( 48, 27);
+ const Score ThreatByPawnPush = S( 38, 22);
+ const Score HinderPassedPawn = S( 7, 0);
+ const Score TrappedBishopA1H1 = S( 50, 50);
#undef S
#undef V
@@ -213,58 +225,72 @@ namespace {
const int KingAttackWeights[PIECE_TYPE_NB] = { 0, 0, 78, 56, 45, 11 };
// Penalties for enemy's safe checks
- const int QueenContactCheck = 997;
- const int QueenCheck = 695;
- const int RookCheck = 638;
- const int BishopCheck = 538;
- const int KnightCheck = 874;
+ const int QueenCheck = 780;
+ const int RookCheck = 880;
+ const int BishopCheck = 435;
+ const int KnightCheck = 790;
+
+ // Threshold for lazy and space evaluation
+ const Value LazyThreshold = Value(1500);
+ const Value SpaceThreshold = Value(12222);
- // eval_init() initializes king and attack bitboards for a given color
- // adding pawn attacks. To be done at the beginning of the evaluation.
+ // initialize() computes king and pawn attacks, and the king ring bitboard
+ // for a given color. This is done at the beginning of the evaluation.
- template
- void eval_init(const Position& pos, EvalInfo& ei) {
+ template template
+ void Evaluation::initialize() {
const Color Them = (Us == WHITE ? BLACK : WHITE);
+ const Square Up = (Us == WHITE ? NORTH : SOUTH);
const Square Down = (Us == WHITE ? SOUTH : NORTH);
+ const Bitboard LowRanks = (Us == WHITE ? Rank2BB | Rank3BB: Rank7BB | Rank6BB);
- ei.pinnedPieces[Us] = pos.pinned_pieces(Us);
- Bitboard b = ei.attackedBy[Them][KING];
- ei.attackedBy[Them][ALL_PIECES] |= b;
- ei.attackedBy[Us][ALL_PIECES] |= ei.attackedBy[Us][PAWN] = ei.pi->pawn_attacks(Us);
- ei.attackedBy2[Us] = ei.attackedBy[Us][PAWN] & ei.attackedBy[Us][KING];
+ // Find our pawns on the first two ranks, and those which are blocked
+ Bitboard b = pos.pieces(Us, PAWN) & (shift(pos.pieces()) | LowRanks);
- // Init king safety tables only if we are going to use them
- if (pos.non_pawn_material(Us) >= QueenValueMg)
+ // Squares occupied by those pawns, by our king, or controlled by enemy pawns
+ // are excluded from the mobility area.
+ mobilityArea[Us] = ~(b | pos.square(Us) | pe->pawn_attacks(Them));
+
+ // Initialise the attack bitboards with the king and pawn information
+ b = attackedBy[Us][KING] = pos.attacks_from(pos.square(Us));
+ attackedBy[Us][PAWN] = pe->pawn_attacks(Us);
+
+ attackedBy2[Us] = b & attackedBy[Us][PAWN];
+ attackedBy[Us][ALL_PIECES] = b | attackedBy[Us][PAWN];
+
+ // Init our king safety tables only if we are going to use them
+ if (pos.non_pawn_material(Them) >= RookValueMg + KnightValueMg)
{
- ei.kingRing[Them] = b | shift(b);
- b &= ei.attackedBy[Us][PAWN];
- ei.kingAttackersCount[Us] = popcount(b);
- ei.kingAdjacentZoneAttacksCount[Us] = ei.kingAttackersWeight[Us] = 0;
+ kingRing[Us] = b;
+ if (relative_rank(Us, pos.square(Us)) == RANK_1)
+ kingRing[Us] |= shift(b);
+
+ kingAttackersCount[Them] = popcount(b & pe->pawn_attacks(Them));
+ kingAdjacentZoneAttacksCount[Them] = kingAttackersWeight[Them] = 0;
}
else
- ei.kingRing[Them] = ei.kingAttackersCount[Us] = 0;
+ kingRing[Us] = kingAttackersCount[Them] = 0;
}
// evaluate_pieces() assigns bonuses and penalties to the pieces of a given
// color and type.
- template
- Score evaluate_pieces(const Position& pos, EvalInfo& ei, Score* mobility,
- const Bitboard* mobilityArea) {
- Bitboard b, bb;
- Square s;
- Score score = SCORE_ZERO;
+ template template
+ Score Evaluation::evaluate_pieces() {
- const PieceType NextPt = (Us == WHITE ? Pt : PieceType(Pt + 1));
const Color Them = (Us == WHITE ? BLACK : WHITE);
const Bitboard OutpostRanks = (Us == WHITE ? Rank4BB | Rank5BB | Rank6BB
: Rank5BB | Rank4BB | Rank3BB);
const Square* pl = pos.squares(Us);
- ei.attackedBy[Us][Pt] = 0;
+ Bitboard b, bb;
+ Square s;
+ Score score = SCORE_ZERO;
+
+ attackedBy[Us][Pt] = 0;
while ((s = *pl++) != SQ_NONE)
{
@@ -273,39 +299,37 @@ namespace {
: Pt == ROOK ? attacks_bb< ROOK>(s, pos.pieces() ^ pos.pieces(Us, ROOK, QUEEN))
: pos.attacks_from(s);
- if (ei.pinnedPieces[Us] & s)
+ if (pos.pinned_pieces(Us) & s)
b &= LineBB[pos.square(Us)][s];
- ei.attackedBy2[Us] |= ei.attackedBy[Us][ALL_PIECES] & b;
- ei.attackedBy[Us][ALL_PIECES] |= ei.attackedBy[Us][Pt] |= b;
+ attackedBy2[Us] |= attackedBy[Us][ALL_PIECES] & b;
+ attackedBy[Us][ALL_PIECES] |= attackedBy[Us][Pt] |= b;
- if (b & ei.kingRing[Them])
+ if (b & kingRing[Them])
{
- ei.kingAttackersCount[Us]++;
- ei.kingAttackersWeight[Us] += KingAttackWeights[Pt];
- ei.kingAdjacentZoneAttacksCount[Us] += popcount(b & ei.attackedBy[Them][KING]);
+ kingAttackersCount[Us]++;
+ kingAttackersWeight[Us] += KingAttackWeights[Pt];
+ kingAdjacentZoneAttacksCount[Us] += popcount(b & attackedBy[Them][KING]);
}
- if (Pt == QUEEN)
- b &= ~( ei.attackedBy[Them][KNIGHT]
- | ei.attackedBy[Them][BISHOP]
- | ei.attackedBy[Them][ROOK]);
-
int mob = popcount(b & mobilityArea[Us]);
- mobility[Us] += MobilityBonus[Pt][mob];
+ mobility[Us] += MobilityBonus[Pt - 2][mob];
+
+ // Bonus for this piece as a king protector
+ score += KingProtector[Pt - 2] * distance(s, pos.square(Us));
if (Pt == BISHOP || Pt == KNIGHT)
{
// Bonus for outpost squares
- bb = OutpostRanks & ~ei.pi->pawn_attacks_span(Them);
+ bb = OutpostRanks & ~pe->pawn_attacks_span(Them);
if (bb & s)
- score += Outpost[Pt == BISHOP][!!(ei.attackedBy[Us][PAWN] & s)];
+ score += Outpost[Pt == BISHOP][!!(attackedBy[Us][PAWN] & s)] * 2;
else
{
bb &= b & ~pos.pieces(Us);
if (bb)
- score += ReachableOutpost[Pt == BISHOP][!!(ei.attackedBy[Us][PAWN] & bb)];
+ score += Outpost[Pt == BISHOP][!!(attackedBy[Us][PAWN] & bb)];
}
// Bonus when behind a pawn
@@ -315,7 +339,7 @@ namespace {
// Penalty for pawns on the same color square as the bishop
if (Pt == BISHOP)
- score -= BishopPawns * ei.pi->pawns_on_same_color_squares(Us, s);
+ score -= BishopPawns * pe->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
@@ -339,17 +363,16 @@ namespace {
score += RookOnPawn * popcount(pos.pieces(Them, PAWN) & PseudoAttacks[ROOK][s]);
// Bonus when on an open or semi-open file
- if (ei.pi->semiopen_file(Us, file_of(s)))
- score += RookOnFile[!!ei.pi->semiopen_file(Them, file_of(s))];
+ if (pe->semiopen_file(Us, file_of(s)))
+ score += RookOnFile[!!pe->semiopen_file(Them, file_of(s))];
- // Penalize when trapped by the king, even more if the king cannot castle
+ // Penalty when trapped by the king, even more if the king cannot castle
else if (mob <= 3)
{
Square ksq = pos.square(Us);
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)))
+ && !pe->semiopen_side(Us, file_of(ksq), file_of(s) < file_of(ksq)))
score -= (TrappedRook - make_score(mob * 22, 0)) * (1 + !pos.can_castle(Us));
}
}
@@ -363,129 +386,118 @@ namespace {
}
}
- if (DoTrace)
+ if (T)
Trace::add(Pt, Us, score);
- // Recursively call evaluate_pieces() of next piece type until KING is excluded
- return score - evaluate_pieces(pos, ei, mobility, mobilityArea);
+ return score;
}
- template<>
- Score evaluate_pieces(const Position&, EvalInfo&, Score*, const Bitboard*) { return SCORE_ZERO; }
- template<>
- Score evaluate_pieces< true, WHITE, KING>(const Position&, EvalInfo&, Score*, const Bitboard*) { return SCORE_ZERO; }
-
// evaluate_king() assigns bonuses and penalties to a king of a given color
- const Bitboard WhiteCamp = Rank1BB | Rank2BB | Rank3BB | Rank4BB | Rank5BB;
- const Bitboard BlackCamp = Rank8BB | Rank7BB | Rank6BB | Rank5BB | Rank4BB;
const Bitboard QueenSide = FileABB | FileBBB | FileCBB | FileDBB;
const Bitboard CenterFiles = FileCBB | FileDBB | FileEBB | FileFBB;
const Bitboard KingSide = FileEBB | FileFBB | FileGBB | FileHBB;
- const Bitboard KingFlank[COLOR_NB][FILE_NB] = {
- { QueenSide & WhiteCamp, QueenSide & WhiteCamp, QueenSide & WhiteCamp, CenterFiles & WhiteCamp,
- CenterFiles & WhiteCamp, KingSide & WhiteCamp, KingSide & WhiteCamp, KingSide & WhiteCamp },
- { QueenSide & BlackCamp, QueenSide & BlackCamp, QueenSide & BlackCamp, CenterFiles & BlackCamp,
- CenterFiles & BlackCamp, KingSide & BlackCamp, KingSide & BlackCamp, KingSide & BlackCamp },
+ const Bitboard KingFlank[FILE_NB] = {
+ QueenSide, QueenSide, QueenSide, CenterFiles, CenterFiles, KingSide, KingSide, KingSide
};
- template
- Score evaluate_king(const Position& pos, const EvalInfo& ei) {
+ template template
+ Score Evaluation::evaluate_king() {
- const Color Them = (Us == WHITE ? BLACK : WHITE);
- const Square Up = (Us == WHITE ? NORTH : SOUTH);
+ const Color Them = (Us == WHITE ? BLACK : WHITE);
+ const Square Up = (Us == WHITE ? NORTH : SOUTH);
+ const Bitboard Camp = (Us == WHITE ? AllSquares ^ Rank6BB ^ Rank7BB ^ Rank8BB
+ : AllSquares ^ Rank1BB ^ Rank2BB ^ Rank3BB);
- Bitboard undefended, b, b1, b2, safe, other;
- int kingDanger;
const Square ksq = pos.square(Us);
+ Bitboard kingOnlyDefended, undefended, b, b1, b2, safe, other;
+ int kingDanger;
// King shelter and enemy pawns storm
- Score score = ei.pi->king_safety(pos, ksq);
+ Score score = pe->king_safety(pos, ksq);
// Main king safety evaluation
- if (ei.kingAttackersCount[Them])
+ if (kingAttackersCount[Them] > (1 - pos.count(Them)))
{
- // Find the attacked squares which are defended only by the king...
- undefended = ei.attackedBy[Them][ALL_PIECES]
- & ei.attackedBy[Us][KING]
- & ~ei.attackedBy2[Us];
+ // Find the attacked squares which are defended only by our king...
+ kingOnlyDefended = attackedBy[Them][ALL_PIECES]
+ & attackedBy[Us][KING]
+ & ~attackedBy2[Us];
// ... and those which are not defended at all in the larger king ring
- b = ei.attackedBy[Them][ALL_PIECES] & ~ei.attackedBy[Us][ALL_PIECES]
- & ei.kingRing[Us] & ~pos.pieces(Them);
+ undefended = attackedBy[Them][ALL_PIECES]
+ & ~attackedBy[Us][ALL_PIECES]
+ & kingRing[Us]
+ & ~pos.pieces(Them);
// Initialize the 'kingDanger' variable, which will be transformed
// later into a king danger score. 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 and the quality of
- // the pawn shelter (current 'score' value).
- kingDanger = std::min(807, ei.kingAttackersCount[Them] * ei.kingAttackersWeight[Them])
- + 101 * ei.kingAdjacentZoneAttacksCount[Them]
- + 235 * popcount(undefended)
- + 134 * (popcount(b) + !!ei.pinnedPieces[Us])
- - 717 * !pos.count(Them)
- - 7 * mg_value(score) / 5 - 5;
+ // attacked and weak squares around our king, the absence of queen and
+ // the quality of the pawn shelter (current 'score' value).
+ kingDanger = kingAttackersCount[Them] * kingAttackersWeight[Them]
+ + 102 * kingAdjacentZoneAttacksCount[Them]
+ + 191 * popcount(kingOnlyDefended | undefended)
+ + 143 * !!pos.pinned_pieces(Us)
+ - 848 * !pos.count(Them)
+ - 9 * mg_value(score) / 8
+ + 40;
- // Analyse the enemy's safe queen contact checks. Firstly, find the
- // undefended squares around the king reachable by the enemy queen...
- b = undefended & ei.attackedBy[Them][QUEEN] & ~pos.pieces(Them);
+ // Analyse the safe enemy's checks which are possible on next move
+ safe = ~pos.pieces(Them);
+ safe &= ~attackedBy[Us][ALL_PIECES] | (kingOnlyDefended & attackedBy2[Them]);
- // ...and keep squares supported by another enemy piece
- kingDanger += QueenContactCheck * popcount(b & ei.attackedBy2[Them]);
-
- // Analyse the safe enemy's checks which are possible on next move...
- safe = ~(ei.attackedBy[Us][ALL_PIECES] | pos.pieces(Them));
-
- // ... and some other potential checks, only requiring the square to be
- // safe from pawn-attacks, and not being occupied by a blocked pawn.
- other = ~( ei.attackedBy[Us][PAWN]
- | (pos.pieces(Them, PAWN) & shift(pos.pieces(PAWN))));
-
- b1 = pos.attacks_from(ksq);
+ b1 = pos.attacks_from< ROOK>(ksq);
b2 = pos.attacks_from(ksq);
// Enemy queen safe checks
- if ((b1 | b2) & ei.attackedBy[Them][QUEEN] & safe)
- kingDanger += QueenCheck, score -= SafeCheck;
+ if ((b1 | b2) & attackedBy[Them][QUEEN] & safe)
+ kingDanger += QueenCheck;
- // For other pieces, also consider the square safe if attacked twice,
- // and only defended by a queen.
- safe |= ei.attackedBy2[Them]
- & ~(ei.attackedBy2[Us] | pos.pieces(Them))
- & ei.attackedBy[Us][QUEEN];
+ // For minors and rooks, also consider the square safe if attacked twice,
+ // and only defended by our queen.
+ safe |= attackedBy2[Them]
+ & ~(attackedBy2[Us] | pos.pieces(Them))
+ & attackedBy[Us][QUEEN];
+
+ // Some other potential checks are also analysed, even from squares
+ // currently occupied by the opponent own pieces, as long as the square
+ // is not attacked by our pawns, and is not occupied by a blocked pawn.
+ other = ~( attackedBy[Us][PAWN]
+ | (pos.pieces(Them, PAWN) & shift(pos.pieces(PAWN))));
// Enemy rooks safe and other checks
- if (b1 & ei.attackedBy[Them][ROOK] & safe)
- kingDanger += RookCheck, score -= SafeCheck;
+ if (b1 & attackedBy[Them][ROOK] & safe)
+ kingDanger += RookCheck;
- else if (b1 & ei.attackedBy[Them][ROOK] & other)
+ else if (b1 & attackedBy[Them][ROOK] & other)
score -= OtherCheck;
// Enemy bishops safe and other checks
- if (b2 & ei.attackedBy[Them][BISHOP] & safe)
- kingDanger += BishopCheck, score -= SafeCheck;
+ if (b2 & attackedBy[Them][BISHOP] & safe)
+ kingDanger += BishopCheck;
- else if (b2 & ei.attackedBy[Them][BISHOP] & other)
+ else if (b2 & attackedBy[Them][BISHOP] & other)
score -= OtherCheck;
// Enemy knights safe and other checks
- b = pos.attacks_from(ksq) & ei.attackedBy[Them][KNIGHT];
+ b = pos.attacks_from(ksq) & attackedBy[Them][KNIGHT];
if (b & safe)
- kingDanger += KnightCheck, score -= SafeCheck;
+ kingDanger += KnightCheck;
else if (b & other)
score -= OtherCheck;
- // Compute the king danger score and subtract it from the evaluation
+ // Transform the kingDanger units into a Score, and substract it from the evaluation
if (kingDanger > 0)
- score -= make_score(std::min(kingDanger * kingDanger / 4096, 2 * int(BishopValueMg)), 0);
+ score -= make_score(kingDanger * kingDanger / 4096, kingDanger / 16);
}
// King tropism: firstly, find squares that opponent attacks in our king flank
File kf = file_of(ksq);
- b = ei.attackedBy[Them][ALL_PIECES] & KingFlank[Us][kf];
+ b = attackedBy[Them][ALL_PIECES] & KingFlank[kf] & Camp;
assert(((Us == WHITE ? b << 4 : b >> 4) & b) == 0);
assert(popcount(Us == WHITE ? b << 4 : b >> 4) == popcount(b));
@@ -493,15 +505,15 @@ namespace {
// Secondly, add the squares which are attacked twice in that flank and
// which are not defended by our pawns.
b = (Us == WHITE ? b << 4 : b >> 4)
- | (b & ei.attackedBy2[Them] & ~ei.attackedBy[Us][PAWN]);
+ | (b & attackedBy2[Them] & ~attackedBy[Us][PAWN]);
score -= CloseEnemies * popcount(b);
// Penalty when our king is on a pawnless flank
- if (!(pos.pieces(PAWN) & (KingFlank[WHITE][kf] | KingFlank[BLACK][kf])))
+ if (!(pos.pieces(PAWN) & KingFlank[kf]))
score -= PawnlessFlank;
- if (DoTrace)
+ if (T)
Trace::add(KING, Us, score);
return score;
@@ -511,110 +523,119 @@ namespace {
// evaluate_threats() assigns bonuses according to the types of the attacking
// and the attacked pieces.
- template
- Score evaluate_threats(const Position& pos, const EvalInfo& ei) {
+ template template
+ Score Evaluation::evaluate_threats() {
const Color Them = (Us == WHITE ? BLACK : WHITE);
const Square Up = (Us == WHITE ? NORTH : SOUTH);
const Square Left = (Us == WHITE ? NORTH_WEST : SOUTH_EAST);
const Square Right = (Us == WHITE ? NORTH_EAST : SOUTH_WEST);
- const Bitboard TRank2BB = (Us == WHITE ? Rank2BB : Rank7BB);
- const Bitboard TRank7BB = (Us == WHITE ? Rank7BB : Rank2BB);
+ const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB);
- enum { Minor, Rook };
-
- Bitboard b, weak, defended, safeThreats;
+ Bitboard b, weak, defended, stronglyProtected, safeThreats;
Score score = SCORE_ZERO;
- // 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;
-
// Non-pawn enemies attacked by a pawn
- weak = (pos.pieces(Them) ^ pos.pieces(Them, PAWN)) & ei.attackedBy[Us][PAWN];
+ weak = (pos.pieces(Them) ^ pos.pieces(Them, PAWN)) & attackedBy[Us][PAWN];
if (weak)
{
- b = pos.pieces(Us, PAWN) & ( ~ei.attackedBy[Them][ALL_PIECES]
- | ei.attackedBy[Us][ALL_PIECES]);
+ b = pos.pieces(Us, PAWN) & ( ~attackedBy[Them][ALL_PIECES]
+ | attackedBy[Us][ALL_PIECES]);
safeThreats = (shift(b) | shift(b)) & weak;
+ score += ThreatBySafePawn * popcount(safeThreats);
+
if (weak ^ safeThreats)
score += ThreatByHangingPawn;
-
- while (safeThreats)
- score += ThreatBySafePawn[type_of(pos.piece_on(pop_lsb(&safeThreats)))];
}
- // Non-pawn enemies defended by a pawn
- defended = (pos.pieces(Them) ^ pos.pieces(Them, PAWN)) & ei.attackedBy[Them][PAWN];
+ // Squares strongly protected by the opponent, either because they attack the
+ // square with a pawn, or because they attack the square twice and we don't.
+ stronglyProtected = attackedBy[Them][PAWN]
+ | (attackedBy2[Them] & ~attackedBy2[Us]);
- // Enemies not defended by a pawn and under our attack
+ // Non-pawn enemies, strongly protected
+ defended = (pos.pieces(Them) ^ pos.pieces(Them, PAWN))
+ & stronglyProtected;
+
+ // Enemies not strongly protected and under our attack
weak = pos.pieces(Them)
- & ~ei.attackedBy[Them][PAWN]
- & ei.attackedBy[Us][ALL_PIECES];
+ & ~stronglyProtected
+ & attackedBy[Us][ALL_PIECES];
// Add a bonus according to the kind of attacking pieces
if (defended | weak)
{
- b = (defended | weak) & (ei.attackedBy[Us][KNIGHT] | ei.attackedBy[Us][BISHOP]);
+ b = (defended | weak) & (attackedBy[Us][KNIGHT] | attackedBy[Us][BISHOP]);
while (b)
- score += Threat[Minor][type_of(pos.piece_on(pop_lsb(&b)))];
+ {
+ Square s = pop_lsb(&b);
+ score += ThreatByMinor[type_of(pos.piece_on(s))];
+ if (type_of(pos.piece_on(s)) != PAWN)
+ score += ThreatByRank * (int)relative_rank(Them, s);
+ }
- b = (pos.pieces(Them, QUEEN) | weak) & ei.attackedBy[Us][ROOK];
+ b = (pos.pieces(Them, QUEEN) | weak) & attackedBy[Us][ROOK];
while (b)
- score += Threat[Rook ][type_of(pos.piece_on(pop_lsb(&b)))];
+ {
+ Square s = pop_lsb(&b);
+ score += ThreatByRook[type_of(pos.piece_on(s))];
+ if (type_of(pos.piece_on(s)) != PAWN)
+ score += ThreatByRank * (int)relative_rank(Them, s);
+ }
- score += Hanging * popcount(weak & ~ei.attackedBy[Them][ALL_PIECES]);
+ score += Hanging * popcount(weak & ~attackedBy[Them][ALL_PIECES]);
- b = weak & ei.attackedBy[Us][KING];
+ b = weak & attackedBy[Us][KING];
if (b)
score += ThreatByKing[more_than_one(b)];
}
- // Bonus if some pawns can safely push and attack an enemy piece
- b = pos.pieces(Us, PAWN) & ~TRank7BB;
- b = shift(b | (shift(b & TRank2BB) & ~pos.pieces()));
+ // Find squares where our pawns can push on the next move
+ b = shift(pos.pieces(Us, PAWN)) & ~pos.pieces();
+ b |= shift(b & TRank3BB) & ~pos.pieces();
- b &= ~pos.pieces()
- & ~ei.attackedBy[Them][PAWN]
- & (ei.attackedBy[Us][ALL_PIECES] | ~ei.attackedBy[Them][ALL_PIECES]);
+ // Keep only the squares which are not completely unsafe
+ b &= ~attackedBy[Them][PAWN]
+ & (attackedBy[Us][ALL_PIECES] | ~attackedBy[Them][ALL_PIECES]);
+ // Add a bonus for each new pawn threats from those squares
b = (shift(b) | shift(b))
& pos.pieces(Them)
- & ~ei.attackedBy[Us][PAWN];
+ & ~attackedBy[Us][PAWN];
score += ThreatByPawnPush * popcount(b);
- if (DoTrace)
+ if (T)
Trace::add(THREAT, Us, score);
return score;
}
- // evaluate_passed_pawns() evaluates the passed pawns of the given color
+ // evaluate_passed_pawns() evaluates the passed pawns and candidate passed
+ // pawns of the given color.
- template
- Score evaluate_passed_pawns(const Position& pos, const EvalInfo& ei) {
+ template template
+ Score Evaluation::evaluate_passed_pawns() {
const Color Them = (Us == WHITE ? BLACK : WHITE);
+ const Square Up = (Us == WHITE ? NORTH : SOUTH);
Bitboard b, bb, squaresToQueen, defendedSquares, unsafeSquares;
Score score = SCORE_ZERO;
- b = ei.pi->passed_pawns(Us);
+ b = pe->passed_pawns(Us);
while (b)
{
Square s = pop_lsb(&b);
- assert(pos.pawn_passed(Us, s));
- assert(!(pos.pieces(PAWN) & forward_bb(Us, s)));
+ assert(!(pos.pieces(Them, PAWN) & forward_file_bb(Us, s + Up)));
- bb = forward_bb(Us, s) & (ei.attackedBy[Them][ALL_PIECES] | pos.pieces(Them));
+ bb = forward_file_bb(Us, s) & (attackedBy[Them][ALL_PIECES] | pos.pieces(Them));
score -= HinderPassedPawn * popcount(bb);
int r = relative_rank(Us, s) - RANK_2;
@@ -624,15 +645,15 @@ namespace {
if (rr)
{
- Square blockSq = s + pawn_push(Us);
+ Square blockSq = s + Up;
// Adjust bonus based on the king's proximity
ebonus += distance(pos.square(Them), blockSq) * 5 * rr
- - distance(pos.square(Us ), blockSq) * 2 * rr;
+ - distance(pos.square( Us), blockSq) * 2 * rr;
// If blockSq is not the queening square then consider also a second push
if (relative_rank(Us, blockSq) != RANK_8)
- ebonus -= distance(pos.square(Us), blockSq + pawn_push(Us)) * rr;
+ ebonus -= distance(pos.square(Us), blockSq + Up) * rr;
// If the pawn is free to advance, then increase the bonus
if (pos.empty(blockSq))
@@ -640,15 +661,15 @@ namespace {
// 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);
+ defendedSquares = unsafeSquares = squaresToQueen = forward_file_bb(Us, s);
- bb = forward_bb(Them, s) & pos.pieces(ROOK, QUEEN) & pos.attacks_from(s);
+ bb = forward_file_bb(Them, s) & pos.pieces(ROOK, QUEEN) & pos.attacks_from(s);
if (!(pos.pieces(Us) & bb))
- defendedSquares &= ei.attackedBy[Us][ALL_PIECES];
+ defendedSquares &= attackedBy[Us][ALL_PIECES];
if (!(pos.pieces(Them) & bb))
- unsafeSquares &= ei.attackedBy[Them][ALL_PIECES] | pos.pieces(Them);
+ unsafeSquares &= attackedBy[Them][ALL_PIECES] | pos.pieces(Them);
// If there aren't any enemy attacks, assign a big bonus. Otherwise
// assign a smaller bonus if the block square isn't attacked.
@@ -668,13 +689,17 @@ namespace {
mbonus += rr + r * 2, ebonus += rr + r * 2;
} // rr != 0
+ // Scale down bonus for candidate passers which need more than one
+ // pawn push to become passed or have a pawn in front of them.
+ if (!pos.pawn_passed(Us, s + Up) || (pos.pieces(PAWN) & forward_file_bb(Us, s)))
+ mbonus /= 2, ebonus /= 2;
+
score += make_score(mbonus, ebonus) + PassedFile[file_of(s)];
}
- if (DoTrace)
+ if (T)
Trace::add(PASSED, Us, score);
- // Add the scores to the middlegame and endgame eval
return score;
}
@@ -685,21 +710,22 @@ namespace {
// squares one, two or three squares behind a friendly pawn are counted
// twice. Finally, the space bonus is multiplied by a weight. The aim is to
// improve play on game opening.
- template
- Score evaluate_space(const Position& pos, const EvalInfo& ei) {
+
+ template template
+ Score Evaluation::evaluate_space() {
const Color Them = (Us == WHITE ? BLACK : WHITE);
const Bitboard SpaceMask =
- Us == WHITE ? (FileCBB | FileDBB | FileEBB | FileFBB) & (Rank2BB | Rank3BB | Rank4BB)
- : (FileCBB | FileDBB | FileEBB | FileFBB) & (Rank7BB | Rank6BB | Rank5BB);
+ Us == WHITE ? CenterFiles & (Rank2BB | Rank3BB | Rank4BB)
+ : CenterFiles & (Rank7BB | Rank6BB | Rank5BB);
// Find the safe squares for our pieces inside the area defined by
// 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
& ~pos.pieces(Us, PAWN)
- & ~ei.attackedBy[Them][PAWN]
- & (ei.attackedBy[Us][ALL_PIECES] | ~ei.attackedBy[Them][ALL_PIECES]);
+ & ~attackedBy[Them][PAWN]
+ & (attackedBy[Us][ALL_PIECES] | ~attackedBy[Them][ALL_PIECES]);
// Find all squares which are at most three squares behind some friendly pawn
Bitboard behind = pos.pieces(Us, PAWN);
@@ -709,46 +735,48 @@ namespace {
// Since SpaceMask[Us] is fully on our half of the board...
assert(unsigned(safe >> (Us == WHITE ? 32 : 0)) == 0);
- // ...count safe + (behind & safe) with a single popcount
+ // ...count safe + (behind & safe) with a single popcount.
int bonus = popcount((Us == WHITE ? safe << 32 : safe >> 32) | (behind & safe));
- bonus = std::min(16, bonus);
- int weight = pos.count(Us) - 2 * ei.pi->open_files();
+ int weight = pos.count(Us) - 2 * pe->open_files();
- return make_score(bonus * weight * weight / 18, 0);
+ return make_score(bonus * weight * weight / 16, 0);
}
// evaluate_initiative() computes the initiative correction value for the
// position, i.e., second order bonus/malus based on the known attacking/defending
// status of the players.
- Score evaluate_initiative(const Position& pos, int asymmetry, Value eg) {
+
+ template
+ Score Evaluation::evaluate_initiative(Value eg) {
int kingDistance = distance(pos.square(WHITE), pos.square(BLACK))
- distance(pos.square(WHITE), pos.square(BLACK));
- int pawns = pos.count(WHITE) + pos.count(BLACK);
+ bool bothFlanks = (pos.pieces(PAWN) & QueenSide) && (pos.pieces(PAWN) & KingSide);
// Compute the initiative bonus for the attacking side
- int initiative = 8 * (asymmetry + kingDistance - 15) + 12 * pawns;
+ int initiative = 8 * (pe->pawn_asymmetry() + kingDistance - 17) + 12 * pos.count() + 16 * bothFlanks;
// 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));
+ // that the endgame score will never change sign after the bonus.
+ int v = ((eg > 0) - (eg < 0)) * std::max(initiative, -abs(eg));
- return make_score(0, value);
+ return make_score(0, v);
}
// evaluate_scale_factor() computes the scale factor for the winning side
- ScaleFactor evaluate_scale_factor(const Position& pos, const EvalInfo& ei, Value eg) {
+
+ template
+ ScaleFactor Evaluation::evaluate_scale_factor(Value eg) {
Color strongSide = eg > VALUE_DRAW ? WHITE : BLACK;
- ScaleFactor sf = ei.me->scale_factor(pos, strongSide);
+ ScaleFactor sf = 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 (sf == SCALE_FACTOR_NORMAL || sf == SCALE_FACTOR_ONEPAWN)
{
if (pos.opposite_bishops())
{
@@ -756,140 +784,116 @@ namespace {
// is almost a draw, in case of KBP vs KB, it is even more a draw.
if ( pos.non_pawn_material(WHITE) == BishopValueMg
&& pos.non_pawn_material(BLACK) == BishopValueMg)
- sf = more_than_one(pos.pieces(PAWN)) ? ScaleFactor(31) : ScaleFactor(9);
+ return 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);
+ return ScaleFactor(46);
}
// Endings where weaker side can place his king in front of the opponent's
// pawns are drawish.
else if ( abs(eg) <= BishopValueEg
&& pos.count(strongSide) <= 2
&& !pos.pawn_passed(~strongSide, pos.square(~strongSide)))
- sf = ScaleFactor(37 + 7 * pos.count(strongSide));
+ return ScaleFactor(37 + 7 * pos.count(strongSide));
}
return sf;
}
+
+ // value() is the main function of the class. It computes the various parts of
+ // the evaluation and returns the value of the position from the point of view
+ // of the side to move.
+
+ template
+ Value Evaluation::value() {
+
+ assert(!pos.checkers());
+
+ // Probe the material hash table
+ me = Material::probe(pos);
+
+ // If we have a specialized evaluation function for the current material
+ // configuration, call it and return.
+ if (me->specialized_eval_exists())
+ return me->evaluate(pos);
+
+ // Initialize score by reading the incrementally updated scores included in
+ // the position object (material + piece square tables) and the material
+ // imbalance. Score is computed internally from the white point of view.
+ Score score = pos.psq_score() + me->imbalance();
+
+ // Probe the pawn hash table
+ pe = Pawns::probe(pos);
+ score += pe->pawns_score();
+
+ // Early exit if score is high
+ Value v = (mg_value(score) + eg_value(score)) / 2;
+ if (abs(v) > LazyThreshold)
+ return pos.side_to_move() == WHITE ? v : -v;
+
+ // Main evaluation begins here
+
+ initialize();
+ initialize();
+
+ score += evaluate_pieces() - evaluate_pieces();
+ score += evaluate_pieces() - evaluate_pieces();
+ score += evaluate_pieces() - evaluate_pieces();
+ score += evaluate_pieces() - evaluate_pieces();
+
+ score += mobility[WHITE] - mobility[BLACK];
+
+ score += evaluate_king()
+ - evaluate_king();
+
+ score += evaluate_threats()
+ - evaluate_threats();
+
+ score += evaluate_passed_pawns()
+ - evaluate_passed_pawns();
+
+ if (pos.non_pawn_material() >= SpaceThreshold)
+ score += evaluate_space()
+ - evaluate_space();
+
+ score += evaluate_initiative(eg_value(score));
+
+ // Interpolate between a middlegame and a (scaled by 'sf') endgame score
+ ScaleFactor sf = evaluate_scale_factor(eg_value(score));
+ v = mg_value(score) * int(me->game_phase())
+ + eg_value(score) * int(PHASE_MIDGAME - me->game_phase()) * sf / SCALE_FACTOR_NORMAL;
+
+ v /= int(PHASE_MIDGAME);
+
+ // In case of tracing add all remaining individual evaluation terms
+ if (T)
+ {
+ Trace::add(MATERIAL, pos.psq_score());
+ Trace::add(IMBALANCE, me->imbalance());
+ Trace::add(PAWN, pe->pawns_score());
+ Trace::add(MOBILITY, mobility[WHITE], mobility[BLACK]);
+ if (pos.non_pawn_material() >= SpaceThreshold)
+ Trace::add(SPACE, evaluate_space()
+ , evaluate_space());
+ Trace::add(TOTAL, score);
+ }
+
+ return (pos.side_to_move() == WHITE ? v : -v) + Eval::Tempo; // Side to move point of view
+ }
+
} // namespace
-/// evaluate() is the main evaluation function. It returns a static evaluation
+/// evaluate() is the evaluator for the outer world. It returns a static evaluation
/// of the position from the point of view of the side to move.
-template
-Value Eval::evaluate(const Position& pos) {
-
- assert(!pos.checkers());
-
- Score mobility[COLOR_NB] = { SCORE_ZERO, SCORE_ZERO };
- EvalInfo ei;
-
- // Probe the material hash table
- ei.me = Material::probe(pos);
-
- // If we have a specialized evaluation function for the current material
- // configuration, call it and return.
- if (ei.me->specialized_eval_exists())
- return ei.me->evaluate(pos);
-
- // Initialize score by reading the incrementally updated scores included in
- // the position object (material + piece square tables) and the material
- // imbalance. Score is computed internally from the white point of view.
- Score score = pos.psq_score() + ei.me->imbalance();
-
- // Probe the pawn hash table
- ei.pi = Pawns::probe(pos);
- score += ei.pi->pawns_score();
-
- // Initialize attack and king safety bitboards
- ei.attackedBy[WHITE][ALL_PIECES] = ei.attackedBy[BLACK][ALL_PIECES] = 0;
- ei.attackedBy[WHITE][KING] = pos.attacks_from(pos.square(WHITE));
- ei.attackedBy[BLACK][KING] = pos.attacks_from(pos.square(BLACK));
- eval_init(pos, ei);
- eval_init(pos, ei);
-
- // Pawns blocked or on ranks 2 and 3 will be excluded from the mobility area
- Bitboard blockedPawns[] = {
- pos.pieces(WHITE, PAWN) & (shift(pos.pieces()) | Rank2BB | Rank3BB),
- pos.pieces(BLACK, PAWN) & (shift(pos.pieces()) | Rank7BB | Rank6BB)
- };
-
- // Do not include in mobility area squares protected by enemy pawns, or occupied
- // by our blocked pawns or king.
- Bitboard mobilityArea[] = {
- ~(ei.attackedBy[BLACK][PAWN] | blockedPawns[WHITE] | pos.square(WHITE)),
- ~(ei.attackedBy[WHITE][PAWN] | blockedPawns[BLACK] | pos.square(BLACK))
- };
-
- // Evaluate all pieces but king and pawns
- score += evaluate_pieces(pos, ei, mobility, mobilityArea);
- score += mobility[WHITE] - mobility[BLACK];
-
- // Evaluate kings after all other pieces because we need full attack
- // information when computing the king safety evaluation.
- score += evaluate_king(pos, ei)
- - evaluate_king(pos, ei);
-
- // 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 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)
- score += Unstoppable * int(relative_rank(WHITE, frontmost_sq(WHITE, b)));
-
- if ((b = ei.pi->passed_pawns(BLACK)) != 0)
- score -= Unstoppable * int(relative_rank(BLACK, frontmost_sq(BLACK, b)));
- }
-
- // Evaluate space for both sides, only during opening
- if (pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK) >= 12222)
- score += evaluate_space(pos, ei)
- - evaluate_space(pos, ei);
-
- // Evaluate position potential for the winning side
- score += evaluate_initiative(pos, ei.pi->pawn_asymmetry(), eg_value(score));
-
- // Evaluate scale factor for the winning side
- ScaleFactor sf = evaluate_scale_factor(pos, ei, eg_value(score));
-
- // Interpolate between a middlegame and a (scaled by 'sf') endgame score
- Value v = mg_value(score) * int(ei.me->game_phase())
- + eg_value(score) * int(PHASE_MIDGAME - ei.me->game_phase()) * sf / SCALE_FACTOR_NORMAL;
-
- v /= int(PHASE_MIDGAME);
-
- // In case of tracing add all remaining individual evaluation terms
- if (DoTrace)
- {
- Trace::add(MATERIAL, pos.psq_score());
- Trace::add(IMBALANCE, ei.me->imbalance());
- Trace::add(PAWN, ei.pi->pawns_score());
- Trace::add(MOBILITY, mobility[WHITE], mobility[BLACK]);
- Trace::add(SPACE, evaluate_space(pos, ei)
- , evaluate_space(pos, ei));
- Trace::add(TOTAL, score);
- }
-
- return (pos.side_to_move() == WHITE ? v : -v) + Eval::Tempo; // Side to move point of view
+Value Eval::evaluate(const Position& pos)
+{
+ return Evaluation<>(pos).value();
}
-// Explicit template instantiations
-template Value Eval::evaluate(const Position&);
-template Value Eval::evaluate(const Position&);
-
-
/// 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.
@@ -898,7 +902,7 @@ std::string Eval::trace(const Position& pos) {
std::memset(scores, 0, sizeof(scores));
- Value v = evaluate(pos);
+ Value v = Evaluation(pos).value();
v = pos.side_to_move() == WHITE ? v : -v; // White's point of view
std::stringstream ss;
@@ -910,7 +914,7 @@ std::string Eval::trace(const Position& pos) {
<< " Imbalance | " << Term(IMBALANCE)
<< " Pawns | " << Term(PAWN)
<< " Knights | " << Term(KNIGHT)
- << " Bishop | " << Term(BISHOP)
+ << " Bishops | " << Term(BISHOP)
<< " Rooks | " << Term(ROOK)
<< " Queens | " << Term(QUEEN)
<< " Mobility | " << Term(MOBILITY)
diff --git a/DroidFish/jni/stockfish/evaluate.h b/DroidFish/jni/stockfish/evaluate.h
index 7f655f6..95a1f19 100644
--- a/DroidFish/jni/stockfish/evaluate.h
+++ b/DroidFish/jni/stockfish/evaluate.h
@@ -2,7 +2,7 @@
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
- Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+ Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -33,7 +33,6 @@ const Value Tempo = Value(20); // Must be visible to search
std::string trace(const Position& pos);
-template
Value evaluate(const Position& pos);
}
diff --git a/DroidFish/jni/stockfish/main.cpp b/DroidFish/jni/stockfish/main.cpp
index 7187d30..065fe8e 100644
--- a/DroidFish/jni/stockfish/main.cpp
+++ b/DroidFish/jni/stockfish/main.cpp
@@ -2,7 +2,7 @@
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
- Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+ Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -43,9 +43,10 @@ int main(int argc, char* argv[]) {
Bitbases::init();
Search::init();
Pawns::init();
- Threads.init();
Tablebases::init(Options["SyzygyPath"]);
TT.resize(Options["Hash"]);
+ Threads.init(Options["Threads"]);
+ Search::clear(); // After threads are up
UCI::loop(argc, argv);
diff --git a/DroidFish/jni/stockfish/material.cpp b/DroidFish/jni/stockfish/material.cpp
index f6c4e2d..d67b95c 100644
--- a/DroidFish/jni/stockfish/material.cpp
+++ b/DroidFish/jni/stockfish/material.cpp
@@ -2,7 +2,7 @@
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
- Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+ Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@ namespace {
// OUR PIECES
// pair pawn knight bishop rook queen
{1667 }, // Bishop pair
- { 40, 2 }, // Pawn
+ { 40, 0 }, // Pawn
{ 32, 255, -3 }, // Knight OUR PIECES
{ 0, 104, 4, 0 }, // Bishop
{ -26, -2, 47, 105, -149 }, // Rook
@@ -53,6 +53,17 @@ namespace {
{ 101, 100, -37, 141, 268, 0 } // Queen
};
+ // PawnSet[pawn count] contains a bonus/malus indexed by number of pawns
+ const int PawnSet[] = {
+ 24, -32, 107, -51, 117, -9, -126, -21, 31
+ };
+
+ // QueenMinorsImbalance[opp_minor_count] is applied when only one side has a queen.
+ // It contains a bonus/malus for the side with the queen.
+ const int QueenMinorsImbalance[13] = {
+ 31, -8, -15, -25, -5
+ };
+
// Endgame evaluation and scaling functions are accessed directly and not through
// the function maps because they correspond to more than one material hash key.
Endgame EvaluateKXK[] = { Endgame(WHITE), Endgame(BLACK) };
@@ -89,7 +100,7 @@ namespace {
const Color Them = (Us == WHITE ? BLACK : WHITE);
- int bonus = 0;
+ int bonus = PawnSet[pieceCount[Us][PAWN]];
// Second-degree polynomial material imbalance by Tord Romstad
for (int pt1 = NO_PIECE_TYPE; pt1 <= QUEEN; ++pt1)
@@ -106,6 +117,10 @@ namespace {
bonus += pieceCount[Us][pt1] * v;
}
+ // Special handling of Queen vs. Minors
+ if (pieceCount[Us][QUEEN] == 1 && pieceCount[Them][QUEEN] == 0)
+ bonus += QueenMinorsImbalance[pieceCount[Them][KNIGHT] + pieceCount[Them][BISHOP]];
+
return bonus;
}
@@ -129,7 +144,13 @@ Entry* probe(const Position& pos) {
std::memset(e, 0, sizeof(Entry));
e->key = key;
e->factor[WHITE] = e->factor[BLACK] = (uint8_t)SCALE_FACTOR_NORMAL;
- e->gamePhase = pos.game_phase();
+
+ Value npm_w = pos.non_pawn_material(WHITE);
+ Value npm_b = pos.non_pawn_material(BLACK);
+ Value npm = std::max(EndgameLimit, std::min(npm_w + npm_b, MidgameLimit));
+
+ // Map total non-pawn material into [PHASE_ENDGAME, PHASE_MIDGAME]
+ e->gamePhase = Phase(((npm - EndgameLimit) * PHASE_MIDGAME) / (MidgameLimit - EndgameLimit));
// Let's look if we have a specialized evaluation function for this particular
// material configuration. Firstly we look for a fixed configuration one, then
@@ -150,7 +171,7 @@ Entry* probe(const Position& pos) {
if ((sf = pos.this_thread()->endgames.probe(key)) != nullptr)
{
- e->scalingFunction[sf->strong_side()] = sf; // Only strong color assigned
+ e->scalingFunction[sf->strongSide] = sf; // Only strong color assigned
return e;
}
@@ -166,9 +187,6 @@ Entry* probe(const Position& pos) {
e->scalingFunction[c] = &ScaleKQKRPs[c];
}
- Value npm_w = pos.non_pawn_material(WHITE);
- Value npm_b = pos.non_pawn_material(BLACK);
-
if (npm_w + npm_b == VALUE_ZERO && pos.pieces(PAWN)) // Only pawns on the board
{
if (!pos.count(BLACK))
diff --git a/DroidFish/jni/stockfish/material.h b/DroidFish/jni/stockfish/material.h
index bec2d66..ccf97b7 100644
--- a/DroidFish/jni/stockfish/material.h
+++ b/DroidFish/jni/stockfish/material.h
@@ -2,7 +2,7 @@
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
- Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+ Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -56,11 +56,11 @@ struct Entry {
}
Key key;
- int16_t value;
- uint8_t factor[COLOR_NB];
EndgameBase* evaluationFunction;
EndgameBase* scalingFunction[COLOR_NB]; // Could be one for each
// side (e.g. KPKP, KBPsKs)
+ int16_t value;
+ uint8_t factor[COLOR_NB];
Phase gamePhase;
};
diff --git a/DroidFish/jni/stockfish/misc.cpp b/DroidFish/jni/stockfish/misc.cpp
index 4c6c254..0136d4c 100644
--- a/DroidFish/jni/stockfish/misc.cpp
+++ b/DroidFish/jni/stockfish/misc.cpp
@@ -2,7 +2,7 @@
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
- Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+ Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,10 +18,29 @@
along with this program. If not, see .
*/
+#ifdef _WIN32
+#if _WIN32_WINNT < 0x0601
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0601 // Force to include needed API prototypes
+#endif
+#include
+// The needed Windows API for processor groups could be missed from old Windows
+// versions, so instead of calling them directly (forcing the linker to resolve
+// the calls at compile time), try to load them at runtime. To do this we need
+// first to define the corresponding function pointers.
+extern "C" {
+typedef bool(*fun1_t)(LOGICAL_PROCESSOR_RELATIONSHIP,
+ PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX, PDWORD);
+typedef bool(*fun2_t)(USHORT, PGROUP_AFFINITY);
+typedef bool(*fun3_t)(HANDLE, CONST GROUP_AFFINITY*, PGROUP_AFFINITY);
+}
+#endif
+
#include
#include
#include
#include
+#include
#include "misc.h"
#include "thread.h"
@@ -32,7 +51,7 @@ namespace {
/// Version number. If Version is left empty, then compile date in the format
/// DD-MM-YY and show in engine_info.
-const string Version = "8";
+const string Version = "2017-09-06";
/// Our fancy logging facility. The trick here is to replace cin.rdbuf() and
/// cout.rdbuf() with two Tie objects that tie cin and cout to a file stream. We
@@ -44,10 +63,10 @@ struct Tie: public streambuf { // MSVC requires split streambuf for cin and cout
Tie(streambuf* b, streambuf* l) : buf(b), logBuf(l) {}
- int sync() { return logBuf->pubsync(), buf->pubsync(); }
- int overflow(int c) { return log(buf->sputc((char)c), "<< "); }
- int underflow() { return buf->sgetc(); }
- int uflow() { return log(buf->sbumpc(), ">> "); }
+ int sync() override { return logBuf->pubsync(), buf->pubsync(); }
+ int overflow(int c) override { return log(buf->sputc((char)c), "<< "); }
+ int underflow() override { return buf->sgetc(); }
+ int uflow() override { return log(buf->sbumpc(), ">> "); }
streambuf *buf, *logBuf;
@@ -185,3 +204,122 @@ void prefetch(void* addr) {
}
#endif
+
+void prefetch2(void* addr) {
+
+ prefetch(addr);
+ prefetch((uint8_t*)addr + 64);
+}
+
+namespace WinProcGroup {
+
+#ifndef _WIN32
+
+void bindThisThread(size_t) {}
+
+#else
+
+/// get_group() retrieves logical processor information using Windows specific
+/// API and returns the best group id for the thread with index idx. Original
+/// code from Texel by Peter Österlund.
+
+int get_group(size_t idx) {
+
+ int threads = 0;
+ int nodes = 0;
+ int cores = 0;
+ DWORD returnLength = 0;
+ DWORD byteOffset = 0;
+
+ // Early exit if the needed API is not available at runtime
+ HMODULE k32 = GetModuleHandle("Kernel32.dll");
+ auto fun1 = (fun1_t)GetProcAddress(k32, "GetLogicalProcessorInformationEx");
+ if (!fun1)
+ return -1;
+
+ // First call to get returnLength. We expect it to fail due to null buffer
+ if (fun1(RelationAll, nullptr, &returnLength))
+ return -1;
+
+ // Once we know returnLength, allocate the buffer
+ SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *buffer, *ptr;
+ ptr = buffer = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*)malloc(returnLength);
+
+ // Second call, now we expect to succeed
+ if (!fun1(RelationAll, buffer, &returnLength))
+ {
+ free(buffer);
+ return -1;
+ }
+
+ while (ptr->Size > 0 && byteOffset + ptr->Size <= returnLength)
+ {
+ if (ptr->Relationship == RelationNumaNode)
+ nodes++;
+
+ else if (ptr->Relationship == RelationProcessorCore)
+ {
+ cores++;
+ threads += (ptr->Processor.Flags == LTP_PC_SMT) ? 2 : 1;
+ }
+
+ byteOffset += ptr->Size;
+ ptr = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*)(((char*)ptr) + ptr->Size);
+ }
+
+ free(buffer);
+
+ std::vector groups;
+
+ // Run as many threads as possible on the same node until core limit is
+ // reached, then move on filling the next node.
+ for (int n = 0; n < nodes; n++)
+ for (int i = 0; i < cores / nodes; i++)
+ groups.push_back(n);
+
+ // In case a core has more than one logical processor (we assume 2) and we
+ // have still threads to allocate, then spread them evenly across available
+ // nodes.
+ for (int t = 0; t < threads - cores; t++)
+ groups.push_back(t % nodes);
+
+ // If we still have more threads than the total number of logical processors
+ // then return -1 and let the OS to decide what to do.
+ return idx < groups.size() ? groups[idx] : -1;
+}
+
+
+/// bindThisThread() set the group affinity of the current thread
+
+void bindThisThread(size_t idx) {
+
+ // If OS already scheduled us on a different group than 0 then don't overwrite
+ // the choice, eventually we are one of many one-threaded processes running on
+ // some Windows NUMA hardware, for instance in fishtest. To make it simple,
+ // just check if running threads are below a threshold, in this case all this
+ // NUMA machinery is not needed.
+ if (Threads.size() < 8)
+ return;
+
+ // Use only local variables to be thread-safe
+ int group = get_group(idx);
+
+ if (group == -1)
+ return;
+
+ // Early exit if the needed API are not available at runtime
+ HMODULE k32 = GetModuleHandle("Kernel32.dll");
+ auto fun2 = (fun2_t)GetProcAddress(k32, "GetNumaNodeProcessorMaskEx");
+ auto fun3 = (fun3_t)GetProcAddress(k32, "SetThreadGroupAffinity");
+
+ if (!fun2 || !fun3)
+ return;
+
+ GROUP_AFFINITY affinity;
+ if (fun2(group, &affinity))
+ fun3(GetCurrentThread(), &affinity, nullptr);
+}
+
+#endif
+
+} // namespace WinProcGroup
diff --git a/DroidFish/jni/stockfish/misc.h b/DroidFish/jni/stockfish/misc.h
index 2889252..8283c63 100644
--- a/DroidFish/jni/stockfish/misc.h
+++ b/DroidFish/jni/stockfish/misc.h
@@ -2,7 +2,7 @@
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
- Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+ Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -32,6 +32,7 @@
const std::string engine_info(bool to_uci = false);
void prefetch(void* addr);
+void prefetch2(void* addr);
void start_logger(const std::string& fname);
void dbg_hit_on(bool b);
@@ -98,6 +99,17 @@ public:
{ return T(rand64() & rand64() & rand64()); }
};
+
+/// Under Windows it is not possible for a process to run on more than one
+/// logical processor group. This usually means to be limited to use max 64
+/// cores. To overcome this, some special platform specific API should be
+/// called to set group affinity for each thread. Original code from Texel by
+/// Peter Österlund.
+
+namespace WinProcGroup {
+ void bindThisThread(size_t idx);
+}
+
inline int stoi(const std::string& s) {
std::stringstream ss(s);
int result = 0;
diff --git a/DroidFish/jni/stockfish/movegen.cpp b/DroidFish/jni/stockfish/movegen.cpp
index 6a3cdc2..465d616 100644
--- a/DroidFish/jni/stockfish/movegen.cpp
+++ b/DroidFish/jni/stockfish/movegen.cpp
@@ -2,7 +2,7 @@
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
- Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+ Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -80,7 +80,7 @@ namespace {
// Knight promotion is the only promotion that can give a direct check
// that's not already included in the queen promotion.
- if (Type == QUIET_CHECKS && (StepAttacksBB[W_KNIGHT][to] & ksq))
+ if (Type == QUIET_CHECKS && (PseudoAttacks[KNIGHT][to] & ksq))
*moveList++ = make(to - D, to, KNIGHT);
else
(void)ksq; // Silence a warning under MSVC
@@ -346,7 +346,7 @@ ExtMove* generate(const Position& pos, ExtMove* moveList) {
if (pt == PAWN)
continue; // Will be generated together with direct checks
- Bitboard b = pos.attacks_from(Piece(pt), from) & ~pos.pieces();
+ Bitboard b = pos.attacks_from(pt, from) & ~pos.pieces();
if (pt == KING)
b &= ~PseudoAttacks[QUEEN][pos.square(~us)];
diff --git a/DroidFish/jni/stockfish/movegen.h b/DroidFish/jni/stockfish/movegen.h
index 2721f15..8256057 100644
--- a/DroidFish/jni/stockfish/movegen.h
+++ b/DroidFish/jni/stockfish/movegen.h
@@ -2,7 +2,7 @@
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
- Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+ Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -21,6 +21,8 @@
#ifndef MOVEGEN_H_INCLUDED
#define MOVEGEN_H_INCLUDED
+#include
+
#include "types.h"
class Position;
@@ -36,10 +38,14 @@ enum GenType {
struct ExtMove {
Move move;
- Value value;
+ int value;
operator Move() const { return move; }
void operator=(Move m) { move = m; }
+
+ // Inhibit unwanted implicit conversions to Move
+ // with an ambiguity that yields to a compile error.
+ operator float() const;
};
inline bool operator<(const ExtMove& f, const ExtMove& s) {
@@ -59,8 +65,7 @@ struct MoveList {
const ExtMove* end() const { return last; }
size_t size() const { return last - moveList; }
bool contains(Move move) const {
- for (const auto& m : *this) if (m == move) return true;
- return false;
+ return std::find(begin(), end(), move) != end();
}
private:
diff --git a/DroidFish/jni/stockfish/movepick.cpp b/DroidFish/jni/stockfish/movepick.cpp
index c187c3a..1c0de69 100644
--- a/DroidFish/jni/stockfish/movepick.cpp
+++ b/DroidFish/jni/stockfish/movepick.cpp
@@ -2,7 +2,7 @@
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
- Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+ Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -21,7 +21,6 @@
#include
#include "movepick.h"
-#include "thread.h"
namespace {
@@ -34,27 +33,28 @@ namespace {
QSEARCH_RECAPTURES, QRECAPTURES
};
- // Our insertion sort, which is guaranteed to be stable, as it should be
- void insertion_sort(ExtMove* begin, ExtMove* end)
- {
- ExtMove tmp, *p, *q;
+ // partial_insertion_sort() sorts moves in descending order up to and including
+ // a given limit. The order of moves smaller than the limit is left unspecified.
+ void partial_insertion_sort(ExtMove* begin, ExtMove* end, int limit) {
- for (p = begin + 1; p < end; ++p)
- {
- tmp = *p;
- for (q = p; q != begin && *(q-1) < tmp; --q)
- *q = *(q-1);
- *q = tmp;
- }
+ for (ExtMove *sortedEnd = begin, *p = begin + 1; p < end; ++p)
+ if (p->value >= limit)
+ {
+ ExtMove tmp = *p, *q;
+ *p = *++sortedEnd;
+ for (q = sortedEnd; q != begin && *(q - 1) < tmp; --q)
+ *q = *(q - 1);
+ *q = tmp;
+ }
}
// pick_best() finds the best move in the range (begin, end) and moves it to
// the front. It's faster than sorting all the moves in advance when there
// are few moves, e.g., the possible captures.
- Move pick_best(ExtMove* begin, ExtMove* end)
- {
- std::swap(*begin, *std::max_element(begin, end));
- return *begin;
+ Move pick_best(ExtMove* begin, ExtMove* end) {
+
+ std::swap(*begin, *std::max_element(begin, end));
+ return *begin;
}
} // namespace
@@ -66,21 +66,22 @@ namespace {
/// search captures, promotions, and some checks) and how important good move
/// ordering is at the current node.
-MovePicker::MovePicker(const Position& p, Move ttm, Depth d, Search::Stack* s)
- : pos(p), ss(s), depth(d) {
+/// MovePicker constructor for the main search
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const ButterflyHistory* mh,
+ const PieceToHistory** ch, Move cm, Move* killers_p)
+ : pos(p), mainHistory(mh), contHistory(ch), countermove(cm),
+ killers{killers_p[0], killers_p[1]}, depth(d){
assert(d > DEPTH_ZERO);
- Square prevSq = to_sq((ss-1)->currentMove);
- countermove = pos.this_thread()->counterMoves[pos.piece_on(prevSq)][prevSq];
-
stage = pos.checkers() ? EVASION : MAIN_SEARCH;
ttMove = ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE;
stage += (ttMove == MOVE_NONE);
}
-MovePicker::MovePicker(const Position& p, Move ttm, Depth d, Square s)
- : pos(p) {
+/// MovePicker constructor for quiescence search
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const ButterflyHistory* mh, Square s)
+ : pos(p), mainHistory(mh) {
assert(d <= DEPTH_ZERO);
@@ -104,81 +105,57 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, Square s)
stage += (ttMove == MOVE_NONE);
}
+/// MovePicker constructor for ProbCut: we generate captures with SEE higher
+/// than or equal to the given threshold.
MovePicker::MovePicker(const Position& p, Move ttm, Value th)
: pos(p), threshold(th) {
assert(!pos.checkers());
stage = PROBCUT;
-
- // In ProbCut we generate captures with SEE higher than the given threshold
ttMove = ttm
&& pos.pseudo_legal(ttm)
&& pos.capture(ttm)
- && pos.see_ge(ttm, threshold + 1)? ttm : MOVE_NONE;
+ && pos.see_ge(ttm, threshold) ? ttm : MOVE_NONE;
stage += (ttMove == MOVE_NONE);
}
+/// score() assigns a numerical value to each move in a list, used for sorting.
+/// Captures are ordered by Most Valuable Victim (MVV), preferring captures
+/// near our home rank. Quiets are ordered using the histories.
+template
+void MovePicker::score() {
-/// score() assigns a numerical value to each move in a move list. The moves with
-/// highest values will be picked first.
-template<>
-void MovePicker::score() {
- // Winning and equal captures in the main search are ordered by MVV, preferring
- // captures near our home rank. Surprisingly, this appears to perform slightly
- // better than SEE-based move ordering: exchanging big pieces before capturing
- // a hanging piece probably helps to reduce the subtree size.
- // In the main search we want to push captures with negative SEE values to the
- // badCaptures[] array, but instead of doing it now we delay until the move
- // has been picked up, saving some SEE calls in case we get a cutoff.
- for (auto& m : *this)
- m.value = PieceValue[MG][pos.piece_on(to_sq(m))]
- - Value(200 * relative_rank(pos.side_to_move(), to_sq(m)));
-}
-
-template<>
-void MovePicker::score() {
-
- const HistoryStats& history = pos.this_thread()->history;
- const FromToStats& fromTo = pos.this_thread()->fromTo;
-
- const CounterMoveStats* cm = (ss-1)->counterMoves;
- const CounterMoveStats* fm = (ss-2)->counterMoves;
- const CounterMoveStats* f2 = (ss-4)->counterMoves;
-
- Color c = pos.side_to_move();
+ static_assert(Type == CAPTURES || Type == QUIETS || Type == EVASIONS, "Wrong type");
for (auto& m : *this)
- m.value = history[pos.moved_piece(m)][to_sq(m)]
- + (cm ? (*cm)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO)
- + (fm ? (*fm)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO)
- + (f2 ? (*f2)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO)
- + fromTo.get(c, m);
-}
-
-template<>
-void MovePicker::score() {
- // Try captures ordered by MVV/LVA, then non-captures ordered by history value
- const HistoryStats& history = pos.this_thread()->history;
- const FromToStats& fromTo = pos.this_thread()->fromTo;
- Color c = pos.side_to_move();
-
- for (auto& m : *this)
- if (pos.capture(m))
+ if (Type == CAPTURES)
m.value = PieceValue[MG][pos.piece_on(to_sq(m))]
- - Value(type_of(pos.moved_piece(m))) + HistoryStats::Max;
- else
- m.value = history[pos.moved_piece(m)][to_sq(m)] + fromTo.get(c, m);
-}
+ - Value(200 * relative_rank(pos.side_to_move(), to_sq(m)));
+ else if (Type == QUIETS)
+ m.value = (*mainHistory)[pos.side_to_move()][from_to(m)]
+ + (*contHistory[0])[pos.moved_piece(m)][to_sq(m)]
+ + (*contHistory[1])[pos.moved_piece(m)][to_sq(m)]
+ + (*contHistory[3])[pos.moved_piece(m)][to_sq(m)];
+
+ else // Type == EVASIONS
+ {
+ if (pos.capture(m))
+ m.value = PieceValue[MG][pos.piece_on(to_sq(m))]
+ - Value(type_of(pos.moved_piece(m)));
+ else
+ m.value = (*mainHistory)[pos.side_to_move()][from_to(m)] - (1 << 28);
+ }
+}
/// next_move() is the most important method of the MovePicker class. It returns
/// a new pseudo legal move every time it is called, until there are no more moves
/// left. It picks the move with the biggest value from a list of generated moves
/// taking care not to return the ttMove if it has already been searched.
-Move MovePicker::next_move() {
+Move MovePicker::next_move(bool skipQuiets) {
Move move;
@@ -194,6 +171,7 @@ Move MovePicker::next_move() {
endMoves = generate(pos, cur);
score();
++stage;
+ /* fallthrough */
case GOOD_CAPTURES:
while (cur < endMoves)
@@ -201,7 +179,7 @@ Move MovePicker::next_move() {
move = pick_best(cur++, endMoves);
if (move != ttMove)
{
- if (pos.see_ge(move, VALUE_ZERO))
+ if (pos.see_ge(move))
return move;
// Losing capture, move it to the beginning of the array
@@ -210,58 +188,59 @@ Move MovePicker::next_move() {
}
++stage;
- move = ss->killers[0]; // First killer move
+ move = killers[0]; // First killer move
if ( move != MOVE_NONE
&& move != ttMove
&& pos.pseudo_legal(move)
&& !pos.capture(move))
return move;
+ /* fallthrough */
case KILLERS:
++stage;
- move = ss->killers[1]; // Second killer move
+ move = killers[1]; // Second killer move
if ( move != MOVE_NONE
&& move != ttMove
&& pos.pseudo_legal(move)
&& !pos.capture(move))
return move;
+ /* fallthrough */
case COUNTERMOVE:
++stage;
move = countermove;
if ( move != MOVE_NONE
&& move != ttMove
- && move != ss->killers[0]
- && move != ss->killers[1]
+ && move != killers[0]
+ && move != killers[1]
&& pos.pseudo_legal(move)
&& !pos.capture(move))
return move;
+ /* fallthrough */
case QUIET_INIT:
cur = endBadCaptures;
endMoves = generate(pos, cur);
score();
- if (depth < 3 * ONE_PLY)
- {
- ExtMove* goodQuiet = std::partition(cur, endMoves, [](const ExtMove& m)
- { return m.value > VALUE_ZERO; });
- insertion_sort(cur, goodQuiet);
- } else
- insertion_sort(cur, endMoves);
+ partial_insertion_sort(cur, endMoves, -4000 * depth / ONE_PLY);
++stage;
+ /* fallthrough */
case QUIET:
- while (cur < endMoves)
+ while ( cur < endMoves
+ && (!skipQuiets || cur->value >= VALUE_ZERO))
{
move = *cur++;
+
if ( move != ttMove
- && move != ss->killers[0]
- && move != ss->killers[1]
+ && move != killers[0]
+ && move != killers[1]
&& move != countermove)
return move;
}
++stage;
cur = moves; // Point to beginning of bad captures
+ /* fallthrough */
case BAD_CAPTURES:
if (cur < endBadCaptures)
@@ -273,6 +252,7 @@ Move MovePicker::next_move() {
endMoves = generate(pos, cur);
score();
++stage;
+ /* fallthrough */
case ALL_EVASIONS:
while (cur < endMoves)
@@ -288,13 +268,14 @@ Move MovePicker::next_move() {
endMoves = generate(pos, cur);
score();
++stage;
+ /* fallthrough */
case PROBCUT_CAPTURES:
while (cur < endMoves)
{
move = pick_best(cur++, endMoves);
if ( move != ttMove
- && pos.see_ge(move, threshold + 1))
+ && pos.see_ge(move, threshold))
return move;
}
break;
@@ -304,6 +285,7 @@ Move MovePicker::next_move() {
endMoves = generate(pos, cur);
score();
++stage;
+ /* fallthrough */
case QCAPTURES_1: case QCAPTURES_2:
while (cur < endMoves)
@@ -317,6 +299,7 @@ Move MovePicker::next_move() {
cur = moves;
endMoves = generate(pos, cur);
++stage;
+ /* fallthrough */
case QCHECKS:
while (cur < endMoves)
@@ -332,6 +315,7 @@ Move MovePicker::next_move() {
endMoves = generate(pos, cur);
score();
++stage;
+ /* fallthrough */
case QRECAPTURES:
while (cur < endMoves)
diff --git a/DroidFish/jni/stockfish/movepick.h b/DroidFish/jni/stockfish/movepick.h
index 6fbd8be..66fc1bd 100644
--- a/DroidFish/jni/stockfish/movepick.h
+++ b/DroidFish/jni/stockfish/movepick.h
@@ -2,7 +2,7 @@
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
- Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+ Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -21,68 +21,66 @@
#ifndef MOVEPICK_H_INCLUDED
#define MOVEPICK_H_INCLUDED
-#include