From 5d723926b0b7a7218a9b23d531603e0704e762bf Mon Sep 17 00:00:00 2001 From: Peter Osterlund Date: Sat, 31 May 2014 12:23:03 +0000 Subject: [PATCH] DroidFish: Updated Stockfish engine to version 5. --- DroidFish/jni/stockfish/benchmark.cpp | 29 +- DroidFish/jni/stockfish/bitbase.cpp | 36 +- DroidFish/jni/stockfish/bitboard.cpp | 134 ++-- DroidFish/jni/stockfish/bitboard.h | 47 +- DroidFish/jni/stockfish/bitcount.h | 10 +- DroidFish/jni/stockfish/book.cpp | 42 +- DroidFish/jni/stockfish/book.h | 2 +- DroidFish/jni/stockfish/endgame.cpp | 163 ++--- DroidFish/jni/stockfish/endgame.h | 22 +- DroidFish/jni/stockfish/evaluate.cpp | 860 +++++++++++--------------- DroidFish/jni/stockfish/evaluate.h | 2 +- DroidFish/jni/stockfish/main.cpp | 12 +- DroidFish/jni/stockfish/material.cpp | 82 +-- DroidFish/jni/stockfish/material.h | 32 +- DroidFish/jni/stockfish/misc.cpp | 50 +- DroidFish/jni/stockfish/misc.h | 14 +- DroidFish/jni/stockfish/movegen.cpp | 124 ++-- DroidFish/jni/stockfish/movegen.h | 6 +- DroidFish/jni/stockfish/movepick.cpp | 121 ++-- DroidFish/jni/stockfish/movepick.h | 34 +- DroidFish/jni/stockfish/notation.cpp | 115 ++-- DroidFish/jni/stockfish/notation.h | 2 +- DroidFish/jni/stockfish/pawns.cpp | 110 ++-- DroidFish/jni/stockfish/pawns.h | 43 +- DroidFish/jni/stockfish/platform.h | 10 +- DroidFish/jni/stockfish/position.cpp | 804 ++++++++++-------------- DroidFish/jni/stockfish/position.h | 101 ++- DroidFish/jni/stockfish/psqtab.h | 98 +-- DroidFish/jni/stockfish/rkiss.h | 18 +- DroidFish/jni/stockfish/search.cpp | 726 ++++++++++------------ DroidFish/jni/stockfish/search.h | 18 +- DroidFish/jni/stockfish/thread.cpp | 190 +++--- DroidFish/jni/stockfish/thread.h | 24 +- DroidFish/jni/stockfish/timeman.cpp | 103 +-- DroidFish/jni/stockfish/timeman.h | 10 +- DroidFish/jni/stockfish/tt.cpp | 34 +- DroidFish/jni/stockfish/tt.h | 76 +-- DroidFish/jni/stockfish/types.h | 188 +++--- DroidFish/jni/stockfish/uci.cpp | 180 +++--- DroidFish/jni/stockfish/ucioption.cpp | 90 +-- DroidFish/jni/stockfish/ucioption.h | 17 +- 41 files changed, 2187 insertions(+), 2592 deletions(-) diff --git a/DroidFish/jni/stockfish/benchmark.cpp b/DroidFish/jni/stockfish/benchmark.cpp index 450afa9..2f943c4 100644 --- a/DroidFish/jni/stockfish/benchmark.cpp +++ b/DroidFish/jni/stockfish/benchmark.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,6 +23,7 @@ #include #include "misc.h" +#include "notation.h" #include "position.h" #include "search.h" #include "thread.h" @@ -66,10 +67,10 @@ static const char* Defaults[] = { /// benchmark() runs a simple benchmark by letting Stockfish analyze a set -/// of positions for a given limit each. There are five parameters; the +/// 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 12), an optional file name where to look for positions in fen +/// 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 secs or number of nodes. @@ -126,7 +127,7 @@ void benchmark(const Position& current, istream& is) { file.close(); } - int64_t nodes = 0; + uint64_t nodes = 0; Search::StateStackPtr st; Time::point elapsed = Time::now(); @@ -136,21 +137,33 @@ void benchmark(const Position& current, istream& is) { cerr << "\nPosition: " << i + 1 << '/' << fens.size() << endl; - if (limitType == "perft") + if (limitType == "divide") + for (MoveList it(pos); *it; ++it) + { + StateInfo si; + pos.do_move(*it, si); + uint64_t cnt = limits.depth > 1 ? Search::perft(pos, (limits.depth - 1) * ONE_PLY) : 1; + pos.undo_move(*it); + cerr << move_to_uci(*it, pos.is_chess960()) << ": " << cnt << endl; + nodes += cnt; + } + else if (limitType == "perft") { - size_t cnt = Search::perft(pos, limits.depth * ONE_PLY); + uint64_t cnt = Search::perft(pos, limits.depth * ONE_PLY); cerr << "\nPerft " << limits.depth << " leaf nodes: " << cnt << endl; nodes += cnt; } else { - Threads.start_thinking(pos, limits, vector(), st); + Threads.start_thinking(pos, limits, st); Threads.wait_for_think_finished(); nodes += Search::RootPos.nodes_searched(); } } - elapsed = Time::now() - elapsed + 1; // Assure positive to avoid a 'divide by zero' + elapsed = Time::now() - elapsed + 1; // Ensure positivity to avoid a 'divide by zero' + + dbg_print(); // Just before to exit cerr << "\n===========================" << "\nTotal time (ms) : " << elapsed diff --git a/DroidFish/jni/stockfish/bitbase.cpp b/DroidFish/jni/stockfish/bitbase.cpp index 37b0564..6094f50 100644 --- a/DroidFish/jni/stockfish/bitbase.cpp +++ b/DroidFish/jni/stockfish/bitbase.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,15 +25,15 @@ namespace { - // The possible pawns squares are 24, the first 4 files and ranks from 2 to 7 - const unsigned IndexMax = 2*24*64*64; // stm * psq * wksq * bksq = 196608 + // There are 24 possible pawn squares: the first 4 files and ranks from 2 to 7 + const unsigned MAX_INDEX = 2*24*64*64; // stm * psq * wksq * bksq = 196608 // Each uint32_t stores results of 32 positions, one per bit - uint32_t KPKBitbase[IndexMax / 32]; + uint32_t KPKBitbase[MAX_INDEX / 32]; // A KPK bitbase index is an integer in [0, IndexMax] range // - // Information is mapped in a way that minimizes number of iterations: + // Information is mapped in a way that minimizes the number of iterations: // // bit 0- 5: white king square (from SQ_A1 to SQ_H8) // bit 6-11: black king square (from SQ_A1 to SQ_H8) @@ -84,20 +84,20 @@ void Bitbases::init_kpk() { unsigned idx, repeat = 1; std::vector db; - db.reserve(IndexMax); + db.reserve(MAX_INDEX); // Initialize db with known win / draw positions - for (idx = 0; idx < IndexMax; ++idx) + for (idx = 0; idx < MAX_INDEX; ++idx) db.push_back(KPKPosition(idx)); - // Iterate through the positions until no more of the unknown positions can be + // Iterate through the positions until none of the unknown positions can be // changed to either wins or draws (15 cycles needed). while (repeat) - for (repeat = idx = 0; idx < IndexMax; ++idx) + for (repeat = idx = 0; idx < MAX_INDEX; ++idx) repeat |= (db[idx] == UNKNOWN && db[idx].classify(db) != UNKNOWN); // Map 32 results into one KPKBitbase[] entry - for (idx = 0; idx < IndexMax; ++idx) + for (idx = 0; idx < MAX_INDEX; ++idx) if (db[idx] == WIN) KPKBitbase[idx / 32] |= 1 << (idx & 0x1F); } @@ -110,24 +110,26 @@ namespace { wksq = Square((idx >> 0) & 0x3F); bksq = Square((idx >> 6) & 0x3F); us = Color ((idx >> 12) & 0x01); - psq = File ((idx >> 13) & 0x03) | Rank(RANK_7 - (idx >> 15)); + psq = make_square(File((idx >> 13) & 0x03), Rank(RANK_7 - (idx >> 15))); result = UNKNOWN; // Check if two pieces are on the same square or if a king can be captured - if ( square_distance(wksq, bksq) <= 1 || wksq == psq || bksq == psq + if ( square_distance(wksq, bksq) <= 1 + || wksq == psq + || bksq == psq || (us == WHITE && (StepAttacksBB[PAWN][psq] & bksq))) result = INVALID; else if (us == WHITE) { - // Immediate win if pawn can be promoted without getting captured + // Immediate win if a pawn can be promoted without getting captured if ( rank_of(psq) == RANK_7 && wksq != psq + DELTA_N && ( square_distance(bksq, psq + DELTA_N) > 1 ||(StepAttacksBB[KING][wksq] & (psq + DELTA_N)))) result = WIN; } - // Immediate draw if is stalemate or king captures undefended pawn + // Immediate draw if it is a stalemate or a king captures undefended pawn else if ( !(StepAttacksBB[KING][bksq] & ~(StepAttacksBB[KING][wksq] | StepAttacksBB[PAWN][psq])) || (StepAttacksBB[KING][bksq] & psq & ~StepAttacksBB[KING][wksq])) result = DRAW; @@ -138,13 +140,13 @@ namespace { // White to Move: If one move leads to a position classified as WIN, the result // of the current position is WIN. If all moves lead to positions classified - // as DRAW, the current position is classified DRAW otherwise the current + // as DRAW, the current position is classified as DRAW, otherwise the current // position is classified as UNKNOWN. // // Black to Move: If one move leads to a position classified as DRAW, the result // of the current position is DRAW. If all moves lead to positions classified - // as WIN, the position is classified WIN otherwise the current position is - // classified UNKNOWN. + // as WIN, the position is classified as WIN, otherwise the current position is + // classified as UNKNOWN. const Color Them = (Us == WHITE ? BLACK : WHITE); diff --git a/DroidFish/jni/stockfish/bitboard.cpp b/DroidFish/jni/stockfish/bitboard.cpp index 3683b36..d4b433f 100644 --- a/DroidFish/jni/stockfish/bitboard.cpp +++ b/DroidFish/jni/stockfish/bitboard.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,12 +18,10 @@ */ #include -#include -#include +#include // For memset #include "bitboard.h" #include "bitcount.h" -#include "misc.h" #include "rkiss.h" CACHE_LINE_ALIGNMENT @@ -81,8 +79,8 @@ namespace { } } -/// lsb()/msb() finds the least/most significant bit in a nonzero bitboard. -/// pop_lsb() finds and clears the least significant bit in a nonzero bitboard. +/// lsb()/msb() finds the least/most significant bit in a non-zero bitboard. +/// pop_lsb() finds and clears the least significant bit in a non-zero bitboard. #ifndef USE_BSFQ @@ -120,55 +118,47 @@ Square msb(Bitboard b) { result += 8; } - return (Square)(result + MS1BTable[b32]); + return Square(result + MS1BTable[b32]); } #endif // ifndef USE_BSFQ -/// Bitboards::print() prints a bitboard in an easily readable format to the -/// standard output. This is sometimes useful for debugging. +/// Bitboards::pretty() returns an ASCII representation of a bitboard to be +/// printed to standard output. This is sometimes useful for debugging. -void Bitboards::print(Bitboard b) { +const std::string Bitboards::pretty(Bitboard b) { - sync_cout; + std::string s = "+---+---+---+---+---+---+---+---+\n"; - for (Rank rank = RANK_8; rank >= RANK_1; --rank) + for (Rank r = RANK_8; r >= RANK_1; --r) { - std::cout << "+---+---+---+---+---+---+---+---+" << '\n'; + for (File f = FILE_A; f <= FILE_H; ++f) + s.append(b & make_square(f, r) ? "| X " : "| "); - for (File file = FILE_A; file <= FILE_H; ++file) - std::cout << "| " << (b & (file | rank) ? "X " : " "); - - std::cout << "|\n"; + s.append("|\n+---+---+---+---+---+---+---+---+\n"); } - std::cout << "+---+---+---+---+---+---+---+---+" << sync_endl; + + return s; } -/// Bitboards::init() initializes various bitboard arrays. It is called during -/// program initialization. +/// Bitboards::init() initializes various bitboard tables. It is called at +/// startup and relies on global objects to be already zero-initialized. void Bitboards::init() { - for (int k = 0, i = 0; i < 8; ++i) - while (k < (2 << i)) - MS1BTable[k++] = i; - - for (int i = 0; i < 64; ++i) - BSFTable[bsf_index(1ULL << i)] = Square(i); - for (Square s = SQ_A1; s <= SQ_H8; ++s) - SquareBB[s] = 1ULL << s; + BSFTable[bsf_index(SquareBB[s] = 1ULL << s)] = s; - FileBB[FILE_A] = FileABB; - RankBB[RANK_1] = Rank1BB; + for (Bitboard b = 1; b < 256; ++b) + MS1BTable[b] = more_than_one(b) ? MS1BTable[b - 1] : lsb(b); - for (int i = 1; i < 8; ++i) - { - FileBB[i] = FileBB[i - 1] << 1; - RankBB[i] = RankBB[i - 1] << 8; - } + for (File f = FILE_A; f <= FILE_H; ++f) + FileBB[f] = f > FILE_A ? FileBB[f - 1] << 1 : FileABB; + + for (Rank r = RANK_1; r <= RANK_8; ++r) + RankBB[r] = r > RANK_1 ? RankBB[r - 1] << 8 : Rank1BB; for (File f = FILE_A; f <= FILE_H; ++f) AdjacentFilesBB[f] = (f > FILE_A ? FileBB[f - 1] : 0) | (f < FILE_H ? FileBB[f + 1] : 0); @@ -186,11 +176,11 @@ void Bitboards::init() { for (Square s1 = SQ_A1; s1 <= SQ_H8; ++s1) for (Square s2 = SQ_A1; s2 <= SQ_H8; ++s2) - { - SquareDistance[s1][s2] = std::max(file_distance(s1, s2), rank_distance(s1, s2)); if (s1 != s2) - DistanceRingsBB[s1][SquareDistance[s1][s2] - 1] |= s2; - } + { + SquareDistance[s1][s2] = std::max(file_distance(s1, s2), rank_distance(s1, s2)); + DistanceRingsBB[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 } }; @@ -198,9 +188,9 @@ void Bitboards::init() { for (Color c = WHITE; c <= BLACK; ++c) for (PieceType pt = PAWN; pt <= KING; ++pt) for (Square s = SQ_A1; s <= SQ_H8; ++s) - for (int k = 0; steps[pt][k]; ++k) + for (int i = 0; steps[pt][i]; ++i) { - Square to = s + Square(c == WHITE ? steps[pt][k] : -steps[pt][k]); + Square to = s + Square(c == WHITE ? steps[pt][i] : -steps[pt][i]); if (is_ok(to) && square_distance(s, to) < 3) StepAttacksBB[make_piece(c, pt)][s] |= to; @@ -212,24 +202,23 @@ void Bitboards::init() { init_magics(RTable, RAttacks, RMagics, RMasks, RShifts, RDeltas, magic_index); init_magics(BTable, BAttacks, BMagics, BMasks, BShifts, BDeltas, magic_index); - for (Square s = SQ_A1; s <= SQ_H8; ++s) - { - PseudoAttacks[QUEEN][s] = PseudoAttacks[BISHOP][s] = attacks_bb(s, 0); - PseudoAttacks[QUEEN][s] |= PseudoAttacks[ ROOK][s] = attacks_bb< ROOK>(s, 0); - } - 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 (Square s2 = SQ_A1; s2 <= SQ_H8; ++s2) - if (PseudoAttacks[QUEEN][s1] & s2) - { - Square delta = (s2 - s1) / square_distance(s1, s2); + { + Piece pc = (PseudoAttacks[BISHOP][s1] & s2) ? W_BISHOP : + (PseudoAttacks[ROOK][s1] & s2) ? W_ROOK : NO_PIECE; - for (Square s = s1 + delta; s != s2; s += delta) - BetweenBB[s1][s2] |= s; + if (pc == NO_PIECE) + continue; - PieceType pt = (PseudoAttacks[BISHOP][s1] & s2) ? BISHOP : ROOK; - LineBB[s1][s2] = (PseudoAttacks[pt][s1] & PseudoAttacks[pt][s2]) | s1 | s2; - } + 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]); + } + } } @@ -254,20 +243,6 @@ namespace { } - Bitboard pick_random(RKISS& rk, int booster) { - - // Values s1 and s2 are used to rotate the candidate magic of a - // quantity known to be the optimal to quickly find the magics. - int s1 = booster & 63, s2 = (booster >> 6) & 63; - - Bitboard m = rk.rand(); - m = (m >> s1) | (m << (64 - s1)); - m &= rk.rand(); - m = (m >> s2) | (m << (64 - s2)); - return m & rk.rand(); - } - - // init_magics() computes all rook and bishop attacks at startup. Magic // bitboards are used to look up attacks of sliding pieces. As a reference see // chessprogramming.wikispaces.com/Magic+Bitboards. In particular, here we @@ -276,8 +251,9 @@ namespace { void init_magics(Bitboard table[], Bitboard* attacks[], Bitboard magics[], Bitboard masks[], unsigned shifts[], Square deltas[], Fn index) { - int MagicBoosters[][8] = { { 3191, 2184, 1310, 3618, 2091, 1308, 2452, 3996 }, - { 1059, 3608, 605, 3234, 3326, 38, 2029, 3043 } }; + int MagicBoosters[][8] = { { 969, 1976, 2850, 542, 2069, 2852, 1708, 164 }, + { 3101, 552, 3555, 926, 834, 26, 2131, 1117 } }; + RKISS rk; Bitboard occupancy[4096], reference[4096], edges, b; int i, size, booster; @@ -303,7 +279,12 @@ namespace { b = size = 0; do { occupancy[size] = b; - reference[size++] = sliding_attack(deltas, s, b); + reference[size] = sliding_attack(deltas, s, b); + + if (HasPext) + attacks[s][_pext_u64(b, masks[s])] = reference[size]; + + size++; b = (b - masks[s]) & masks[s]; } while (b); @@ -312,12 +293,15 @@ namespace { if (s < SQ_H8) attacks[s + 1] = attacks[s] + size; + if (HasPext) + continue; + booster = MagicBoosters[Is64Bit][rank_of(s)]; // 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] = pick_random(rk, booster); + do magics[s] = rk.magic_rand(booster); while (popcount((magics[s] * masks[s]) >> 56) < 6); std::memset(attacks[s], 0, size * sizeof(Bitboard)); @@ -333,11 +317,11 @@ namespace { if (attack && attack != reference[i]) break; - assert(reference[i] != 0); + assert(reference[i]); attack = reference[i]; } - } while (i != size); + } while (i < size); } } } diff --git a/DroidFish/jni/stockfish/bitboard.h b/DroidFish/jni/stockfish/bitboard.h index e95bf0d..9814268 100644 --- a/DroidFish/jni/stockfish/bitboard.h +++ b/DroidFish/jni/stockfish/bitboard.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ namespace Bitboards { void init(); -void print(Bitboard b); +const std::string pretty(Bitboard b); } @@ -177,7 +177,7 @@ inline Bitboard in_front_bb(Color c, Rank r) { /// between_bb() returns a bitboard representing all squares between two squares. /// For instance, between_bb(SQ_C4, SQ_F7) returns a bitboard with the bits for -/// square d5 and e6 set. If s1 and s2 are not on the same line, file or diagonal, +/// square d5 and e6 set. If s1 and s2 are not on the same rank, file or diagonal, /// 0 is returned. inline Bitboard between_bb(Square s1, Square s2) { @@ -241,6 +241,9 @@ FORCE_INLINE unsigned magic_index(Square s, Bitboard occ) { Bitboard* const Magics = Pt == ROOK ? RMagics : BMagics; unsigned* const Shifts = Pt == ROOK ? RShifts : BShifts; + if (HasPext) + return unsigned(_pext_u64(occ, Masks[s])); + if (Is64Bit) return unsigned(((occ & Masks[s]) * Magics[s]) >> Shifts[s]); @@ -254,24 +257,34 @@ inline Bitboard attacks_bb(Square s, Bitboard occ) { return (Pt == ROOK ? RAttacks : BAttacks)[s][magic_index(s, occ)]; } +inline Bitboard attacks_bb(Piece pc, Square s, Bitboard occ) { -/// lsb()/msb() finds the least/most significant bit in a nonzero bitboard. -/// pop_lsb() finds and clears the least significant bit in a nonzero bitboard. + switch (type_of(pc)) + { + case BISHOP: return attacks_bb(s, occ); + case ROOK : return attacks_bb(s, occ); + case QUEEN : return attacks_bb(s, occ) | attacks_bb(s, occ); + default : return StepAttacksBB[pc][s]; + } +} + +/// lsb()/msb() finds the least/most significant bit in a non-zero bitboard. +/// pop_lsb() finds and clears the least significant bit in a non-zero bitboard. #ifdef USE_BSFQ # if defined(_MSC_VER) && !defined(__INTEL_COMPILER) FORCE_INLINE Square lsb(Bitboard b) { - unsigned long index; - _BitScanForward64(&index, b); - return (Square) index; + unsigned long idx; + _BitScanForward64(&idx, b); + return (Square) idx; } FORCE_INLINE Square msb(Bitboard b) { - unsigned long index; - _BitScanReverse64(&index, b); - return (Square) index; + unsigned long idx; + _BitScanReverse64(&idx, b); + return (Square) idx; } # elif defined(__arm__) @@ -292,15 +305,15 @@ FORCE_INLINE Square lsb(Bitboard b) { # else FORCE_INLINE Square lsb(Bitboard b) { // Assembly code by Heinz van Saanen - Bitboard index; - __asm__("bsfq %1, %0": "=r"(index): "rm"(b) ); - return (Square) index; + Bitboard idx; + __asm__("bsfq %1, %0": "=r"(idx): "rm"(b) ); + return (Square) idx; } FORCE_INLINE Square msb(Bitboard b) { - Bitboard index; - __asm__("bsrq %1, %0": "=r"(index): "rm"(b) ); - return (Square) index; + Bitboard idx; + __asm__("bsrq %1, %0": "=r"(idx): "rm"(b) ); + return (Square) idx; } # endif diff --git a/DroidFish/jni/stockfish/bitcount.h b/DroidFish/jni/stockfish/bitcount.h index ad8df94..f84c51c 100644 --- a/DroidFish/jni/stockfish/bitcount.h +++ b/DroidFish/jni/stockfish/bitcount.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,14 +32,14 @@ enum BitCountType { CNT_HW_POPCNT }; -/// Determine at compile time the best popcount<> specialization according if -/// platform is 32 or 64 bits, to the maximum number of nonzero bits to count -/// and if hardware popcnt instruction is available. +/// 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 nonzero bits in a bitboard +/// popcount() counts the number of non-zero bits in a bitboard template inline int popcount(Bitboard); template<> diff --git a/DroidFish/jni/stockfish/book.cpp b/DroidFish/jni/stockfish/book.cpp index ec0a0f8..fbbc3fe 100644 --- a/DroidFish/jni/stockfish/book.cpp +++ b/DroidFish/jni/stockfish/book.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,7 +25,6 @@ #include #include -#include #include "book.h" #include "misc.h" @@ -36,8 +35,8 @@ using namespace std; namespace { // A Polyglot book is a series of "entries" of 16 bytes. All integers are - // stored in big-endian format, with highest byte first (regardless of size). - // The entries are ordered according to the key in ascending order. + // stored in big-endian format, with the highest byte first (regardless of + // size). The entries are ordered according to the key in ascending order. struct Entry { uint64_t key; uint16_t move; @@ -50,7 +49,7 @@ namespace { Key PolyGlotRandoms[781]; struct { Key psq[12][64]; // [piece][square] - Key castle[4]; // [castle right] + Key castling[4]; // [castling flag] Key enpassant[8]; // [file] Key turn; } Zobrist; @@ -327,16 +326,16 @@ namespace { while (b) { Square s = pop_lsb(&b); - Piece p = pos.piece_on(s); + Piece pc = pos.piece_on(s); // PolyGlot pieces are: BP = 0, WP = 1, BN = 2, ... BK = 10, WK = 11 - key ^= PG.Zobrist.psq[2 * (type_of(p) - 1) + (color_of(p) == WHITE)][s]; + key ^= PG.Zobrist.psq[2 * (type_of(pc) - 1) + (color_of(pc) == WHITE)][s]; } - b = pos.can_castle(ALL_CASTLES); + b = pos.can_castle(ANY_CASTLING); while (b) - key ^= PG.Zobrist.castle[pop_lsb(&b)]; + key ^= PG.Zobrist.castling[pop_lsb(&b)]; if (pos.ep_square() != SQ_NONE) key ^= PG.Zobrist.enpassant[file_of(pos.ep_square())]; @@ -355,7 +354,7 @@ PolyglotBook::~PolyglotBook() { if (is_open()) close(); } /// operator>>() reads sizeof(T) chars from the file's binary byte stream and -/// converts them in a number of type T. A Polyglot book stores numbers in +/// converts them into a number of type T. A Polyglot book stores numbers in /// big-endian format. template PolyglotBook& PolyglotBook::operator>>(T& n) { @@ -373,7 +372,7 @@ template<> PolyglotBook& PolyglotBook::operator>>(Entry& e) { /// open() tries to open a book file with the given name after closing any -/// exsisting one. +/// existing one. bool PolyglotBook::open(const char* fName) { @@ -383,14 +382,15 @@ bool PolyglotBook::open(const char* fName) { ifstream::open(fName, ifstream::in | ifstream::binary); fileName = is_open() ? fName : ""; - ifstream::clear(); // Reset any error flag to allow retry ifstream::open() + ifstream::clear(); // Reset any error flag to allow a retry ifstream::open() return !fileName.empty(); } /// probe() tries to find a book move for the given position. If no move is -/// found returns MOVE_NONE. If pickBest is true returns always the highest -/// rated move, otherwise randomly chooses one, based on the move score. +/// found, it returns MOVE_NONE. If pickBest is true, then it always returns +/// the highest-rated move, otherwise it randomly chooses one based on the +/// move score. Move PolyglotBook::probe(const Position& pos, const string& fName, bool pickBest) { @@ -410,9 +410,9 @@ Move PolyglotBook::probe(const Position& pos, const string& fName, bool pickBest best = max(best, e.count); sum += e.count; - // Choose book move according to its score. If a move has a very - // high score it has higher probability to be choosen than a move - // with lower score. Note that first entry is always chosen. + // Choose book move according to its score. If a move has a very high + // score it has a higher probability of being choosen than a move with + // a lower score. Note that first entry is always chosen. if ( (!pickBest && sum && rkiss.rand() % sum < e.count) || (pickBest && e.count == best)) move = Move(e.move); @@ -427,10 +427,10 @@ Move PolyglotBook::probe(const Position& pos, const string& fName, bool pickBest // bit 6-11: origin square (from 0 to 63) // bit 12-14: promotion piece (from KNIGHT == 1 to QUEEN == 4) // - // Castling moves follow "king captures rook" representation. So in case book - // move is a promotion we have to convert to our representation, in all the - // other cases we can directly compare with a Move after having masked out - // the special Move's flags (bit 14-15) that are not supported by PolyGlot. + // Castling moves follow the "king captures rook" representation. If a book + // move is a promotion, we have to convert it to our representation and in + // all other cases, we can directly compare with a Move after having masked + // out the special Move flags (bit 14-15) that are not supported by PolyGlot. int pt = (move >> 12) & 7; if (pt) move = make(from_sq(move), to_sq(move), PieceType(pt + 1)); diff --git a/DroidFish/jni/stockfish/book.h b/DroidFish/jni/stockfish/book.h index 4ce74f4..fc84e09 100644 --- a/DroidFish/jni/stockfish/book.h +++ b/DroidFish/jni/stockfish/book.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/DroidFish/jni/stockfish/endgame.cpp b/DroidFish/jni/stockfish/endgame.cpp index 6ead680..311443e 100644 --- a/DroidFish/jni/stockfish/endgame.cpp +++ b/DroidFish/jni/stockfish/endgame.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -80,10 +80,9 @@ namespace { return sq; } - // Get the material key of a 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 to do the work for us. Note that the - // fen string could correspond to an illegal position. + // 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); @@ -94,8 +93,8 @@ namespace { std::transform(sides[c].begin(), sides[c].end(), sides[c].begin(), tolower); - string fen = sides[0] + char('0' + int(8 - code.length())) - + sides[1] + "/8/8/8/8/8/8/8 w - - 0 10"; + 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"; return Position(fen, false, NULL).material_key(); } @@ -118,7 +117,6 @@ Endgames::Endgames() { add("KRKN"); add("KQKP"); add("KQKR"); - add("KBBKN"); add("KNPK"); add("KNPKB"); @@ -145,7 +143,7 @@ void Endgames::add(const string& code) { /// 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 +/// 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 /// of the board, and for keeping the distance between the two kings small. template<> @@ -168,6 +166,7 @@ Value Endgame::operator()(const Position& pos) const { if ( pos.count(strongSide) || pos.count(strongSide) + ||(pos.count(strongSide) && pos.count(strongSide)) || pos.bishop_pair(strongSide)) result += VALUE_KNOWN_WIN; @@ -187,9 +186,9 @@ Value Endgame::operator()(const Position& pos) const { Square loserKSq = pos.king_square(weakSide); Square bishopSq = pos.list(strongSide)[0]; - // kbnk_mate_table() tries to drive toward corners A1 or H8, - // if we have a bishop that cannot reach the above squares we - // flip the kings so to drive enemy toward corners A8 or H1. + // kbnk_mate_table() tries to drive toward corners A1 or H8. If we have a + // bishop that cannot reach the above squares, we flip the kings in order + // to drive the enemy toward corners A8 or H1. if (opposite_colors(bishopSq, SQ_A1)) { winnerKSq = ~winnerKSq; @@ -242,18 +241,18 @@ Value Endgame::operator()(const Position& pos) const { Square rsq = relative_square(strongSide, pos.list(strongSide)[0]); Square psq = relative_square(strongSide, pos.list(weakSide)[0]); - Square queeningSq = file_of(psq) | RANK_1; + Square queeningSq = make_square(file_of(psq), RANK_1); Value result; // If the stronger side's king is in front of the pawn, it's a win if (wksq < psq && file_of(wksq) == file_of(psq)) - result = RookValueEg - Value(square_distance(wksq, psq)); + result = RookValueEg - square_distance(wksq, psq); // If the weaker side's king is too far from the pawn and the rook, // it's a win. else if ( square_distance(bksq, psq) >= 3 + (pos.side_to_move() == weakSide) && square_distance(bksq, rsq) >= 3) - result = RookValueEg - Value(square_distance(wksq, psq)); + result = RookValueEg - square_distance(wksq, psq); // If the pawn is far advanced and supported by the defending king, // the position is drawish @@ -261,13 +260,12 @@ Value Endgame::operator()(const Position& pos) const { && square_distance(bksq, psq) == 1 && rank_of(wksq) >= RANK_4 && square_distance(wksq, psq) > 2 + (pos.side_to_move() == strongSide)) - result = Value(80 - square_distance(wksq, psq) * 8); + result = Value(80) - 8 * square_distance(wksq, psq); else - result = Value(200) - - Value(square_distance(wksq, psq + DELTA_S) * 8) - + Value(square_distance(bksq, psq + DELTA_S) * 8) - + Value(square_distance(psq, queeningSq) * 8); + result = Value(200) - 8 * ( square_distance(wksq, psq + DELTA_S) + - square_distance(bksq, psq + DELTA_S) + - square_distance(psq, queeningSq)); return strongSide == pos.side_to_move() ? result : -result; } @@ -286,7 +284,7 @@ Value Endgame::operator()(const Position& pos) const { } -/// KR vs KN. The attacking side has slightly better winning chances than +/// KR vs KN. The attacking side has slightly better winning chances than /// in KR vs KB, particularly if the king and the knight are far apart. template<> Value Endgame::operator()(const Position& pos) const { @@ -301,9 +299,10 @@ Value Endgame::operator()(const Position& pos) const { } -/// KQ vs KP. In general, a win for the stronger side, however, there are a few -/// important exceptions. Pawn on 7th rank, A,C,F or H file, with king next can -/// be a draw, so we scale down to distance between kings only. +/// KQ vs KP. In general, this is a win for the stronger side, but there are a +/// few important exceptions. A pawn on 7th rank and on the A,C,F or H files +/// with a king positioned next to it can be a draw, so in that case, we only +/// use the distance between the kings. template<> Value Endgame::operator()(const Position& pos) const { @@ -327,9 +326,8 @@ Value Endgame::operator()(const Position& pos) const { /// KQ vs KR. This is almost identical to KX vs K: We give the attacking /// king a bonus for having the kings close together, and for forcing the -/// defending king towards the edge. If we also take care to avoid null move -/// for the defending side in the search, this is usually sufficient to be -/// able to win KQ vs KR. +/// defending king towards the edge. If we also take care to avoid null move for +/// the defending side in the search, this is usually sufficient to win KQ vs KR. template<> Value Endgame::operator()(const Position& pos) const { @@ -348,35 +346,11 @@ Value Endgame::operator()(const Position& pos) const { } -/// KBB vs KN. This is almost always a win. We try to push enemy king to a corner -/// and away from his knight. For a reference of this difficult endgame see: -/// en.wikipedia.org/wiki/Chess_endgame#Effect_of_tablebases_on_endgame_theory - -template<> -Value Endgame::operator()(const Position& pos) const { - - assert(verify_material(pos, strongSide, 2 * BishopValueMg, 0)); - assert(verify_material(pos, weakSide, KnightValueMg, 0)); - - Square winnerKSq = pos.king_square(strongSide); - Square loserKSq = pos.king_square(weakSide); - Square knightSq = pos.list(weakSide)[0]; - - Value result = VALUE_KNOWN_WIN - + PushToCorners[loserKSq] - + PushClose[square_distance(winnerKSq, loserKSq)] - + PushAway[square_distance(loserKSq, knightSq)]; - - return strongSide == pos.side_to_move() ? result : -result; -} - - /// Some cases of trivial draws template<> Value Endgame::operator()(const Position&) const { return VALUE_DRAW; } -template<> Value Endgame::operator()(const Position&) const { return VALUE_DRAW; } -/// K, bishop and one or more pawns vs K. It checks for draws with rook pawns and +/// KB and one or more pawns vs K. It checks for draws with rook pawns and /// a bishop of the wrong color. If such a draw is detected, SCALE_FACTOR_DRAW /// is returned. If not, the return value is SCALE_FACTOR_NONE, i.e. no scaling /// will be used. @@ -397,7 +371,7 @@ ScaleFactor Endgame::operator()(const Position& pos) const { && !(pawns & ~file_bb(pawnFile))) { Square bishopSq = pos.list(strongSide)[0]; - Square queeningSq = relative_square(strongSide, pawnFile | RANK_8); + Square queeningSq = relative_square(strongSide, make_square(pawnFile, RANK_8)); Square kingSq = pos.king_square(weakSide); if ( opposite_colors(queeningSq, bishopSq) @@ -405,20 +379,20 @@ ScaleFactor Endgame::operator()(const Position& pos) const { return SCALE_FACTOR_DRAW; } - // All pawns on same B or G file? Then potential draw + // If all the pawns are on the same B or G file, then it's potentially a draw if ( (pawnFile == FILE_B || pawnFile == FILE_G) && !(pos.pieces(PAWN) & ~file_bb(pawnFile)) && pos.non_pawn_material(weakSide) == 0 && pos.count(weakSide) >= 1) { - // Get weakSide pawn that is closest to home rank + // Get weakSide pawn that is closest to the home rank Square weakPawnSq = backmost_sq(weakSide, pos.pieces(weakSide, PAWN)); Square strongKingSq = pos.king_square(strongSide); Square weakKingSq = pos.king_square(weakSide); Square bishopSq = pos.list(strongSide)[0]; - // Potential for a draw if our pawn is blocked on the 7th rank + // There's potential for a draw if our pawn is blocked on the 7th rank, // the bishop cannot attack it or they only have one pawn left if ( relative_rank(strongSide, weakPawnSq) == RANK_7 && (pos.pieces(strongSide, PAWN) & (weakPawnSq + pawn_push(weakSide))) @@ -427,7 +401,7 @@ ScaleFactor Endgame::operator()(const Position& pos) const { int strongKingDist = square_distance(weakPawnSq, strongKingSq); int weakKingDist = square_distance(weakPawnSq, weakKingSq); - // Draw if the weak king is on it's back two ranks, within 2 + // It's a draw if the weak king is on its back two ranks, within 2 // squares of the blocking pawn and the strong king is not // closer. (I think this rule only fails in practically // unreachable positions such as 5k1K/6p1/6P1/8/8/3B4/8/8 w @@ -444,8 +418,8 @@ ScaleFactor Endgame::operator()(const Position& pos) const { } -/// K and queen vs K, rook and one or more pawns. It tests for fortress draws with -/// a rook on the third rank defended by a pawn. +/// KQ vs KR and one or more pawns. It tests for fortress draws with a rook on +/// the third rank defended by a pawn. template<> ScaleFactor Endgame::operator()(const Position& pos) const { @@ -468,12 +442,12 @@ ScaleFactor Endgame::operator()(const Position& pos) const { } -/// K, rook and one pawn vs K and a rook. This function knows a handful of the -/// most important classes of drawn positions, but is far from perfect. It would -/// probably be a good idea to add more knowledge in the future. +/// KRP vs KR. This function knows a handful of the most important classes of +/// drawn positions, but is far from perfect. It would probably be a good idea +/// to add more knowledge in the future. /// /// It would also be nice to rewrite the actual code for this function, -/// which is mostly copied from Glaurung 1.x, and not very pretty. +/// which is mostly copied from Glaurung 1.x, and isn't very pretty. template<> ScaleFactor Endgame::operator()(const Position& pos) const { @@ -489,7 +463,7 @@ ScaleFactor Endgame::operator()(const Position& pos) const { File f = file_of(wpsq); Rank r = rank_of(wpsq); - Square queeningSq = f | RANK_8; + Square queeningSq = make_square(f, RANK_8); int tempo = (pos.side_to_move() == strongSide); // If the pawn is not too far advanced and the defending king defends the @@ -555,7 +529,7 @@ ScaleFactor Endgame::operator()(const Position& pos) const { - 8 * square_distance(wpsq, queeningSq) - 2 * square_distance(wksq, queeningSq)); - // If the pawn is not far advanced, and the defending king is somewhere in + // If the pawn is not far advanced and the defending king is somewhere in // the pawn's path, it's probably a draw. if (r <= RANK_4 && bksq > wpsq) { @@ -612,9 +586,8 @@ ScaleFactor Endgame::operator()(const Position& pos) const { return SCALE_FACTOR_NONE; } -/// K, rook and two pawns vs K, rook and one pawn. There is only a single -/// pattern: If the stronger side has no passed pawns and the defending king -/// is actively placed, the position is drawish. +/// KRPP vs KRP. There is just a single rule: if the stronger side has no passed +/// pawns and the defending king is actively placed, the position is drawish. template<> ScaleFactor Endgame::operator()(const Position& pos) const { @@ -661,8 +634,8 @@ ScaleFactor Endgame::operator()(const Position& pos) const { Bitboard pawns = pos.pieces(strongSide, PAWN); Square psq = pos.list(strongSide)[0]; - // If all pawns are ahead of the king, all pawns are on a single - // rook file and the king is within one file of the pawns then draw. + // 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))) && !((pawns & ~FileABB) && (pawns & ~FileHBB)) && file_distance(ksq, psq) <= 1) @@ -672,10 +645,10 @@ ScaleFactor Endgame::operator()(const Position& pos) const { } -/// K, bishop and a pawn vs K and a bishop. There are two rules: If the defending -/// king is somewhere along the path of the pawn, and the square of the king is -/// not of the same color as the stronger side's bishop, it's a draw. If the two -/// bishops have opposite color, it's almost always a draw. +/// KBP vs KB. There are two rules: if the defending king is somewhere along the +/// path of the pawn, and the square of the king is not of the same color as the +/// stronger side's bishop, it's a draw. If the two bishops have opposite color, +/// it's almost always a draw. template<> ScaleFactor Endgame::operator()(const Position& pos) const { @@ -725,8 +698,7 @@ ScaleFactor Endgame::operator()(const Position& pos) const { } -/// K, bishop and two pawns vs K and bishop. It detects a few basic draws with -/// opposite-colored bishops. +/// KBPP vs KB. It detects a few basic draws with opposite-colored bishops template<> ScaleFactor Endgame::operator()(const Position& pos) const { @@ -749,19 +721,19 @@ ScaleFactor Endgame::operator()(const Position& pos) const { if (relative_rank(strongSide, psq1) > relative_rank(strongSide, psq2)) { blockSq1 = psq1 + pawn_push(strongSide); - blockSq2 = file_of(psq2) | rank_of(psq1); + blockSq2 = make_square(file_of(psq2), rank_of(psq1)); } else { blockSq1 = psq2 + pawn_push(strongSide); - blockSq2 = file_of(psq1) | rank_of(psq2); + blockSq2 = make_square(file_of(psq1), rank_of(psq2)); } switch (file_distance(psq1, psq2)) { case 0: - // Both pawns are on the same file. Easy draw if defender firmly controls - // some square in the frontmost pawn's path. + // Both pawns are on the same file. It's an easy draw if the defender firmly + // controls some square in the frontmost pawn's path. if ( file_of(ksq) == file_of(blockSq1) && relative_rank(strongSide, ksq) >= relative_rank(strongSide, blockSq1) && opposite_colors(ksq, wbsq)) @@ -770,9 +742,9 @@ ScaleFactor Endgame::operator()(const Position& pos) const { return SCALE_FACTOR_NONE; case 1: - // Pawns on adjacent files. Draw if defender firmly controls the square - // in front of the frontmost pawn's path, and the square diagonally behind - // this square on the file of the other pawn. + // Pawns on adjacent files. It's a draw if the defender firmly controls the + // square in front of the frontmost pawn's path, and the square diagonally + // behind this square on the file of the other pawn. if ( ksq == blockSq1 && opposite_colors(ksq, wbsq) && ( bbsq == blockSq2 @@ -795,9 +767,9 @@ ScaleFactor Endgame::operator()(const Position& pos) const { } -/// K, bisop and a pawn vs K and knight. There is a single rule: If the defending -/// king is somewhere along the path of the pawn, and the square of the king is -/// not of the same color as the stronger side's bishop, it's a draw. +/// KBP vs KN. There is a single rule: If the defending king is somewhere along +/// the path of the pawn, and the square of the king is not of the same color as +/// the stronger side's bishop, it's a draw. template<> ScaleFactor Endgame::operator()(const Position& pos) const { @@ -818,9 +790,8 @@ ScaleFactor Endgame::operator()(const Position& pos) const { } -/// K, knight and a pawn vs K. There is a single rule: If the pawn is a rook pawn -/// on the 7th rank and the defending king prevents the pawn from advancing, the -/// position is drawn. +/// KNP vs K. There is a single rule: if the pawn is a rook pawn on the 7th rank +/// and the defending king prevents the pawn from advancing, the position is drawn. template<> ScaleFactor Endgame::operator()(const Position& pos) const { @@ -838,8 +809,8 @@ ScaleFactor Endgame::operator()(const Position& pos) const { } -/// K, knight and a pawn vs K and bishop. If knight can block bishop from taking -/// pawn, it's a win. Otherwise, drawn. +/// KNP vs KB. If knight can block bishop from taking pawn, it's a win. +/// Otherwise the position is drawn. template<> ScaleFactor Endgame::operator()(const Position& pos) const { @@ -856,11 +827,11 @@ ScaleFactor Endgame::operator()(const Position& pos) const { } -/// K and a pawn vs K and a pawn. This is done by removing the weakest side's -/// pawn and probing the KP vs K bitbase: If the weakest side has a draw without -/// the pawn, she probably has at least a draw with the pawn as well. The exception -/// is when the stronger side's pawn is far advanced and not on a rook file; in -/// this case it is often possible to win (e.g. 8/4k3/3p4/3P4/6K1/8/8/8 w - - 0 1). +/// KP vs KP. This is done by removing the weakest side's pawn and probing the +/// KP vs K bitbase: If the weakest side has a draw without the pawn, it probably +/// has at least a draw with the pawn as well. The exception is when the stronger +/// side's pawn is far advanced and not on a rook file; in this case it is often +/// possible to win (e.g. 8/4k3/3p4/3P4/6K1/8/8/8 w - - 0 1). template<> ScaleFactor Endgame::operator()(const Position& pos) const { diff --git a/DroidFish/jni/stockfish/endgame.h b/DroidFish/jni/stockfish/endgame.h index 278ddb6..c3d5dd0 100644 --- a/DroidFish/jni/stockfish/endgame.h +++ b/DroidFish/jni/stockfish/endgame.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -42,19 +42,17 @@ enum EndgameType { KRKN, // KR vs KN KQKP, // KQ vs KP KQKR, // KQ vs KR - KBBKN, // KBB vs KN - KmmKm, // K and two minors vs K and one or two minors // Scaling functions SCALE_FUNS, - KBPsK, // KB+pawns vs K - KQKRPs, // KQ vs KR+pawns + KBPsK, // KB and pawns vs K + KQKRPs, // KQ vs KR and pawns KRPKR, // KRP vs KR KRPKB, // KRP vs KB KRPPKRP, // KRPP vs KRP - KPsK, // King and pawns vs king + KPsK, // K and pawns vs K KBPKB, // KBP vs KB KBPPKB, // KBPP vs KB KBPKN, // KBP vs KN @@ -64,9 +62,9 @@ enum EndgameType { }; -/// Endgame functions can be of two types according if return a Value or a -/// ScaleFactor. Type eg_fun::type equals to either ScaleFactor or Value -/// depending if the template parameter is 0 or 1. +/// Endgame functions can be of two types depending on whether they return a +/// Value or a ScaleFactor. Type eg_fun::type returns either ScaleFactor +/// or Value depending on whether the template parameter is 0 or 1. template struct eg_fun { typedef Value type; }; template<> struct eg_fun<1> { typedef ScaleFactor type; }; @@ -95,9 +93,9 @@ private: }; -/// Endgames class stores in two std::map the pointers to endgame evaluation -/// and scaling base objects. Then we use polymorphism to invoke the actual -/// endgame function calling its operator() that is virtual. +/// The Endgames class stores the pointers to endgame evaluation and scaling +/// base objects in two std::map typedefs. We then use polymorphism to invoke +/// the actual endgame function by calling its virtual operator(). class Endgames { diff --git a/DroidFish/jni/stockfish/evaluate.cpp b/DroidFish/jni/stockfish/evaluate.cpp index dd71955..64b1bf4 100644 --- a/DroidFish/jni/stockfish/evaluate.cpp +++ b/DroidFish/jni/stockfish/evaluate.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,10 +17,10 @@ along with this program. If not, see . */ +#include #include #include #include -#include #include "bitcount.h" #include "evaluate.h" @@ -31,20 +31,6 @@ namespace { - enum ExtendedPieceType { // Used for tracing - PST = 8, IMBALANCE, MOBILITY, THREAT, PASSED, SPACE, TOTAL - }; - - namespace Tracing { - - Score scores[COLOR_NB][TOTAL + 1]; - std::stringstream stream; - - void add(int idx, Score term_w, Score term_b = SCORE_ZERO); - void row(const char* name, int idx); - std::string do_trace(const Position& pos); - } - // Struct EvalInfo contains various information computed and collected // by the evaluation functions. struct EvalInfo { @@ -87,12 +73,25 @@ namespace { Bitboard pinnedPieces[COLOR_NB]; }; - // Evaluation grain size, must be a power of 2 - const int GrainSize = 4; + namespace Tracing { + + enum Terms { // First 8 entries are for PieceType + PST = 8, IMBALANCE, MOBILITY, THREAT, PASSED, SPACE, TOTAL, TERMS_NB + }; + + Score terms[COLOR_NB][TERMS_NB]; + EvalInfo ei; + ScaleFactor sf; + + double to_cp(Value v); + void add_term(int idx, Score term_w, Score term_b = SCORE_ZERO); + void format_row(std::stringstream& ss, const char* name, int idx); + std::string do_trace(const Position& pos); + } // Evaluation weights, initialized from UCI options enum { Mobility, PawnStructure, PassedPawns, Space, KingDangerUs, KingDangerThem }; - Score Weights[6]; + struct Weight { int mg, eg; } Weights[6]; typedef Value V; #define S(mg, eg) make_score(mg, eg) @@ -104,34 +103,33 @@ namespace { // // Values modified by Joona Kiiski const Score WeightsInternal[] = { - S(289, 344), S(233, 201), S(221, 273), S(46, 0), S(271, 0), S(307, 0) + S(289, 344), S(233, 201), S(221, 273), S(46, 0), S(271, 0), S(307, 0) }; // MobilityBonus[PieceType][attacked] contains bonuses for middle and end // game, indexed by piece type and number of attacked squares not occupied by // friendly pieces. const Score MobilityBonus[][32] = { - {}, {}, - { S(-35,-30), S(-22,-20), S(-9,-10), S( 3, 0), S(15, 10), S(27, 20), // Knights - S( 37, 28), S( 42, 31), S(44, 33) }, - { S(-22,-27), S( -8,-13), S( 6, 1), S(20, 15), S(34, 29), S(48, 43), // Bishops - S( 60, 55), S( 68, 63), S(74, 68), S(77, 72), S(80, 75), S(82, 77), - S( 84, 79), S( 86, 81) }, - { S(-17,-33), S(-11,-16), S(-5, 0), S( 1, 16), S( 7, 32), S(13, 48), // Rooks - S( 18, 64), S( 22, 80), S(26, 96), S(29,109), S(31,115), S(33,119), - S( 35,122), S( 36,123), S(37,124) }, - { S(-12,-20), S( -8,-13), S(-5, -7), S(-2, -1), S( 1, 5), S( 4, 11), // Queens - S( 7, 17), S( 10, 23), S(13, 29), S(16, 34), S(18, 38), S(20, 40), - S( 22, 41), S( 23, 41), S(24, 41), S(25, 41), S(25, 41), S(25, 41), - S( 25, 41), S( 25, 41), S(25, 41), S(25, 41), S(25, 41), S(25, 41), - S( 25, 41), S( 25, 41), S(25, 41), S(25, 41) } + {}, {}, + { S(-65,-50), S(-42,-30), S(-9,-10), S( 3, 0), S(15, 10), S(27, 20), // Knights + S( 37, 28), S( 42, 31), S(44, 33) }, + { S(-52,-47), S(-28,-23), S( 6, 1), S(20, 15), S(34, 29), S(48, 43), // Bishops + S( 60, 55), S( 68, 63), S(74, 68), S(77, 72), S(80, 75), S(82, 77), + S( 84, 79), S( 86, 81) }, + { S(-47,-53), S(-31,-26), S(-5, 0), S( 1, 16), S( 7, 32), S(13, 48), // Rooks + S( 18, 64), S( 22, 80), S(26, 96), S(29,109), S(31,115), S(33,119), + S( 35,122), S( 36,123), S(37,124) }, + { S(-42,-40), S(-28,-23), S(-5, -7), S( 0, 0), S( 6, 10), S(11, 19), // Queens + S( 13, 29), S( 18, 38), S(20, 40), S(21, 41), S(22, 41), S(22, 41), + S( 22, 41), S( 23, 41), S(24, 41), S(25, 41), S(25, 41), S(25, 41), + S( 25, 41), S( 25, 41), S(25, 41), S(25, 41), S(25, 41), S(25, 41), + S( 25, 41), S( 25, 41), S(25, 41), S(25, 41) } }; - // Outpost[PieceType][Square] contains bonuses of knights and bishops, indexed - // by piece type and square (from white's point of view). + // Outpost[PieceType][Square] contains bonuses for knights and bishops outposts, + // indexed by piece type and square (from white's point of view). const Value Outpost[][SQUARE_NB] = { - { - // A B C D E F G H + {// A B C D E F G H V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), // Knights V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(4), V(8), V(8), V(4), V(0), V(0), @@ -150,11 +148,8 @@ namespace { // Threat[attacking][attacked] contains bonuses according to which piece // type attacks which one. const Score Threat[][PIECE_TYPE_NB] = { - {}, {}, - { S(0, 0), S( 7, 39), S( 0, 0), S(24, 49), S(41,100), S(41,100) }, // KNIGHT - { S(0, 0), S( 7, 39), S(24, 49), S( 0, 0), S(41,100), S(41,100) }, // BISHOP - { S(0, 0), S( 0, 22), S(15, 49), S(15, 49), S( 0, 0), S(24, 49) }, // ROOK - { S(0, 0), S(15, 39), S(15, 39), S(15, 39), S(15, 39), S( 0, 0) } // QUEEN + { S(0, 0), S( 7, 39), S(24, 49), S(24, 49), S(41,100), S(41,100) }, // Minor + { S(0, 0), S(15, 39), S(15, 45), S(15, 45), S(15, 45), S(24, 49) } // Major }; // ThreatenedByPawn[PieceType] contains a penalty according to which piece @@ -163,20 +158,17 @@ namespace { S(0, 0), S(0, 0), S(56, 70), S(56, 70), S(76, 99), S(86, 118) }; + // Hanging[side to move] contains a bonus for each enemy hanging piece + const Score Hanging[2] = { S(23, 20) , S(35, 45) }; + #undef S const Score Tempo = make_score(24, 11); - const Score BishopPin = make_score(66, 11); - const Score RookOn7th = make_score(11, 20); - const Score QueenOn7th = make_score( 3, 8); const Score RookOnPawn = make_score(10, 28); - const Score QueenOnPawn = make_score( 4, 20); const Score RookOpenFile = make_score(43, 21); const Score RookSemiopenFile = make_score(19, 10); const Score BishopPawns = make_score( 8, 12); - const Score KnightPawns = make_score( 8, 4); const Score MinorBehindPawn = make_score(16, 0); - const Score UndefendedMinor = make_score(25, 10); const Score TrappedRook = make_score(90, 0); const Score Unstoppable = make_score( 0, 20); @@ -185,8 +177,8 @@ namespace { // happen in Chess960 games. const Score TrappedBishopA1H1 = make_score(50, 50); - // The SpaceMask[Color] contains the area of the board which is considered - // by the space evaluation. In the middle game, each side is given a bonus + // SpaceMask[Color] contains the area of the board which is considered + // by the space evaluation. In the middlegame, each side is given a bonus // based on how many squares inside this area are safe and available for // friendly minor pieces. const Bitboard SpaceMask[] = { @@ -195,9 +187,9 @@ namespace { }; // King danger constants and variables. The king danger scores are taken - // from the KingDanger[]. Various little "meta-bonuses" measuring - // the strength of the enemy attack are added up into an integer, which - // is used as an index to KingDanger[]. + // from KingDanger[]. Various little "meta-bonuses" measuring the strength + // of the enemy attack are added up into an integer, which is used as an + // index to KingDanger[]. // // KingAttackWeights[PieceType] contains king attack weights by piece type const int KingAttackWeights[] = { 0, 0, 2, 2, 3, 5 }; @@ -210,212 +202,28 @@ namespace { const int BishopCheck = 2; const int KnightCheck = 3; - // KingExposed[Square] contains penalties based on the position of the - // defending king, indexed by king's square (from white's point of view). - const int KingExposed[] = { - 2, 0, 2, 5, 5, 2, 0, 2, - 2, 2, 4, 8, 8, 4, 2, 2, - 7, 10, 12, 12, 12, 12, 10, 7, - 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 15 - }; - // KingDanger[Color][attackUnits] contains the actual king danger weighted // scores, indexed by color and by a calculated integer number. Score KingDanger[COLOR_NB][128]; - // Function prototypes - template - Value do_evaluate(const Position& pos); - template - void init_eval_info(const Position& pos, EvalInfo& ei); - - template - Score evaluate_pieces_of_color(const Position& pos, EvalInfo& ei, Score* mobility); - - template - Score evaluate_king(const Position& pos, const EvalInfo& ei); - - template - Score evaluate_threats(const Position& pos, const EvalInfo& ei); - - template - Score evaluate_passed_pawns(const Position& pos, const EvalInfo& ei); - - template - int evaluate_space(const Position& pos, const EvalInfo& ei); - - Score evaluate_unstoppable_pawns(const Position& pos, Color us, const EvalInfo& ei); - - Value interpolate(const Score& v, Phase ph, ScaleFactor sf); - Score apply_weight(Score v, Score w); - Score weight_option(const std::string& mgOpt, const std::string& egOpt, Score internalWeight); - double to_cp(Value v); -} - - -namespace Eval { - - /// evaluate() is the main evaluation function. It always computes two - /// values, an endgame score and a middle game score, and interpolates - /// between them based on the remaining material. - - Value evaluate(const Position& pos) { - return do_evaluate(pos); + // apply_weight() weighs score 'v' by weight 'w' trying to prevent overflow + Score apply_weight(Score v, const Weight& w) { + return make_score(mg_value(v) * w.mg / 256, eg_value(v) * w.eg / 256); } - /// trace() is like evaluate() but instead of a value returns a string suitable - /// to be print on stdout with the detailed descriptions and values of each - /// evaluation term. Used mainly for debugging. - std::string trace(const Position& pos) { - return Tracing::do_trace(pos); + // weight_option() computes the value of an evaluation weight, by combining + // two UCI-configurable weights (midgame and endgame) with an internal weight. + + Weight weight_option(const std::string& mgOpt, const std::string& egOpt, Score internalWeight) { + + Weight w = { Options[mgOpt] * mg_value(internalWeight) / 100, + Options[egOpt] * eg_value(internalWeight) / 100 }; + return w; } - /// init() computes evaluation weights from the corresponding UCI parameters - /// and setup king tables. - - void init() { - - Weights[Mobility] = weight_option("Mobility (Midgame)", "Mobility (Endgame)", WeightsInternal[Mobility]); - Weights[PawnStructure] = weight_option("Pawn Structure (Midgame)", "Pawn Structure (Endgame)", WeightsInternal[PawnStructure]); - Weights[PassedPawns] = weight_option("Passed Pawns (Midgame)", "Passed Pawns (Endgame)", WeightsInternal[PassedPawns]); - Weights[Space] = weight_option("Space", "Space", WeightsInternal[Space]); - Weights[KingDangerUs] = weight_option("Cowardice", "Cowardice", WeightsInternal[KingDangerUs]); - Weights[KingDangerThem] = weight_option("Aggressiveness", "Aggressiveness", WeightsInternal[KingDangerThem]); - - const int MaxSlope = 30; - const int Peak = 1280; - - for (int t = 0, i = 1; i < 100; ++i) - { - t = std::min(Peak, std::min(int(0.4 * i * i), t + MaxSlope)); - - KingDanger[1][i] = apply_weight(make_score(t, 0), Weights[KingDangerUs]); - KingDanger[0][i] = apply_weight(make_score(t, 0), Weights[KingDangerThem]); - } - } - -} // namespace Eval - - -namespace { - -template -Value do_evaluate(const Position& pos) { - - assert(!pos.checkers()); - - EvalInfo ei; - Score score, mobility[2] = { SCORE_ZERO, SCORE_ZERO }; - Thread* th = pos.this_thread(); - - // Initialize score by reading the incrementally updated scores included - // in the position object (material + piece square tables) and adding - // Tempo bonus. Score is computed from the point of view of white. - score = pos.psq_score() + (pos.side_to_move() == WHITE ? Tempo : -Tempo); - - // Probe the material hash table - ei.mi = Material::probe(pos, th->materialTable, th->endgames); - score += ei.mi->material_value(); - - // If we have a specialized evaluation function for the current material - // configuration, call it and return. - if (ei.mi->specialized_eval_exists()) - return ei.mi->evaluate(pos); - - // Probe the pawn hash table - ei.pi = Pawns::probe(pos, th->pawnsTable); - score += apply_weight(ei.pi->pawns_value(), Weights[PawnStructure]); - - // Initialize attack and king safety bitboards - init_eval_info(pos, ei); - init_eval_info(pos, ei); - - // Evaluate pieces and mobility - score += evaluate_pieces_of_color(pos, ei, mobility) - - evaluate_pieces_of_color(pos, ei, mobility); - - score += apply_weight(mobility[WHITE] - mobility[BLACK], Weights[Mobility]); - - // Evaluate kings after all other pieces because we need complete 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 one side has only a king, score for potential unstoppable pawns - if (!pos.non_pawn_material(WHITE) || !pos.non_pawn_material(BLACK)) - score += evaluate_unstoppable_pawns(pos, WHITE, ei) - - evaluate_unstoppable_pawns(pos, BLACK, ei); - - // Evaluate space for both sides, only in middle-game. - if (ei.mi->space_weight()) - { - int s = evaluate_space(pos, ei) - evaluate_space(pos, ei); - score += apply_weight(s * ei.mi->space_weight(), Weights[Space]); - } - - // Scale winning side if position is more drawish that what it appears - ScaleFactor sf = eg_value(score) > VALUE_DRAW ? ei.mi->scale_factor(pos, WHITE) - : ei.mi->scale_factor(pos, BLACK); - - // If we don't already have an unusual scale factor, check for opposite - // colored bishop endgames, and use a lower scale for those. - if ( ei.mi->game_phase() < PHASE_MIDGAME - && pos.opposite_bishops() - && sf == SCALE_FACTOR_NORMAL) - { - // Only the two bishops ? - if ( pos.non_pawn_material(WHITE) == BishopValueMg - && pos.non_pawn_material(BLACK) == BishopValueMg) - { - // Check for KBP vs KB with only a single pawn that is almost - // certainly a draw or at least two pawns. - bool one_pawn = (pos.count(WHITE) + pos.count(BLACK) == 1); - sf = one_pawn ? ScaleFactor(8) : ScaleFactor(32); - } - else - // Endgame with opposite-colored bishops, but also other pieces. Still - // a bit drawish, but not as drawish as with only the two bishops. - sf = ScaleFactor(50); - } - - Value v = interpolate(score, ei.mi->game_phase(), sf); - - // In case of tracing add all single evaluation contributions for both white and black - if (Trace) - { - Tracing::add(PST, pos.psq_score()); - Tracing::add(IMBALANCE, ei.mi->material_value()); - Tracing::add(PAWN, ei.pi->pawns_value()); - Score w = ei.mi->space_weight() * evaluate_space(pos, ei); - Score b = ei.mi->space_weight() * evaluate_space(pos, ei); - Tracing::add(SPACE, apply_weight(w, Weights[Space]), apply_weight(b, Weights[Space])); - Tracing::add(TOTAL, score); - Tracing::stream << "\nScaling: " << std::noshowpos - << std::setw(6) << 100.0 * ei.mi->game_phase() / 128.0 << "% MG, " - << std::setw(6) << 100.0 * (1.0 - ei.mi->game_phase() / 128.0) << "% * " - << std::setw(6) << (100.0 * sf) / SCALE_FACTOR_NORMAL << "% EG.\n" - << "Total evaluation: " << to_cp(v); - } - - return pos.side_to_move() == WHITE ? v : -v; -} - - // init_eval_info() initializes king bitboards for given color adding // pawn attacks. To be done at the beginning of the evaluation. @@ -428,14 +236,14 @@ Value do_evaluate(const Position& pos) { ei.pinnedPieces[Us] = pos.pinned_pieces(Us); Bitboard b = ei.attackedBy[Them][KING] = pos.attacks_from(pos.king_square(Them)); - ei.attackedBy[Us][PAWN] = ei.pi->pawn_attacks(Us); + ei.attackedBy[Us][ALL_PIECES] = ei.attackedBy[Us][PAWN] = ei.pi->pawn_attacks(Us); // Init king safety tables only if we are going to use them if (pos.count(Us) && pos.non_pawn_material(Us) > QueenValueMg + PawnValueMg) { ei.kingRing[Them] = b | shift_bb(b); b &= ei.attackedBy[Us][PAWN]; - ei.kingAttackersCount[Us] = b ? popcount(b) / 2 : 0; + ei.kingAttackersCount[Us] = b ? popcount(b) : 0; ei.kingAdjacentZoneAttacksCount[Us] = ei.kingAttackersWeight[Us] = 0; } else @@ -443,20 +251,20 @@ Value do_evaluate(const Position& pos) { } - // evaluate_outposts() evaluates bishop and knight outposts squares + // evaluate_outposts() evaluates bishop and knight outpost squares - template + template Score evaluate_outposts(const Position& pos, EvalInfo& ei, Square s) { const Color Them = (Us == WHITE ? BLACK : WHITE); - assert (Piece == BISHOP || Piece == KNIGHT); + assert (Pt == BISHOP || Pt == KNIGHT); // Initial bonus based on square - Value bonus = Outpost[Piece == BISHOP][relative_square(Us, s)]; + Value bonus = Outpost[Pt == BISHOP][relative_square(Us, s)]; // Increase bonus if supported by pawn, especially if the opponent has - // no minor piece which can exchange the outpost piece. + // no minor piece which can trade with the outpost piece. if (bonus && (ei.attackedBy[Us][PAWN] & s)) { if ( !pos.pieces(Them, KNIGHT) @@ -472,69 +280,64 @@ Value do_evaluate(const Position& pos) { // evaluate_pieces() assigns bonuses and penalties to the pieces of a given color - template - Score evaluate_pieces(const Position& pos, EvalInfo& ei, Score* mobility, Bitboard mobilityArea) { + template + Score evaluate_pieces(const Position& pos, EvalInfo& ei, Score* mobility, Bitboard* mobilityArea) { Bitboard b; Square s; Score score = SCORE_ZERO; + const PieceType NextPt = (Us == WHITE ? Pt : PieceType(Pt + 1)); const Color Them = (Us == WHITE ? BLACK : WHITE); - const Square* pl = pos.list(Us); + const Square* pl = pos.list(Us); - ei.attackedBy[Us][Piece] = 0; + ei.attackedBy[Us][Pt] = 0; while ((s = *pl++) != SQ_NONE) { // Find attacked squares, including x-ray attacks for bishops and rooks - b = Piece == BISHOP ? attacks_bb(s, pos.pieces() ^ pos.pieces(Us, QUEEN)) - : Piece == ROOK ? attacks_bb< ROOK>(s, pos.pieces() ^ pos.pieces(Us, ROOK, QUEEN)) - : pos.attacks_from(s); + b = Pt == BISHOP ? attacks_bb(s, pos.pieces() ^ pos.pieces(Us, QUEEN)) + : Pt == ROOK ? attacks_bb< ROOK>(s, pos.pieces() ^ pos.pieces(Us, ROOK, QUEEN)) + : pos.attacks_from(s); if (ei.pinnedPieces[Us] & s) b &= LineBB[pos.king_square(Us)][s]; - ei.attackedBy[Us][Piece] |= b; + ei.attackedBy[Us][ALL_PIECES] |= ei.attackedBy[Us][Pt] |= b; if (b & ei.kingRing[Them]) { ei.kingAttackersCount[Us]++; - ei.kingAttackersWeight[Us] += KingAttackWeights[Piece]; + ei.kingAttackersWeight[Us] += KingAttackWeights[Pt]; Bitboard bb = b & ei.attackedBy[Them][KING]; if (bb) ei.kingAdjacentZoneAttacksCount[Us] += popcount(bb); } - int mob = Piece != QUEEN ? popcount(b & mobilityArea) - : popcount(b & mobilityArea); + if (Pt == QUEEN) + b &= ~( ei.attackedBy[Them][KNIGHT] + | ei.attackedBy[Them][BISHOP] + | ei.attackedBy[Them][ROOK]); - mobility[Us] += MobilityBonus[Piece][mob]; + int mob = Pt != QUEEN ? popcount(b & mobilityArea[Us]) + : popcount(b & mobilityArea[Us]); - // Decrease score if we are attacked by an enemy pawn. Remaining part + mobility[Us] += MobilityBonus[Pt][mob]; + + // Decrease score if we are attacked by an enemy pawn. The remaining part // of threat evaluation must be done later when we have full attack info. if (ei.attackedBy[Them][PAWN] & s) - score -= ThreatenedByPawn[Piece]; + score -= ThreatenedByPawn[Pt]; - // Otherwise give a bonus if we are a bishop and can pin a piece or can - // give a discovered check through an x-ray attack. - else if ( Piece == BISHOP - && (PseudoAttacks[Piece][pos.king_square(Them)] & s) - && !more_than_one(BetweenBB[s][pos.king_square(Them)] & pos.pieces())) - score += BishopPin; - - // Penalty for bishop with same coloured pawns - if (Piece == BISHOP) - score -= BishopPawns * ei.pi->pawns_on_same_color_squares(Us, s); - - // Penalty for knight when there are few enemy pawns - if (Piece == KNIGHT) - score -= KnightPawns * std::max(5 - pos.count(Them), 0); - - if (Piece == BISHOP || Piece == KNIGHT) + if (Pt == BISHOP || Pt == KNIGHT) { + // Penalty for bishop with same colored pawns + if (Pt == BISHOP) + score -= BishopPawns * ei.pi->pawns_on_same_color_squares(Us, s); + // Bishop and knight outposts squares if (!(pos.pieces(Them, PAWN) & pawn_attack_span(Us, s))) - score += evaluate_outposts(pos, ei, s); + score += evaluate_outposts(pos, ei, s); // Bishop or knight behind a pawn if ( relative_rank(Us, s) < RANK_5 @@ -542,88 +345,58 @@ Value do_evaluate(const Position& pos) { score += MinorBehindPawn; } - if ( (Piece == ROOK || Piece == QUEEN) - && relative_rank(Us, s) >= RANK_5) + if (Pt == ROOK) { - // Major piece on 7th rank and enemy king trapped on 8th - if ( relative_rank(Us, s) == RANK_7 - && relative_rank(Us, pos.king_square(Them)) == RANK_8) - score += Piece == ROOK ? RookOn7th : QueenOn7th; + // Rook piece attacking enemy pawns on the same rank/file + if (relative_rank(Us, s) >= RANK_5) + { + Bitboard pawns = pos.pieces(Them, PAWN) & PseudoAttacks[ROOK][s]; + if (pawns) + score += popcount(pawns) * RookOnPawn; + } - // Major piece attacking enemy pawns on the same rank/file - Bitboard pawns = pos.pieces(Them, PAWN) & PseudoAttacks[ROOK][s]; - if (pawns) - score += popcount(pawns) * (Piece == ROOK ? RookOnPawn : QueenOnPawn); - } - - // Special extra evaluation for rooks - if (Piece == ROOK) - { // Give a bonus for a rook on a open or semi-open file - if (ei.pi->semiopen(Us, file_of(s))) - score += ei.pi->semiopen(Them, file_of(s)) ? RookOpenFile : RookSemiopenFile; + if (ei.pi->semiopen_file(Us, file_of(s))) + score += ei.pi->semiopen_file(Them, file_of(s)) ? RookOpenFile : RookSemiopenFile; - if (mob > 3 || ei.pi->semiopen(Us, file_of(s))) + if (mob > 3 || ei.pi->semiopen_file(Us, file_of(s))) continue; Square ksq = pos.king_square(Us); - // Penalize rooks which are trapped inside a king. Penalize more if - // king has lost right to castle. + // Penalize rooks which are trapped by a king. Penalize more if the + // king has lost its castling capability. if ( ((file_of(ksq) < FILE_E) == (file_of(s) < file_of(ksq))) && (rank_of(ksq) == rank_of(s) || relative_rank(Us, ksq) == RANK_1) - && !ei.pi->semiopen_on_side(Us, file_of(ksq), file_of(ksq) < FILE_E)) - score -= (TrappedRook - make_score(mob * 8, 0)) * (pos.can_castle(Us) ? 1 : 2); + && !ei.pi->semiopen_side(Us, file_of(ksq), file_of(s) < file_of(ksq))) + score -= (TrappedRook - make_score(mob * 8, 0)) * (1 + !pos.can_castle(Us)); } // An important Chess960 pattern: A cornered bishop blocked by a friendly // pawn diagonally in front of it is a very serious problem, especially // when that pawn is also blocked. - if ( Piece == BISHOP + if ( Pt == BISHOP && pos.is_chess960() && (s == relative_square(Us, SQ_A1) || s == relative_square(Us, SQ_H1))) { - const enum Piece P = make_piece(Us, PAWN); Square d = pawn_push(Us) + (file_of(s) == FILE_A ? DELTA_E : DELTA_W); - if (pos.piece_on(s + d) == P) - score -= !pos.empty(s + d + pawn_push(Us)) ? TrappedBishopA1H1 * 4 - : pos.piece_on(s + d + d) == P ? TrappedBishopA1H1 * 2 - : TrappedBishopA1H1; + if (pos.piece_on(s + d) == make_piece(Us, PAWN)) + score -= !pos.empty(s + d + pawn_push(Us)) ? TrappedBishopA1H1 * 4 + : pos.piece_on(s + d + d) == make_piece(Us, PAWN) ? TrappedBishopA1H1 * 2 + : TrappedBishopA1H1; } } if (Trace) - Tracing::scores[Us][Piece] = score; + Tracing::terms[Us][Pt] = score; - return score; + return score - evaluate_pieces(pos, ei, mobility, mobilityArea); } - - // evaluate_pieces_of_color() assigns bonuses and penalties to all the - // pieces of a given color. - - template - Score evaluate_pieces_of_color(const Position& pos, EvalInfo& ei, Score* mobility) { - - const Color Them = (Us == WHITE ? BLACK : WHITE); - - // Do not include in mobility squares protected by enemy pawns or occupied by our pieces - const Bitboard mobilityArea = ~(ei.attackedBy[Them][PAWN] | pos.pieces(Us, PAWN, KING)); - - Score score = evaluate_pieces(pos, ei, mobility, mobilityArea) - + evaluate_pieces(pos, ei, mobility, mobilityArea) - + evaluate_pieces(pos, ei, mobility, mobilityArea) - + evaluate_pieces(pos, ei, mobility, mobilityArea); - - // Sum up all attacked squares (updated in evaluate_pieces) - ei.attackedBy[Us][ALL_PIECES] = ei.attackedBy[Us][PAWN] | ei.attackedBy[Us][KNIGHT] - | ei.attackedBy[Us][BISHOP] | ei.attackedBy[Us][ROOK] - | ei.attackedBy[Us][QUEEN] | ei.attackedBy[Us][KING]; - if (Trace) - Tracing::scores[Us][MOBILITY] = apply_weight(mobility[Us], Weights[Mobility]); - - return score; - } + template<> + Score evaluate_pieces(const Position&, EvalInfo&, Score*, Bitboard*) { return SCORE_ZERO; } + template<> + Score evaluate_pieces(const Position&, EvalInfo&, Score*, Bitboard*) { return SCORE_ZERO; } // evaluate_king() assigns bonuses and penalties to a king of a given color @@ -641,10 +414,9 @@ Value do_evaluate(const Position& pos) { Score score = ei.pi->king_safety(pos, ksq); // Main king safety evaluation - if ( ei.kingAttackersCount[Them] >= 2 - && ei.kingAdjacentZoneAttacksCount[Them]) + if (ei.kingAttackersCount[Them]) { - // Find the attacked squares around the king which has no defenders + // Find the attacked squares around the king which have no defenders // apart from the king itself undefended = ei.attackedBy[Them][ALL_PIECES] & ei.attackedBy[Us][KING] @@ -655,46 +427,50 @@ Value do_evaluate(const Position& pos) { // Initialize the 'attackUnits' variable, which is used later on as an // index to the KingDanger[] array. The initial value is based on the // number and types of the enemy's attacking pieces, the number of - // attacked and undefended squares around our king, the square of the - // king, and the quality of the pawn shelter. + // attacked and undefended squares around our king and the quality of + // the pawn shelter (current 'score' value). attackUnits = std::min(20, (ei.kingAttackersCount[Them] * ei.kingAttackersWeight[Them]) / 2) + 3 * (ei.kingAdjacentZoneAttacksCount[Them] + popcount(undefended)) - + KingExposed[relative_square(Us, ksq)] + + 2 * (ei.pinnedPieces[Us] != 0) - mg_value(score) / 32; - // Analyse enemy's safe queen contact checks. First find undefended - // squares around the king attacked by enemy queen... + // Analyse the enemy's safe queen contact checks. Firstly, find the + // undefended squares around the king that are attacked by the enemy's + // queen... b = undefended & ei.attackedBy[Them][QUEEN] & ~pos.pieces(Them); if (b) { - // ...then remove squares not supported by another enemy piece + // ...and then remove squares not supported by another enemy piece b &= ( ei.attackedBy[Them][PAWN] | ei.attackedBy[Them][KNIGHT] | ei.attackedBy[Them][BISHOP] | ei.attackedBy[Them][ROOK]); + if (b) attackUnits += QueenContactCheck * popcount(b) * (Them == pos.side_to_move() ? 2 : 1); } - // Analyse enemy's safe rook contact checks. First find undefended - // squares around the king attacked by enemy rooks... + // Analyse the enemy's safe rook contact checks. Firstly, find the + // undefended squares around the king that are attacked by the enemy's + // rooks... b = undefended & ei.attackedBy[Them][ROOK] & ~pos.pieces(Them); - // Consider only squares where the enemy rook gives check + // Consider only squares where the enemy's rook gives check b &= PseudoAttacks[ROOK][ksq]; if (b) { - // ...then remove squares not supported by another enemy piece + // ...and then remove squares not supported by another enemy piece b &= ( ei.attackedBy[Them][PAWN] | ei.attackedBy[Them][KNIGHT] | ei.attackedBy[Them][BISHOP] | ei.attackedBy[Them][QUEEN]); + if (b) attackUnits += RookContactCheck * popcount(b) * (Them == pos.side_to_move() ? 2 : 1); } - // Analyse enemy's safe distance checks for sliders and knights + // Analyse the enemy's safe distance checks for sliders and knights safe = ~(pos.pieces(Them) | ei.attackedBy[Us][ALL_PIECES]); b1 = pos.attacks_from(ksq) & safe; @@ -729,7 +505,7 @@ Value do_evaluate(const Position& pos) { } if (Trace) - Tracing::scores[Us][KING] = score; + Tracing::terms[Us][KING] = score; return score; } @@ -743,36 +519,33 @@ Value do_evaluate(const Position& pos) { const Color Them = (Us == WHITE ? BLACK : WHITE); - Bitboard b, undefendedMinors, weakEnemies; + Bitboard b, weakEnemies; Score score = SCORE_ZERO; - // Undefended minors get penalized even if not under attack - undefendedMinors = pos.pieces(Them, BISHOP, KNIGHT) - & ~ei.attackedBy[Them][ALL_PIECES]; - - if (undefendedMinors) - score += UndefendedMinor; - - // Enemy pieces not defended by a pawn and under our attack + // Enemies not defended by a pawn and under our attack weakEnemies = pos.pieces(Them) & ~ei.attackedBy[Them][PAWN] & ei.attackedBy[Us][ALL_PIECES]; - // Add bonus according to type of attacked enemy piece and to the - // type of attacking piece, from knights to queens. Kings are not - // considered because are already handled in king evaluation. + // Add a bonus according if the attacking pieces are minor or major if (weakEnemies) - for (PieceType pt1 = KNIGHT; pt1 < KING; ++pt1) - { - b = ei.attackedBy[Us][pt1] & weakEnemies; - if (b) - for (PieceType pt2 = PAWN; pt2 < KING; ++pt2) - if (b & pos.pieces(pt2)) - score += Threat[pt1][pt2]; - } + { + b = weakEnemies & (ei.attackedBy[Us][PAWN] | ei.attackedBy[Us][KNIGHT] | ei.attackedBy[Us][BISHOP]); + if (b) + score += Threat[0][type_of(pos.piece_on(lsb(b)))]; + + b = weakEnemies & (ei.attackedBy[Us][ROOK] | ei.attackedBy[Us][QUEEN]); + if (b) + score += Threat[1][type_of(pos.piece_on(lsb(b)))]; + + b = weakEnemies & ~ei.attackedBy[Them][ALL_PIECES]; + if (b) + score += more_than_one(b) ? Hanging[Us != pos.side_to_move()] * popcount(b) + : Hanging[Us == pos.side_to_move()]; + } if (Trace) - Tracing::scores[Us][THREAT] = score; + Tracing::terms[Us][Tracing::THREAT] = score; return score; } @@ -785,7 +558,7 @@ Value do_evaluate(const Position& pos) { const Color Them = (Us == WHITE ? BLACK : WHITE); - Bitboard b, squaresToQueen, defendedSquares, unsafeSquares, supportingPawns; + Bitboard b, squaresToQueen, defendedSquares, unsafeSquares; Score score = SCORE_ZERO; b = ei.pi->passed_pawns(Us); @@ -796,26 +569,25 @@ Value do_evaluate(const Position& pos) { assert(pos.pawn_passed(Us, s)); - int r = int(relative_rank(Us, s) - RANK_2); + int r = relative_rank(Us, s) - RANK_2; int rr = r * (r - 1); // Base bonus based on rank - Value mbonus = Value(17 * rr); - Value ebonus = Value(7 * (rr + r + 1)); + Value mbonus = Value(17 * rr), ebonus = Value(7 * (rr + r + 1)); if (rr) { Square blockSq = s + pawn_push(Us); - // Adjust bonus based on kings proximity - ebonus += Value(square_distance(pos.king_square(Them), blockSq) * 5 * rr) - - Value(square_distance(pos.king_square(Us ), blockSq) * 2 * rr); + // Adjust bonus based on the king's proximity + ebonus += square_distance(pos.king_square(Them), blockSq) * 5 * rr + - square_distance(pos.king_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 -= Value(square_distance(pos.king_square(Us), blockSq + pawn_push(Us)) * rr); + ebonus -= square_distance(pos.king_square(Us), blockSq + pawn_push(Us)) * rr; - // If the pawn is free to advance, increase bonus + // If the pawn is free to advance, then increase the bonus if (pos.empty(blockSq)) { squaresToQueen = forward_bb(Us, s); @@ -835,64 +607,39 @@ Value do_evaluate(const Position& pos) { else defendedSquares = squaresToQueen & ei.attackedBy[Us][ALL_PIECES]; - // If there aren't enemy attacks huge bonus, a bit smaller if at - // least block square is not attacked, otherwise smallest bonus. - int k = !unsafeSquares ? 15 : !(unsafeSquares & blockSq) ? 9 : 3; + // If there aren't any enemy attacks, assign a big bonus. Otherwise + // assign a smaller bonus if the block square isn't attacked. + int k = !unsafeSquares ? 15 : !(unsafeSquares & blockSq) ? 9 : 0; - // Big bonus if the path to queen is fully defended, a bit less - // if at least block square is defended. + // If the path to queen is fully defended, assign a big bonus. + // Otherwise assign a smaller bonus if the block square is defended. if (defendedSquares == squaresToQueen) k += 6; else if (defendedSquares & blockSq) - k += (unsafeSquares & defendedSquares) == unsafeSquares ? 4 : 2; + k += 4; - mbonus += Value(k * rr), ebonus += Value(k * rr); + mbonus += k * rr, ebonus += k * rr; } } // rr != 0 - // Increase the bonus if the passed pawn is supported by a friendly pawn - // on the same rank and a bit smaller if it's on the previous rank. - supportingPawns = pos.pieces(Us, PAWN) & adjacent_files_bb(file_of(s)); - if (supportingPawns & rank_bb(s)) - ebonus += Value(r * 20); - - else if (supportingPawns & rank_bb(s - pawn_push(Us))) - ebonus += Value(r * 12); - - // Rook pawns are a special case: They are sometimes worse, and - // sometimes better than other passed pawns. It is difficult to find - // good rules for determining whether they are good or bad. For now, - // we try the following: Increase the value for rook pawns if the - // other side has no pieces apart from a knight, and decrease the - // value if the other side has a rook or queen. - if (file_of(s) == FILE_A || file_of(s) == FILE_H) - { - if (pos.non_pawn_material(Them) <= KnightValueMg) - ebonus += ebonus / 4; - - else if (pos.pieces(Them, ROOK, QUEEN)) - ebonus -= ebonus / 4; - } - if (pos.count(Us) < pos.count(Them)) ebonus += ebonus / 4; score += make_score(mbonus, ebonus); - } if (Trace) - Tracing::scores[Us][PASSED] = apply_weight(score, Weights[PassedPawns]); + Tracing::terms[Us][Tracing::PASSED] = apply_weight(score, Weights[PassedPawns]); - // Add the scores to the middle game and endgame eval + // Add the scores to the middlegame and endgame eval return apply_weight(score, Weights[PassedPawns]); } // evaluate_unstoppable_pawns() scores the most advanced among the passed and // candidate pawns. In case opponent has no pieces but pawns, this is somewhat - // related to the possibility pawns are unstoppable. + // related to the possibility that pawns are unstoppable. Score evaluate_unstoppable_pawns(const Position& pos, Color us, const EvalInfo& ei) { @@ -937,104 +684,237 @@ Value do_evaluate(const Position& pos) { } - // interpolate() interpolates between a middle game and an endgame score, - // based on game phase. It also scales the return value by a ScaleFactor array. + // do_evaluate() is the evaluation entry point, called directly from evaluate() - Value interpolate(const Score& v, Phase ph, ScaleFactor sf) { + template + Value do_evaluate(const Position& pos) { - assert(mg_value(v) > -VALUE_INFINITE && mg_value(v) < VALUE_INFINITE); - assert(eg_value(v) > -VALUE_INFINITE && eg_value(v) < VALUE_INFINITE); - assert(ph >= PHASE_ENDGAME && ph <= PHASE_MIDGAME); + assert(!pos.checkers()); - int e = (eg_value(v) * int(sf)) / SCALE_FACTOR_NORMAL; - int r = (mg_value(v) * int(ph) + e * int(PHASE_MIDGAME - ph)) / PHASE_MIDGAME; - return Value((r / GrainSize) * GrainSize); // Sign independent - } + EvalInfo ei; + Score score, mobility[2] = { SCORE_ZERO, SCORE_ZERO }; + Thread* thisThread = pos.this_thread(); - // apply_weight() weights score v by score w trying to prevent overflow - Score apply_weight(Score v, Score w) { - return make_score((int(mg_value(v)) * mg_value(w)) / 0x100, - (int(eg_value(v)) * eg_value(w)) / 0x100); - } + // Initialize score by reading the incrementally updated scores included + // in the position object (material + piece square tables) and adding a + // Tempo bonus. Score is computed from the point of view of white. + score = pos.psq_score() + (pos.side_to_move() == WHITE ? Tempo : -Tempo); - // weight_option() computes the value of an evaluation weight, by combining - // two UCI-configurable weights (midgame and endgame) with an internal weight. + // Probe the material hash table + ei.mi = Material::probe(pos, thisThread->materialTable, thisThread->endgames); + score += ei.mi->material_value(); - Score weight_option(const std::string& mgOpt, const std::string& egOpt, Score internalWeight) { + // If we have a specialized evaluation function for the current material + // configuration, call it and return. + if (ei.mi->specialized_eval_exists()) + return ei.mi->evaluate(pos); - // Scale option value from 100 to 256 - int mg = Options[mgOpt] * 256 / 100; - int eg = Options[egOpt] * 256 / 100; + // Probe the pawn hash table + ei.pi = Pawns::probe(pos, thisThread->pawnsTable); + score += apply_weight(ei.pi->pawns_value(), Weights[PawnStructure]); - return apply_weight(make_score(mg, eg), internalWeight); + // Initialize attack and king safety bitboards + init_eval_info(pos, ei); + init_eval_info(pos, ei); + + ei.attackedBy[WHITE][ALL_PIECES] |= ei.attackedBy[WHITE][KING]; + ei.attackedBy[BLACK][ALL_PIECES] |= ei.attackedBy[BLACK][KING]; + + // Do not include in mobility squares protected by enemy pawns or occupied by our pawns or king + Bitboard mobilityArea[] = { ~(ei.attackedBy[BLACK][PAWN] | pos.pieces(WHITE, PAWN, KING)), + ~(ei.attackedBy[WHITE][PAWN] | pos.pieces(BLACK, PAWN, KING)) }; + + // Evaluate pieces and mobility + score += evaluate_pieces(pos, ei, mobility, mobilityArea); + score += apply_weight(mobility[WHITE] - mobility[BLACK], Weights[Mobility]); + + // Evaluate kings after all other pieces because we need complete 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 one side has only a king, score for potential unstoppable pawns + if (!pos.non_pawn_material(WHITE) || !pos.non_pawn_material(BLACK)) + score += evaluate_unstoppable_pawns(pos, WHITE, ei) + - evaluate_unstoppable_pawns(pos, BLACK, ei); + + // Evaluate space for both sides, only in middlegame + if (ei.mi->space_weight()) + { + int s = evaluate_space(pos, ei) - evaluate_space(pos, ei); + score += apply_weight(s * ei.mi->space_weight(), Weights[Space]); + } + + // Scale winning side if position is more drawish than it appears + ScaleFactor sf = eg_value(score) > VALUE_DRAW ? ei.mi->scale_factor(pos, WHITE) + : ei.mi->scale_factor(pos, BLACK); + + // If we don't already have an unusual scale factor, check for opposite + // colored bishop endgames, and use a lower scale for those. + if ( ei.mi->game_phase() < PHASE_MIDGAME + && pos.opposite_bishops() + && (sf == SCALE_FACTOR_NORMAL || sf == SCALE_FACTOR_ONEPAWN)) + { + // Ignoring any pawns, do both sides only have a single bishop and no + // other pieces? + if ( pos.non_pawn_material(WHITE) == BishopValueMg + && pos.non_pawn_material(BLACK) == BishopValueMg) + { + // Check for KBP vs KB with only a single pawn that is almost + // certainly a draw or at least two pawns. + bool one_pawn = (pos.count(WHITE) + pos.count(BLACK) == 1); + sf = one_pawn ? ScaleFactor(8) : ScaleFactor(32); + } + else + // Endgame with opposite-colored bishops, but also other pieces. Still + // a bit drawish, but not as drawish as with only the two bishops. + sf = ScaleFactor(50 * sf / SCALE_FACTOR_NORMAL); + } + + // Interpolate between a middlegame and a (scaled by 'sf') endgame score + Value v = mg_value(score) * int(ei.mi->game_phase()) + + eg_value(score) * int(PHASE_MIDGAME - ei.mi->game_phase()) * sf / SCALE_FACTOR_NORMAL; + + v /= int(PHASE_MIDGAME); + + // In case of tracing add all single evaluation contributions for both white and black + if (Trace) + { + Tracing::add_term(Tracing::PST, pos.psq_score()); + Tracing::add_term(Tracing::IMBALANCE, ei.mi->material_value()); + Tracing::add_term(PAWN, ei.pi->pawns_value()); + Tracing::add_term(Tracing::MOBILITY, apply_weight(mobility[WHITE], Weights[Mobility]) + , apply_weight(mobility[BLACK], Weights[Mobility])); + Score w = ei.mi->space_weight() * evaluate_space(pos, ei); + Score b = ei.mi->space_weight() * evaluate_space(pos, ei); + Tracing::add_term(Tracing::SPACE, apply_weight(w, Weights[Space]), apply_weight(b, Weights[Space])); + Tracing::add_term(Tracing::TOTAL, score); + Tracing::ei = ei; + Tracing::sf = sf; + } + + return pos.side_to_move() == WHITE ? v : -v; } - // Tracing functions definitions + // Tracing function definitions - double to_cp(Value v) { return double(v) / double(PawnValueMg); } + double Tracing::to_cp(Value v) { return double(v) / PawnValueEg; } - void Tracing::add(int idx, Score wScore, Score bScore) { + void Tracing::add_term(int idx, Score wScore, Score bScore) { - scores[WHITE][idx] = wScore; - scores[BLACK][idx] = bScore; + terms[WHITE][idx] = wScore; + terms[BLACK][idx] = bScore; } - void Tracing::row(const char* name, int idx) { + void Tracing::format_row(std::stringstream& ss, const char* name, int idx) { - Score wScore = scores[WHITE][idx]; - Score bScore = scores[BLACK][idx]; + Score wScore = terms[WHITE][idx]; + Score bScore = terms[BLACK][idx]; switch (idx) { case PST: case IMBALANCE: case PAWN: case TOTAL: - stream << std::setw(20) << name << " | --- --- | --- --- | " - << std::setw(6) << to_cp(mg_value(wScore)) << " " - << std::setw(6) << to_cp(eg_value(wScore)) << " \n"; + ss << std::setw(20) << name << " | --- --- | --- --- | " + << std::setw(5) << to_cp(mg_value(wScore - bScore)) << " " + << std::setw(5) << to_cp(eg_value(wScore - bScore)) << " \n"; break; default: - stream << std::setw(20) << name << " | " << std::noshowpos - << std::setw(5) << to_cp(mg_value(wScore)) << " " - << std::setw(5) << to_cp(eg_value(wScore)) << " | " - << std::setw(5) << to_cp(mg_value(bScore)) << " " - << std::setw(5) << to_cp(eg_value(bScore)) << " | " - << std::showpos - << std::setw(6) << to_cp(mg_value(wScore - bScore)) << " " - << std::setw(6) << to_cp(eg_value(wScore - bScore)) << " \n"; + ss << std::setw(20) << name << " | " << std::noshowpos + << std::setw(5) << to_cp(mg_value(wScore)) << " " + << std::setw(5) << to_cp(eg_value(wScore)) << " | " + << std::setw(5) << to_cp(mg_value(bScore)) << " " + << std::setw(5) << to_cp(eg_value(bScore)) << " | " + << std::setw(5) << to_cp(mg_value(wScore - bScore)) << " " + << std::setw(5) << to_cp(eg_value(wScore - bScore)) << " \n"; } } std::string Tracing::do_trace(const Position& pos) { - stream.str(""); - stream << std::showpoint << std::showpos << std::fixed << std::setprecision(2); - std::memset(scores, 0, 2 * (TOTAL + 1) * sizeof(Score)); + std::memset(terms, 0, sizeof(terms)); - do_evaluate(pos); + Value v = do_evaluate(pos); + v = pos.side_to_move() == WHITE ? v : -v; // White's point of view - std::string totals = stream.str(); - stream.str(""); + std::stringstream ss; + ss << std::showpoint << std::noshowpos << std::fixed << std::setprecision(2) + << " Eval term | White | Black | Total \n" + << " | MG EG | MG EG | MG EG \n" + << "---------------------+-------------+-------------+-------------\n"; - stream << std::setw(21) << "Eval term " << "| White | Black | Total \n" - << " | MG EG | MG EG | MG EG \n" - << "---------------------+-------------+-------------+---------------\n"; + format_row(ss, "Material, PST, Tempo", PST); + format_row(ss, "Material imbalance", IMBALANCE); + format_row(ss, "Pawns", PAWN); + format_row(ss, "Knights", KNIGHT); + format_row(ss, "Bishops", BISHOP); + format_row(ss, "Rooks", ROOK); + format_row(ss, "Queens", QUEEN); + format_row(ss, "Mobility", MOBILITY); + format_row(ss, "King safety", KING); + format_row(ss, "Threats", THREAT); + format_row(ss, "Passed pawns", PASSED); + format_row(ss, "Space", SPACE); - row("Material, PST, Tempo", PST); - row("Material imbalance", IMBALANCE); - row("Pawns", PAWN); - row("Knights", KNIGHT); - row("Bishops", BISHOP); - row("Rooks", ROOK); - row("Queens", QUEEN); - row("Mobility", MOBILITY); - row("King safety", KING); - row("Threats", THREAT); - row("Passed pawns", PASSED); - row("Space", SPACE); + ss << "---------------------+-------------+-------------+-------------\n"; + format_row(ss, "Total", TOTAL); - stream << "---------------------+-------------+-------------+---------------\n"; - row("Total", TOTAL); - stream << totals; + ss << "\nTotal Evaluation: " << to_cp(v) << " (white side)\n"; - return stream.str(); + return ss.str(); } -} + +} // namespace + + +namespace Eval { + + /// evaluate() is the main evaluation function. It returns a static evaluation + /// of the position always from the point of view of the side to move. + + Value evaluate(const Position& pos) { + return do_evaluate(pos); + } + + + /// 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. It's mainly used for + /// debugging. + std::string trace(const Position& pos) { + return Tracing::do_trace(pos); + } + + + /// init() computes evaluation weights from the corresponding UCI parameters + /// and setup king tables. + + void init() { + + Weights[Mobility] = weight_option("Mobility (Midgame)", "Mobility (Endgame)", WeightsInternal[Mobility]); + Weights[PawnStructure] = weight_option("Pawn Structure (Midgame)", "Pawn Structure (Endgame)", WeightsInternal[PawnStructure]); + Weights[PassedPawns] = weight_option("Passed Pawns (Midgame)", "Passed Pawns (Endgame)", WeightsInternal[PassedPawns]); + Weights[Space] = weight_option("Space", "Space", WeightsInternal[Space]); + Weights[KingDangerUs] = weight_option("Cowardice", "Cowardice", WeightsInternal[KingDangerUs]); + Weights[KingDangerThem] = weight_option("Aggressiveness", "Aggressiveness", WeightsInternal[KingDangerThem]); + + const double MaxSlope = 30; + const double Peak = 1280; + + for (int t = 0, i = 1; i < 100; ++i) + { + t = int(std::min(Peak, std::min(0.4 * i * i, t + MaxSlope))); + + KingDanger[1][i] = apply_weight(make_score(t, 0), Weights[KingDangerUs]); + KingDanger[0][i] = apply_weight(make_score(t, 0), Weights[KingDangerThem]); + } + } + +} // namespace Eval diff --git a/DroidFish/jni/stockfish/evaluate.h b/DroidFish/jni/stockfish/evaluate.h index ae9b6e7..73df76a 100644 --- a/DroidFish/jni/stockfish/evaluate.h +++ b/DroidFish/jni/stockfish/evaluate.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/DroidFish/jni/stockfish/main.cpp b/DroidFish/jni/stockfish/main.cpp index c0a9a34..cbb260f 100644 --- a/DroidFish/jni/stockfish/main.cpp +++ b/DroidFish/jni/stockfish/main.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,7 +18,6 @@ */ #include -#include #include "bitboard.h" #include "evaluate.h" @@ -40,14 +39,9 @@ int main(int argc, char* argv[]) { Pawns::init(); Eval::init(); Threads.init(); - TT.set_size(Options["Hash"]); + TT.resize(Options["Hash"]); - std::string args; - - for (int i = 1; i < argc; ++i) - args += std::string(argv[i]) + " "; - - UCI::loop(args); + UCI::loop(argc, argv); Threads.exit(); } diff --git a/DroidFish/jni/stockfish/material.cpp b/DroidFish/jni/stockfish/material.cpp index 068d88e..9a12066 100644 --- a/DroidFish/jni/stockfish/material.cpp +++ b/DroidFish/jni/stockfish/material.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,29 +27,23 @@ using namespace std; namespace { - // Values modified by Joona Kiiski - const Value MidgameLimit = Value(15581); - const Value EndgameLimit = Value(3998); - - // Scale factors used when one side has no more pawns - const int NoPawnsSF[4] = { 6, 12, 32 }; - // Polynomial material balance parameters // pair pawn knight bishop rook queen - const int LinearCoefficients[6] = { 1852, -162, -1122, -183, 249, -52 }; + const int LinearCoefficients[6] = { 1852, -162, -1122, -183, 249, -154 }; - const int QuadraticCoefficientsSameColor[][PIECE_TYPE_NB] = { + const int QuadraticCoefficientsSameSide[][PIECE_TYPE_NB] = { + // OUR PIECES // pair pawn knight bishop rook queen { 0 }, // Bishop pair { 39, 2 }, // Pawn - { 35, 271, -4 }, // Knight + { 35, 271, -4 }, // knight OUR PIECES { 0, 105, 4, 0 }, // Bishop { -27, -2, 46, 100, -141 }, // Rook - { 58, 29, 83, 148, -163, 0 } // Queen + {-177, 25, 129, 142, -137, 0 } // Queen }; - const int QuadraticCoefficientsOppositeColor[][PIECE_TYPE_NB] = { + const int QuadraticCoefficientsOppositeSide[][PIECE_TYPE_NB] = { // THEIR PIECES // pair pawn knight bishop rook queen { 0 }, // Bishop pair @@ -57,12 +51,11 @@ namespace { { 10, 62, 0 }, // Knight OUR PIECES { 57, 64, 39, 0 }, // Bishop { 50, 40, 23, -22, 0 }, // Rook - { 106, 101, 3, 151, 171, 0 } // Queen + { 98, 105, -39, 141, 274, 0 } // Queen }; - // Endgame evaluation and scaling functions accessed direcly and not through - // the function maps because correspond to more then one material hash key. - Endgame EvaluateKmmKm[] = { Endgame(WHITE), Endgame(BLACK) }; + // 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) }; Endgame ScaleKBPsK[] = { Endgame(WHITE), Endgame(BLACK) }; @@ -93,7 +86,7 @@ namespace { && pos.count(Them) >= 1; } - /// imbalance() calculates imbalance comparing piece count of each + /// imbalance() calculates the imbalance by comparing the piece count of each /// piece type for both colors. template @@ -114,11 +107,12 @@ namespace { v = LinearCoefficients[pt1]; for (pt2 = NO_PIECE_TYPE; pt2 <= pt1; ++pt2) - v += QuadraticCoefficientsSameColor[pt1][pt2] * pieceCount[Us][pt2] - + QuadraticCoefficientsOppositeColor[pt1][pt2] * pieceCount[Them][pt2]; + v += QuadraticCoefficientsSameSide[pt1][pt2] * pieceCount[Us][pt2] + + QuadraticCoefficientsOppositeSide[pt1][pt2] * pieceCount[Them][pt2]; value += pc * v; } + return value; } @@ -147,9 +141,9 @@ Entry* probe(const Position& pos, Table& entries, Endgames& endgames) { e->factor[WHITE] = e->factor[BLACK] = (uint8_t)SCALE_FACTOR_NORMAL; e->gamePhase = game_phase(pos); - // Let's look if we have a specialized evaluation function for this - // particular material configuration. First we look for a fixed - // configuration one, then a generic one if previous search failed. + // Let's look if we have a specialized evaluation function for this particular + // material configuration. Firstly we look for a fixed configuration one, then + // for a generic one if the previous search failed. if (endgames.probe(key, e->evaluationFunction)) return e; @@ -165,21 +159,6 @@ Entry* probe(const Position& pos, Table& entries, Endgames& endgames) { return e; } - if (!pos.pieces(PAWN) && !pos.pieces(ROOK) && !pos.pieces(QUEEN)) - { - // Minor piece endgame with at least one minor piece per side and - // no pawns. Note that the case KmmK is already handled by KXK. - assert((pos.pieces(WHITE, KNIGHT) | pos.pieces(WHITE, BISHOP))); - assert((pos.pieces(BLACK, KNIGHT) | pos.pieces(BLACK, BISHOP))); - - if ( pos.count(WHITE) + pos.count(WHITE) <= 2 - && pos.count(BLACK) + pos.count(BLACK) <= 2) - { - e->evaluationFunction = &EvaluateKmmKm[pos.side_to_move()]; - return e; - } - } - // OK, we didn't find any special evaluation function for the current // material configuration. Is there a suitable scaling function? // @@ -193,8 +172,8 @@ Entry* probe(const Position& pos, Table& entries, Endgames& endgames) { return e; } - // Generic scaling functions that refer to more then one material - // distribution. Should be probed after the specialized ones. + // Generic scaling functions that refer to more than one material + // distribution. They should be probed after the specialized ones. // Note that these ones don't return after setting the function. if (is_KBPsKs(pos)) e->scalingFunction[WHITE] = &ScaleKBPsK[WHITE]; @@ -211,7 +190,7 @@ Entry* probe(const Position& pos, Table& entries, Endgames& endgames) { Value npm_w = pos.non_pawn_material(WHITE); Value npm_b = pos.non_pawn_material(BLACK); - if (npm_w + npm_b == VALUE_ZERO) + if (npm_w + npm_b == VALUE_ZERO && pos.pieces(PAWN)) { if (!pos.count(BLACK)) { @@ -233,18 +212,19 @@ Entry* probe(const Position& pos, Table& entries, Endgames& endgames) { } // No pawns makes it difficult to win, even with a material advantage. This - // catches some trivial draws like KK, KBK and KNK + // catches some trivial draws like KK, KBK and KNK and gives a very drawish + // scale factor for cases such as KRKBP and KmmKm (except for KBBKN). if (!pos.count(WHITE) && npm_w - npm_b <= BishopValueMg) - { - e->factor[WHITE] = (uint8_t) - (npm_w == npm_b || npm_w < RookValueMg ? 0 : NoPawnsSF[std::min(pos.count(WHITE), 2)]); - } + e->factor[WHITE] = uint8_t(npm_w < RookValueMg ? SCALE_FACTOR_DRAW : npm_b <= BishopValueMg ? 4 : 12); if (!pos.count(BLACK) && npm_b - npm_w <= BishopValueMg) - { - e->factor[BLACK] = (uint8_t) - (npm_w == npm_b || npm_b < RookValueMg ? 0 : NoPawnsSF[std::min(pos.count(BLACK), 2)]); - } + e->factor[BLACK] = uint8_t(npm_b < RookValueMg ? SCALE_FACTOR_DRAW : npm_w <= BishopValueMg ? 4 : 12); + + if (pos.count(WHITE) == 1 && npm_w - npm_b <= BishopValueMg) + e->factor[WHITE] = (uint8_t) SCALE_FACTOR_ONEPAWN; + + if (pos.count(BLACK) == 1 && npm_b - npm_w <= BishopValueMg) + e->factor[BLACK] = (uint8_t) SCALE_FACTOR_ONEPAWN; // Compute the space weight if (npm_w + npm_b >= 2 * QueenValueMg + 4 * RookValueMg + 2 * KnightValueMg) @@ -256,7 +236,7 @@ Entry* probe(const Position& pos, Table& entries, Endgames& endgames) { } // Evaluate the material imbalance. We use PIECE_TYPE_NONE as a place holder - // for the bishop pair "extended piece", this allow us to be more flexible + // for the bishop pair "extended piece", which allows us to be more flexible // in defining bishop pair bonuses. const int pieceCount[COLOR_NB][PIECE_TYPE_NB] = { { pos.count(WHITE) > 1, pos.count(WHITE), pos.count(WHITE), diff --git a/DroidFish/jni/stockfish/material.h b/DroidFish/jni/stockfish/material.h index cbf6e55..9116361 100644 --- a/DroidFish/jni/stockfish/material.h +++ b/DroidFish/jni/stockfish/material.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -42,8 +42,19 @@ struct Entry { Score space_weight() const { return spaceWeight; } Phase game_phase() const { return gamePhase; } bool specialized_eval_exists() const { return evaluationFunction != NULL; } - Value evaluate(const Position& p) const { return (*evaluationFunction)(p); } - ScaleFactor scale_factor(const Position& pos, Color c) const; + Value evaluate(const Position& pos) const { return (*evaluationFunction)(pos); } + + // scale_factor takes a position and a color as input, and returns a scale factor + // for the given color. We have to provide the position in addition to the color, + // because the scale factor need not be a constant: It can also be a function + // which should be applied to the position. For instance, in KBP vs K endgames, + // a scaling function for draws with rook pawns and wrong-colored bishops. + + ScaleFactor scale_factor(const Position& pos, Color c) const { + + return !scalingFunction[c] || (*scalingFunction[c])(pos) == SCALE_FACTOR_NONE + ? ScaleFactor(factor[c]) : (*scalingFunction[c])(pos); + } Key key; int16_t value; @@ -59,19 +70,6 @@ typedef HashTable Table; Entry* probe(const Position& pos, Table& entries, Endgames& endgames); Phase game_phase(const Position& pos); -/// Material::scale_factor takes a position and a color as input, and -/// returns a scale factor for the given color. We have to provide the -/// position in addition to the color, because the scale factor need not -/// to be a constant: It can also be a function which should be applied to -/// the position. For instance, in KBP vs K endgames, a scaling function -/// which checks for draws with rook pawns and wrong-colored bishops. - -inline ScaleFactor Entry::scale_factor(const Position& pos, Color c) const { - - return !scalingFunction[c] || (*scalingFunction[c])(pos) == SCALE_FACTOR_NONE - ? ScaleFactor(factor[c]) : (*scalingFunction[c])(pos); -} - -} +} // namespace Material #endif // #ifndef MATERIAL_H_INCLUDED diff --git a/DroidFish/jni/stockfish/misc.cpp b/DroidFish/jni/stockfish/misc.cpp index d11ab8d..ebbb778 100644 --- a/DroidFish/jni/stockfish/misc.cpp +++ b/DroidFish/jni/stockfish/misc.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,9 +26,9 @@ using namespace std; -/// Version number. If Version is left empty, then compile date, in the -/// format DD-MM-YY, is shown in engine_info. -static const string Version = "DD"; +/// Version number. If Version is left empty, then compile date in the format +/// DD-MM-YY and show in engine_info. +static const string Version = "5"; /// engine_info() returns the full name of the current Stockfish version. This @@ -40,28 +40,28 @@ const string engine_info(bool to_uci) { const string months("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec"); string month, day, year; - stringstream s, date(__DATE__); // From compiler, format is "Sep 21 2008" + stringstream ss, date(__DATE__); // From compiler, format is "Sep 21 2008" - s << "Stockfish " << Version << setfill('0'); + ss << "Stockfish " << Version << setfill('0'); if (Version.empty()) { date >> month >> day >> year; - s << setw(2) << day << setw(2) << (1 + months.find(month) / 4) << year.substr(2); + ss << setw(2) << day << setw(2) << (1 + months.find(month) / 4) << year.substr(2); } - s << (Is64Bit ? " 64" : "") - << (HasPopCnt ? " SSE4.2" : "") - << (to_uci ? "\nid author ": " by ") - << "Tord Romstad, Marco Costalba and Joona Kiiski"; + ss << (Is64Bit ? " 64" : "") + << (HasPext ? " BMI2" : (HasPopCnt ? " SSE4.2" : "")) + << (to_uci ? "\nid author ": " by ") + << "Tord Romstad, Marco Costalba and Joona Kiiski"; - return s.str(); + return ss.str(); } /// Debug functions used mainly to collect run-time statistics -static uint64_t hits[2], means[2]; +static int64_t hits[2], means[2]; void dbg_hit_on(bool b) { ++hits[0]; if (b) ++hits[1]; } void dbg_hit_on_c(bool c, bool b) { if (c) dbg_hit_on(b); } @@ -81,8 +81,8 @@ void dbg_print() { /// 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 -/// can toggle the logging of std::cout and std:cin at runtime while preserving -/// usual i/o functionality and without changing a single line of code! +/// can toggle the logging of std::cout and std:cin at runtime whilst preserving +/// usual i/o functionality, all without changing a single line of code! /// Idea from http://groups.google.com/group/comp.lang.c++/msg/1d941c0f26ea0d81 struct Tie: public streambuf { // MSVC requires splitted streambuf for cin and cout @@ -137,17 +137,17 @@ public: }; -/// Used to serialize access to std::cout to avoid multiple threads to write at +/// Used to serialize access to std::cout to avoid multiple threads writing at /// the same time. std::ostream& operator<<(std::ostream& os, SyncCout sc) { static Mutex m; - if (sc == io_lock) + if (sc == IO_LOCK) m.lock(); - if (sc == io_unlock) + if (sc == IO_UNLOCK) m.unlock(); return os; @@ -158,8 +158,8 @@ std::ostream& operator<<(std::ostream& os, SyncCout sc) { void start_logger(bool b) { Logger::start(b); } -/// timed_wait() waits for msec milliseconds. It is mainly an helper to wrap -/// conversion from milliseconds to struct timespec, as used by pthreads. +/// timed_wait() waits for msec milliseconds. It is mainly a helper to wrap +/// the conversion from milliseconds to struct timespec, as used by pthreads. void timed_wait(WaitCondition& sleepCond, Lock& sleepLock, int msec) { @@ -177,9 +177,9 @@ void timed_wait(WaitCondition& sleepCond, Lock& sleepLock, int msec) { } -/// prefetch() preloads the given address in L1/L2 cache. This is a non -/// blocking function and do not stalls the CPU waiting for data to be -/// loaded from memory, that can be quite slow. +/// prefetch() preloads the given address in L1/L2 cache. This is a non-blocking +/// function that doesn't stall the CPU waiting for data to be loaded from memory, +/// which can be quite slow. #ifdef NO_PREFETCH void prefetch(char*) {} @@ -189,8 +189,8 @@ void prefetch(char*) {} void prefetch(char* addr) { # if defined(__INTEL_COMPILER) - // This hack prevents prefetches to be optimized away by - // Intel compiler. Both MSVC and gcc seems not affected. + // This hack prevents prefetches from being optimized away by + // Intel compiler. Both MSVC and gcc seem not be affected by this. __asm__ (""); # endif diff --git a/DroidFish/jni/stockfish/misc.h b/DroidFish/jni/stockfish/misc.h index 82baa58..92bde8f 100644 --- a/DroidFish/jni/stockfish/misc.h +++ b/DroidFish/jni/stockfish/misc.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -51,18 +51,18 @@ namespace Time { template struct HashTable { - HashTable() : e(Size, Entry()) {} - Entry* operator[](Key k) { return &e[(uint32_t)k & (Size - 1)]; } + HashTable() : table(Size, Entry()) {} + Entry* operator[](Key k) { return &table[(uint32_t)k & (Size - 1)]; } private: - std::vector e; + std::vector table; }; -enum SyncCout { io_lock, io_unlock }; +enum SyncCout { IO_LOCK, IO_UNLOCK }; std::ostream& operator<<(std::ostream&, SyncCout); -#define sync_cout std::cout << io_lock -#define sync_endl std::endl << io_unlock +#define sync_cout std::cout << IO_LOCK +#define sync_endl std::endl << IO_UNLOCK #endif // #ifndef MISC_H_INCLUDED diff --git a/DroidFish/jni/stockfish/movegen.cpp b/DroidFish/jni/stockfish/movegen.cpp index a3623a6..dab830b 100644 --- a/DroidFish/jni/stockfish/movegen.cpp +++ b/DroidFish/jni/stockfish/movegen.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,34 +22,29 @@ #include "movegen.h" #include "position.h" -/// Simple macro to wrap a very common while loop, no facny, no flexibility, -/// hardcoded names 'mlist' and 'from'. -#define SERIALIZE(b) while (b) (mlist++)->move = make_move(from, pop_lsb(&b)) - -/// Version used for pawns, where the 'from' square is given as a delta from the 'to' square -#define SERIALIZE_PAWNS(b, d) while (b) { Square to = pop_lsb(&b); \ - (mlist++)->move = make_move(to - (d), to); } namespace { - template - ExtMove* generate_castle(const Position& pos, ExtMove* mlist, Color us) { + template + ExtMove* generate_castling(const Position& pos, ExtMove* mlist, Color us, const CheckInfo* ci) { - if (pos.castle_impeded(us, Side) || !pos.can_castle(make_castle_right(us, Side))) + static const bool KingSide = (Cr == WHITE_OO || Cr == BLACK_OO); + + if (pos.castling_impeded(Cr) || !pos.can_castle(Cr)) return mlist; // After castling, the rook and king final positions are the same in Chess960 // as they would be in standard chess. Square kfrom = pos.king_square(us); - Square rfrom = pos.castle_rook_square(us, Side); - Square kto = relative_square(us, Side == KING_SIDE ? SQ_G1 : SQ_C1); + Square rfrom = pos.castling_rook_square(Cr); + Square kto = relative_square(us, KingSide ? SQ_G1 : SQ_C1); Bitboard enemies = pos.pieces(~us); assert(!pos.checkers()); - const int K = Chess960 ? kto > kfrom ? -1 : 1 - : Side == KING_SIDE ? -1 : 1; + const Square K = Chess960 ? kto > kfrom ? DELTA_W : DELTA_E + : KingSide ? DELTA_W : DELTA_E; - for (Square s = kto; s != kfrom; s += (Square)K) + for (Square s = kto; s != kfrom; s += K) if (pos.attackers_to(s) & enemies) return mlist; @@ -59,10 +54,12 @@ namespace { if (Chess960 && (attacks_bb(kto, pos.pieces() ^ rfrom) & pos.pieces(~us, ROOK, QUEEN))) return mlist; - (mlist++)->move = make(kfrom, rfrom); + Move m = make(kfrom, rfrom); - if (Checks && !pos.gives_check((mlist - 1)->move, CheckInfo(pos))) - --mlist; + if (Checks && !pos.gives_check(m, *ci)) + return mlist; + + (mlist++)->move = m; return mlist; } @@ -88,8 +85,8 @@ namespace { (mlist++)->move = make(to - Delta, to, KNIGHT); } - // Knight-promotion is the only one that can give a direct check not - // already included in the queen-promotion. + // 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] & ci->ksq)) (mlist++)->move = make(to - Delta, to, KNIGHT); else @@ -144,7 +141,7 @@ namespace { // Add pawn pushes which give discovered check. This is possible only // if the pawn is not on the same file as the enemy king, because we // don't generate captures. Note that a possible discovery check - // promotion has been already generated among captures. + // promotion has been already generated amongst the captures. if (pawnsNotOn7 & ci->dcCandidates) { dc1 = shift_bb(pawnsNotOn7 & ci->dcCandidates) & emptySquares & ~file_bb(ci->ksq); @@ -155,8 +152,17 @@ namespace { } } - SERIALIZE_PAWNS(b1, Up); - SERIALIZE_PAWNS(b2, Up + Up); + while (b1) + { + Square to = pop_lsb(&b1); + (mlist++)->move = make_move(to - Up, to); + } + + while (b2) + { + Square to = pop_lsb(&b2); + (mlist++)->move = make_move(to - Up - Up, to); + } } // Promotions and underpromotions @@ -179,8 +185,17 @@ namespace { b1 = shift_bb(pawnsNotOn7) & enemies; b2 = shift_bb(pawnsNotOn7) & enemies; - SERIALIZE_PAWNS(b1, Right); - SERIALIZE_PAWNS(b2, Left); + while (b1) + { + Square to = pop_lsb(&b1); + (mlist++)->move = make_move(to - Right, to); + } + + while (b2) + { + Square to = pop_lsb(&b2); + (mlist++)->move = make_move(to - Left, to); + } if (pos.ep_square() != SQ_NONE) { @@ -230,7 +245,8 @@ namespace { if (Checks) b &= ci->checkSq[Pt]; - SERIALIZE(b); + while (b) + (mlist++)->move = make_move(from, pop_lsb(&b)); } return mlist; @@ -251,22 +267,23 @@ namespace { if (Type != QUIET_CHECKS && Type != EVASIONS) { - Square from = pos.king_square(Us); - Bitboard b = pos.attacks_from(from) & target; - SERIALIZE(b); + Square ksq = pos.king_square(Us); + Bitboard b = pos.attacks_from(ksq) & target; + while (b) + (mlist++)->move = make_move(ksq, pop_lsb(&b)); } if (Type != CAPTURES && Type != EVASIONS && pos.can_castle(Us)) { if (pos.is_chess960()) { - mlist = generate_castle< KING_SIDE, Checks, true>(pos, mlist, Us); - mlist = generate_castle(pos, mlist, Us); + mlist = generate_castling::right, Checks, true>(pos, mlist, Us, ci); + mlist = generate_castling::right, Checks, true>(pos, mlist, Us, ci); } else { - mlist = generate_castle< KING_SIDE, Checks, false>(pos, mlist, Us); - mlist = generate_castle(pos, mlist, Us); + mlist = generate_castling::right, Checks, false>(pos, mlist, Us, ci); + mlist = generate_castling::right, Checks, false>(pos, mlist, Us, ci); } } @@ -325,14 +342,15 @@ ExtMove* generate(const Position& pos, ExtMove* mlist) { PieceType pt = type_of(pos.piece_on(from)); if (pt == PAWN) - continue; // Will be generated togheter with direct checks + continue; // Will be generated together with direct checks Bitboard b = pos.attacks_from(Piece(pt), from) & ~pos.pieces(); if (pt == KING) b &= ~PseudoAttacks[QUEEN][ci.ksq]; - SERIALIZE(b); + while (b) + (mlist++)->move = make_move(from, pop_lsb(&b)); } return us == WHITE ? generate_all(pos, mlist, ~pos.pieces(), &ci) @@ -347,36 +365,30 @@ ExtMove* generate(const Position& pos, ExtMove* mlist) { assert(pos.checkers()); - int checkersCnt = 0; Color us = pos.side_to_move(); - Square ksq = pos.king_square(us), from = ksq /* For SERIALIZE */, checksq; + Square ksq = pos.king_square(us); Bitboard sliderAttacks = 0; - Bitboard b = pos.checkers(); + Bitboard sliders = pos.checkers() & ~pos.pieces(KNIGHT, PAWN); - assert(pos.checkers()); - - // Find squares attacked by slider checkers, we will remove them from the king - // evasions so to skip known illegal moves avoiding useless legality check later. - do + // Find all the squares attacked by slider checkers. We will remove them from + // the king evasions in order to skip known illegal moves, which avoids any + // useless legality checks later on. + while (sliders) { - ++checkersCnt; - checksq = pop_lsb(&b); - - assert(color_of(pos.piece_on(checksq)) == ~us); - - if (type_of(pos.piece_on(checksq)) > KNIGHT) // A slider - sliderAttacks |= LineBB[checksq][ksq] ^ checksq; - - } while (b); + Square checksq = pop_lsb(&sliders); + sliderAttacks |= LineBB[checksq][ksq] ^ checksq; + } // Generate evasions for king, capture and non capture moves - b = pos.attacks_from(ksq) & ~pos.pieces(us) & ~sliderAttacks; - SERIALIZE(b); + Bitboard b = pos.attacks_from(ksq) & ~pos.pieces(us) & ~sliderAttacks; + while (b) + (mlist++)->move = make_move(ksq, pop_lsb(&b)); - if (checkersCnt > 1) + if (more_than_one(pos.checkers())) return mlist; // Double check, only a king move can save the day // Generate blocking evasions or captures of the checking piece + Square checksq = lsb(pos.checkers()); Bitboard target = between_bb(checksq, ksq) | checksq; return us == WHITE ? generate_all(pos, mlist, target) diff --git a/DroidFish/jni/stockfish/movegen.h b/DroidFish/jni/stockfish/movegen.h index c93252a..c18fa07 100644 --- a/DroidFish/jni/stockfish/movegen.h +++ b/DroidFish/jni/stockfish/movegen.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -36,8 +36,8 @@ class Position; template ExtMove* generate(const Position& pos, ExtMove* mlist); -/// The MoveList struct is a simple wrapper around generate(), sometimes comes -/// handy to use this class instead of the low level generate() function. +/// The MoveList struct is a simple wrapper around generate(). It sometimes comes +/// in handy to use this class instead of the low level generate() function. template struct MoveList { diff --git a/DroidFish/jni/stockfish/movepick.cpp b/DroidFish/jni/stockfish/movepick.cpp index 8baf32a..95172b9 100644 --- a/DroidFish/jni/stockfish/movepick.cpp +++ b/DroidFish/jni/stockfish/movepick.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -35,7 +35,7 @@ namespace { STOP }; - // Our insertion sort, guaranteed to be stable, as is needed + // Our insertion sort, which is guaranteed (and also needed) to be stable void insertion_sort(ExtMove* begin, ExtMove* end) { ExtMove tmp, *p, *q; @@ -49,13 +49,13 @@ namespace { } } - // Unary predicate used by std::partition to split positive scores from remaining - // ones so to sort separately the two sets, and with the second sort delayed. - inline bool has_positive_score(const ExtMove& ms) { return ms.score > 0; } + // Unary predicate used by std::partition to split positive values from remaining + // ones so as to sort the two sets separately, with the second sort delayed. + inline bool has_positive_value(const ExtMove& ms) { return ms.value > 0; } - // Picks and moves to the front the best move in the range [begin, end), - // it is faster than sorting all the moves in advance when moves are few, as - // normally are the possible captures. + // Picks 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. possible captures. inline ExtMove* pick_best(ExtMove* begin, ExtMove* end) { std::swap(*begin, *std::max_element(begin, end)); @@ -65,22 +65,23 @@ namespace { /// Constructors of the MovePicker class. As arguments we pass information -/// to help it to return the presumably good moves first, to decide which +/// to help it to return the (presumably) good moves first, to decide which /// moves to return (in the quiescence search, for instance, we only want to -/// search captures, promotions and some checks) and about how important good -/// move ordering is at the current node. +/// 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, const HistoryStats& h, - Move* cm, Search::Stack* s) : pos(p), history(h), depth(d) { + Move* cm, Move* fm, Search::Stack* s) : pos(p), history(h), depth(d) { assert(d > DEPTH_ZERO); cur = end = moves; endBadCaptures = moves + MAX_MOVES - 1; countermoves = cm; + followupmoves = fm; ss = s; - if (p.checkers()) + if (pos.checkers()) stage = EVASION; else @@ -91,11 +92,11 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& } MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h, - Square sq) : pos(p), history(h), cur(moves), end(moves) { + Square s) : pos(p), history(h), cur(moves), end(moves) { assert(d <= DEPTH_ZERO); - if (p.checkers()) + if (pos.checkers()) stage = EVASION; else if (d > DEPTH_QS_NO_CHECKS) @@ -105,7 +106,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& { stage = QSEARCH_1; - // Skip TT move if is not a capture or a promotion, this avoids qsearch + // Skip TT move if is not a capture or a promotion. This avoids qsearch // tree explosion due to a possible perpetual check or similar rare cases // when TT table is full. if (ttm && !pos.capture_or_promotion(ttm)) @@ -114,7 +115,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& else { stage = RECAPTURE; - recaptureSquare = sq; + recaptureSquare = s; ttm = MOVE_NONE; } @@ -129,7 +130,8 @@ MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, Piece stage = PROBCUT; - // In ProbCut we generate only captures better than parent's captured piece + // In ProbCut we generate only captures that are better than the parent's + // captured piece. captureThreshold = PieceValue[MG][pt]; ttMove = (ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE); @@ -140,8 +142,8 @@ MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, Piece } -/// score() assign a numerical move ordering score to each move in a move list. -/// The moves with highest scores will be picked first. +/// score() assign 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/LVA. @@ -153,23 +155,23 @@ void MovePicker::score() { // where it is possible to recapture with the hanging piece). Exchanging // big pieces before capturing a hanging piece probably helps to reduce // the subtree size. - // In main search we want to push captures with negative SEE values to - // badCaptures[] array, but instead of doing it now we delay till when - // the move has been picked up in pick_move_from_list(), this way we save - // some SEE calls in case we get a cutoff (idea from Pablo Vazquez). + // In 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 in pick_move_from_list(). This way we save some SEE + // calls in case we get a cutoff. Move m; for (ExtMove* it = moves; it != end; ++it) { m = it->move; - it->score = PieceValue[MG][pos.piece_on(to_sq(m))] - - type_of(pos.moved_piece(m)); + it->value = PieceValue[MG][pos.piece_on(to_sq(m))] + - Value(type_of(pos.moved_piece(m))); - if (type_of(m) == PROMOTION) - it->score += PieceValue[MG][promotion_type(m)] - PieceValue[MG][PAWN]; + if (type_of(m) == ENPASSANT) + it->value += PieceValue[MG][PAWN]; - else if (type_of(m) == ENPASSANT) - it->score += PieceValue[MG][PAWN]; + else if (type_of(m) == PROMOTION) + it->value += PieceValue[MG][promotion_type(m)] - PieceValue[MG][PAWN]; } } @@ -181,7 +183,7 @@ void MovePicker::score() { for (ExtMove* it = moves; it != end; ++it) { m = it->move; - it->score = history[pos.moved_piece(m)][to_sq(m)]; + it->value = history[pos.moved_piece(m)][to_sq(m)]; } } @@ -189,29 +191,29 @@ template<> void MovePicker::score() { // Try good captures ordered by MVV/LVA, then non-captures if destination square // is not under attack, ordered by history value, then bad-captures and quiet - // moves with a negative SEE. This last group is ordered by the SEE score. + // moves with a negative SEE. This last group is ordered by the SEE value. Move m; - int seeScore; + Value see; for (ExtMove* it = moves; it != end; ++it) { m = it->move; - if ((seeScore = pos.see_sign(m)) < 0) - it->score = seeScore - HistoryStats::Max; // At the bottom + if ((see = pos.see_sign(m)) < VALUE_ZERO) + it->value = see - HistoryStats::Max; // At the bottom else if (pos.capture(m)) - it->score = PieceValue[MG][pos.piece_on(to_sq(m))] - - type_of(pos.moved_piece(m)) + HistoryStats::Max; + it->value = PieceValue[MG][pos.piece_on(to_sq(m))] + - Value(type_of(pos.moved_piece(m))) + HistoryStats::Max; else - it->score = history[pos.moved_piece(m)][to_sq(m)]; + it->value = history[pos.moved_piece(m)][to_sq(m)]; } } -/// generate_next() generates, scores and sorts the next bunch of moves, when -/// there are no more moves to try for the current phase. +/// generate_next_stage() generates, scores and sorts the next bunch of moves, +/// when there are no more moves to try for the current stage. -void MovePicker::generate_next() { +void MovePicker::generate_next_stage() { cur = moves; @@ -229,21 +231,30 @@ void MovePicker::generate_next() { killers[0].move = ss->killers[0]; killers[1].move = ss->killers[1]; killers[2].move = killers[3].move = MOVE_NONE; + killers[4].move = killers[5].move = MOVE_NONE; + + // Please note that following code is racy and could yield to rare (less + // than 1 out of a million) duplicated entries in SMP case. This is harmless. // Be sure countermoves are different from killers for (int i = 0; i < 2; ++i) - if (countermoves[i] != cur->move && countermoves[i] != (cur+1)->move) + if ( countermoves[i] != (cur+0)->move + && countermoves[i] != (cur+1)->move) (end++)->move = countermoves[i]; - if (countermoves[1] && countermoves[1] == countermoves[0]) // Due to SMP races - killers[3].move = MOVE_NONE; - + // Be sure followupmoves are different from killers and countermoves + for (int i = 0; i < 2; ++i) + if ( followupmoves[i] != (cur+0)->move + && followupmoves[i] != (cur+1)->move + && followupmoves[i] != (cur+2)->move + && followupmoves[i] != (cur+3)->move) + (end++)->move = followupmoves[i]; return; case QUIETS_1_S1: endQuiets = end = generate(pos, moves); score(); - end = std::partition(cur, end, has_positive_score); + end = std::partition(cur, end, has_positive_value); insertion_sort(cur, end); return; @@ -272,6 +283,8 @@ void MovePicker::generate_next() { case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT: case RECAPTURE: stage = STOP; + /* Fall through */ + case STOP: end = cur + 1; // Avoid another next_phase() call return; @@ -283,9 +296,9 @@ void MovePicker::generate_next() { /// next_move() is the most important method of the MovePicker class. It returns -/// a new pseudo legal move every time is called, until there are no more moves -/// left. It picks the move with the biggest score from a list of generated moves -/// taking care not returning the ttMove if has already been searched previously. +/// 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. template<> Move MovePicker::next_move() { @@ -294,7 +307,7 @@ Move MovePicker::next_move() { while (true) { while (cur == end) - generate_next(); + generate_next_stage(); switch (stage) { @@ -306,7 +319,7 @@ Move MovePicker::next_move() { move = pick_best(cur++, end)->move; if (move != ttMove) { - if (pos.see_sign(move) >= 0) + if (pos.see_sign(move) >= VALUE_ZERO) return move; // Losing capture, move it to the tail of the array @@ -317,8 +330,8 @@ Move MovePicker::next_move() { case KILLERS_S1: move = (cur++)->move; if ( move != MOVE_NONE - && pos.pseudo_legal(move) && move != ttMove + && pos.pseudo_legal(move) && !pos.capture(move)) return move; break; @@ -329,7 +342,9 @@ Move MovePicker::next_move() { && move != killers[0].move && move != killers[1].move && move != killers[2].move - && move != killers[3].move) + && move != killers[3].move + && move != killers[4].move + && move != killers[5].move) return move; break; diff --git a/DroidFish/jni/stockfish/movepick.h b/DroidFish/jni/stockfish/movepick.h index c444615..c512d13 100644 --- a/DroidFish/jni/stockfish/movepick.h +++ b/DroidFish/jni/stockfish/movepick.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -35,32 +35,32 @@ /// and is used for reduction and move ordering decisions. Gains records the move's /// best evaluation gain from one ply to the next and is used for pruning decisions. /// Countermoves store the move that refute a previous one. Entries are stored -/// according only to moving piece and destination square, hence two moves with +/// using only the moving piece and destination square, hence two moves with /// different origin but same destination and piece will be considered identical. template struct Stats { static const Value Max = Value(2000); - const T* operator[](Piece p) const { return table[p]; } + const T* operator[](Piece pc) const { return table[pc]; } void clear() { std::memset(table, 0, sizeof(table)); } - void update(Piece p, Square to, Move m) { + void update(Piece pc, Square to, Move m) { - if (m == table[p][to].first) + if (m == table[pc][to].first) return; - table[p][to].second = table[p][to].first; - table[p][to].first = m; + table[pc][to].second = table[pc][to].first; + table[pc][to].first = m; } - void update(Piece p, Square to, Value v) { + void update(Piece pc, Square to, Value v) { if (Gain) - table[p][to] = std::max(v, table[p][to] - 1); + table[pc][to] = std::max(v, table[pc][to] - 1); - else if (abs(table[p][to] + v) < Max) - table[p][to] += v; + else if (abs(table[pc][to] + v) < Max) + table[pc][to] += v; } private: @@ -69,7 +69,7 @@ private: typedef Stats< true, Value> GainsStats; typedef Stats HistoryStats; -typedef Stats > CountermovesStats; +typedef Stats > MovesStats; /// MovePicker class is used to pick one pseudo legal move at a time from the @@ -86,23 +86,25 @@ class MovePicker { public: MovePicker(const Position&, Move, Depth, const HistoryStats&, Square); MovePicker(const Position&, Move, const HistoryStats&, PieceType); - MovePicker(const Position&, Move, Depth, const HistoryStats&, Move*, Search::Stack*); + MovePicker(const Position&, Move, Depth, const HistoryStats&, Move*, Move*, Search::Stack*); template Move next_move(); private: template void score(); - void generate_next(); + void generate_next_stage(); const Position& pos; const HistoryStats& history; Search::Stack* ss; Move* countermoves; + Move* followupmoves; Depth depth; Move ttMove; - ExtMove killers[4]; + ExtMove killers[6]; Square recaptureSquare; - int captureThreshold, stage; + Value captureThreshold; + int stage; ExtMove *cur, *end, *endQuiets, *endBadCaptures; ExtMove moves[MAX_MOVES]; }; diff --git a/DroidFish/jni/stockfish/notation.cpp b/DroidFish/jni/stockfish/notation.cpp index d017c07..cace78b 100644 --- a/DroidFish/jni/stockfish/notation.cpp +++ b/DroidFish/jni/stockfish/notation.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -40,23 +40,23 @@ static const char* PieceToChar[COLOR_NB] = { " PNBRQK", " pnbrqk" }; string score_to_uci(Value v, Value alpha, Value beta) { - stringstream s; + stringstream ss; if (abs(v) < VALUE_MATE_IN_MAX_PLY) - s << "cp " << v * 100 / int(PawnValueMg); + ss << "cp " << v * 100 / PawnValueEg; else - s << "mate " << (v > 0 ? VALUE_MATE - v + 1 : -VALUE_MATE - v) / 2; + ss << "mate " << (v > 0 ? VALUE_MATE - v + 1 : -VALUE_MATE - v) / 2; - s << (v >= beta ? " lowerbound" : v <= alpha ? " upperbound" : ""); + ss << (v >= beta ? " lowerbound" : v <= alpha ? " upperbound" : ""); - return s.str(); + return ss.str(); } /// move_to_uci() converts a move to a string in coordinate notation /// (g1f3, a7a8q, etc.). The only special case is castling moves, where we print /// in the e1g1 notation in normal chess mode, and in e1h1 notation in chess960 -/// mode. Internally castle moves are always coded as "king captures rook". +/// mode. Internally castling moves are always encoded as "king captures rook". const string move_to_uci(Move m, bool chess960) { @@ -69,10 +69,10 @@ const string move_to_uci(Move m, bool chess960) { if (m == MOVE_NULL) return "0000"; - if (type_of(m) == CASTLE && !chess960) - to = (to > from ? FILE_G : FILE_C) | rank_of(from); + if (type_of(m) == CASTLING && !chess960) + to = make_square(to > from ? FILE_G : FILE_C, rank_of(from)); - string move = square_to_string(from) + square_to_string(to); + string move = to_string(from) + to_string(to); if (type_of(m) == PROMOTION) move += PieceToChar[BLACK][promotion_type(m)]; // Lower case @@ -118,7 +118,7 @@ const string move_to_san(Position& pos, Move m) { Piece pc = pos.piece_on(from); PieceType pt = type_of(pc); - if (type_of(m) == CASTLE) + if (type_of(m) == CASTLING) san = to > from ? "O-O" : "O-O-O"; else { @@ -126,36 +126,36 @@ const string move_to_san(Position& pos, Move m) { { san = PieceToChar[WHITE][pt]; // Upper case - // Disambiguation if we have more then one piece of type 'pt' that can - // reach 'to' with a legal move. + // A disambiguation occurs if we have more then one piece of type 'pt' + // that can reach 'to' with a legal move. others = b = (pos.attacks_from(pc, to) & pos.pieces(us, pt)) ^ from; while (b) { - Move move = make_move(pop_lsb(&b), to); - if (!pos.legal(move, pos.pinned_pieces(pos.side_to_move()))) - others ^= from_sq(move); + Square s = pop_lsb(&b); + if (!pos.legal(make_move(s, to), pos.pinned_pieces(us))) + others ^= s; } - if (others) - { - if (!(others & file_bb(from))) - san += file_to_char(file_of(from)); + if (!others) + { /* Disambiguation is not needed */ } - else if (!(others & rank_bb(from))) - san += rank_to_char(rank_of(from)); + else if (!(others & file_bb(from))) + san += to_char(file_of(from)); - else - san += square_to_string(from); - } + else if (!(others & rank_bb(from))) + san += to_char(rank_of(from)); + + else + san += to_string(from); } else if (pos.capture(m)) - san = file_to_char(file_of(from)); + san = to_char(file_of(from)); if (pos.capture(m)) san += 'x'; - san += square_to_string(to); + san += to_string(to); if (type_of(m) == PROMOTION) san += string("=") + PieceToChar[WHITE][promotion_type(m)]; @@ -175,9 +175,9 @@ const string move_to_san(Position& pos, Move m) { /// pretty_pv() formats human-readable search information, typically to be /// appended to the search log file. It uses the two helpers below to pretty -/// format time and score respectively. +/// format the time and score respectively. -static string time_to_string(int64_t msecs) { +static string format(int64_t msecs) { const int MSecMinute = 1000 * 60; const int MSecHour = 1000 * 60 * 60; @@ -186,71 +186,64 @@ static string time_to_string(int64_t msecs) { int64_t minutes = (msecs % MSecHour) / MSecMinute; int64_t seconds = ((msecs % MSecHour) % MSecMinute) / 1000; - stringstream s; + stringstream ss; if (hours) - s << hours << ':'; + ss << hours << ':'; - s << setfill('0') << setw(2) << minutes << ':' << setw(2) << seconds; + ss << setfill('0') << setw(2) << minutes << ':' << setw(2) << seconds; - return s.str(); + return ss.str(); } -static string score_to_string(Value v) { +static string format(Value v) { - stringstream s; + stringstream ss; if (v >= VALUE_MATE_IN_MAX_PLY) - s << "#" << (VALUE_MATE - v + 1) / 2; + ss << "#" << (VALUE_MATE - v + 1) / 2; else if (v <= VALUE_MATED_IN_MAX_PLY) - s << "-#" << (VALUE_MATE + v) / 2; + ss << "-#" << (VALUE_MATE + v) / 2; else - s << setprecision(2) << fixed << showpos << double(v) / PawnValueMg; + ss << setprecision(2) << fixed << showpos << double(v) / PawnValueEg; - return s.str(); + return ss.str(); } string pretty_pv(Position& pos, int depth, Value value, int64_t msecs, Move pv[]) { - const int64_t K = 1000; - const int64_t M = 1000000; + const uint64_t K = 1000; + const uint64_t M = 1000000; std::stack st; Move* m = pv; - string san, padding; - size_t length; - stringstream s; + string san, str, padding; + stringstream ss; - s << setw(2) << depth - << setw(8) << score_to_string(value) - << setw(8) << time_to_string(msecs); + ss << setw(2) << depth << setw(8) << format(value) << setw(8) << format(msecs); if (pos.nodes_searched() < M) - s << setw(8) << pos.nodes_searched() / 1 << " "; + ss << setw(8) << pos.nodes_searched() / 1 << " "; else if (pos.nodes_searched() < K * M) - s << setw(7) << pos.nodes_searched() / K << "K "; + ss << setw(7) << pos.nodes_searched() / K << "K "; else - s << setw(7) << pos.nodes_searched() / M << "M "; + ss << setw(7) << pos.nodes_searched() / M << "M "; - padding = string(s.str().length(), ' '); - length = padding.length(); + str = ss.str(); + padding = string(str.length(), ' '); while (*m != MOVE_NONE) { - san = move_to_san(pos, *m); + san = move_to_san(pos, *m) + ' '; - if (length + san.length() > 80) - { - s << "\n" + padding; - length = padding.length(); - } + if ((str.length() + san.length()) % 80 <= san.length()) // Exceed 80 cols + str += "\n" + padding; - s << san << ' '; - length += san.length() + 1; + str += san; st.push(StateInfo()); pos.do_move(*m++, st.top()); @@ -259,5 +252,5 @@ string pretty_pv(Position& pos, int depth, Value value, int64_t msecs, Move pv[] while (m != pv) pos.undo_move(*--m); - return s.str(); + return str; } diff --git a/DroidFish/jni/stockfish/notation.h b/DroidFish/jni/stockfish/notation.h index 3ede260..730e841 100644 --- a/DroidFish/jni/stockfish/notation.h +++ b/DroidFish/jni/stockfish/notation.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/DroidFish/jni/stockfish/pawns.cpp b/DroidFish/jni/stockfish/pawns.cpp index d2a53ef..5768eb3 100644 --- a/DroidFish/jni/stockfish/pawns.cpp +++ b/DroidFish/jni/stockfish/pawns.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -49,14 +49,20 @@ namespace { { S(20, 28), S(29, 31), S(33, 31), S(33, 31), S(33, 31), S(33, 31), S(29, 31), S(20, 28) } }; - // Pawn chain membership bonus by file and rank (initialized by formula) - Score ChainMember[FILE_NB][RANK_NB]; + // Connected pawn bonus by file and rank (initialized by formula) + Score Connected[FILE_NB][RANK_NB]; // Candidate passed pawn bonus by rank const Score CandidatePassed[RANK_NB] = { S( 0, 0), S( 6, 13), S(6,13), S(14,29), S(34,68), S(83,166), S(0, 0), S( 0, 0) }; + // Bonus for file distance of the two outermost pawns + const Score PawnsFileSpan = S(0, 15); + + // Unsupported pawn penalty + const Score UnsupportedPawnPenalty = S(20, 10); + // Weakness of our pawn shelter in front of the king indexed by [rank] const Value ShelterWeakness[RANK_NB] = { V(100), V(0), V(27), V(73), V(92), V(101), V(101) }; @@ -66,7 +72,7 @@ namespace { const Value StormDanger[3][RANK_NB] = { { V( 0), V(64), V(128), V(51), V(26) }, { V(26), V(32), V( 96), V(38), V(20) }, - { V( 0), V( 0), V( 64), V(25), V(13) } }; + { V( 0), V( 0), V(160), V(25), V(13) } }; // Max bonus for king safety. Corresponds to start position with all the pawns // in front of the king and no enemy pawn on the horizon. @@ -83,10 +89,10 @@ namespace { const Square Right = (Us == WHITE ? DELTA_NE : DELTA_SW); const Square Left = (Us == WHITE ? DELTA_NW : DELTA_SE); - Bitboard b; + Bitboard b, p, doubled; Square s; File f; - bool passed, isolated, doubled, opposed, chain, backward, candidate; + bool passed, isolated, opposed, connected, backward, candidate, unsupported; Score value = SCORE_ZERO; const Square* pl = pos.list(Us); @@ -110,22 +116,26 @@ namespace { // This file cannot be semi-open e->semiopenFiles[Us] &= ~(1 << f); - // Our rank plus previous one. Used for chain detection - b = rank_bb(s) | rank_bb(s - pawn_push(Us)); + // Previous rank + p = rank_bb(s - pawn_push(Us)); - // Flag the pawn as passed, isolated, doubled or member of a pawn - // chain (but not the backward one). - chain = ourPawns & adjacent_files_bb(f) & b; - isolated = !(ourPawns & adjacent_files_bb(f)); - doubled = ourPawns & forward_bb(Us, s); - opposed = theirPawns & forward_bb(Us, s); - passed = !(theirPawns & passed_pawn_mask(Us, s)); + // Our rank plus previous one + b = rank_bb(s) | p; + + // Flag the pawn as passed, isolated, doubled, + // unsupported or connected (but not the backward one). + connected = ourPawns & adjacent_files_bb(f) & b; + unsupported = !(ourPawns & adjacent_files_bb(f) & p); + isolated = !(ourPawns & adjacent_files_bb(f)); + doubled = ourPawns & forward_bb(Us, s); + opposed = theirPawns & forward_bb(Us, s); + passed = !(theirPawns & passed_pawn_mask(Us, s)); // Test for backward pawn. - // If the pawn is passed, isolated, or member of a pawn chain it cannot - // be backward. If there are friendly pawns behind on adjacent files - // or if can capture an enemy pawn it cannot be backward either. - if ( (passed | isolated | chain) + // If the pawn is passed, isolated, or connected it cannot be + // backward. If there are friendly pawns behind on adjacent files + // or if it can capture an enemy pawn it cannot be backward either. + if ( (passed | isolated | connected) || (ourPawns & pawn_attack_span(Them, s)) || (pos.attacks_from(s, Us) & theirPawns)) backward = false; @@ -145,9 +155,9 @@ namespace { assert(opposed | passed | (pawn_attack_span(Us, s) & theirPawns)); - // A not passed pawn is a candidate to become passed, if it is free to + // A not-passed pawn is a candidate to become passed, if it is free to // advance and if the number of friendly pawns beside or behind this - // pawn on adjacent files is higher or equal than the number of + // pawn on adjacent files is higher than or equal to the number of // enemy pawns in the forward direction on the adjacent files. candidate = !(opposed | passed | backward | isolated) && (b = pawn_attack_span(Them, s + pawn_push(Us)) & ourPawns) != 0 @@ -163,14 +173,17 @@ namespace { if (isolated) value -= Isolated[opposed][f]; + if (unsupported && !isolated) + value -= UnsupportedPawnPenalty; + if (doubled) - value -= Doubled[f]; + value -= Doubled[f] / rank_distance(s, lsb(doubled)); if (backward) value -= Backward[opposed][f]; - if (chain) - value += ChainMember[f][relative_rank(Us, s)]; + if (connected) + value += Connected[f][relative_rank(Us, s)]; if (candidate) { @@ -181,6 +194,14 @@ namespace { } } + // In endgame it's better to have pawns on both wings. So give a bonus according + // to file distance between left and right outermost pawns. + if (pos.count(Us) > 1) + { + b = e->semiopenFiles[Us] ^ 0xFF; + value += PawnsFileSpan * int(msb(b) - lsb(b)); + } + return value; } @@ -188,18 +209,18 @@ namespace { namespace Pawns { -/// init() initializes some tables by formula instead of hard-code their values +/// init() initializes some tables by formula instead of hard-coding their values void init() { - const int chainByFile[8] = { 1, 3, 3, 4, 4, 3, 3, 1 }; + const int bonusesByFile[8] = { 1, 3, 3, 4, 4, 3, 3, 1 }; int bonus; for (Rank r = RANK_1; r < RANK_8; ++r) for (File f = FILE_A; f <= FILE_H; ++f) { - bonus = r * (r-1) * (r-2) + chainByFile[f] * (r/2 + 1); - ChainMember[f][r] = make_score(bonus, bonus); + bonus = r * (r-1) * (r-2) + bonusesByFile[f] * (r/2 + 1); + Connected[f][r] = make_score(bonus, bonus); } } @@ -229,6 +250,7 @@ template Value Entry::shelter_storm(const Position& pos, Square ksq) { const Color Them = (Us == WHITE ? BLACK : WHITE); + static const Bitboard MiddleEdges = (FileABB | FileHBB) & (Rank2BB | Rank3BB); Value safety = MaxSafetyBonus; Bitboard b = pos.pieces(PAWN) & (in_front_bb(Us, rank_of(ksq)) | rank_bb(ksq)); @@ -241,25 +263,31 @@ Value Entry::shelter_storm(const Position& pos, Square ksq) { { b = ourPawns & file_bb(f); rkUs = b ? relative_rank(Us, backmost_sq(Us, b)) : RANK_1; - safety -= ShelterWeakness[rkUs]; b = theirPawns & file_bb(f); rkThem = b ? relative_rank(Us, frontmost_sq(Them, b)) : RANK_1; - safety -= StormDanger[rkUs == RANK_1 ? 0 : rkThem == rkUs + 1 ? 2 : 1][rkThem]; + + if ( (MiddleEdges & make_square(f, rkThem)) + && file_of(ksq) == f + && relative_rank(Us, ksq) == rkThem - 1) + safety += 200; + else + safety -= ShelterWeakness[rkUs] + + StormDanger[rkUs == RANK_1 ? 0 : rkThem == rkUs + 1 ? 2 : 1][rkThem]; } return safety; } -/// Entry::update_safety() calculates and caches a bonus for king safety. It is -/// called only when king square changes, about 20% of total king_safety() calls. +/// Entry::do_king_safety() calculates a bonus for king safety. It is called only +/// when king square changes, which is about 20% of total king_safety() calls. template -Score Entry::update_safety(const Position& pos, Square ksq) { +Score Entry::do_king_safety(const Position& pos, Square ksq) { kingSquares[Us] = ksq; - castleRights[Us] = pos.can_castle(Us); + castlingRights[Us] = pos.can_castle(Us); minKPdistance[Us] = 0; Bitboard pawns = pos.pieces(Us, PAWN); @@ -267,22 +295,22 @@ Score Entry::update_safety(const Position& pos, Square ksq) { while (!(DistanceRingsBB[ksq][minKPdistance[Us]++] & pawns)) {} if (relative_rank(Us, ksq) > RANK_4) - return kingSafety[Us] = make_score(0, -16 * minKPdistance[Us]); + return make_score(0, -16 * minKPdistance[Us]); Value bonus = shelter_storm(pos, ksq); - // If we can castle use the bonus after the castle if it is bigger - if (pos.can_castle(make_castle_right(Us, KING_SIDE))) + // If we can castle use the bonus after the castling if it is bigger + if (pos.can_castle(MakeCastling::right)) bonus = std::max(bonus, shelter_storm(pos, relative_square(Us, SQ_G1))); - if (pos.can_castle(make_castle_right(Us, QUEEN_SIDE))) + if (pos.can_castle(MakeCastling::right)) bonus = std::max(bonus, shelter_storm(pos, relative_square(Us, SQ_C1))); - return kingSafety[Us] = make_score(bonus, -16 * minKPdistance[Us]); + return make_score(bonus, -16 * minKPdistance[Us]); } // Explicit template instantiation -template Score Entry::update_safety(const Position& pos, Square ksq); -template Score Entry::update_safety(const Position& pos, Square ksq); +template Score Entry::do_king_safety(const Position& pos, Square ksq); +template Score Entry::do_king_safety(const Position& pos, Square ksq); } // namespace Pawns diff --git a/DroidFish/jni/stockfish/pawns.h b/DroidFish/jni/stockfish/pawns.h index f6be84e..28fe1c0 100644 --- a/DroidFish/jni/stockfish/pawns.h +++ b/DroidFish/jni/stockfish/pawns.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,11 +26,9 @@ namespace Pawns { -/// Pawns::Entry contains various information about a pawn structure. Currently, -/// it only includes a middle game and end game pawn structure evaluation, and a -/// bitboard of passed pawns. We may want to add further information in the future. -/// A lookup to the pawn hash table (performed by calling the probe function) -/// returns a pointer to an Entry object. +/// Pawns::Entry contains various information about a pawn structure. A lookup +/// to the pawn hash table (performed by calling the probe function) returns a +/// pointer to an Entry object. struct Entry { @@ -38,37 +36,42 @@ struct Entry { Bitboard pawn_attacks(Color c) const { return pawnAttacks[c]; } Bitboard passed_pawns(Color c) const { return passedPawns[c]; } Bitboard candidate_pawns(Color c) const { return candidatePawns[c]; } - int pawns_on_same_color_squares(Color c, Square s) const { return pawnsOnSquares[c][!!(DarkSquares & s)]; } - int semiopen(Color c, File f) const { return semiopenFiles[c] & (1 << int(f)); } - int semiopen_on_side(Color c, File f, bool left) const { - return semiopenFiles[c] & (left ? ((1 << int(f)) - 1) : ~((1 << int(f+1)) - 1)); + int semiopen_file(Color c, File f) const { + return semiopenFiles[c] & (1 << f); + } + + int semiopen_side(Color c, File f, bool leftSide) const { + return semiopenFiles[c] & (leftSide ? (1 << f) - 1 : ~((1 << (f + 1)) - 1)); + } + + int pawns_on_same_color_squares(Color c, Square s) const { + return pawnsOnSquares[c][!!(DarkSquares & s)]; } template Score king_safety(const Position& pos, Square ksq) { - - return kingSquares[Us] == ksq && castleRights[Us] == pos.can_castle(Us) - ? kingSafety[Us] : update_safety(pos, ksq); + return kingSquares[Us] == ksq && castlingRights[Us] == pos.can_castle(Us) + ? kingSafety[Us] : (kingSafety[Us] = do_king_safety(pos, ksq)); } template - Score update_safety(const Position& pos, Square ksq); + Score do_king_safety(const Position& pos, Square ksq); template Value shelter_storm(const Position& pos, Square ksq); Key key; + Score value; Bitboard passedPawns[COLOR_NB]; Bitboard candidatePawns[COLOR_NB]; Bitboard pawnAttacks[COLOR_NB]; Square kingSquares[COLOR_NB]; - int minKPdistance[COLOR_NB]; - int castleRights[COLOR_NB]; - Score value; - int semiopenFiles[COLOR_NB]; Score kingSafety[COLOR_NB]; - int pawnsOnSquares[COLOR_NB][COLOR_NB]; + int minKPdistance[COLOR_NB]; + int castlingRights[COLOR_NB]; + int semiopenFiles[COLOR_NB]; + int pawnsOnSquares[COLOR_NB][COLOR_NB]; // [color][light/dark squares] }; typedef HashTable Table; @@ -76,6 +79,6 @@ typedef HashTable Table; void init(); Entry* probe(const Position& pos, Table& entries); -} +} // namespace Pawns #endif // #ifndef PAWNS_H_INCLUDED diff --git a/DroidFish/jni/stockfish/platform.h b/DroidFish/jni/stockfish/platform.h index ee03898..151c882 100644 --- a/DroidFish/jni/stockfish/platform.h +++ b/DroidFish/jni/stockfish/platform.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ #ifdef _MSC_VER -// Disable some silly and noisy warning from MSVC compiler +// Disable some silly and noisy warnings from MSVC compiler #pragma warning(disable: 4127) // Conditional expression is constant #pragma warning(disable: 4146) // Unary minus operator applied to unsigned type #pragma warning(disable: 4800) // Forcing value to bool 'true' or 'false' @@ -89,14 +89,14 @@ inline int64_t system_time_to_msec() { #undef WIN32_LEAN_AND_MEAN #undef NOMINMAX -// We use critical sections on Windows to support Windows XP and older versions, -// unfortunatly cond_wait() is racy between lock_release() and WaitForSingleObject() +// We use critical sections on Windows to support Windows XP and older versions. +// Unfortunately, cond_wait() is racy between lock_release() and WaitForSingleObject() // but apart from this they have the same speed performance of SRW locks. typedef CRITICAL_SECTION Lock; typedef HANDLE WaitCondition; typedef HANDLE NativeHandle; -// On Windows 95 and 98 parameter lpThreadId my not be null +// On Windows 95 and 98 parameter lpThreadId may not be null inline DWORD* dwWin9xKludge() { static DWORD dw; return &dw; } # define lock_init(x) InitializeCriticalSection(&(x)) diff --git a/DroidFish/jni/stockfish/position.cpp b/DroidFish/jni/stockfish/position.cpp index c40b119..982352c 100644 --- a/DroidFish/jni/stockfish/position.cpp +++ b/DroidFish/jni/stockfish/position.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,7 +21,6 @@ #include #include #include -#include #include #include "bitcount.h" @@ -34,23 +33,22 @@ #include "tt.h" using std::string; -using std::cout; -using std::endl; static const string PieceToChar(" PNBRQK pnbrqk"); CACHE_LINE_ALIGNMENT -Score psq[COLOR_NB][PIECE_TYPE_NB][SQUARE_NB]; Value PieceValue[PHASE_NB][PIECE_NB] = { { VALUE_ZERO, PawnValueMg, KnightValueMg, BishopValueMg, RookValueMg, QueenValueMg }, { VALUE_ZERO, PawnValueEg, KnightValueEg, BishopValueEg, RookValueEg, QueenValueEg } }; +static Score psq[COLOR_NB][PIECE_TYPE_NB][SQUARE_NB]; + namespace Zobrist { Key psq[COLOR_NB][PIECE_TYPE_NB][SQUARE_NB]; Key enpassant[FILE_NB]; - Key castle[CASTLE_RIGHT_NB]; + Key castling[CASTLING_RIGHT_NB]; Key side; Key exclusion; } @@ -59,7 +57,7 @@ Key Position::exclusion_key() const { return st->key ^ Zobrist::exclusion;} namespace { -// min_attacker() is an helper function used by see() to locate the least +// min_attacker() is a helper function used by see() to locate the least // valuable attacker for the side to move, remove the attacker we just found // from the bitboards and scan for new X-ray attacks behind it. @@ -85,7 +83,7 @@ PieceType min_attacker(const Bitboard* bb, const Square& to, const Bitboard& stm template<> FORCE_INLINE PieceType min_attacker(const Bitboard*, const Square&, const Bitboard&, Bitboard&, Bitboard&) { - return KING; // No need to update bitboards, it is the last cycle + return KING; // No need to update bitboards: it is the last cycle } } // namespace @@ -112,9 +110,9 @@ CheckInfo::CheckInfo(const Position& pos) { /// Position::init() initializes at startup the various arrays used to compute /// hash keys and the piece square tables. The latter is a two-step operation: -/// First, the white halves of the tables are copied from PSQT[] tables. Second, -/// the black halves of the tables are initialized by flipping and changing the -/// sign of the white scores. +/// Firstly, the white halves of the tables are copied from PSQT[] tables. +/// Secondly, the black halves of the tables are initialized by flipping and +/// changing the sign of the white scores. void Position::init() { @@ -128,13 +126,13 @@ void Position::init() { for (File f = FILE_A; f <= FILE_H; ++f) Zobrist::enpassant[f] = rk.rand(); - for (int cr = CASTLES_NONE; cr <= ALL_CASTLES; ++cr) + for (int cf = NO_CASTLING; cf <= ANY_CASTLING; ++cf) { - Bitboard b = cr; + Bitboard b = cf; while (b) { - Key k = Zobrist::castle[1ULL << pop_lsb(&b)]; - Zobrist::castle[cr] ^= k ? k : rk.rand(); + Key k = Zobrist::castling[1ULL << pop_lsb(&b)]; + Zobrist::castling[cf] ^= k ? k : rk.rand(); } } @@ -158,7 +156,7 @@ void Position::init() { /// Position::operator=() creates a copy of 'pos'. We want the new born Position -/// object do not depend on any external data so we detach state pointer from +/// object to not depend on any external data so we detach state pointer from /// the source one. Position& Position::operator=(const Position& pos) { @@ -174,6 +172,21 @@ Position& Position::operator=(const Position& pos) { } +/// Position::clear() erases the position object to a pristine state, with an +/// empty board, white to move, and no castling rights. + +void Position::clear() { + + std::memset(this, 0, sizeof(Position)); + startState.epSquare = SQ_NONE; + st = &startState; + + for (int i = 0; i < PIECE_TYPE_NB; ++i) + for (int j = 0; j < 16; ++j) + pieceList[WHITE][i][j] = pieceList[BLACK][i][j] = SQ_NONE; +} + + /// Position::set() initializes the position object with the given FEN string. /// This function is not very robust - make sure that input FENs are correct, /// this is assumed to be the responsibility of the GUI. @@ -185,11 +198,11 @@ void Position::set(const string& fenStr, bool isChess960, Thread* th) { A FEN string contains six fields separated by a space. The fields are: 1) Piece placement (from white's perspective). Each rank is described, starting - with rank 8 and ending with rank 1; within each rank, the contents of each + with rank 8 and ending with rank 1. Within each rank, the contents of each square are described from file A through file H. Following the Standard Algebraic Notation (SAN), each piece is identified by a single letter taken from the standard English names. White pieces are designated using upper-case - letters ("PNBRQK") while Black take lowercase ("pnbrqk"). Blank squares are + letters ("PNBRQK") whilst Black uses lowercase ("pnbrqk"). Blank squares are noted using digits 1 through 8 (the number of blank squares), and "/" separates ranks. @@ -214,7 +227,7 @@ void Position::set(const string& fenStr, bool isChess960, Thread* th) { */ char col, row, token; - size_t p; + size_t idx; Square sq = SQ_A8; std::istringstream ss(fenStr); @@ -230,9 +243,9 @@ void Position::set(const string& fenStr, bool isChess960, Thread* th) { else if (token == '/') sq -= Square(16); - else if ((p = PieceToChar.find(token)) != string::npos) + else if ((idx = PieceToChar.find(token)) != string::npos) { - put_piece(sq, color_of(Piece(p)), type_of(Piece(p))); + put_piece(sq, color_of(Piece(idx)), type_of(Piece(idx))); ++sq; } } @@ -261,19 +274,19 @@ void Position::set(const string& fenStr, bool isChess960, Thread* th) { for (rsq = relative_square(c, SQ_A1); type_of(piece_on(rsq)) != ROOK; ++rsq) {} else if (token >= 'A' && token <= 'H') - rsq = File(token - 'A') | relative_rank(c, RANK_1); + rsq = make_square(File(token - 'A'), relative_rank(c, RANK_1)); else continue; - set_castle_right(c, rsq); + set_castling_right(c, rsq); } // 4. En passant square. Ignore if no pawn capture is possible if ( ((ss >> col) && (col >= 'a' && col <= 'h')) && ((ss >> row) && (row == '3' || row == '6'))) { - st->epSquare = File(col - 'a') | Rank(row - '1'); + st->epSquare = make_square(File(col - 'a'), Rank(row - '1')); if (!(attackers_to(st->epSquare) & pieces(sideToMove, PAWN))) st->epSquare = SQ_NONE; @@ -284,98 +297,134 @@ void Position::set(const string& fenStr, bool isChess960, Thread* th) { // Convert from fullmove starting from 1 to ply starting from 0, // handle also common incorrect FEN with fullmove = 0. - gamePly = std::max(2 * (gamePly - 1), 0) + int(sideToMove == BLACK); + gamePly = std::max(2 * (gamePly - 1), 0) + (sideToMove == BLACK); - st->key = compute_key(); - st->pawnKey = compute_pawn_key(); - st->materialKey = compute_material_key(); - st->psq = compute_psq_score(); - st->npMaterial[WHITE] = compute_non_pawn_material(WHITE); - st->npMaterial[BLACK] = compute_non_pawn_material(BLACK); - st->checkersBB = attackers_to(king_square(sideToMove)) & pieces(~sideToMove); chess960 = isChess960; thisThread = th; + set_state(st); assert(pos_is_ok()); } -/// Position::set_castle_right() is an helper function used to set castling +/// Position::set_castling_right() is a helper function used to set castling /// rights given the corresponding color and the rook starting square. -void Position::set_castle_right(Color c, Square rfrom) { +void Position::set_castling_right(Color c, Square rfrom) { Square kfrom = king_square(c); CastlingSide cs = kfrom < rfrom ? KING_SIDE : QUEEN_SIDE; - CastleRight cr = make_castle_right(c, cs); + CastlingRight cr = (c | cs); - st->castleRights |= cr; - castleRightsMask[kfrom] |= cr; - castleRightsMask[rfrom] |= cr; - castleRookSquare[c][cs] = rfrom; + st->castlingRights |= cr; + castlingRightsMask[kfrom] |= cr; + castlingRightsMask[rfrom] |= cr; + castlingRookSquare[cr] = rfrom; Square kto = relative_square(c, cs == KING_SIDE ? SQ_G1 : SQ_C1); Square rto = relative_square(c, cs == KING_SIDE ? SQ_F1 : SQ_D1); for (Square s = std::min(rfrom, rto); s <= std::max(rfrom, rto); ++s) if (s != kfrom && s != rfrom) - castlePath[c][cs] |= s; + castlingPath[cr] |= s; for (Square s = std::min(kfrom, kto); s <= std::max(kfrom, kto); ++s) if (s != kfrom && s != rfrom) - castlePath[c][cs] |= s; + castlingPath[cr] |= s; } -/// Position::fen() returns a FEN representation of the position. In case -/// of Chess960 the Shredder-FEN notation is used. Mainly a debugging function. +/// Position::set_state() computes the hash keys of the position, and other +/// data that once computed is updated incrementally as moves are made. +/// The function is only used when a new position is set up, and to verify +/// the correctness of the StateInfo data when running in debug mode. + +void Position::set_state(StateInfo* si) const { + + si->key = si->pawnKey = si->materialKey = 0; + si->npMaterial[WHITE] = si->npMaterial[BLACK] = VALUE_ZERO; + si->psq = SCORE_ZERO; + + si->checkersBB = attackers_to(king_square(sideToMove)) & pieces(~sideToMove); + + for (Bitboard b = pieces(); b; ) + { + Square s = pop_lsb(&b); + Piece pc = piece_on(s); + si->key ^= Zobrist::psq[color_of(pc)][type_of(pc)][s]; + si->psq += psq[color_of(pc)][type_of(pc)][s]; + } + + if (ep_square() != SQ_NONE) + si->key ^= Zobrist::enpassant[file_of(ep_square())]; + + if (sideToMove == BLACK) + si->key ^= Zobrist::side; + + si->key ^= Zobrist::castling[st->castlingRights]; + + for (Bitboard b = pieces(PAWN); b; ) + { + Square s = pop_lsb(&b); + si->pawnKey ^= Zobrist::psq[color_of(piece_on(s))][PAWN][s]; + } + + for (Color c = WHITE; c <= BLACK; ++c) + for (PieceType pt = PAWN; pt <= KING; ++pt) + for (int cnt = 0; cnt < pieceCount[c][pt]; ++cnt) + si->materialKey ^= Zobrist::psq[c][pt][cnt]; + + for (Color c = WHITE; c <= BLACK; ++c) + for (PieceType pt = KNIGHT; pt <= QUEEN; ++pt) + si->npMaterial[c] += pieceCount[c][pt] * PieceValue[MG][pt]; +} + + +/// Position::fen() returns a FEN representation of the position. In case of +/// Chess960 the Shredder-FEN notation is used. This is mainly a debugging function. const string Position::fen() const { + int emptyCnt; std::ostringstream ss; - for (Rank rank = RANK_8; rank >= RANK_1; --rank) + for (Rank r = RANK_8; r >= RANK_1; --r) { - for (File file = FILE_A; file <= FILE_H; ++file) + for (File f = FILE_A; f <= FILE_H; ++f) { - Square sq = file | rank; - - if (empty(sq)) - { - int emptyCnt = 1; - - for ( ; file < FILE_H && empty(++sq); ++file) - ++emptyCnt; + for (emptyCnt = 0; f <= FILE_H && empty(make_square(f, r)); ++f) + ++emptyCnt; + if (emptyCnt) ss << emptyCnt; - } - else - ss << PieceToChar[piece_on(sq)]; + + if (f <= FILE_H) + ss << PieceToChar[piece_on(make_square(f, r))]; } - if (rank > RANK_1) + if (r > RANK_1) ss << '/'; } ss << (sideToMove == WHITE ? " w " : " b "); if (can_castle(WHITE_OO)) - ss << (chess960 ? file_to_char(file_of(castle_rook_square(WHITE, KING_SIDE)), false) : 'K'); + ss << (chess960 ? to_char(file_of(castling_rook_square(WHITE | KING_SIDE)), false) : 'K'); if (can_castle(WHITE_OOO)) - ss << (chess960 ? file_to_char(file_of(castle_rook_square(WHITE, QUEEN_SIDE)), false) : 'Q'); + ss << (chess960 ? to_char(file_of(castling_rook_square(WHITE | QUEEN_SIDE)), false) : 'Q'); if (can_castle(BLACK_OO)) - ss << (chess960 ? file_to_char(file_of(castle_rook_square(BLACK, KING_SIDE)), true) : 'k'); + ss << (chess960 ? to_char(file_of(castling_rook_square(BLACK | KING_SIDE)), true) : 'k'); if (can_castle(BLACK_OOO)) - ss << (chess960 ? file_to_char(file_of(castle_rook_square(BLACK, QUEEN_SIDE)), true) : 'q'); + ss << (chess960 ? to_char(file_of(castling_rook_square(BLACK | QUEEN_SIDE)), true) : 'q'); - if (st->castleRights == CASTLES_NONE) + if (!can_castle(WHITE) && !can_castle(BLACK)) ss << '-'; - ss << (ep_square() == SQ_NONE ? " - " : " " + square_to_string(ep_square()) + " ") - << st->rule50 << " " << 1 + (gamePly - int(sideToMove == BLACK)) / 2; + ss << (ep_square() == SQ_NONE ? " - " : " " + to_string(ep_square()) + " ") + << st->rule50 << " " << 1 + (gamePly - (sideToMove == BLACK)) / 2; return ss.str(); } @@ -384,31 +433,29 @@ const string Position::fen() const { /// Position::pretty() returns an ASCII representation of the position to be /// printed to the standard output together with the move's san notation. -const string Position::pretty(Move move) const { - - const string dottedLine = "\n+---+---+---+---+---+---+---+---+"; - const string twoRows = dottedLine + "\n| | . | | . | | . | | . |" - + dottedLine + "\n| . | | . | | . | | . | |"; - - string brd = twoRows + twoRows + twoRows + twoRows + dottedLine; - - for (Bitboard b = pieces(); b; ) - { - Square s = pop_lsb(&b); - brd[513 - 68 * rank_of(s) + 4 * file_of(s)] = PieceToChar[piece_on(s)]; - } +const string Position::pretty(Move m) const { std::ostringstream ss; - if (move) + if (m) ss << "\nMove: " << (sideToMove == BLACK ? ".." : "") - << move_to_san(*const_cast(this), move); + << move_to_san(*const_cast(this), m); - ss << brd << "\nFen: " << fen() << "\nKey: " << std::hex << std::uppercase + ss << "\n +---+---+---+---+---+---+---+---+\n"; + + for (Rank r = RANK_8; r >= RANK_1; --r) + { + for (File f = FILE_A; f <= FILE_H; ++f) + ss << " | " << PieceToChar[piece_on(make_square(f, r))]; + + ss << " |\n +---+---+---+---+---+---+---+---+\n"; + } + + ss << "\nFen: " << fen() << "\nKey: " << std::hex << std::uppercase << std::setfill('0') << std::setw(16) << st->key << "\nCheckers: "; for (Bitboard b = checkers(); b; ) - ss << square_to_string(pop_lsb(&b)) << " "; + ss << to_string(pop_lsb(&b)) << " "; ss << "\nLegal moves: "; for (MoveList it(*this); *it; ++it) @@ -418,31 +465,35 @@ const string Position::pretty(Move move) const { } -/// Position:hidden_checkers() returns a bitboard of all pinned / discovery check -/// pieces, according to the call parameters. Pinned pieces protect our king, -/// discovery check pieces attack the enemy king. +/// Position::check_blockers() returns a bitboard of all the pieces with color +/// 'c' that are blocking check on the king with color 'kingColor'. A piece +/// blocks a check if removing that piece from the board would result in a +/// position where the king is in check. A check blocking piece can be either a +/// pinned or a discovered check piece, according if its color 'c' is the same +/// or the opposite of 'kingColor'. -Bitboard Position::hidden_checkers(Square ksq, Color c, Color toMove) const { +Bitboard Position::check_blockers(Color c, Color kingColor) const { Bitboard b, pinners, result = 0; + Square ksq = king_square(kingColor); - // Pinners are sliders that give check when pinned piece is removed + // Pinners are sliders that give check when a pinned piece is removed pinners = ( (pieces( ROOK, QUEEN) & PseudoAttacks[ROOK ][ksq]) - | (pieces(BISHOP, QUEEN) & PseudoAttacks[BISHOP][ksq])) & pieces(c); + | (pieces(BISHOP, QUEEN) & PseudoAttacks[BISHOP][ksq])) & pieces(~kingColor); while (pinners) { b = between_bb(ksq, pop_lsb(&pinners)) & pieces(); if (!more_than_one(b)) - result |= b & pieces(toMove); + result |= b & pieces(c); } return result; } /// Position::attackers_to() computes a bitboard of all pieces which attack a -/// given square. Slider attacks use occ bitboard as occupancy. +/// given square. Slider attacks use the occ bitboard to indicate occupancy. Bitboard Position::attackers_to(Square s, Bitboard occ) const { @@ -455,23 +506,6 @@ Bitboard Position::attackers_to(Square s, Bitboard occ) const { } -/// Position::attacks_from() computes a bitboard of all attacks of a given piece -/// put in a given square. Slider attacks use occ bitboard as occupancy. - -Bitboard Position::attacks_from(Piece p, Square s, Bitboard occ) { - - assert(is_ok(s)); - - switch (type_of(p)) - { - case BISHOP: return attacks_bb(s, occ); - case ROOK : return attacks_bb(s, occ); - case QUEEN : return attacks_bb(s, occ) | attacks_bb(s, occ); - default : return StepAttacksBB[p][s]; - } -} - - /// Position::legal() tests whether a pseudo-legal move is legal bool Position::legal(Move m, Bitboard pinned) const { @@ -490,26 +524,25 @@ bool Position::legal(Move m, Bitboard pinned) const { // the move is made. if (type_of(m) == ENPASSANT) { - Color them = ~us; - Square to = to_sq(m); - Square capsq = to + pawn_push(them); Square ksq = king_square(us); - Bitboard b = (pieces() ^ from ^ capsq) | to; + Square to = to_sq(m); + Square capsq = to - pawn_push(us); + Bitboard occ = (pieces() ^ from ^ capsq) | to; assert(to == ep_square()); assert(moved_piece(m) == make_piece(us, PAWN)); - assert(piece_on(capsq) == make_piece(them, PAWN)); + assert(piece_on(capsq) == make_piece(~us, PAWN)); assert(piece_on(to) == NO_PIECE); - return !(attacks_bb< ROOK>(ksq, b) & pieces(them, QUEEN, ROOK)) - && !(attacks_bb(ksq, b) & pieces(them, QUEEN, BISHOP)); + return !(attacks_bb< ROOK>(ksq, occ) & pieces(~us, QUEEN, ROOK)) + && !(attacks_bb(ksq, occ) & pieces(~us, QUEEN, BISHOP)); } // If the moving piece is a king, check whether the destination // square is attacked by the opponent. Castling moves are checked // for legality during move generation. if (type_of(piece_on(from)) == KING) - return type_of(m) == CASTLE || !(attackers_to(to_sq(m)) & pieces(~us)); + return type_of(m) == CASTLING || !(attackers_to(to_sq(m)) & pieces(~us)); // A non-king move is legal if and only if it is not pinned or it // is moving along the ray towards or away from the king. @@ -538,7 +571,7 @@ bool Position::pseudo_legal(const Move m) const { if (promotion_type(m) - 2 != NO_PIECE_TYPE) return false; - // If the from square is not occupied by a piece belonging to the side to + // If the 'from' square is not occupied by a piece belonging to the side to // move, the move is obviously not legal. if (pc == NO_PIECE || color_of(pc) != us) return false; @@ -550,71 +583,27 @@ bool Position::pseudo_legal(const Move m) const { // Handle the special case of a pawn move if (type_of(pc) == PAWN) { - // Move direction must be compatible with pawn color - int direction = to - from; - if ((us == WHITE) != (direction > 0)) - return false; - // We have already handled promotion moves, so destination - // cannot be on the 8/1th rank. - if (rank_of(to) == RANK_8 || rank_of(to) == RANK_1) + // cannot be on the 8th/1st rank. + if (rank_of(to) == relative_rank(us, RANK_8)) return false; - // Proceed according to the square delta between the origin and - // destination squares. - switch (direction) - { - case DELTA_NW: - case DELTA_NE: - case DELTA_SW: - case DELTA_SE: - // Capture. The destination square must be occupied by an enemy - // piece (en passant captures was handled earlier). - if (piece_on(to) == NO_PIECE || color_of(piece_on(to)) != ~us) - return false; + if ( !(attacks_from(from, us) & pieces(~us) & to) // Not a capture - // From and to files must be one file apart, avoids a7h5 - if (abs(file_of(from) - file_of(to)) != 1) - return false; - break; + && !((from + pawn_push(us) == to) && empty(to)) // Not a single push - case DELTA_N: - case DELTA_S: - // Pawn push. The destination square must be empty. - if (!empty(to)) + && !( (from + 2 * pawn_push(us) == to) // Not a double push + && (rank_of(from) == relative_rank(us, RANK_2)) + && empty(to) + && empty(to - pawn_push(us)))) return false; - break; - - case DELTA_NN: - // Double white pawn push. The destination square must be on the fourth - // rank, and both the destination square and the square between the - // source and destination squares must be empty. - if ( rank_of(to) != RANK_4 - || !empty(to) - || !empty(from + DELTA_N)) - return false; - break; - - case DELTA_SS: - // Double black pawn push. The destination square must be on the fifth - // rank, and both the destination square and the square between the - // source and destination squares must be empty. - if ( rank_of(to) != RANK_5 - || !empty(to) - || !empty(from + DELTA_S)) - return false; - break; - - default: - return false; - } } else if (!(attacks_from(pc, from) & to)) return false; // Evasions generator already takes care to avoid some kind of illegal moves - // and pl_move_is_legal() relies on this. So we have to take care that the - // same kind of moves are filtered out here. + // and legal() relies on this. We therefore have to take care that the same + // kind of moves are filtered out here. if (checkers()) { if (type_of(pc) != KING) @@ -627,8 +616,8 @@ bool Position::pseudo_legal(const Move m) const { if (!((between_bb(lsb(checkers()), king_square(us)) | checkers()) & to)) return false; } - // In case of king moves under check we have to remove king so to catch - // as invalid moves like b1a1 when opposite queen is on c1. + // In case of king moves under check we have to remove king so as to catch + // invalid moves like b1a1 when opposite queen is on c1. else if (attackers_to(to, pieces() ^ from) & pieces(~us)) return false; } @@ -637,7 +626,7 @@ bool Position::pseudo_legal(const Move m) const { } -/// Position::move_gives_check() tests whether a pseudo-legal move gives a check +/// Position::gives_check() tests whether a pseudo-legal move gives a check bool Position::gives_check(Move m, const CheckInfo& ci) const { @@ -649,52 +638,45 @@ bool Position::gives_check(Move m, const CheckInfo& ci) const { Square to = to_sq(m); PieceType pt = type_of(piece_on(from)); - // Direct check ? + // Is there a direct check? if (ci.checkSq[pt] & to) return true; - // Discovery check ? - if (unlikely(ci.dcCandidates) && (ci.dcCandidates & from)) - { - // For pawn and king moves we need to verify also direction - if ( (pt != PAWN && pt != KING) - || !aligned(from, to, king_square(~sideToMove))) - return true; - } - - // Can we skip the ugly special cases ? - if (type_of(m) == NORMAL) - return false; - - Color us = sideToMove; - Square ksq = king_square(~us); + // Is there a discovered check? + if ( unlikely(ci.dcCandidates) + && (ci.dcCandidates & from) + && !aligned(from, to, ci.ksq)) + return true; switch (type_of(m)) { - case PROMOTION: - return attacks_from(Piece(promotion_type(m)), to, pieces() ^ from) & ksq; + case NORMAL: + return false; - // En passant capture with check ? We have already handled the case - // of direct checks and ordinary discovered check, the only case we + case PROMOTION: + return attacks_bb(Piece(promotion_type(m)), to, pieces() ^ from) & ci.ksq; + + // En passant capture with check? We have already handled the case + // of direct checks and ordinary discovered check, so the only case we // need to handle is the unusual case of a discovered check through // the captured pawn. case ENPASSANT: { - Square capsq = file_of(to) | rank_of(from); + Square capsq = make_square(file_of(to), rank_of(from)); Bitboard b = (pieces() ^ from ^ capsq) | to; - return (attacks_bb< ROOK>(ksq, b) & pieces(us, QUEEN, ROOK)) - | (attacks_bb(ksq, b) & pieces(us, QUEEN, BISHOP)); + return (attacks_bb< ROOK>(ci.ksq, b) & pieces(sideToMove, QUEEN, ROOK)) + | (attacks_bb(ci.ksq, b) & pieces(sideToMove, QUEEN, BISHOP)); } - case CASTLE: + case CASTLING: { Square kfrom = from; - Square rfrom = to; // 'King captures the rook' notation - Square kto = relative_square(us, rfrom > kfrom ? SQ_G1 : SQ_C1); - Square rto = relative_square(us, rfrom > kfrom ? SQ_F1 : SQ_D1); + Square rfrom = to; // Castling is encoded as 'King captures the rook' + Square kto = relative_square(sideToMove, rfrom > kfrom ? SQ_G1 : SQ_C1); + Square rto = relative_square(sideToMove, rfrom > kfrom ? SQ_F1 : SQ_D1); - return (PseudoAttacks[ROOK][rto] & ksq) - && (attacks_bb(rto, (pieces() ^ kfrom ^ rfrom) | rto | kto) & ksq); + return (PseudoAttacks[ROOK][rto] & ci.ksq) + && (attacks_bb(rto, (pieces() ^ kfrom ^ rfrom) | rto | kto) & ci.ksq); } default: assert(false); @@ -721,9 +703,9 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI ++nodes; Key k = st->key; - // Copy some fields of old state to our new StateInfo object except the ones - // which are going to be recalculated from scratch anyway, then switch our state - // pointer to point to the new, ready to be updated, state. + // Copy some fields of the old state to our new StateInfo object except the + // ones which are going to be recalculated from scratch anyway and then switch + // our state pointer to point to the new (ready to be updated) state. std::memcpy(&newSt, st, StateCopySize64 * sizeof(uint64_t)); newSt.previous = st; @@ -732,7 +714,7 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI // Update side to move k ^= Zobrist::side; - // Increment ply counters.In particular rule50 will be later reset it to zero + // Increment ply counters. In particular, rule50 will be reset to zero later on // in case of a capture or a pawn move. ++gamePly; ++st->rule50; @@ -747,21 +729,17 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI PieceType captured = type_of(m) == ENPASSANT ? PAWN : type_of(piece_on(to)); assert(color_of(pc) == us); - assert(piece_on(to) == NO_PIECE || color_of(piece_on(to)) == them || type_of(m) == CASTLE); + assert(piece_on(to) == NO_PIECE || color_of(piece_on(to)) == them || type_of(m) == CASTLING); assert(captured != KING); - if (type_of(m) == CASTLE) + if (type_of(m) == CASTLING) { assert(pc == make_piece(us, KING)); - bool kingSide = to > from; - Square rfrom = to; // Castle is encoded as "king captures friendly rook" - Square rto = relative_square(us, kingSide ? SQ_F1 : SQ_D1); - to = relative_square(us, kingSide ? SQ_G1 : SQ_C1); + Square rfrom, rto; + do_castling(from, to, rfrom, rto); + captured = NO_PIECE_TYPE; - - do_castle(from, to, rfrom, rto); - st->psq += psq[us][ROOK][rto] - psq[us][ROOK][rfrom]; k ^= Zobrist::psq[us][ROOK][rfrom] ^ Zobrist::psq[us][ROOK][rto]; } @@ -817,25 +795,25 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI st->epSquare = SQ_NONE; } - // Update castle rights if needed - if (st->castleRights && (castleRightsMask[from] | castleRightsMask[to])) + // Update castling rights if needed + if (st->castlingRights && (castlingRightsMask[from] | castlingRightsMask[to])) { - int cr = castleRightsMask[from] | castleRightsMask[to]; - k ^= Zobrist::castle[st->castleRights & cr]; - st->castleRights &= ~cr; + int cr = castlingRightsMask[from] | castlingRightsMask[to]; + k ^= Zobrist::castling[st->castlingRights & cr]; + st->castlingRights &= ~cr; } // Prefetch TT access as soon as we know the new hash key prefetch((char*)TT.first_entry(k)); - // Move the piece. The tricky Chess960 castle is handled earlier - if (type_of(m) != CASTLE) + // Move the piece. The tricky Chess960 castling is handled earlier + if (type_of(m) != CASTLING) move_piece(from, to, us, pt); // If the moving piece is a pawn do some special extra work if (pt == PAWN) { - // Set en-passant square, only if moved pawn can be captured + // Set en-passant square if the moved pawn can be captured if ( (int(to) ^ int(from)) == 16 && (attacks_from(from + pawn_push(us), us) & pieces(them, PAWN))) { @@ -843,7 +821,7 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI k ^= Zobrist::enpassant[file_of(st->epSquare)]; } - if (type_of(m) == PROMOTION) + else if (type_of(m) == PROMOTION) { PieceType promotion = promotion_type(m); @@ -883,7 +861,7 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI // Update the key with the final value st->key = k; - // Update checkers bitboard, piece must be already moved + // Update checkers bitboard: piece must be already moved due to attacks_from() st->checkersBB = 0; if (moveIsCheck) @@ -896,8 +874,8 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI if (ci.checkSq[pt] & to) st->checkersBB |= to; - // Discovery checks - if (ci.dcCandidates && (ci.dcCandidates & from)) + // Discovered checks + if (unlikely(ci.dcCandidates) && (ci.dcCandidates & from)) { if (pt != ROOK) st->checkersBB |= attacks_from(king_square(them)) & pieces(us, QUEEN, ROOK); @@ -924,56 +902,49 @@ void Position::undo_move(Move m) { sideToMove = ~sideToMove; Color us = sideToMove; - Color them = ~us; Square from = from_sq(m); Square to = to_sq(m); PieceType pt = type_of(piece_on(to)); - PieceType captured = st->capturedType; - assert(empty(from) || type_of(m) == CASTLE); - assert(captured != KING); + assert(empty(from) || type_of(m) == CASTLING); + assert(st->capturedType != KING); if (type_of(m) == PROMOTION) { - PieceType promotion = promotion_type(m); - - assert(promotion == pt); + assert(pt == promotion_type(m)); assert(relative_rank(us, to) == RANK_8); - assert(promotion >= KNIGHT && promotion <= QUEEN); + assert(promotion_type(m) >= KNIGHT && promotion_type(m) <= QUEEN); - remove_piece(to, us, promotion); + remove_piece(to, us, promotion_type(m)); put_piece(to, us, PAWN); pt = PAWN; } - if (type_of(m) == CASTLE) + if (type_of(m) == CASTLING) { - bool kingSide = to > from; - Square rfrom = to; // Castle is encoded as "king captures friendly rook" - Square rto = relative_square(us, kingSide ? SQ_F1 : SQ_D1); - to = relative_square(us, kingSide ? SQ_G1 : SQ_C1); - captured = NO_PIECE_TYPE; - pt = KING; - do_castle(to, from, rto, rfrom); + Square rfrom, rto; + do_castling(from, to, rfrom, rto); } else + { move_piece(to, from, us, pt); // Put the piece back at the source square - if (captured) - { - Square capsq = to; - - if (type_of(m) == ENPASSANT) + if (st->capturedType) { - capsq -= pawn_push(us); + Square capsq = to; - assert(pt == PAWN); - assert(to == st->previous->epSquare); - assert(relative_rank(us, to) == RANK_6); - assert(piece_on(capsq) == NO_PIECE); + if (type_of(m) == ENPASSANT) + { + capsq -= pawn_push(us); + + assert(pt == PAWN); + assert(to == st->previous->epSquare); + assert(relative_rank(us, to) == RANK_6); + assert(piece_on(capsq) == NO_PIECE); + } + + put_piece(capsq, ~us, st->capturedType); // Restore the captured piece } - - put_piece(capsq, them, captured); // Restore the captured piece } // Finally point our state pointer back to the previous state @@ -984,17 +955,22 @@ void Position::undo_move(Move m) { } -/// Position::do_castle() is a helper used to do/undo a castling move. This +/// Position::do_castling() is a helper used to do/undo a castling move. This /// is a bit tricky, especially in Chess960. +template +void Position::do_castling(Square from, Square& to, Square& rfrom, Square& rto) { -void Position::do_castle(Square kfrom, Square kto, Square rfrom, Square rto) { + bool kingSide = to > from; + rfrom = to; // Castling is encoded as "king captures friendly rook" + rto = relative_square(sideToMove, kingSide ? SQ_F1 : SQ_D1); + to = relative_square(sideToMove, kingSide ? SQ_G1 : SQ_C1); // Remove both pieces first since squares could overlap in Chess960 - remove_piece(kfrom, sideToMove, KING); - remove_piece(rfrom, sideToMove, ROOK); - board[kfrom] = board[rfrom] = NO_PIECE; // Since remove_piece doesn't do it for us - put_piece(kto, sideToMove, KING); - put_piece(rto, sideToMove, ROOK); + remove_piece(Do ? from : to, sideToMove, KING); + remove_piece(Do ? rfrom : rto, sideToMove, ROOK); + board[Do ? from : to] = board[Do ? rfrom : rto] = NO_PIECE; // Since remove_piece doesn't do it for us + put_piece(Do ? to : from, sideToMove, KING); + put_piece(Do ? rto : rfrom, sideToMove, ROOK); } @@ -1037,12 +1013,9 @@ void Position::undo_null_move() { /// Position::see() is a static exchange evaluator: It tries to estimate the -/// material gain or loss resulting from a move. Parameter 'asymmThreshold' takes -/// tempi into account. If the side who initiated the capturing sequence does the -/// last capture, he loses a tempo and if the result is below 'asymmThreshold' -/// the capturing sequence is considered bad. +/// material gain or loss resulting from a move. -int Position::see_sign(Move m) const { +Value Position::see_sign(Move m) const { assert(is_ok(m)); @@ -1050,16 +1023,17 @@ int Position::see_sign(Move m) const { // is not less then capturing one. Note that king moves always return // here because king midgame value is set to 0. if (PieceValue[MG][moved_piece(m)] <= PieceValue[MG][piece_on(to_sq(m))]) - return 1; + return VALUE_KNOWN_WIN; return see(m); } -int Position::see(Move m, int asymmThreshold) const { +Value Position::see(Move m) const { Square from, to; Bitboard occupied, attackers, stmAttackers; - int swapList[32], slIndex = 1; + Value swapList[32]; + int slIndex = 1; PieceType captured; Color stm; @@ -1071,11 +1045,11 @@ int Position::see(Move m, int asymmThreshold) const { stm = color_of(piece_on(from)); occupied = pieces() ^ from; - // Castle moves are implemented as king capturing the rook so cannot be + // Castling moves are implemented as king capturing the rook so cannot be // handled correctly. Simply return 0 that is always the correct value // unless in the rare case the rook ends up under attack. - if (type_of(m) == CASTLE) - return 0; + if (type_of(m) == CASTLING) + return VALUE_ZERO; if (type_of(m) == ENPASSANT) { @@ -1106,30 +1080,24 @@ int Position::see(Move m, int asymmThreshold) const { // Add the new entry to the swap list swapList[slIndex] = -swapList[slIndex - 1] + PieceValue[MG][captured]; - ++slIndex; // Locate and remove the next least valuable attacker captured = min_attacker(byTypeBB, to, stmAttackers, occupied, attackers); - stm = ~stm; - stmAttackers = attackers & pieces(stm); // Stop before processing a king capture - if (captured == KING && stmAttackers) + if (captured == KING) { - swapList[slIndex++] = QueenValueMg * 16; + if (stmAttackers == attackers) + ++slIndex; + break; } - } while (stmAttackers); + stm = ~stm; + stmAttackers = attackers & pieces(stm); + ++slIndex; - // If we are doing asymmetric SEE evaluation and the same side does the first - // and the last capture, he loses a tempo and gain must be at least worth - // 'asymmThreshold', otherwise we replace the score with a very low value, - // before negamaxing. - if (asymmThreshold) - for (int i = 0; i < slIndex; i += 2) - if (swapList[i] < asymmThreshold) - swapList[i] = - QueenValueMg * 16; + } while (stmAttackers); // Having built the swap list, we negamax through it to find the best // achievable score from the point of view of the side to move. @@ -1140,150 +1108,25 @@ int Position::see(Move m, int asymmThreshold) const { } -/// Position::clear() erases the position object to a pristine state, with an -/// empty board, white to move, and no castling rights. +/// Position::is_draw() tests whether the position is drawn by material, 50 moves +/// rule or repetition. It does not detect stalemates. -void Position::clear() { - - std::memset(this, 0, sizeof(Position)); - startState.epSquare = SQ_NONE; - st = &startState; - - for (int i = 0; i < PIECE_TYPE_NB; ++i) - for (int j = 0; j < 16; ++j) - pieceList[WHITE][i][j] = pieceList[BLACK][i][j] = SQ_NONE; -} - - -/// Position::compute_key() computes the hash key of the position. The hash -/// key is usually updated incrementally as moves are made and unmade, the -/// compute_key() function is only used when a new position is set up, and -/// to verify the correctness of the hash key when running in debug mode. - -Key Position::compute_key() const { - - Key k = Zobrist::castle[st->castleRights]; - - for (Bitboard b = pieces(); b; ) - { - Square s = pop_lsb(&b); - k ^= Zobrist::psq[color_of(piece_on(s))][type_of(piece_on(s))][s]; - } - - if (ep_square() != SQ_NONE) - k ^= Zobrist::enpassant[file_of(ep_square())]; - - if (sideToMove == BLACK) - k ^= Zobrist::side; - - return k; -} - - -/// Position::compute_pawn_key() computes the hash key of the position. The -/// hash key is usually updated incrementally as moves are made and unmade, -/// the compute_pawn_key() function is only used when a new position is set -/// up, and to verify the correctness of the pawn hash key when running in -/// debug mode. - -Key Position::compute_pawn_key() const { - - Key k = 0; - - for (Bitboard b = pieces(PAWN); b; ) - { - Square s = pop_lsb(&b); - k ^= Zobrist::psq[color_of(piece_on(s))][PAWN][s]; - } - - return k; -} - - -/// Position::compute_material_key() computes the hash key of the position. -/// The hash key is usually updated incrementally as moves are made and unmade, -/// the compute_material_key() function is only used when a new position is set -/// up, and to verify the correctness of the material hash key when running in -/// debug mode. - -Key Position::compute_material_key() const { - - Key k = 0; - - for (Color c = WHITE; c <= BLACK; ++c) - for (PieceType pt = PAWN; pt <= QUEEN; ++pt) - for (int cnt = 0; cnt < pieceCount[c][pt]; ++cnt) - k ^= Zobrist::psq[c][pt][cnt]; - - return k; -} - - -/// Position::compute_psq_score() computes the incremental scores for the middle -/// game and the endgame. These functions are used to initialize the incremental -/// scores when a new position is set up, and to verify that the scores are correctly -/// updated by do_move and undo_move when the program is running in debug mode. - -Score Position::compute_psq_score() const { - - Score score = SCORE_ZERO; - - for (Bitboard b = pieces(); b; ) - { - Square s = pop_lsb(&b); - Piece pc = piece_on(s); - score += psq[color_of(pc)][type_of(pc)][s]; - } - - return score; -} - - -/// Position::compute_non_pawn_material() computes the total non-pawn middle -/// game material value for the given side. Material values are updated -/// incrementally during the search, this function is only used while -/// initializing a new Position object. - -Value Position::compute_non_pawn_material(Color c) const { - - Value value = VALUE_ZERO; - - for (PieceType pt = KNIGHT; pt <= QUEEN; ++pt) - value += pieceCount[c][pt] * PieceValue[MG][pt]; - - return value; -} - - -/// Position::is_draw() tests whether the position is drawn by material, -/// repetition, or the 50 moves rule. It does not detect stalemates, this -/// must be done by the search. bool Position::is_draw() const { - // Draw by material? if ( !pieces(PAWN) && (non_pawn_material(WHITE) + non_pawn_material(BLACK) <= BishopValueMg)) return true; - // Draw by the 50 moves rule? if (st->rule50 > 99 && (!checkers() || MoveList(*this).size())) return true; - int i = 4, e = std::min(st->rule50, st->pliesFromNull); - - if (i <= e) + StateInfo* stp = st; + for (int i = 2, e = std::min(st->rule50, st->pliesFromNull); i <= e; i += 2) { - StateInfo* stp = st->previous->previous; + stp = stp->previous->previous; - do { - stp = stp->previous->previous; - - if (stp->key == st->key) - return true; // Draw after first repetition - - i += 2; - - } while (i <= e); + if (stp->key == st->key) + return true; // Draw at first repetition } return false; @@ -1291,7 +1134,7 @@ bool Position::is_draw() const { /// Position::flip() flips position with the white and black sides reversed. This -/// is only useful for debugging especially for finding evaluation symmetry bugs. +/// is only useful for debugging e.g. for finding evaluation symmetry bugs. static char toggle_case(char c) { return char(islower(c) ? toupper(c) : tolower(c)); @@ -1302,9 +1145,9 @@ void Position::flip() { string f, token; std::stringstream ss(fen()); - for (Rank rank = RANK_8; rank >= RANK_1; --rank) // Piece placement + for (Rank r = RANK_8; r >= RANK_1; --r) // Piece placement { - std::getline(ss, token, rank > RANK_1 ? '/' : ' '); + std::getline(ss, token, r > RANK_1 ? '/' : ' '); f.insert(0, token + (f.empty() ? " " : "/")); } @@ -1328,60 +1171,33 @@ void Position::flip() { } -/// Position::pos_is_ok() performs some consitency checks for the position object. +/// Position::pos_is_ok() performs some consistency checks for the position object. /// This is meant to be helpful when debugging. -bool Position::pos_is_ok(int* failedStep) const { +bool Position::pos_is_ok(int* step) const { - int dummy, *step = failedStep ? failedStep : &dummy; - - // What features of the position should be verified? + // Which parts of the position should be verified? const bool all = false; - const bool debugBitboards = all || false; - const bool debugKingCount = all || false; - const bool debugKingCapture = all || false; - const bool debugCheckerCount = all || false; - const bool debugKey = all || false; - const bool debugMaterialKey = all || false; - const bool debugPawnKey = all || false; - const bool debugIncrementalEval = all || false; - const bool debugNonPawnMaterial = all || false; - const bool debugPieceCounts = all || false; - const bool debugPieceList = all || false; - const bool debugCastleSquares = all || false; + const bool testBitboards = all || false; + const bool testState = all || false; + const bool testKingCount = all || false; + const bool testKingCapture = all || false; + const bool testPieceCounts = all || false; + const bool testPieceList = all || false; + const bool testCastlingSquares = all || false; - *step = 1; + if (step) + *step = 1; - if (sideToMove != WHITE && sideToMove != BLACK) + if ( (sideToMove != WHITE && sideToMove != BLACK) + || piece_on(king_square(WHITE)) != W_KING + || piece_on(king_square(BLACK)) != B_KING + || ( ep_square() != SQ_NONE + && relative_rank(sideToMove, ep_square()) != RANK_6)) return false; - if ((*step)++, piece_on(king_square(WHITE)) != W_KING) - return false; - - if ((*step)++, piece_on(king_square(BLACK)) != B_KING) - return false; - - if ((*step)++, debugKingCount) - { - int kingCount[COLOR_NB] = {}; - - for (Square s = SQ_A1; s <= SQ_H8; ++s) - if (type_of(piece_on(s)) == KING) - ++kingCount[color_of(piece_on(s))]; - - if (kingCount[0] != 1 || kingCount[1] != 1) - return false; - } - - if ((*step)++, debugKingCapture) - if (attackers_to(king_square(~sideToMove)) & pieces(sideToMove)) - return false; - - if ((*step)++, debugCheckerCount && popcount(st->checkersBB) > 2) - return false; - - if ((*step)++, debugBitboards) + if (step && ++*step, testBitboards) { // The intersection of the white and black pieces must be empty if (pieces(WHITE) & pieces(BLACK)) @@ -1399,33 +1215,36 @@ bool Position::pos_is_ok(int* failedStep) const { return false; } - if ((*step)++, ep_square() != SQ_NONE && relative_rank(sideToMove, ep_square()) != RANK_6) - return false; + if (step && ++*step, testState) + { + StateInfo si; + set_state(&si); + if ( st->key != si.key + || st->pawnKey != si.pawnKey + || st->materialKey != si.materialKey + || st->npMaterial[WHITE] != si.npMaterial[WHITE] + || st->npMaterial[BLACK] != si.npMaterial[BLACK] + || st->psq != si.psq + || st->checkersBB != si.checkersBB) + return false; + } - if ((*step)++, debugKey && st->key != compute_key()) - return false; - - if ((*step)++, debugPawnKey && st->pawnKey != compute_pawn_key()) - return false; - - if ((*step)++, debugMaterialKey && st->materialKey != compute_material_key()) - return false; - - if ((*step)++, debugIncrementalEval && st->psq != compute_psq_score()) - return false; - - if ((*step)++, debugNonPawnMaterial) - if ( st->npMaterial[WHITE] != compute_non_pawn_material(WHITE) - || st->npMaterial[BLACK] != compute_non_pawn_material(BLACK)) + if (step && ++*step, testKingCount) + if ( std::count(board, board + SQUARE_NB, W_KING) != 1 + || std::count(board, board + SQUARE_NB, B_KING) != 1) return false; - if ((*step)++, debugPieceCounts) + if (step && ++*step, testKingCapture) + if (attackers_to(king_square(~sideToMove)) & pieces(sideToMove)) + return false; + + if (step && ++*step, testPieceCounts) for (Color c = WHITE; c <= BLACK; ++c) for (PieceType pt = PAWN; pt <= KING; ++pt) if (pieceCount[c][pt] != popcount(pieces(c, pt))) return false; - if ((*step)++, debugPieceList) + if (step && ++*step, testPieceList) for (Color c = WHITE; c <= BLACK; ++c) for (PieceType pt = PAWN; pt <= KING; ++pt) for (int i = 0; i < pieceCount[c][pt]; ++i) @@ -1433,21 +1252,18 @@ bool Position::pos_is_ok(int* failedStep) const { || index[pieceList[c][pt][i]] != i) return false; - if ((*step)++, debugCastleSquares) + if (step && ++*step, testCastlingSquares) for (Color c = WHITE; c <= BLACK; ++c) for (CastlingSide s = KING_SIDE; s <= QUEEN_SIDE; s = CastlingSide(s + 1)) { - CastleRight cr = make_castle_right(c, s); - - if (!can_castle(cr)) + if (!can_castle(c | s)) continue; - if ( (castleRightsMask[king_square(c)] & cr) != cr - || piece_on(castleRookSquare[c][s]) != make_piece(c, ROOK) - || castleRightsMask[castleRookSquare[c][s]] != cr) + if ( (castlingRightsMask[king_square(c)] & (c | s)) != (c | s) + || piece_on(castlingRookSquare[c | s]) != make_piece(c, ROOK) + || castlingRightsMask[castlingRookSquare[c | s]] != (c | s)) return false; } - *step = 0; return true; } diff --git a/DroidFish/jni/stockfish/position.h b/DroidFish/jni/stockfish/position.h index c333e55..0f88944 100644 --- a/DroidFish/jni/stockfish/position.h +++ b/DroidFish/jni/stockfish/position.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -51,7 +51,7 @@ struct CheckInfo { struct StateInfo { Key pawnKey, materialKey; Value npMaterial[COLOR_NB]; - int castleRights, rule50, pliesFromNull; + int castlingRights, rule50, pliesFromNull; Score psq; Square epSquare; @@ -75,13 +75,13 @@ const size_t StateCopySize64 = offsetof(StateInfo, key) / sizeof(uint64_t) + 1; class Position { public: Position() {} - Position(const Position& p, Thread* t) { *this = p; thisThread = t; } + Position(const Position& pos, Thread* t) { *this = pos; thisThread = t; } Position(const std::string& f, bool c960, Thread* t) { set(f, c960, t); } Position& operator=(const Position&); static void init(); // Text input/output - void set(const std::string& fen, bool isChess960, Thread* th); + void set(const std::string& fenStr, bool isChess960, Thread* th); const std::string fen() const; const std::string pretty(Move m = MOVE_NONE) const; @@ -100,21 +100,20 @@ public: template const Square* list(Color c) const; // Castling - int can_castle(CastleRight f) const; int can_castle(Color c) const; - bool castle_impeded(Color c, CastlingSide s) const; - Square castle_rook_square(Color c, CastlingSide s) const; + int can_castle(CastlingRight cr) const; + bool castling_impeded(CastlingRight cr) const; + Square castling_rook_square(CastlingRight cr) const; // Checking Bitboard checkers() const; Bitboard discovered_check_candidates() const; - Bitboard pinned_pieces(Color toMove) const; + Bitboard pinned_pieces(Color c) const; // Attacks to/from a given square Bitboard attackers_to(Square s) const; Bitboard attackers_to(Square s, Bitboard occ) const; - Bitboard attacks_from(Piece p, Square s) const; - static Bitboard attacks_from(Piece p, Square s, Bitboard occ); + Bitboard attacks_from(Piece pc, Square s) const; template Bitboard attacks_from(Square s) const; template Bitboard attacks_from(Square s, Color c) const; @@ -124,7 +123,7 @@ public: bool capture(Move m) const; bool capture_or_promotion(Move m) const; bool gives_check(Move m, const CheckInfo& ci) const; - bool passed_pawn_push(Move m) const; + bool advanced_pawn_push(Move m) const; Piece moved_piece(Move m) const; PieceType captured_piece_type() const; @@ -142,8 +141,8 @@ public: void undo_null_move(); // Static exchange evaluation - int see(Move m, int asymmThreshold = 0) const; - int see_sign(Move m) const; + Value see(Move m) const; + Value see_sign(Move m) const; // Accessing hash keys Key key() const; @@ -160,34 +159,27 @@ public: int game_ply() const; bool is_chess960() const; Thread* this_thread() const; - int64_t nodes_searched() const; - void set_nodes_searched(int64_t n); + uint64_t nodes_searched() const; + void set_nodes_searched(uint64_t n); bool is_draw() const; // Position consistency check, for debugging - bool pos_is_ok(int* failedStep = NULL) const; + bool pos_is_ok(int* step = NULL) const; void flip(); private: // Initialization helpers (used while setting up a position) void clear(); - void set_castle_right(Color c, Square rfrom); + void set_castling_right(Color c, Square rfrom); + void set_state(StateInfo* si) const; // Helper functions - void do_castle(Square kfrom, Square kto, Square rfrom, Square rto); - Bitboard hidden_checkers(Square ksq, Color c, Color toMove) const; + Bitboard check_blockers(Color c, Color kingColor) const; void put_piece(Square s, Color c, PieceType pt); void remove_piece(Square s, Color c, PieceType pt); void move_piece(Square from, Square to, Color c, PieceType pt); - - // Computing hash keys from scratch (for initialization and debugging) - Key compute_key() const; - Key compute_pawn_key() const; - Key compute_material_key() const; - - // Computing incremental evaluation scores and material counts - Score compute_psq_score() const; - Value compute_non_pawn_material(Color c) const; + template + void do_castling(Square from, Square& to, Square& rfrom, Square& rto); // Board and pieces Piece board[SQUARE_NB]; @@ -198,23 +190,23 @@ private: int index[SQUARE_NB]; // Other info - int castleRightsMask[SQUARE_NB]; - Square castleRookSquare[COLOR_NB][CASTLING_SIDE_NB]; - Bitboard castlePath[COLOR_NB][CASTLING_SIDE_NB]; + int castlingRightsMask[SQUARE_NB]; + Square castlingRookSquare[CASTLING_RIGHT_NB]; + Bitboard castlingPath[CASTLING_RIGHT_NB]; StateInfo startState; - int64_t nodes; + uint64_t nodes; int gamePly; Color sideToMove; Thread* thisThread; StateInfo* st; - int chess960; + bool chess960; }; -inline int64_t Position::nodes_searched() const { +inline uint64_t Position::nodes_searched() const { return nodes; } -inline void Position::set_nodes_searched(int64_t n) { +inline void Position::set_nodes_searched(uint64_t n) { nodes = n; } @@ -274,26 +266,26 @@ inline Square Position::king_square(Color c) const { return pieceList[c][KING][0]; } -inline int Position::can_castle(CastleRight f) const { - return st->castleRights & f; +inline int Position::can_castle(CastlingRight cr) const { + return st->castlingRights & cr; } inline int Position::can_castle(Color c) const { - return st->castleRights & ((WHITE_OO | WHITE_OOO) << (2 * c)); + return st->castlingRights & ((WHITE_OO | WHITE_OOO) << (2 * c)); } -inline bool Position::castle_impeded(Color c, CastlingSide s) const { - return byTypeBB[ALL_PIECES] & castlePath[c][s]; +inline bool Position::castling_impeded(CastlingRight cr) const { + return byTypeBB[ALL_PIECES] & castlingPath[cr]; } -inline Square Position::castle_rook_square(Color c, CastlingSide s) const { - return castleRookSquare[c][s]; +inline Square Position::castling_rook_square(CastlingRight cr) const { + return castlingRookSquare[cr]; } template inline Bitboard Position::attacks_from(Square s) const { - return Pt == BISHOP || Pt == ROOK ? attacks_bb(s, pieces()) + return Pt == BISHOP || Pt == ROOK ? attacks_bb(s, byTypeBB[ALL_PIECES]) : Pt == QUEEN ? attacks_from(s) | attacks_from(s) : StepAttacksBB[Pt][s]; } @@ -303,8 +295,8 @@ inline Bitboard Position::attacks_from(Square s, Color c) const { return StepAttacksBB[make_piece(c, PAWN)][s]; } -inline Bitboard Position::attacks_from(Piece p, Square s) const { - return attacks_from(p, s, byTypeBB[ALL_PIECES]); +inline Bitboard Position::attacks_from(Piece pc, Square s) const { + return attacks_bb(pc, s, byTypeBB[ALL_PIECES]); } inline Bitboard Position::attackers_to(Square s) const { @@ -316,21 +308,20 @@ inline Bitboard Position::checkers() const { } inline Bitboard Position::discovered_check_candidates() const { - return hidden_checkers(king_square(~sideToMove), sideToMove, sideToMove); + return check_blockers(sideToMove, ~sideToMove); } -inline Bitboard Position::pinned_pieces(Color toMove) const { - return hidden_checkers(king_square(toMove), ~toMove, toMove); +inline Bitboard Position::pinned_pieces(Color c) const { + return check_blockers(c, c); } inline bool Position::pawn_passed(Color c, Square s) const { return !(pieces(~c, PAWN) & passed_pawn_mask(c, s)); } -inline bool Position::passed_pawn_push(Move m) const { - +inline bool Position::advanced_pawn_push(Move m) const { return type_of(moved_piece(m)) == PAWN - && pawn_passed(sideToMove, to_sq(m)); + && relative_rank(sideToMove, from_sq(m)) > RANK_4; } inline Key Position::key() const { @@ -381,14 +372,14 @@ inline bool Position::is_chess960() const { inline bool Position::capture_or_promotion(Move m) const { assert(is_ok(m)); - return type_of(m) ? type_of(m) != CASTLE : !empty(to_sq(m)); + return type_of(m) != NORMAL ? type_of(m) != CASTLING : !empty(to_sq(m)); } inline bool Position::capture(Move m) const { - // Note that castle is coded as "king captures the rook" + // Note that castling is encoded as "king captures the rook" assert(is_ok(m)); - return (!empty(to_sq(m)) && type_of(m) != CASTLE) || type_of(m) == ENPASSANT; + return (!empty(to_sq(m)) && type_of(m) != CASTLING) || type_of(m) == ENPASSANT; } inline PieceType Position::captured_piece_type() const { @@ -405,7 +396,6 @@ inline void Position::put_piece(Square s, Color c, PieceType pt) { byTypeBB[ALL_PIECES] |= s; byTypeBB[pt] |= s; byColorBB[c] |= s; - pieceCount[c][ALL_PIECES]++; index[s] = pieceCount[c][pt]++; pieceList[c][pt][index[s]] = s; } @@ -434,7 +424,6 @@ inline void Position::remove_piece(Square s, Color c, PieceType pt) { byTypeBB[pt] ^= s; byColorBB[c] ^= s; /* board[s] = NO_PIECE; */ // Not needed, will be overwritten by capturing - pieceCount[c][ALL_PIECES]--; Square lastSquare = pieceList[c][pt][--pieceCount[c][pt]]; index[lastSquare] = index[s]; pieceList[c][pt][index[lastSquare]] = lastSquare; diff --git a/DroidFish/jni/stockfish/psqtab.h b/DroidFish/jni/stockfish/psqtab.h index f45442d..a88d31d 100644 --- a/DroidFish/jni/stockfish/psqtab.h +++ b/DroidFish/jni/stockfish/psqtab.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,70 +26,70 @@ /// PSQT[PieceType][Square] contains Piece-Square scores. For each piece type on -/// a given square a (midgame, endgame) score pair is assigned. PSQT is defined -/// for white side, for black side the tables are symmetric. +/// a given square a (middlegame, endgame) score pair is assigned. PSQT is defined +/// for the white side and the tables are symmetric for the black side. static const Score PSQT[][SQUARE_NB] = { { }, { // Pawn S( 0, 0), S( 0, 0), S( 0, 0), S( 0, 0), S(0, 0), S( 0, 0), S( 0, 0), S( 0, 0), - S(-20,-8), S(-6,-8), S( 4,-8), S(14,-8), S(14,-8), S( 4,-8), S(-6,-8), S(-20,-8), - S(-20,-8), S(-6,-8), S( 9,-8), S(34,-8), S(34,-8), S( 9,-8), S(-6,-8), S(-20,-8), - S(-20,-8), S(-6,-8), S(17,-8), S(54,-8), S(54,-8), S(17,-8), S(-6,-8), S(-20,-8), - S(-20,-8), S(-6,-8), S(17,-8), S(34,-8), S(34,-8), S(17,-8), S(-6,-8), S(-20,-8), - S(-20,-8), S(-6,-8), S( 9,-8), S(14,-8), S(14,-8), S( 9,-8), S(-6,-8), S(-20,-8), - S(-20,-8), S(-6,-8), S( 4,-8), S(14,-8), S(14,-8), S( 4,-8), S(-6,-8), S(-20,-8), + S(-20, 0), S( 0, 0), S( 0, 0), S( 0, 0), S(0, 0), S( 0, 0), S( 0, 0), S(-20, 0), + S(-20, 0), S( 0, 0), S(10, 0), S(20, 0), S(20, 0), S(10, 0), S( 0, 0), S(-20, 0), + S(-20, 0), S( 0, 0), S(20, 0), S(40, 0), S(40, 0), S(20, 0), S( 0, 0), S(-20, 0), + S(-20, 0), S( 0, 0), S(10, 0), S(20, 0), S(20, 0), S(10, 0), S( 0, 0), S(-20, 0), + S(-20, 0), S( 0, 0), S( 0, 0), S( 0, 0), S(0, 0), S( 0, 0), S( 0, 0), S(-20, 0), + S(-20, 0), S( 0, 0), S( 0, 0), S( 0, 0), S(0, 0), S( 0, 0), S( 0, 0), S(-20, 0), S( 0, 0), S( 0, 0), S( 0, 0), S( 0, 0), S(0, 0), S( 0, 0), S( 0, 0), S( 0, 0) }, { // Knight - S(-135,-104), S(-107,-79), S(-80,-55), S(-67,-42), S(-67,-42), S(-80,-55), S(-107,-79), S(-135,-104), - S( -93, -79), S( -67,-55), S(-39,-30), S(-25,-17), S(-25,-17), S(-39,-30), S( -67,-55), S( -93, -79), - S( -53, -55), S( -25,-30), S( 1, -6), S( 13, 5), S( 13, 5), S( 1, -6), S( -25,-30), S( -53, -55), - S( -25, -42), S( 1,-17), S( 27, 5), S( 41, 18), S( 41, 18), S( 27, 5), S( 1,-17), S( -25, -42), - S( -11, -42), S( 13,-17), S( 41, 5), S( 55, 18), S( 55, 18), S( 41, 5), S( 13,-17), S( -11, -42), - S( -11, -55), S( 13,-30), S( 41, -6), S( 55, 5), S( 55, 5), S( 41, -6), S( 13,-30), S( -11, -55), - S( -53, -79), S( -25,-55), S( 1,-30), S( 13,-17), S( 13,-17), S( 1,-30), S( -25,-55), S( -53, -79), - S(-193,-104), S( -67,-79), S(-39,-55), S(-25,-42), S(-25,-42), S(-39,-55), S( -67,-79), S(-193,-104) + S(-144,-98), S(-109,-83), S(-85,-51), S(-73,-16), S(-73,-16), S(-85,-51), S(-109,-83), S(-144,-98), + S( -88,-68), S( -43,-53), S(-19,-21), S( -7, 14), S( -7, 14), S(-19,-21), S( -43,-53), S( -88,-68), + S( -69,-53), S( -24,-38), S( 0, -6), S( 12, 29), S( 12, 29), S( 0, -6), S( -24,-38), S( -69,-53), + S( -28,-42), S( 17,-27), S( 41, 5), S( 53, 40), S( 53, 40), S( 41, 5), S( 17,-27), S( -28,-42), + S( -30,-42), S( 15,-27), S( 39, 5), S( 51, 40), S( 51, 40), S( 39, 5), S( 15,-27), S( -30,-42), + S( -10,-53), S( 35,-38), S( 59, -6), S( 71, 29), S( 71, 29), S( 59, -6), S( 35,-38), S( -10,-53), + S( -64,-68), S( -19,-53), S( 5,-21), S( 17, 14), S( 17, 14), S( 5,-21), S( -19,-53), S( -64,-68), + S(-200,-98), S( -65,-83), S(-41,-51), S(-29,-16), S(-29,-16), S(-41,-51), S( -65,-83), S(-200,-98) }, { // Bishop - S(-40,-59), S(-40,-42), S(-35,-35), S(-30,-26), S(-30,-26), S(-35,-35), S(-40,-42), S(-40,-59), - S(-17,-42), S( 0,-26), S( -4,-18), S( 0,-11), S( 0,-11), S( -4,-18), S( 0,-26), S(-17,-42), - S(-13,-35), S( -4,-18), S( 8,-11), S( 4, -4), S( 4, -4), S( 8,-11), S( -4,-18), S(-13,-35), - S( -8,-26), S( 0,-11), S( 4, -4), S( 17, 4), S( 17, 4), S( 4, -4), S( 0,-11), S( -8,-26), - S( -8,-26), S( 0,-11), S( 4, -4), S( 17, 4), S( 17, 4), S( 4, -4), S( 0,-11), S( -8,-26), - S(-13,-35), S( -4,-18), S( 8,-11), S( 4, -4), S( 4, -4), S( 8,-11), S( -4,-18), S(-13,-35), - S(-17,-42), S( 0,-26), S( -4,-18), S( 0,-11), S( 0,-11), S( -4,-18), S( 0,-26), S(-17,-42), - S(-17,-59), S(-17,-42), S(-13,-35), S( -8,-26), S( -8,-26), S(-13,-35), S(-17,-42), S(-17,-59) + S(-54,-65), S(-27,-42), S(-34,-44), S(-43,-26), S(-43,-26), S(-34,-44), S(-27,-42), S(-54,-65), + S(-29,-43), S( 8,-20), S( 1,-22), S( -8, -4), S( -8, -4), S( 1,-22), S( 8,-20), S(-29,-43), + S(-20,-33), S( 17,-10), S( 10,-12), S( 1, 6), S( 1, 6), S( 10,-12), S( 17,-10), S(-20,-33), + S(-19,-35), S( 18,-12), S( 11,-14), S( 2, 4), S( 2, 4), S( 11,-14), S( 18,-12), S(-19,-35), + S(-22,-35), S( 15,-12), S( 8,-14), S( -1, 4), S( -1, 4), S( 8,-14), S( 15,-12), S(-22,-35), + S(-28,-33), S( 9,-10), S( 2,-12), S( -7, 6), S( -7, 6), S( 2,-12), S( 9,-10), S(-28,-33), + S(-32,-43), S( 5,-20), S( -2,-22), S(-11, -4), S(-11, -4), S( -2,-22), S( 5,-20), S(-32,-43), + S(-49,-65), S(-22,-42), S(-29,-44), S(-38,-26), S(-38,-26), S(-29,-44), S(-22,-42), S(-49,-65) }, { // Rook - S(-12, 3), S(-7, 3), S(-2, 3), S(2, 3), S(2, 3), S(-2, 3), S(-7, 3), S(-12, 3), - S(-12, 3), S(-7, 3), S(-2, 3), S(2, 3), S(2, 3), S(-2, 3), S(-7, 3), S(-12, 3), - S(-12, 3), S(-7, 3), S(-2, 3), S(2, 3), S(2, 3), S(-2, 3), S(-7, 3), S(-12, 3), - S(-12, 3), S(-7, 3), S(-2, 3), S(2, 3), S(2, 3), S(-2, 3), S(-7, 3), S(-12, 3), - S(-12, 3), S(-7, 3), S(-2, 3), S(2, 3), S(2, 3), S(-2, 3), S(-7, 3), S(-12, 3), - S(-12, 3), S(-7, 3), S(-2, 3), S(2, 3), S(2, 3), S(-2, 3), S(-7, 3), S(-12, 3), - S(-12, 3), S(-7, 3), S(-2, 3), S(2, 3), S(2, 3), S(-2, 3), S(-7, 3), S(-12, 3), - S(-12, 3), S(-7, 3), S(-2, 3), S(2, 3), S(2, 3), S(-2, 3), S(-7, 3), S(-12, 3) + S(-22, 3), S(-17, 3), S(-12, 3), S(-8, 3), S(-8, 3), S(-12, 3), S(-17, 3), S(-22, 3), + S(-22, 3), S( -7, 3), S( -2, 3), S( 2, 3), S( 2, 3), S( -2, 3), S( -7, 3), S(-22, 3), + S(-22, 3), S( -7, 3), S( -2, 3), S( 2, 3), S( 2, 3), S( -2, 3), S( -7, 3), S(-22, 3), + S(-22, 3), S( -7, 3), S( -2, 3), S( 2, 3), S( 2, 3), S( -2, 3), S( -7, 3), S(-22, 3), + S(-22, 3), S( -7, 3), S( -2, 3), S( 2, 3), S( 2, 3), S( -2, 3), S( -7, 3), S(-22, 3), + S(-22, 3), S( -7, 3), S( -2, 3), S( 2, 3), S( 2, 3), S( -2, 3), S( -7, 3), S(-22, 3), + S(-11, 3), S( 4, 3), S( 9, 3), S(13, 3), S(13, 3), S( 9, 3), S( 4, 3), S(-11, 3), + S(-22, 3), S(-17, 3), S(-12, 3), S(-8, 3), S(-8, 3), S(-12, 3), S(-17, 3), S(-22, 3) }, { // Queen - S(8,-80), S(8,-54), S(8,-42), S(8,-30), S(8,-30), S(8,-42), S(8,-54), S(8,-80), - S(8,-54), S(8,-30), S(8,-18), S(8, -6), S(8, -6), S(8,-18), S(8,-30), S(8,-54), - S(8,-42), S(8,-18), S(8, -6), S(8, 6), S(8, 6), S(8, -6), S(8,-18), S(8,-42), - S(8,-30), S(8, -6), S(8, 6), S(8, 18), S(8, 18), S(8, 6), S(8, -6), S(8,-30), - S(8,-30), S(8, -6), S(8, 6), S(8, 18), S(8, 18), S(8, 6), S(8, -6), S(8,-30), - S(8,-42), S(8,-18), S(8, -6), S(8, 6), S(8, 6), S(8, -6), S(8,-18), S(8,-42), - S(8,-54), S(8,-30), S(8,-18), S(8, -6), S(8, -6), S(8,-18), S(8,-30), S(8,-54), - S(8,-80), S(8,-54), S(8,-42), S(8,-30), S(8,-30), S(8,-42), S(8,-54), S(8,-80) + S(-2,-80), S(-2,-54), S(-2,-42), S(-2,-30), S(-2,-30), S(-2,-42), S(-2,-54), S(-2,-80), + S(-2,-54), S( 8,-30), S( 8,-18), S( 8, -6), S( 8, -6), S( 8,-18), S( 8,-30), S(-2,-54), + S(-2,-42), S( 8,-18), S( 8, -6), S( 8, 6), S( 8, 6), S( 8, -6), S( 8,-18), S(-2,-42), + S(-2,-30), S( 8, -6), S( 8, 6), S( 8, 18), S( 8, 18), S( 8, 6), S( 8, -6), S(-2,-30), + S(-2,-30), S( 8, -6), S( 8, 6), S( 8, 18), S( 8, 18), S( 8, 6), S( 8, -6), S(-2,-30), + S(-2,-42), S( 8,-18), S( 8, -6), S( 8, 6), S( 8, 6), S( 8, -6), S( 8,-18), S(-2,-42), + S(-2,-54), S( 8,-30), S( 8,-18), S( 8, -6), S( 8, -6), S( 8,-18), S( 8,-30), S(-2,-54), + S(-2,-80), S(-2,-54), S(-2,-42), S(-2,-30), S(-2,-30), S(-2,-42), S(-2,-54), S(-2,-80) }, { // King - S(287, 18), S(311, 77), S(262,105), S(214,135), S(214,135), S(262,105), S(311, 77), S(287, 18), - S(262, 77), S(287,135), S(238,165), S(190,193), S(190,193), S(238,165), S(287,135), S(262, 77), - S(214,105), S(238,165), S(190,193), S(142,222), S(142,222), S(190,193), S(238,165), S(214,105), - S(190,135), S(214,193), S(167,222), S(119,251), S(119,251), S(167,222), S(214,193), S(190,135), - S(167,135), S(190,193), S(142,222), S( 94,251), S( 94,251), S(142,222), S(190,193), S(167,135), - S(142,105), S(167,165), S(119,193), S( 69,222), S( 69,222), S(119,193), S(167,165), S(142,105), - S(119, 77), S(142,135), S( 94,165), S( 46,193), S( 46,193), S( 94,165), S(142,135), S(119, 77), - S(94, 18), S(119, 77), S( 69,105), S( 21,135), S( 21,135), S( 69,105), S(119, 77), S( 94, 18) + S(298, 27), S(332, 81), S(273,108), S(225,116), S(225,116), S(273,108), S(332, 81), S(298, 27), + S(287, 74), S(321,128), S(262,155), S(214,163), S(214,163), S(262,155), S(321,128), S(287, 74), + S(224,111), S(258,165), S(199,192), S(151,200), S(151,200), S(199,192), S(258,165), S(224,111), + S(196,135), S(230,189), S(171,216), S(123,224), S(123,224), S(171,216), S(230,189), S(196,135), + S(173,135), S(207,189), S(148,216), S(100,224), S(100,224), S(148,216), S(207,189), S(173,135), + S(146,111), S(180,165), S(121,192), S( 73,200), S( 73,200), S(121,192), S(180,165), S(146,111), + S(119, 74), S(153,128), S( 94,155), S( 46,163), S( 46,163), S( 94,155), S(153,128), S(119, 74), + S( 98, 27), S(132, 81), S( 73,108), S( 25,116), S( 25,116), S( 73,108), S(132, 81), S( 98, 27) } }; diff --git a/DroidFish/jni/stockfish/rkiss.h b/DroidFish/jni/stockfish/rkiss.h index ffcaf35..f3468db 100644 --- a/DroidFish/jni/stockfish/rkiss.h +++ b/DroidFish/jni/stockfish/rkiss.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -45,15 +45,15 @@ class RKISS { uint64_t a, b, c, d; - uint64_t rotate(uint64_t x, uint64_t k) const { + uint64_t rotate_L(uint64_t x, unsigned k) const { return (x << k) | (x >> (64 - k)); } uint64_t rand64() { - const uint64_t e = a - rotate(b, 7); - a = b ^ rotate(c, 13); - b = c + rotate(d, 37); + const uint64_t e = a - rotate_L(b, 7); + a = b ^ rotate_L(c, 13); + b = c + rotate_L(d, 37); c = d + e; return d = e + a; } @@ -68,6 +68,14 @@ public: } template T rand() { return T(rand64()); } + + /// Special generator used to fast init magic numbers. Here the + /// trick is to rotate the randoms of a given quantity 's' known + /// to be optimal to quickly find a good magic candidate. + template T magic_rand(int s) { + return rotate_L(rotate_L(rand(), (s >> 0) & 0x3F) & rand() + , (s >> 6) & 0x3F) & rand(); + } }; #endif // #ifndef RKISS_H_INCLUDED diff --git a/DroidFish/jni/stockfish/search.cpp b/DroidFish/jni/stockfish/search.cpp index f1ab80f..4ac4c08 100644 --- a/DroidFish/jni/stockfish/search.cpp +++ b/DroidFish/jni/stockfish/search.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -57,16 +57,16 @@ namespace { const bool FakeSplit = false; // Different node types, used as template parameter - enum NodeType { Root, PV, NonPV, SplitPointRoot, SplitPointPV, SplitPointNonPV }; + enum NodeType { Root, PV, NonPV }; // Dynamic razoring margin based on depth - inline Value razor_margin(Depth d) { return Value(512 + 16 * int(d)); } + inline Value razor_margin(Depth d) { return Value(512 + 16 * d); } // Futility lookup tables (initialized at startup) and their access functions int FutilityMoveCounts[2][32]; // [improving][depth] inline Value futility_margin(Depth d) { - return Value(100 * int(d)); + return Value(100 * d); } // Reduction lookup tables (initialized at startup) and their access function @@ -77,15 +77,15 @@ namespace { return (Depth) Reductions[PvNode][i][std::min(int(d) / ONE_PLY, 63)][std::min(mn, 63)]; } - size_t PVSize, PVIdx; + size_t MultiPV, PVIdx; TimeManager TimeMgr; double BestMoveChanges; Value DrawValue[COLOR_NB]; HistoryStats History; GainsStats Gains; - CountermovesStats Countermoves; + MovesStats Countermoves, Followupmoves; - template + template Value search(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth, bool cutNode); template @@ -94,8 +94,7 @@ namespace { void id_loop(Position& pos); Value value_to_tt(Value v, int ply); Value value_from_tt(Value v, int ply); - bool allows(const Position& pos, Move first, Move second); - bool refutes(const Position& pos, Move first, Move second); + void update_stats(const Position& pos, Stack* ss, Move move, Depth depth, Move* quiets, int quietsCnt); string uci_pv(const Position& pos, int depth, Value alpha, Value beta); struct Skill { @@ -128,10 +127,10 @@ void Search::init() { // Init reductions array for (hd = 1; hd < 64; ++hd) for (mc = 1; mc < 64; ++mc) { - double pvRed = log(double(hd)) * log(double(mc)) / 3.0; + double pvRed = 0.00 + log(double(hd)) * log(double(mc)) / 3.00; double nonPVRed = 0.33 + log(double(hd)) * log(double(mc)) / 2.25; - Reductions[1][1][hd][mc] = (int8_t) ( pvRed >= 1.0 ? floor( pvRed * int(ONE_PLY)) : 0); - Reductions[0][1][hd][mc] = (int8_t) (nonPVRed >= 1.0 ? floor(nonPVRed * int(ONE_PLY)) : 0); + Reductions[1][1][hd][mc] = int8_t( pvRed >= 1.0 ? pvRed * int(ONE_PLY) : 0); + Reductions[0][1][hd][mc] = int8_t(nonPVRed >= 1.0 ? nonPVRed * int(ONE_PLY) : 0); Reductions[1][0][hd][mc] = Reductions[1][1][hd][mc]; Reductions[0][0][hd][mc] = Reductions[0][1][hd][mc]; @@ -146,8 +145,8 @@ void Search::init() { // Init futility move count array for (d = 0; d < 32; ++d) { - FutilityMoveCounts[0][d] = int(2.4 + 0.222 * pow(d + 0.0, 1.8)); - FutilityMoveCounts[1][d] = int(3.0 + 0.3 * pow(d + 0.98, 1.8)); + FutilityMoveCounts[0][d] = int(2.4 + 0.222 * pow(d + 0.00, 1.8)); + FutilityMoveCounts[1][d] = int(3.0 + 0.300 * pow(d + 0.98, 1.8)); } } @@ -155,10 +154,10 @@ void Search::init() { /// Search::perft() is our utility to verify move generation. All the leaf nodes /// up to the given depth are generated and counted and the sum returned. -static size_t perft(Position& pos, Depth depth) { +static uint64_t perft(Position& pos, Depth depth) { StateInfo st; - size_t cnt = 0; + uint64_t cnt = 0; CheckInfo ci(pos); const bool leaf = depth == 2 * ONE_PLY; @@ -171,7 +170,7 @@ static size_t perft(Position& pos, Depth depth) { return cnt; } -size_t Search::perft(Position& pos, Depth depth) { +uint64_t Search::perft(Position& pos, Depth depth) { return depth > ONE_PLY ? ::perft(pos, depth) : MoveList(pos).size(); } @@ -186,6 +185,10 @@ void Search::think() { RootColor = RootPos.side_to_move(); TimeMgr.init(Limits, RootPos.game_ply(), RootColor); + int cf = Options["Contempt Factor"] * PawnValueEg / 100; // From centipawns + DrawValue[ RootColor] = VALUE_DRAW - Value(cf); + DrawValue[~RootColor] = VALUE_DRAW + Value(cf); + if (RootMoves.empty()) { RootMoves.push_back(MOVE_NONE); @@ -207,16 +210,6 @@ void Search::think() { } } - if (Options["Contempt Factor"] && !Options["UCI_AnalyseMode"]) - { - int cf = Options["Contempt Factor"] * PawnValueMg / 100; // From centipawns - cf = cf * Material::game_phase(RootPos) / PHASE_MIDGAME; // Scale down with phase - DrawValue[ RootColor] = VALUE_DRAW - Value(cf); - DrawValue[~RootColor] = VALUE_DRAW + Value(cf); - } - else - DrawValue[WHITE] = DrawValue[BLACK] = VALUE_DRAW; - if (Options["Write Search Log"]) { Log log(Options["Search Log Filename"]); @@ -226,21 +219,19 @@ void Search::think() { << " time: " << Limits.time[RootColor] << " increment: " << Limits.inc[RootColor] << " moves to go: " << Limits.movestogo - << std::endl; + << "\n" << std::endl; } - // Reset the threads, still sleeping: will be wake up at split time + // Reset the threads, still sleeping: will wake up at split time for (size_t i = 0; i < Threads.size(); ++i) Threads[i]->maxPly = 0; - Threads.sleepWhileIdle = Options["Idle Threads Sleep"]; Threads.timer->run = true; Threads.timer->notify_one(); // Wake up the recurring timer id_loop(RootPos); // Let's start searching ! Threads.timer->run = false; // Stop the timer - Threads.sleepWhileIdle = true; // Send idle threads to sleep if (Options["Write Search Log"]) { @@ -263,11 +254,11 @@ finalize: sync_cout << "info nodes " << RootPos.nodes_searched() << " time " << Time::now() - SearchTime + 1 << sync_endl; - // When we reach max depth we arrive here even without Signals.stop is raised, - // but if we are pondering or in infinite search, according to UCI protocol, - // we shouldn't print the best move before the GUI sends a "stop" or "ponderhit" - // command. We simply wait here until GUI sends one of those commands (that - // raise Signals.stop). + // When we reach the maximum depth, we can arrive here without a raise of + // Signals.stop. However, if we are pondering or in an infinite search, + // the UCI protocol states that we shouldn't print the best move before the + // GUI sends a "stop" or "ponderhit" command. We therefore simply wait here + // until the GUI sends one of those commands (which also raises Signals.stop). if (!Signals.stop && (Limits.ponder || Limits.infinite)) { Signals.stopOnPonderhit = true; @@ -305,30 +296,31 @@ namespace { History.clear(); Gains.clear(); Countermoves.clear(); + Followupmoves.clear(); - PVSize = Options["MultiPV"]; + MultiPV = Options["MultiPV"]; Skill skill(Options["Skill Level"]); // Do we have to play with skill handicap? In this case enable MultiPV search // that we will use behind the scenes to retrieve a set of possible moves. - if (skill.enabled() && PVSize < 4) - PVSize = 4; + if (skill.enabled() && MultiPV < 4) + MultiPV = 4; - PVSize = std::min(PVSize, RootMoves.size()); + MultiPV = std::min(MultiPV, RootMoves.size()); // Iterative deepening loop until requested to stop or target depth reached while (++depth <= MAX_PLY && !Signals.stop && (!Limits.depth || depth <= Limits.depth)) { // Age out PV variability metric - BestMoveChanges *= 0.8; + BestMoveChanges *= 0.5; - // Save last iteration's scores before first PV line is searched and all - // the move scores but the (new) PV are set to -VALUE_INFINITE. + // Save the last iteration's scores before first PV line is searched and + // all the move scores except the (new) PV are set to -VALUE_INFINITE. for (size_t i = 0; i < RootMoves.size(); ++i) RootMoves[i].prevScore = RootMoves[i].score; // MultiPV loop. We perform a full root search for each PV line - for (PVIdx = 0; PVIdx < PVSize && !Signals.stop; ++PVIdx) + for (PVIdx = 0; PVIdx < MultiPV && !Signals.stop; ++PVIdx) { // Reset aspiration window starting size if (depth >= 5) @@ -338,18 +330,19 @@ namespace { beta = std::min(RootMoves[PVIdx].prevScore + delta, VALUE_INFINITE); } - // Start with a small aspiration window and, in case of fail high/low, - // research with bigger window until not failing high/low anymore. + // Start with a small aspiration window and, in the case of a fail + // high/low, re-search with a bigger window until we're not failing + // high/low anymore. while (true) { - bestValue = search(pos, ss, alpha, beta, depth * ONE_PLY, false); + bestValue = search(pos, ss, alpha, beta, depth * ONE_PLY, false); - // Bring to front the best move. It is critical that sorting is - // done with a stable algorithm because all the values but the first - // and eventually the new best one are set to -VALUE_INFINITE and - // we want to keep the same order for all the moves but the new - // PV that goes to the front. Note that in case of MultiPV search - // the already searched PV lines are preserved. + // Bring the best move to the front. It is critical that sorting + // is done with a stable algorithm because all the values but the + // first and eventually the new best one are set to -VALUE_INFINITE + // and we want to keep the same order for all the moves except the + // new PV that goes to the front. Note that in case of MultiPV + // search the already searched PV lines are preserved. std::stable_sort(RootMoves.begin() + PVIdx, RootMoves.end()); // Write PV back to transposition table in case the relevant @@ -358,19 +351,19 @@ namespace { RootMoves[i].insert_pv_in_tt(pos); // If search has been stopped break immediately. Sorting and - // writing PV back to TT is safe becuase RootMoves is still - // valid, although refers to previous iteration. + // writing PV back to TT is safe because RootMoves is still + // valid, although it refers to previous iteration. if (Signals.stop) break; // When failing high/low give some update (without cluttering - // the UI) before to research. + // the UI) before a re-search. if ( (bestValue <= alpha || bestValue >= beta) && Time::now() - SearchTime > 3000) sync_cout << uci_pv(pos, depth, alpha, beta) << sync_endl; // In case of failing low/high increase aspiration window and - // research, otherwise exit the loop. + // re-search, otherwise exit the loop. if (bestValue <= alpha) { alpha = std::max(bestValue - delta, -VALUE_INFINITE); @@ -392,11 +385,11 @@ namespace { // Sort the PV lines searched so far and update the GUI std::stable_sort(RootMoves.begin(), RootMoves.begin() + PVIdx + 1); - if (PVIdx + 1 == PVSize || Time::now() - SearchTime > 3000) + if (PVIdx + 1 == MultiPV || Time::now() - SearchTime > 3000) sync_cout << uci_pv(pos, depth, alpha, beta) << sync_endl; } - // Do we need to pick now the sub-optimal best move ? + // If skill levels are enabled and time is up, pick a sub-optimal best move if (skill.enabled() && skill.time_to_pick(depth)) skill.pick_move(); @@ -411,7 +404,7 @@ namespace { << std::endl; } - // Do we have found a "mate in x"? + // Have we found a "mate in x"? if ( Limits.mate && bestValue >= VALUE_MATE_IN_MAX_PLY && VALUE_MATE - bestValue <= 2 * Limits.mate) @@ -420,42 +413,17 @@ namespace { // Do we have time for the next iteration? Can we stop searching now? if (Limits.use_time_management() && !Signals.stop && !Signals.stopOnPonderhit) { - bool stop = false; // Local variable, not the volatile Signals.stop - - // Take in account some extra time if the best move has changed - if (depth > 4 && depth < 50 && PVSize == 1) + // Take some extra time if the best move has changed + if (depth > 4 && depth < 50 && MultiPV == 1) TimeMgr.pv_instability(BestMoveChanges); - // Stop search if most of available time is already consumed. We - // probably don't have enough time to search the first move at the - // next iteration anyway. - if (Time::now() - SearchTime > (TimeMgr.available_time() * 62) / 100) - stop = true; - - // Stop search early if one move seems to be much better than others - if ( depth >= 12 - && BestMoveChanges <= DBL_EPSILON - && !stop - && PVSize == 1 - && bestValue > VALUE_MATED_IN_MAX_PLY - && ( RootMoves.size() == 1 - || Time::now() - SearchTime > (TimeMgr.available_time() * 20) / 100)) - { - Value rBeta = bestValue - 2 * PawnValueMg; - ss->excludedMove = RootMoves[0].pv[0]; - ss->skipNullMove = true; - Value v = search(pos, ss, rBeta - 1, rBeta, (depth - 3) * ONE_PLY, true); - ss->skipNullMove = false; - ss->excludedMove = MOVE_NONE; - - if (v < rBeta) - stop = true; - } - - if (stop) + // Stop the search if only one legal move is available or all + // of the available time has been used. + if ( RootMoves.size() == 1 + || Time::now() - SearchTime > TimeMgr.available_time()) { // If we are allowed to ponder do not stop the search now but - // keep pondering until GUI sends "ponderhit" or "stop". + // keep pondering until the GUI sends "ponderhit" or "stop". if (Limits.ponder) Signals.stopOnPonderhit = true; else @@ -469,18 +437,17 @@ namespace { // search<>() is the main search function for both PV and non-PV nodes and for // normal and SplitPoint nodes. When called just after a split point the search // is simpler because we have already probed the hash table, done a null move - // search, and searched the first move before splitting, we don't have to repeat - // all this work again. We also don't need to store anything to the hash table - // here: This is taken care of after we return from the split point. + // search, and searched the first move before splitting, so we don't have to + // repeat all this work again. We also don't need to store anything to the hash + // table here: This is taken care of after we return from the split point. - template + template Value search(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth, bool cutNode) { - const bool PvNode = (NT == PV || NT == Root || NT == SplitPointPV || NT == SplitPointRoot); - const bool SpNode = (NT == SplitPointPV || NT == SplitPointNonPV || NT == SplitPointRoot); - const bool RootNode = (NT == Root || NT == SplitPointRoot); + const bool RootNode = NT == Root; + const bool PvNode = NT == PV || NT == Root; - assert(alpha >= -VALUE_INFINITE && alpha < beta && beta <= VALUE_INFINITE); + assert(-VALUE_INFINITE <= alpha && alpha < beta && beta <= VALUE_INFINITE); assert(PvNode || (alpha == beta - 1)); assert(depth > DEPTH_ZERO); @@ -489,7 +456,7 @@ namespace { const TTEntry *tte; SplitPoint* splitPoint; Key posKey; - Move ttMove, move, excludedMove, bestMove, threatMove; + Move ttMove, move, excludedMove, bestMove; Depth ext, newDepth, predictedDepth; Value bestValue, value, ttValue, eval, nullValue, futilityValue; bool inCheck, givesCheck, pvMove, singularExtensionNode, improving; @@ -504,7 +471,6 @@ namespace { { splitPoint = ss->splitPoint; bestMove = splitPoint->bestMove; - threatMove = splitPoint->threatMove; bestValue = splitPoint->bestValue; tte = NULL; ttMove = excludedMove = MOVE_NONE; @@ -517,7 +483,7 @@ namespace { moveCount = quietCount = 0; bestValue = -VALUE_INFINITE; - ss->currentMove = threatMove = (ss+1)->excludedMove = bestMove = MOVE_NONE; + ss->currentMove = ss->ttMove = (ss+1)->excludedMove = bestMove = MOVE_NONE; ss->ply = (ss-1)->ply + 1; (ss+1)->skipNullMove = false; (ss+1)->reduction = DEPTH_ZERO; (ss+2)->killers[0] = (ss+2)->killers[1] = MOVE_NONE; @@ -530,14 +496,14 @@ namespace { { // Step 2. Check for aborted search and immediate draw if (Signals.stop || pos.is_draw() || ss->ply > MAX_PLY) - return DrawValue[pos.side_to_move()]; + return ss->ply > MAX_PLY && !inCheck ? evaluate(pos) : DrawValue[pos.side_to_move()]; // Step 3. Mate distance pruning. Even if we mate at the next move our score // would be at best mate_in(ss->ply+1), but if alpha is already bigger because // a shorter mate was found upward in the tree then there is no need to search - // further, we will never beat current alpha. Same logic but with reversed signs - // applies also in the opposite condition of being mated instead of giving mate, - // in this case return a fail-high score. + // because we will never beat the current alpha. Same logic but with reversed + // signs applies also in the opposite condition of being mated instead of giving + // mate. In this case return a fail-high score. alpha = std::max(mated_in(ss->ply), alpha); beta = std::min(mate_in(ss->ply+1), beta); if (alpha >= beta) @@ -550,11 +516,11 @@ namespace { excludedMove = ss->excludedMove; posKey = excludedMove ? pos.exclusion_key() : pos.key(); tte = TT.probe(posKey); - ttMove = RootNode ? RootMoves[PVIdx].pv[0] : tte ? tte->move() : MOVE_NONE; + ss->ttMove = ttMove = RootNode ? RootMoves[PVIdx].pv[0] : tte ? tte->move() : MOVE_NONE; ttValue = tte ? value_from_tt(tte->value(), ss->ply) : VALUE_NONE; - // At PV nodes we check for exact scores, while at non-PV nodes we check for - // a fail high/low. Biggest advantage at probing at PV nodes is to have a + // At PV nodes we check for exact scores, whilst at non-PV nodes we check for + // a fail high/low. The biggest advantage to probing at PV nodes is to have a // smooth experience in analysis mode. We don't probe at Root nodes otherwise // we should also update RootMoveList to avoid bogus output. if ( !RootNode @@ -565,17 +531,12 @@ namespace { : ttValue >= beta ? (tte->bound() & BOUND_LOWER) : (tte->bound() & BOUND_UPPER))) { - TT.refresh(tte); ss->currentMove = ttMove; // Can be MOVE_NONE - if ( ttValue >= beta - && ttMove - && !pos.capture_or_promotion(ttMove) - && ttMove != ss->killers[0]) - { - ss->killers[1] = ss->killers[0]; - ss->killers[0] = ttMove; - } + // If ttMove is quiet, update killers, history, counter move and followup move on TT hit + if (ttValue >= beta && ttMove && !pos.capture_or_promotion(ttMove) && !inCheck) + update_stats(pos, ss, ttMove, depth, NULL, 0); + return ttValue; } @@ -616,16 +577,18 @@ namespace { // Step 6. Razoring (skipped when in check) if ( !PvNode && depth < 4 * ONE_PLY - && eval + razor_margin(depth) < beta + && eval + razor_margin(depth) <= alpha && ttMove == MOVE_NONE && abs(beta) < VALUE_MATE_IN_MAX_PLY && !pos.pawn_on_7th(pos.side_to_move())) { - Value rbeta = beta - razor_margin(depth); - Value v = qsearch(pos, ss, rbeta-1, rbeta, DEPTH_ZERO); - if (v < rbeta) - // Logically we should return (v + razor_margin(depth)), but - // surprisingly this did slightly weaker in tests. + if ( depth <= ONE_PLY + && eval + razor_margin(3 * ONE_PLY) <= alpha) + return qsearch(pos, ss, alpha, beta, DEPTH_ZERO); + + Value ralpha = alpha - razor_margin(depth); + Value v = qsearch(pos, ss, ralpha, ralpha+1, DEPTH_ZERO); + if (v <= ralpha) return v; } @@ -649,17 +612,17 @@ namespace { { ss->currentMove = MOVE_NULL; - // Null move dynamic reduction based on depth - Depth R = 3 * ONE_PLY + depth / 4; + assert(eval - beta >= 0); - // Null move dynamic reduction based on value - if (eval - PawnValueMg > beta) - R += ONE_PLY; + // Null move dynamic reduction based on depth and value + Depth R = 3 * ONE_PLY + + depth / 4 + + int(eval - beta) / PawnValueMg * ONE_PLY; pos.do_null_move(st); (ss+1)->skipNullMove = true; - nullValue = depth-R < ONE_PLY ? -qsearch(pos, ss+1, -beta, -alpha, DEPTH_ZERO) - : - search(pos, ss+1, -beta, -alpha, depth-R, !cutNode); + nullValue = depth-R < ONE_PLY ? -qsearch(pos, ss+1, -beta, -beta+1, DEPTH_ZERO) + : - search(pos, ss+1, -beta, -beta+1, depth-R, !cutNode); (ss+1)->skipNullMove = false; pos.undo_null_move(); @@ -674,28 +637,13 @@ namespace { // Do verification search at high depths ss->skipNullMove = true; - Value v = search(pos, ss, alpha, beta, depth-R, false); + Value v = depth-R < ONE_PLY ? qsearch(pos, ss, beta-1, beta, DEPTH_ZERO) + : search(pos, ss, beta-1, beta, depth-R, false); ss->skipNullMove = false; if (v >= beta) return nullValue; } - else - { - // The null move failed low, which means that we may be faced with - // some kind of threat. If the previous move was reduced, check if - // the move that refuted the null move was somehow connected to the - // move which was reduced. If a connection is found, return a fail - // low score (which will cause the reduced move to fail high in the - // parent node, which will trigger a re-search with full depth). - threatMove = (ss+1)->currentMove; - - if ( depth < 5 * ONE_PLY - && (ss-1)->reduction - && threatMove != MOVE_NONE - && allows(pos, (ss-1)->currentMove, threatMove)) - return alpha; - } } // Step 9. ProbCut (skipped when in check) @@ -707,8 +655,8 @@ namespace { && !ss->skipNullMove && abs(beta) < VALUE_MATE_IN_MAX_PLY) { - Value rbeta = beta + 200; - Depth rdepth = depth - ONE_PLY - 3 * ONE_PLY; + Value rbeta = std::min(beta + 200, VALUE_INFINITE); + Depth rdepth = depth - 4 * ONE_PLY; assert(rdepth >= ONE_PLY); assert((ss-1)->currentMove != MOVE_NONE); @@ -722,7 +670,7 @@ namespace { { ss->currentMove = move; pos.do_move(move, st, ci, pos.gives_check(move, ci)); - value = -search(pos, ss+1, -rbeta, -rbeta+1, rdepth, !cutNode); + value = -search(pos, ss+1, -rbeta, -rbeta+1, rdepth, !cutNode); pos.undo_move(move); if (value >= rbeta) return value; @@ -730,14 +678,14 @@ namespace { } // Step 10. Internal iterative deepening (skipped when in check) - if ( depth >= (PvNode ? 5 * ONE_PLY : 8 * ONE_PLY) - && ttMove == MOVE_NONE - && (PvNode || ss->staticEval + Value(256) >= beta)) + if ( depth >= (PvNode ? 5 * ONE_PLY : 8 * ONE_PLY) + && !ttMove + && (PvNode || ss->staticEval + 256 >= beta)) { Depth d = depth - 2 * ONE_PLY - (PvNode ? DEPTH_ZERO : depth / 4); ss->skipNullMove = true; - search(pos, ss, alpha, beta, d, true); + search(pos, ss, alpha, beta, d, true); ss->skipNullMove = false; tte = TT.probe(posKey); @@ -750,7 +698,11 @@ moves_loop: // When in check and at SpNode search starts from here Move countermoves[] = { Countermoves[pos.piece_on(prevMoveSq)][prevMoveSq].first, Countermoves[pos.piece_on(prevMoveSq)][prevMoveSq].second }; - MovePicker mp(pos, ttMove, depth, History, countermoves, ss); + Square prevOwnMoveSq = to_sq((ss-2)->currentMove); + Move followupmoves[] = { Followupmoves[pos.piece_on(prevOwnMoveSq)][prevOwnMoveSq].first, + Followupmoves[pos.piece_on(prevOwnMoveSq)][prevOwnMoveSq].second }; + + MovePicker mp(pos, ttMove, depth, History, countermoves, followupmoves, ss); CheckInfo ci(pos); value = bestValue; // Workaround a bogus 'uninitialized' warning under gcc improving = ss->staticEval >= (ss-2)->staticEval @@ -775,14 +727,14 @@ moves_loop: // When in check and at SpNode search starts from here continue; // At root obey the "searchmoves" option and skip moves not listed in Root - // Move List, as a consequence any illegal move is also skipped. In MultiPV + // Move List. As a consequence any illegal move is also skipped. In MultiPV // mode we also skip PV moves which have been already searched. if (RootNode && !std::count(RootMoves.begin() + PVIdx, RootMoves.end(), move)) continue; if (SpNode) { - // Shared counter cannot be decremented later if move turns out to be illegal + // Shared counter cannot be decremented later if the move turns out to be illegal if (!pos.legal(move, ci.pinned)) continue; @@ -804,20 +756,24 @@ moves_loop: // When in check and at SpNode search starts from here ext = DEPTH_ZERO; captureOrPromotion = pos.capture_or_promotion(move); - givesCheck = pos.gives_check(move, ci); + + givesCheck = type_of(move) == NORMAL && !ci.dcCandidates + ? ci.checkSq[type_of(pos.piece_on(from_sq(move)))] & to_sq(move) + : pos.gives_check(move, ci); + dangerous = givesCheck - || pos.passed_pawn_push(move) - || type_of(move) == CASTLE; + || type_of(move) != NORMAL + || pos.advanced_pawn_push(move); // Step 12. Extend checks - if (givesCheck && pos.see_sign(move) >= 0) + if (givesCheck && pos.see_sign(move) >= VALUE_ZERO) ext = ONE_PLY; // Singular extension search. If all moves but one fail low on a search of // (alpha-s, beta-s), and just one fails high on (alpha, beta), then that move // is singular and should be extended. To verify this we do a reduced search - // on all the other moves but the ttMove, if result is lower than ttValue minus - // a margin then we extend ttMove. + // on all the other moves but the ttMove and if the result is lower than + // ttValue minus a margin then we extend the ttMove. if ( singularExtensionNode && move == ttMove && !ext @@ -829,7 +785,7 @@ moves_loop: // When in check and at SpNode search starts from here Value rBeta = ttValue - int(depth); ss->excludedMove = move; ss->skipNullMove = true; - value = search(pos, ss, rBeta - 1, rBeta, depth / 2, cutNode); + value = search(pos, ss, rBeta - 1, rBeta, depth / 2, cutNode); ss->skipNullMove = false; ss->excludedMove = MOVE_NONE; @@ -837,7 +793,7 @@ moves_loop: // When in check and at SpNode search starts from here ext = ONE_PLY; } - // Update current move (this must be done after singular extension search) + // Update the current move (this must be done after singular extension search) newDepth = depth - ONE_PLY + ext; // Step 13. Pruning at shallow depth (exclude PV nodes) @@ -850,8 +806,7 @@ moves_loop: // When in check and at SpNode search starts from here { // Move count based pruning if ( depth < 16 * ONE_PLY - && moveCount >= FutilityMoveCounts[improving][depth] - && (!threatMove || !refutes(pos, move, threatMove))) + && moveCount >= FutilityMoveCounts[improving][depth] ) { if (SpNode) splitPoint->mutex.lock(); @@ -865,7 +820,7 @@ moves_loop: // When in check and at SpNode search starts from here if (predictedDepth < 7 * ONE_PLY) { futilityValue = ss->staticEval + futility_margin(predictedDepth) - + Value(128) + Gains[pos.moved_piece(move)][to_sq(move)]; + + 128 + Gains[pos.moved_piece(move)][to_sq(move)]; if (futilityValue <= alpha) { @@ -882,17 +837,16 @@ moves_loop: // When in check and at SpNode search starts from here } // Prune moves with negative SEE at low depths - if (predictedDepth < 4 * ONE_PLY && pos.see_sign(move) < 0) + if (predictedDepth < 4 * ONE_PLY && pos.see_sign(move) < VALUE_ZERO) { if (SpNode) splitPoint->mutex.lock(); continue; } - } - // Check for legality only before to do the move + // Check for legality just before making the move if (!RootNode && !SpNode && !pos.legal(move, ci.pinned)) { moveCount--; @@ -907,7 +861,7 @@ moves_loop: // When in check and at SpNode search starts from here // Step 14. Make the move pos.do_move(move, st, ci, givesCheck); - // Step 15. Reduced depth search (LMR). If the move fails high will be + // Step 15. Reduced depth search (LMR). If the move fails high it will be // re-searched at full depth. if ( depth >= 3 * ONE_PLY && !pvMove @@ -931,7 +885,14 @@ moves_loop: // When in check and at SpNode search starts from here if (SpNode) alpha = splitPoint->alpha; - value = -search(pos, ss+1, -(alpha+1), -alpha, d, true); + value = -search(pos, ss+1, -(alpha+1), -alpha, d, true); + + // Re-search at intermediate depth if reduction is very high + if (value > alpha && ss->reduction >= 4 * ONE_PLY) + { + Depth d2 = std::max(newDepth - 2 * ONE_PLY, ONE_PLY); + value = -search(pos, ss+1, -(alpha+1), -alpha, d2, true); + } doFullDepthSearch = (value > alpha && ss->reduction != DEPTH_ZERO); ss->reduction = DEPTH_ZERO; @@ -948,17 +909,17 @@ moves_loop: // When in check and at SpNode search starts from here value = newDepth < ONE_PLY ? givesCheck ? -qsearch(pos, ss+1, -(alpha+1), -alpha, DEPTH_ZERO) : -qsearch(pos, ss+1, -(alpha+1), -alpha, DEPTH_ZERO) - : - search(pos, ss+1, -(alpha+1), -alpha, newDepth, !cutNode); + : - search(pos, ss+1, -(alpha+1), -alpha, newDepth, !cutNode); } - // Only for PV nodes do a full PV search on the first move or after a fail - // high, in the latter case search only if value < beta, otherwise let the - // parent node to fail low with value <= alpha and to try another move. + // For PV nodes only, do a full PV search on the first move or after a fail + // high (in the latter case search only if value < beta), otherwise let the + // parent node fail low with value <= alpha and to try another move. if (PvNode && (pvMove || (value > alpha && (RootNode || value < beta)))) value = newDepth < ONE_PLY ? givesCheck ? -qsearch(pos, ss+1, -beta, -alpha, DEPTH_ZERO) : -qsearch(pos, ss+1, -beta, -alpha, DEPTH_ZERO) - : - search(pos, ss+1, -beta, -alpha, newDepth, false); + : - search(pos, ss+1, -beta, -alpha, newDepth, false); // Step 17. Undo move pos.undo_move(move); @@ -972,12 +933,11 @@ moves_loop: // When in check and at SpNode search starts from here alpha = splitPoint->alpha; } - // Finished searching the move. If Signals.stop is true, the search - // was aborted because the user interrupted the search or because we - // ran out of time. In this case, the return value of the search cannot - // be trusted, and we don't update the best move and/or PV. + // Finished searching the move. If a stop or a cutoff occurred, the return + // value of the search cannot be trusted, and we return immediately without + // updating best move, PV and TT. if (Signals.stop || thisThread->cutoff_occurred()) - return value; // To avoid returning VALUE_INFINITE + return VALUE_ZERO; if (RootNode) { @@ -996,9 +956,9 @@ moves_loop: // When in check and at SpNode search starts from here ++BestMoveChanges; } else - // All other moves but the PV are set to the lowest value, this - // is not a problem when sorting becuase sort is stable and move - // position in the list is preserved, just the PV is pushed up. + // All other moves but the PV are set to the lowest value: this is + // not a problem when sorting because the sort is stable and the + // move position in the list is preserved - just the PV is pushed up. rm.score = -VALUE_INFINITE; } @@ -1026,14 +986,20 @@ moves_loop: // When in check and at SpNode search starts from here // Step 19. Check for splitting the search if ( !SpNode + && Threads.size() >= 2 && depth >= Threads.minimumSplitDepth - && Threads.available_slave(thisThread) + && ( !thisThread->activeSplitPoint + || !thisThread->activeSplitPoint->allSlavesSearching) && thisThread->splitPointsSize < MAX_SPLITPOINTS_PER_THREAD) { - assert(bestValue < beta); + assert(bestValue > -VALUE_INFINITE && bestValue < beta); thisThread->split(pos, ss, alpha, beta, &bestValue, &bestMove, - depth, threatMove, moveCount, &mp, NT, cutNode); + depth, moveCount, &mp, NT, cutNode); + + if (Signals.stop || thisThread->cutoff_occurred()) + return VALUE_ZERO; + if (bestValue >= beta) break; } @@ -1042,51 +1008,31 @@ moves_loop: // When in check and at SpNode search starts from here if (SpNode) return bestValue; + // Following condition would detect a stop or a cutoff set only after move + // loop has been completed. But in this case bestValue is valid because we + // have fully searched our subtree, and we can anyhow save the result in TT. + /* + if (Signals.stop || thisThread->cutoff_occurred()) + return VALUE_DRAW; + */ + // Step 20. Check for mate and stalemate // All legal moves have been searched and if there are no legal moves, it - // must be mate or stalemate. Note that we can have a false positive in - // case of Signals.stop or thread.cutoff_occurred() are set, but this is - // harmless because return value is discarded anyhow in the parent nodes. - // If we are in a singular extension search then return a fail low score. - // A split node has at least one move, the one tried before to be splitted. + // must be mate or stalemate. If we are in a singular extension search then + // return a fail low score. if (!moveCount) - return excludedMove ? alpha - : inCheck ? mated_in(ss->ply) : DrawValue[pos.side_to_move()]; + bestValue = excludedMove ? alpha + : inCheck ? mated_in(ss->ply) : DrawValue[pos.side_to_move()]; - // If we have pruned all the moves without searching return a fail-low score - if (bestValue == -VALUE_INFINITE) - bestValue = alpha; + // Quiet best move: update killers, history, countermoves and followupmoves + else if (bestValue >= beta && !pos.capture_or_promotion(bestMove) && !inCheck) + update_stats(pos, ss, bestMove, depth, quietsSearched, quietCount - 1); TT.store(posKey, value_to_tt(bestValue, ss->ply), bestValue >= beta ? BOUND_LOWER : PvNode && bestMove ? BOUND_EXACT : BOUND_UPPER, depth, bestMove, ss->staticEval); - // Quiet best move: update killers, history and countermoves - if ( bestValue >= beta - && !pos.capture_or_promotion(bestMove) - && !inCheck) - { - if (ss->killers[0] != bestMove) - { - ss->killers[1] = ss->killers[0]; - ss->killers[0] = bestMove; - } - - // Increase history value of the cut-off move and decrease all the other - // played non-capture moves. - Value bonus = Value(int(depth) * int(depth)); - History.update(pos.moved_piece(bestMove), to_sq(bestMove), bonus); - for (int i = 0; i < quietCount - 1; ++i) - { - Move m = quietsSearched[i]; - History.update(pos.moved_piece(m), to_sq(m), -bonus); - } - - if (is_ok((ss-1)->currentMove)) - Countermoves.update(pos.piece_on(prevMoveSq), prevMoveSq, bestMove); - } - assert(bestValue > -VALUE_INFINITE && bestValue < VALUE_INFINITE); return bestValue; @@ -1100,7 +1046,7 @@ moves_loop: // When in check and at SpNode search starts from here template Value qsearch(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth) { - const bool PvNode = (NT == PV); + const bool PvNode = NT == PV; assert(NT == PV || NT == NonPV); assert(InCheck == !!pos.checkers()); @@ -1123,11 +1069,11 @@ moves_loop: // When in check and at SpNode search starts from here ss->currentMove = bestMove = MOVE_NONE; ss->ply = (ss-1)->ply + 1; - // Check for an instant draw or maximum ply reached + // Check for an instant draw or if the maximum ply has been reached if (pos.is_draw() || ss->ply > MAX_PLY) - return DrawValue[pos.side_to_move()]; + return ss->ply > MAX_PLY && !InCheck ? evaluate(pos) : DrawValue[pos.side_to_move()]; - // Decide whether or not to include checks, this fixes also the type of + // Decide whether or not to include checks: this fixes also the type of // TT entry depth that we are going to use. Note that in qsearch we use // only two types of depth in TT: DEPTH_QS_CHECKS or DEPTH_QS_NO_CHECKS. ttDepth = InCheck || depth >= DEPTH_QS_CHECKS ? DEPTH_QS_CHECKS @@ -1185,7 +1131,7 @@ moves_loop: // When in check and at SpNode search starts from here if (PvNode && bestValue > alpha) alpha = bestValue; - futilityBase = bestValue + Value(128); + futilityBase = bestValue + 128; } // Initialize a MovePicker object for the current position, and prepare @@ -1200,20 +1146,21 @@ moves_loop: // When in check and at SpNode search starts from here { assert(is_ok(move)); - givesCheck = pos.gives_check(move, ci); + givesCheck = type_of(move) == NORMAL && !ci.dcCandidates + ? ci.checkSq[type_of(pos.piece_on(from_sq(move)))] & to_sq(move) + : pos.gives_check(move, ci); // Futility pruning if ( !PvNode && !InCheck && !givesCheck && move != ttMove - && type_of(move) != PROMOTION && futilityBase > -VALUE_KNOWN_WIN - && !pos.passed_pawn_push(move)) + && !pos.advanced_pawn_push(move)) { - futilityValue = futilityBase - + PieceValue[EG][pos.piece_on(to_sq(move))] - + (type_of(move) == ENPASSANT ? PawnValueEg : VALUE_ZERO); + assert(type_of(move) != ENPASSANT); // Due to !pos.advanced_pawn_push + + futilityValue = futilityBase + PieceValue[EG][pos.piece_on(to_sq(move))]; if (futilityValue < beta) { @@ -1221,17 +1168,14 @@ moves_loop: // When in check and at SpNode search starts from here continue; } - // Prune moves with negative or equal SEE and also moves with positive - // SEE where capturing piece loses a tempo and SEE < beta - futilityBase. - if ( futilityBase < beta - && pos.see(move, beta - futilityBase) <= 0) + if (futilityBase < beta && pos.see(move) <= VALUE_ZERO) { bestValue = std::max(bestValue, futilityBase); continue; } } - // Detect non-capture evasions that are candidate to be pruned + // Detect non-capture evasions that are candidates to be pruned evasionPrunable = InCheck && bestValue > VALUE_MATED_IN_MAX_PLY && !pos.capture(move) @@ -1242,10 +1186,10 @@ moves_loop: // When in check and at SpNode search starts from here && (!InCheck || evasionPrunable) && move != ttMove && type_of(move) != PROMOTION - && pos.see_sign(move) < 0) + && pos.see_sign(move) < VALUE_ZERO) continue; - // Check for legality only before to do the move + // Check for legality just before making the move if (!pos.legal(move, ci.pinned)) continue; @@ -1299,7 +1243,7 @@ moves_loop: // When in check and at SpNode search starts from here // value_to_tt() adjusts a mate score from "plies to mate from the root" to // "plies to mate from the current position". Non-mate scores are unchanged. - // The function is called before storing a value to the transposition table. + // The function is called before storing a value in the transposition table. Value value_to_tt(Value v, int ply) { @@ -1311,7 +1255,7 @@ moves_loop: // When in check and at SpNode search starts from here // value_from_tt() is the inverse of value_to_tt(): It adjusts a mate score - // from the transposition table (where refers to the plies to mate/be mated + // from the transposition table (which refers to the plies to mate/be mated // from current position) to "plies to mate/be mated from the root". Value value_from_tt(Value v, int ply) { @@ -1322,101 +1266,43 @@ moves_loop: // When in check and at SpNode search starts from here } - // allows() tests whether the 'first' move at previous ply somehow makes the - // 'second' move possible, for instance if the moving piece is the same in - // both moves. Normally the second move is the threat (the best move returned - // from a null search that fails low). + // update_stats() updates killers, history, countermoves and followupmoves stats after a fail-high + // of a quiet move. - bool allows(const Position& pos, Move first, Move second) { + void update_stats(const Position& pos, Stack* ss, Move move, Depth depth, Move* quiets, int quietsCnt) { - assert(is_ok(first)); - assert(is_ok(second)); - assert(color_of(pos.piece_on(from_sq(second))) == ~pos.side_to_move()); - assert(type_of(first) == CASTLE || color_of(pos.piece_on(to_sq(first))) == ~pos.side_to_move()); - - Square m1from = from_sq(first); - Square m2from = from_sq(second); - Square m1to = to_sq(first); - Square m2to = to_sq(second); - - // The piece is the same or second's destination was vacated by the first move - // We exclude the trivial case where a sliding piece does in two moves what - // it could do in one move: eg. Ra1a2, Ra2a3. - if ( m2to == m1from - || (m1to == m2from && !aligned(m1from, m2from, m2to))) - return true; - - // Second one moves through the square vacated by first one - if (between_bb(m2from, m2to) & m1from) - return true; - - // Second's destination is defended by the first move's piece - Bitboard m1att = pos.attacks_from(pos.piece_on(m1to), m1to, pos.pieces() ^ m2from); - if (m1att & m2to) - return true; - - // Second move gives a discovered check through the first's checking piece - if (m1att & pos.king_square(pos.side_to_move())) + if (ss->killers[0] != move) { - assert(between_bb(m1to, pos.king_square(pos.side_to_move())) & m2from); - return true; + ss->killers[1] = ss->killers[0]; + ss->killers[0] = move; } - return false; + // Increase history value of the cut-off move and decrease all the other + // played quiet moves. + Value bonus = Value(int(depth) * int(depth)); + History.update(pos.moved_piece(move), to_sq(move), bonus); + for (int i = 0; i < quietsCnt; ++i) + { + Move m = quiets[i]; + History.update(pos.moved_piece(m), to_sq(m), -bonus); + } + + if (is_ok((ss-1)->currentMove)) + { + Square prevMoveSq = to_sq((ss-1)->currentMove); + Countermoves.update(pos.piece_on(prevMoveSq), prevMoveSq, move); + } + + if (is_ok((ss-2)->currentMove) && (ss-1)->currentMove == (ss-1)->ttMove) + { + Square prevOwnMoveSq = to_sq((ss-2)->currentMove); + Followupmoves.update(pos.piece_on(prevOwnMoveSq), prevOwnMoveSq, move); + } } - // refutes() tests whether a 'first' move is able to defend against a 'second' - // opponent's move. In this case will not be pruned. Normally the second move - // is the threat (the best move returned from a null search that fails low). - - bool refutes(const Position& pos, Move first, Move second) { - - assert(is_ok(first)); - assert(is_ok(second)); - - Square m1from = from_sq(first); - Square m2from = from_sq(second); - Square m1to = to_sq(first); - Square m2to = to_sq(second); - - // Don't prune moves of the threatened piece - if (m1from == m2to) - return true; - - // If the threatened piece has value less than or equal to the value of the - // threat piece, don't prune moves which defend it. - if ( pos.capture(second) - && ( PieceValue[MG][pos.piece_on(m2from)] >= PieceValue[MG][pos.piece_on(m2to)] - || type_of(pos.piece_on(m2from)) == KING)) - { - // Update occupancy as if the piece and the threat are moving - Bitboard occ = pos.pieces() ^ m1from ^ m1to ^ m2from; - Piece pc = pos.piece_on(m1from); - - // The moved piece attacks the square 'tto' ? - if (pos.attacks_from(pc, m1to, occ) & m2to) - return true; - - // Scan for possible X-ray attackers behind the moved piece - Bitboard xray = (attacks_bb< ROOK>(m2to, occ) & pos.pieces(color_of(pc), QUEEN, ROOK)) - | (attacks_bb(m2to, occ) & pos.pieces(color_of(pc), QUEEN, BISHOP)); - - // Verify attackers are triggered by our move and not already existing - if (unlikely(xray) && (xray & ~pos.attacks_from(m2to))) - return true; - } - - // Don't prune safe moves which block the threat path - if ((between_bb(m2from, m2to) & m1to) && pos.see_sign(first) >= 0) - return true; - - return false; - } - - - // When playing with strength handicap choose best move among the MultiPV set - // using a statistical rule dependent on 'level'. Idea by Heinz van Saanen. + // When playing with a strength handicap, choose best move among the MultiPV + // set using a statistical rule dependent on 'level'. Idea by Heinz van Saanen. Move Skill::pick_move() { @@ -1427,15 +1313,15 @@ moves_loop: // When in check and at SpNode search starts from here rk.rand(); // RootMoves are already sorted by score in descending order - int variance = std::min(RootMoves[0].score - RootMoves[PVSize - 1].score, PawnValueMg); + int variance = std::min(RootMoves[0].score - RootMoves[MultiPV - 1].score, PawnValueMg); int weakness = 120 - 2 * level; int max_s = -VALUE_INFINITE; best = MOVE_NONE; // Choose best move. For each move score we add two terms both dependent on - // weakness, one deterministic and bigger for weaker moves, and one random, + // weakness. One deterministic and bigger for weaker moves, and one random, // then we choose the move with the resulting highest score. - for (size_t i = 0; i < PVSize; ++i) + for (size_t i = 0; i < MultiPV; ++i) { int s = RootMoves[i].score; @@ -1457,13 +1343,13 @@ moves_loop: // When in check and at SpNode search starts from here } - // uci_pv() formats PV information according to UCI protocol. UCI requires - // to send all the PV lines also if are still to be searched and so refer to - // the previous search score. + // uci_pv() formats PV information according to the UCI protocol. UCI + // requires that all (if any) unsearched PV lines are sent using a previous + // search score. string uci_pv(const Position& pos, int depth, Value alpha, Value beta) { - std::stringstream s; + std::stringstream ss; Time::point elapsed = Time::now() - SearchTime + 1; size_t uciPVSize = std::min((size_t)Options["MultiPV"], RootMoves.size()); int selDepth = 0; @@ -1482,59 +1368,62 @@ moves_loop: // When in check and at SpNode search starts from here int d = updated ? depth : depth - 1; Value v = updated ? RootMoves[i].score : RootMoves[i].prevScore; - if (s.rdbuf()->in_avail()) // Not at first line - s << "\n"; + if (ss.rdbuf()->in_avail()) // Not at first line + ss << "\n"; - s << "info depth " << d - << " seldepth " << selDepth - << " score " << (i == PVIdx ? score_to_uci(v, alpha, beta) : score_to_uci(v)) - << " nodes " << pos.nodes_searched() - << " nps " << pos.nodes_searched() * 1000 / elapsed - << " time " << elapsed - << " multipv " << i + 1 - << " pv"; + ss << "info depth " << d + << " seldepth " << selDepth + << " score " << (i == PVIdx ? score_to_uci(v, alpha, beta) : score_to_uci(v)) + << " nodes " << pos.nodes_searched() + << " nps " << pos.nodes_searched() * 1000 / elapsed + << " time " << elapsed + << " multipv " << i + 1 + << " pv"; for (size_t j = 0; RootMoves[i].pv[j] != MOVE_NONE; ++j) - s << " " << move_to_uci(RootMoves[i].pv[j], pos.is_chess960()); + ss << " " << move_to_uci(RootMoves[i].pv[j], pos.is_chess960()); } - return s.str(); + return ss.str(); } } // namespace /// RootMove::extract_pv_from_tt() builds a PV by adding moves from the TT table. -/// We consider also failing high nodes and not only BOUND_EXACT nodes so to -/// allow to always have a ponder move even when we fail high at root, and a -/// long PV to print that is important for position analysis. +/// We also consider both failing high nodes and BOUND_EXACT nodes here to +/// ensure that we have a ponder move even when we fail high at root. This +/// results in a long PV to print that is important for position analysis. void RootMove::extract_pv_from_tt(Position& pos) { StateInfo state[MAX_PLY_PLUS_6], *st = state; const TTEntry* tte; - int ply = 0; - Move m = pv[0]; + int ply = 1; // At root ply is 1... + Move m = pv[0]; // ...instead pv[] array starts from 0 + Value expectedScore = score; pv.clear(); do { pv.push_back(m); - assert(MoveList(pos).contains(pv[ply])); + assert(MoveList(pos).contains(pv[ply - 1])); - pos.do_move(pv[ply++], *st++); + pos.do_move(pv[ply++ - 1], *st++); tte = TT.probe(pos.key()); + expectedScore = -expectedScore; } while ( tte + && expectedScore == value_from_tt(tte->value(), ply) && pos.pseudo_legal(m = tte->move()) // Local copy, TT could change && pos.legal(m, pos.pinned_pieces(pos.side_to_move())) && ply < MAX_PLY - && (!pos.is_draw() || ply < 2)); + && (!pos.is_draw() || ply <= 2)); pv.push_back(MOVE_NONE); // Must be zero-terminating - while (ply) pos.undo_move(pv[--ply]); + while (--ply) pos.undo_move(pv[ply - 1]); } @@ -1546,21 +1435,21 @@ void RootMove::insert_pv_in_tt(Position& pos) { StateInfo state[MAX_PLY_PLUS_6], *st = state; const TTEntry* tte; - int ply = 0; + int idx = 0; // Ply starts from 1, we need to start from 0 do { tte = TT.probe(pos.key()); - if (!tte || tte->move() != pv[ply]) // Don't overwrite correct entries - TT.store(pos.key(), VALUE_NONE, BOUND_NONE, DEPTH_NONE, pv[ply], VALUE_NONE); + if (!tte || tte->move() != pv[idx]) // Don't overwrite correct entries + TT.store(pos.key(), VALUE_NONE, BOUND_NONE, DEPTH_NONE, pv[idx], VALUE_NONE); - assert(MoveList(pos).contains(pv[ply])); + assert(MoveList(pos).contains(pv[idx])); - pos.do_move(pv[ply++], *st++); + pos.do_move(pv[idx++], *st++); - } while (pv[ply] != MOVE_NONE); + } while (pv[idx] != MOVE_NONE); - while (ply) pos.undo_move(pv[--ply]); + while (idx) pos.undo_move(pv[--idx]); } @@ -1569,7 +1458,7 @@ void RootMove::insert_pv_in_tt(Position& pos) { void Thread::idle_loop() { // Pointer 'this_sp' is not null only if we are called from split(), and not - // at the thread creation. So it means we are the split point's master. + // at the thread creation. This means we are the split point's master. SplitPoint* this_sp = splitPointsSize ? activeSplitPoint : NULL; assert(!this_sp || (this_sp->masterThread == this && searching)); @@ -1578,7 +1467,7 @@ void Thread::idle_loop() { { // If we are not searching, wait for a condition to be signaled instead of // wasting CPU time polling for work. - while ((!searching && Threads.sleepWhileIdle) || exit) + while (!searching || exit) { if (exit) { @@ -1590,13 +1479,13 @@ void Thread::idle_loop() { mutex.lock(); // If we are master and all slaves have finished then exit idle_loop - if (this_sp && !this_sp->slavesMask) + if (this_sp && this_sp->slavesMask.none()) { mutex.unlock(); break; } - // Do sleep after retesting sleep conditions under lock protection, in + // Do sleep after retesting sleep conditions under lock protection. In // particular we need to avoid a deadlock in case a master thread has, // in the meanwhile, allocated us and sent the notify_one() call before // we had the chance to grab the lock. @@ -1631,50 +1520,78 @@ void Thread::idle_loop() { activePosition = &pos; - switch (sp->nodeType) { - case Root: - search(pos, ss, sp->alpha, sp->beta, sp->depth, sp->cutNode); - break; - case PV: - search(pos, ss, sp->alpha, sp->beta, sp->depth, sp->cutNode); - break; - case NonPV: - search(pos, ss, sp->alpha, sp->beta, sp->depth, sp->cutNode); - break; - default: + if (sp->nodeType == NonPV) + search(pos, ss, sp->alpha, sp->beta, sp->depth, sp->cutNode); + + else if (sp->nodeType == PV) + search(pos, ss, sp->alpha, sp->beta, sp->depth, sp->cutNode); + + else if (sp->nodeType == Root) + search(pos, ss, sp->alpha, sp->beta, sp->depth, sp->cutNode); + + else assert(false); - } assert(searching); searching = false; activePosition = NULL; - sp->slavesMask &= ~(1ULL << idx); + sp->slavesMask.reset(idx); + sp->allSlavesSearching = false; sp->nodes += pos.nodes_searched(); - // Wake up master thread so to allow it to return from the idle loop - // in case we are the last slave of the split point. - if ( Threads.sleepWhileIdle - && this != sp->masterThread - && !sp->slavesMask) + // Wake up the master thread so to allow it to return from the idle + // loop in case we are the last slave of the split point. + if ( this != sp->masterThread + && sp->slavesMask.none()) { assert(!sp->masterThread->searching); sp->masterThread->notify_one(); } - // After releasing the lock we cannot access anymore any SplitPoint - // related data in a safe way becuase it could have been released under - // our feet by the sp master. Also accessing other Thread objects is - // unsafe because if we are exiting there is a chance are already freed. + // After releasing the lock we can't access any SplitPoint related data + // in a safe way because it could have been released under our feet by + // the sp master. sp->mutex.unlock(); + + // Try to late join to another split point if none of its slaves has + // already finished. + if (Threads.size() > 2) + for (size_t i = 0; i < Threads.size(); ++i) + { + int size = Threads[i]->splitPointsSize; // Local copy + sp = size ? &Threads[i]->splitPoints[size - 1] : NULL; + + if ( sp + && sp->allSlavesSearching + && available_to(Threads[i])) + { + // Recheck the conditions under lock protection + Threads.mutex.lock(); + sp->mutex.lock(); + + if ( sp->allSlavesSearching + && available_to(Threads[i])) + { + sp->slavesMask.set(idx); + activeSplitPoint = sp; + searching = true; + } + + sp->mutex.unlock(); + Threads.mutex.unlock(); + + break; // Just a single attempt + } + } } // If this thread is the master of a split point and all slaves have finished // their work at this split point, return from the idle loop. - if (this_sp && !this_sp->slavesMask) + if (this_sp && this_sp->slavesMask.none()) { this_sp->mutex.lock(); - bool finished = !this_sp->slavesMask; // Retest under lock protection + bool finished = this_sp->slavesMask.none(); // Retest under lock protection this_sp->mutex.unlock(); if (finished) return; @@ -1684,8 +1601,8 @@ void Thread::idle_loop() { /// check_time() is called by the timer thread when the timer triggers. It is -/// used to print debug info and, more important, to detect when we are out of -/// available time and so stop the search. +/// used to print debug info and, more importantly, to detect when we are out of +/// available time and thus stop the search. void check_time() { @@ -1717,13 +1634,10 @@ void check_time() { sp.mutex.lock(); nodes += sp.nodes; - Bitboard sm = sp.slavesMask; - while (sm) - { - Position* pos = Threads[pop_lsb(&sm)]->activePosition; - if (pos) - nodes += pos->nodes_searched(); - } + + for (size_t idx = 0; idx < Threads.size(); ++idx) + if (sp.slavesMask.test(idx) && Threads[idx]->activePosition) + nodes += Threads[idx]->activePosition->nodes_searched(); sp.mutex.unlock(); } @@ -1734,7 +1648,7 @@ void check_time() { Time::point elapsed = Time::now() - SearchTime; bool stillAtFirstMove = Signals.firstRootMove && !Signals.failedLowAtRoot - && elapsed > TimeMgr.available_time(); + && elapsed > TimeMgr.available_time() * 75 / 100; bool noMoreTime = elapsed > TimeMgr.maximum_time() - 2 * TimerThread::Resolution || stillAtFirstMove; diff --git a/DroidFish/jni/stockfish/search.h b/DroidFish/jni/stockfish/search.h index ecc9a39..a9f21fa 100644 --- a/DroidFish/jni/stockfish/search.h +++ b/DroidFish/jni/stockfish/search.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,7 +20,6 @@ #ifndef SEARCH_H_INCLUDED #define SEARCH_H_INCLUDED -#include #include #include #include @@ -41,6 +40,7 @@ struct Stack { SplitPoint* splitPoint; int ply; Move currentMove; + Move ttMove; Move excludedMove; Move killers[2]; Depth reduction; @@ -73,22 +73,26 @@ struct RootMove { /// The LimitsType struct stores information sent by GUI about available time /// to search the current move, maximum depth/time, if we are in analysis mode -/// or if we have to ponder while is our opponent's side to move. +/// or if we have to ponder while it's our opponent's turn to move. struct LimitsType { - LimitsType() { std::memset(this, 0, sizeof(LimitsType)); } + LimitsType() { // Using memset on a std::vector is undefined behavior + time[WHITE] = time[BLACK] = inc[WHITE] = inc[BLACK] = movestogo = + depth = nodes = movetime = mate = infinite = ponder = 0; + } bool use_time_management() const { return !(mate | movetime | depth | nodes | infinite); } + std::vector searchmoves; int time[COLOR_NB], inc[COLOR_NB], movestogo, depth, nodes, movetime, mate, infinite, ponder; }; /// The SignalsType struct stores volatile flags updated during the search -/// typically in an async fashion, for instance to stop the search by the GUI. +/// typically in an async fashion e.g. to stop the search by the GUI. struct SignalsType { - bool stopOnPonderhit, firstRootMove, stop, failedLowAtRoot; + bool stop, stopOnPonderhit, firstRootMove, failedLowAtRoot; }; typedef std::auto_ptr > StateStackPtr; @@ -102,7 +106,7 @@ extern Time::point SearchTime; extern StateStackPtr SetupStates; extern void init(); -extern size_t perft(Position& pos, Depth depth); +extern uint64_t perft(Position& pos, Depth depth); extern void think(); } // namespace Search diff --git a/DroidFish/jni/stockfish/thread.cpp b/DroidFish/jni/stockfish/thread.cpp index a6899de..344cfb7 100644 --- a/DroidFish/jni/stockfish/thread.cpp +++ b/DroidFish/jni/stockfish/thread.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,6 +29,8 @@ using namespace Search; ThreadPool Threads; // Global object +extern void check_time(); + namespace { // start_routine() is the C function which is called when a new thread @@ -38,7 +40,7 @@ namespace { // Helpers to launch a thread after creation and joining before delete. Must be - // outside Thread c'tor and d'tor because object shall be fully initialized + // outside Thread c'tor and d'tor because the object will be fully initialized // when start_routine (and hence virtual idle_loop) is called and when joining. template T* new_thread() { @@ -57,7 +59,7 @@ namespace { } -// ThreadBase::notify_one() wakes up the thread when there is some work to do +// notify_one() wakes up the thread when there is some work to do void ThreadBase::notify_one() { @@ -67,7 +69,7 @@ void ThreadBase::notify_one() { } -// ThreadBase::wait_for() set the thread to sleep until condition 'b' turns true +// wait_for() set the thread to sleep until condition 'b' turns true void ThreadBase::wait_for(volatile const bool& b) { @@ -77,8 +79,8 @@ void ThreadBase::wait_for(volatile const bool& b) { } -// Thread c'tor just inits data but does not launch any thread of execution that -// instead will be started only upon c'tor returns. +// Thread c'tor just inits data and does not launch any execution thread. +// Such a thread will only be started when c'tor returns. Thread::Thread() /* : splitPoints() */ { // Value-initialization bug in MSVC @@ -86,13 +88,47 @@ Thread::Thread() /* : splitPoints() */ { // Value-initialization bug in MSVC maxPly = splitPointsSize = 0; activeSplitPoint = NULL; activePosition = NULL; - idx = Threads.size(); + idx = Threads.size(); // Starts from 0 +} + + +// cutoff_occurred() checks whether a beta cutoff has occurred in the +// current active split point, or in some ancestor of the split point. + +bool Thread::cutoff_occurred() const { + + for (SplitPoint* sp = activeSplitPoint; sp; sp = sp->parentSplitPoint) + if (sp->cutoff) + return true; + + return false; +} + + +// Thread::available_to() checks whether the thread is available to help the +// thread 'master' at a split point. An obvious requirement is that thread must +// be idle. With more than two threads, this is not sufficient: If the thread is +// the master of some split point, it is only available as a slave to the slaves +// which are busy searching the split point at the top of slave's split point +// stack (the "helpful master concept" in YBWC terminology). + +bool Thread::available_to(const Thread* master) const { + + if (searching) + return false; + + // Make a local copy to be sure it doesn't become zero under our feet while + // testing next condition and so leading to an out of bounds access. + int size = splitPointsSize; + + // No split points means that the thread is available as a slave for any + // other thread otherwise apply the "helpful master" concept if possible. + return !size || splitPoints[size - 1].slavesMask.test(master->idx); } // TimerThread::idle_loop() is where the timer thread waits msec milliseconds -// and then calls check_time(). If msec is 0 thread sleeps until is woken up. -extern void check_time(); +// and then calls check_time(). If msec is 0 thread sleeps until it's woken up. void TimerThread::idle_loop() { @@ -112,7 +148,7 @@ void TimerThread::idle_loop() { // MainThread::idle_loop() is where the main thread is parked waiting to be started -// when there is a new search. Main thread will launch all the slave threads. +// when there is a new search. The main thread will launch all the slave threads. void MainThread::idle_loop() { @@ -124,7 +160,7 @@ void MainThread::idle_loop() { while (!thinking && !exit) { - Threads.sleepCondition.notify_one(); // Wake up UI thread if needed + Threads.sleepCondition.notify_one(); // Wake up the UI thread if needed sleepCondition.wait(mutex); } @@ -144,56 +180,21 @@ void MainThread::idle_loop() { } -// Thread::cutoff_occurred() checks whether a beta cutoff has occurred in the -// current active split point, or in some ancestor of the split point. - -bool Thread::cutoff_occurred() const { - - for (SplitPoint* sp = activeSplitPoint; sp; sp = sp->parentSplitPoint) - if (sp->cutoff) - return true; - - return false; -} - - -// Thread::available_to() checks whether the thread is available to help the -// thread 'master' at a split point. An obvious requirement is that thread must -// be idle. With more than two threads, this is not sufficient: If the thread is -// the master of some split point, it is only available as a slave to the slaves -// which are busy searching the split point at the top of slaves split point -// stack (the "helpful master concept" in YBWC terminology). - -bool Thread::available_to(const Thread* master) const { - - if (searching) - return false; - - // Make a local copy to be sure doesn't become zero under our feet while - // testing next condition and so leading to an out of bound access. - int size = splitPointsSize; - - // No split points means that the thread is available as a slave for any - // other thread otherwise apply the "helpful master" concept if possible. - return !size || (splitPoints[size - 1].slavesMask & (1ULL << master->idx)); -} - - // init() is called at startup to create and launch requested threads, that will -// go immediately to sleep due to 'sleepWhileIdle' set to true. We cannot use -// a c'tor becuase Threads is a static object and we need a fully initialized -// engine at this point due to allocation of Endgames in Thread c'tor. +// go immediately to sleep. We cannot use a c'tor because Threads is a static +// object and we need a fully initialized engine at this point due to allocation +// of Endgames in Thread c'tor. void ThreadPool::init() { - sleepWhileIdle = true; timer = new_thread(); push_back(new_thread()); read_uci_options(); } -// exit() cleanly terminates the threads before the program exits +// exit() cleanly terminates the threads before the program exits. Cannot be done in +// d'tor because we have to terminate the threads before to free ThreadPool object. void ThreadPool::exit() { @@ -206,23 +207,20 @@ void ThreadPool::exit() { // read_uci_options() updates internal threads parameters from the corresponding // UCI options and creates/destroys threads to match the requested number. Thread -// objects are dynamically allocated to avoid creating in advance all possible -// threads, with included pawns and material tables, if only few are used. +// objects are dynamically allocated to avoid creating all possible threads +// in advance (which include pawns and material tables), even if only a few +// are to be used. void ThreadPool::read_uci_options() { - maxThreadsPerSplitPoint = Options["Max Threads per Split Point"]; - minimumSplitDepth = Options["Min Split Depth"] * ONE_PLY; - size_t requested = Options["Threads"]; + minimumSplitDepth = Options["Min Split Depth"] * ONE_PLY; + size_t requested = Options["Threads"]; assert(requested > 0); - // Value 0 has a special meaning: We determine the optimal minimum split depth - // automatically. Anyhow the minimumSplitDepth should never be under 4 plies. + // If zero (default) then set best minimum split depth automatically if (!minimumSplitDepth) - minimumSplitDepth = (requested < 8 ? 4 : 7) * ONE_PLY; - else - minimumSplitDepth = std::max(4 * ONE_PLY, minimumSplitDepth); + minimumSplitDepth = requested < 8 ? 4 * ONE_PLY : 7 * ONE_PLY; while (size() < requested) push_back(new_thread()); @@ -235,7 +233,7 @@ void ThreadPool::read_uci_options() { } -// slave_available() tries to find an idle thread which is available as a slave +// available_slave() tries to find an idle thread which is available as a slave // for the thread 'master'. Thread* ThreadPool::available_slave(const Thread* master) const { @@ -259,12 +257,11 @@ Thread* ThreadPool::available_slave(const Thread* master) const { template void Thread::split(Position& pos, const Stack* ss, Value alpha, Value beta, Value* bestValue, - Move* bestMove, Depth depth, Move threatMove, int moveCount, + Move* bestMove, Depth depth, int moveCount, MovePicker* movePicker, int nodeType, bool cutNode) { assert(pos.pos_is_ok()); - assert(*bestValue <= alpha && alpha < beta && beta <= VALUE_INFINITE); - assert(*bestValue > -VALUE_INFINITE); + assert(-VALUE_INFINITE < *bestValue && *bestValue <= alpha && alpha < beta && beta <= VALUE_INFINITE); assert(depth >= Threads.minimumSplitDepth); assert(searching); assert(splitPointsSize < MAX_SPLITPOINTS_PER_THREAD); @@ -274,11 +271,10 @@ void Thread::split(Position& pos, const Stack* ss, Value alpha, Value beta, Valu sp.masterThread = this; sp.parentSplitPoint = activeSplitPoint; - sp.slavesMask = 1ULL << idx; + sp.slavesMask = 0, sp.slavesMask.set(idx); sp.depth = depth; sp.bestValue = *bestValue; sp.bestMove = *bestMove; - sp.threatMove = threatMove; sp.alpha = alpha; sp.beta = beta; sp.nodeType = nodeType; @@ -296,44 +292,40 @@ void Thread::split(Position& pos, const Stack* ss, Value alpha, Value beta, Valu Threads.mutex.lock(); sp.mutex.lock(); + sp.allSlavesSearching = true; // Must be set under lock protection ++splitPointsSize; activeSplitPoint = &sp; activePosition = NULL; - size_t slavesCnt = 1; // This thread is always included - Thread* slave; - - while ( (slave = Threads.available_slave(this)) != NULL - && ++slavesCnt <= Threads.maxThreadsPerSplitPoint && !Fake) - { - sp.slavesMask |= 1ULL << slave->idx; - slave->activeSplitPoint = &sp; - slave->searching = true; // Slave leaves idle_loop() - slave->notify_one(); // Could be sleeping - } + if (!Fake) + for (Thread* slave; (slave = Threads.available_slave(this)) != NULL; ) + { + sp.slavesMask.set(slave->idx); + slave->activeSplitPoint = &sp; + slave->searching = true; // Slave leaves idle_loop() + slave->notify_one(); // Could be sleeping + } // Everything is set up. The master thread enters the idle loop, from which // it will instantly launch a search, because its 'searching' flag is set. // The thread will return from the idle loop when all slaves have finished // their work at this split point. - if (slavesCnt > 1 || Fake) - { - sp.mutex.unlock(); - Threads.mutex.unlock(); + sp.mutex.unlock(); + Threads.mutex.unlock(); - Thread::idle_loop(); // Force a call to base class idle_loop() + Thread::idle_loop(); // Force a call to base class idle_loop() - // In helpful master concept a master can help only a sub-tree of its split - // point, and because here is all finished is not possible master is booked. - assert(!searching); - assert(!activePosition); + // In the helpful master concept, a master can help only a sub-tree of its + // split point and because everything is finished here, it's not possible + // for the master to be booked. + assert(!searching); + assert(!activePosition); - // We have returned from the idle loop, which means that all threads are - // finished. Note that setting 'searching' and decreasing splitPointsSize is - // done under lock protection to avoid a race with Thread::available_to(). - Threads.mutex.lock(); - sp.mutex.lock(); - } + // We have returned from the idle loop, which means that all threads are + // finished. Note that setting 'searching' and decreasing splitPointsSize is + // done under lock protection to avoid a race with Thread::available_to(). + Threads.mutex.lock(); + sp.mutex.lock(); searching = true; --splitPointsSize; @@ -348,8 +340,8 @@ void Thread::split(Position& pos, const Stack* ss, Value alpha, Value beta, Valu } // Explicit template instantiations -template void Thread::split(Position&, const Stack*, Value, Value, Value*, Move*, Depth, Move, int, MovePicker*, int, bool); -template void Thread::split< true>(Position&, const Stack*, Value, Value, Value*, Move*, Depth, Move, int, MovePicker*, int, bool); +template void Thread::split(Position&, const Stack*, Value, Value, Value*, Move*, Depth, int, MovePicker*, int, bool); +template void Thread::split< true>(Position&, const Stack*, Value, Value, Value*, Move*, Depth, int, MovePicker*, int, bool); // wait_for_think_finished() waits for main thread to go to sleep then returns @@ -366,8 +358,8 @@ void ThreadPool::wait_for_think_finished() { // start_thinking() wakes up the main thread sleeping in MainThread::idle_loop() // so to start a new search, then returns immediately. -void ThreadPool::start_thinking(const Position& pos, const LimitsType& limits, - const std::vector& searchMoves, StateStackPtr& states) { +void ThreadPool::start_thinking(const Position& pos, const LimitsType& limits, StateStackPtr& states) { + wait_for_think_finished(); SearchTime = Time::now(); // As early as possible @@ -385,8 +377,8 @@ void ThreadPool::start_thinking(const Position& pos, const LimitsType& limits, } for (MoveList it(pos); *it; ++it) - if ( searchMoves.empty() - || std::count(searchMoves.begin(), searchMoves.end(), *it)) + if ( limits.searchmoves.empty() + || std::count(limits.searchmoves.begin(), limits.searchmoves.end(), *it)) RootMoves.push_back(RootMove(*it)); main()->thinking = true; diff --git a/DroidFish/jni/stockfish/thread.h b/DroidFish/jni/stockfish/thread.h index 92f5ed3..3565431 100644 --- a/DroidFish/jni/stockfish/thread.h +++ b/DroidFish/jni/stockfish/thread.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,6 +20,7 @@ #ifndef THREAD_H_INCLUDED #define THREAD_H_INCLUDED +#include #include #include "material.h" @@ -28,7 +29,7 @@ #include "position.h" #include "search.h" -const int MAX_THREADS = 64; // Because SplitPoint::slavesMask is a uint64_t +const int MAX_THREADS = 128; const int MAX_SPLITPOINTS_PER_THREAD = 8; struct Mutex { @@ -67,7 +68,6 @@ struct SplitPoint { Depth depth; Value beta; int nodeType; - Move threatMove; bool cutNode; // Const pointers to shared data @@ -76,8 +76,9 @@ struct SplitPoint { // Shared data Mutex mutex; - volatile uint64_t slavesMask; - volatile int64_t nodes; + std::bitset slavesMask; + volatile bool allSlavesSearching; + volatile uint64_t nodes; volatile Value alpha; volatile Value bestValue; volatile Move bestMove; @@ -91,7 +92,7 @@ struct SplitPoint { struct ThreadBase { - ThreadBase() : exit(false) {} + ThreadBase() : handle(NativeHandle()), exit(false) {} virtual ~ThreadBase() {} virtual void idle_loop() = 0; void notify_one(); @@ -118,7 +119,7 @@ struct Thread : public ThreadBase { template void split(Position& pos, const Search::Stack* ss, Value alpha, Value beta, Value* bestValue, Move* bestMove, - Depth depth, Move threatMove, int moveCount, MovePicker* movePicker, int nodeType, bool cutNode); + Depth depth, int moveCount, MovePicker* movePicker, int nodeType, bool cutNode); SplitPoint splitPoints[MAX_SPLITPOINTS_PER_THREAD]; Material::Table materialTable; @@ -151,24 +152,21 @@ struct TimerThread : public ThreadBase { /// ThreadPool struct handles all the threads related stuff like init, starting, -/// parking and, the most important, launching a slave thread at a split point. +/// parking and, most importantly, launching a slave thread at a split point. /// All the access to shared thread data is done through this class. struct ThreadPool : public std::vector { void init(); // No c'tor and d'tor, threads rely on globals that should - void exit(); // be initialized and valid during the whole thread lifetime. + void exit(); // be initialized and are valid during the whole thread lifetime. MainThread* main() { return static_cast((*this)[0]); } void read_uci_options(); Thread* available_slave(const Thread* master) const; void wait_for_think_finished(); - void start_thinking(const Position&, const Search::LimitsType&, - const std::vector&, Search::StateStackPtr&); + void start_thinking(const Position&, const Search::LimitsType&, Search::StateStackPtr&); - bool sleepWhileIdle; Depth minimumSplitDepth; - size_t maxThreadsPerSplitPoint; Mutex mutex; ConditionVariable sleepCondition; TimerThread* timer; diff --git a/DroidFish/jni/stockfish/timeman.cpp b/DroidFish/jni/stockfish/timeman.cpp index 146818e..c305e61 100644 --- a/DroidFish/jni/stockfish/timeman.cpp +++ b/DroidFish/jni/stockfish/timeman.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,6 +18,7 @@ */ #include +#include #include #include "search.h" @@ -26,65 +27,51 @@ namespace { - /// Constants + enum TimeType { OptimumTime, MaxTime }; - const int MoveHorizon = 50; // Plan time management at most this many moves ahead + const int MoveHorizon = 50; // Plan time management at most this many moves ahead const double MaxRatio = 7.0; // When in trouble, we can step over reserved time with this ratio const double StealRatio = 0.33; // However we must not steal time from remaining moves over this ratio + const double xscale = 9.3; + const double xshift = 59.8; + const double skewfactor = 0.172; - // MoveImportance[] is based on naive statistical analysis of "how many games are still undecided - // after n half-moves". Game is considered "undecided" as long as neither side has >275cp advantage. + + // move_importance() is a skew-logistic function based on naive statistical + // analysis of "how many games are still undecided after n half-moves". Game + // is considered "undecided" as long as neither side has >275cp advantage. // Data was extracted from CCRL game database with some simple filtering criteria. - const int MoveImportance[512] = { - 7780, 7780, 7780, 7780, 7780, 7780, 7780, 7780, 7780, 7780, 7780, 7780, 7780, 7780, 7780, 7780, - 7780, 7780, 7780, 7780, 7778, 7778, 7776, 7776, 7776, 7773, 7770, 7768, 7766, 7763, 7757, 7751, - 7743, 7735, 7724, 7713, 7696, 7689, 7670, 7656, 7627, 7605, 7571, 7549, 7522, 7493, 7462, 7425, - 7385, 7350, 7308, 7272, 7230, 7180, 7139, 7094, 7055, 7010, 6959, 6902, 6841, 6778, 6705, 6651, - 6569, 6508, 6435, 6378, 6323, 6253, 6152, 6085, 5995, 5931, 5859, 5794, 5717, 5646, 5544, 5462, - 5364, 5282, 5172, 5078, 4988, 4901, 4831, 4764, 4688, 4609, 4536, 4443, 4365, 4293, 4225, 4155, - 4085, 4005, 3927, 3844, 3765, 3693, 3634, 3560, 3479, 3404, 3331, 3268, 3207, 3146, 3077, 3011, - 2947, 2894, 2828, 2776, 2727, 2676, 2626, 2589, 2538, 2490, 2442, 2394, 2345, 2302, 2243, 2192, - 2156, 2115, 2078, 2043, 2004, 1967, 1922, 1893, 1845, 1809, 1772, 1736, 1702, 1674, 1640, 1605, - 1566, 1536, 1509, 1479, 1452, 1423, 1388, 1362, 1332, 1304, 1289, 1266, 1250, 1228, 1206, 1180, - 1160, 1134, 1118, 1100, 1080, 1068, 1051, 1034, 1012, 1001, 980, 960, 945, 934, 916, 900, 888, - 878, 865, 852, 828, 807, 787, 770, 753, 744, 731, 722, 706, 700, 683, 676, 671, 664, 652, 641, - 634, 627, 613, 604, 591, 582, 568, 560, 552, 540, 534, 529, 519, 509, 495, 484, 474, 467, 460, - 450, 438, 427, 419, 410, 406, 399, 394, 387, 382, 377, 372, 366, 359, 353, 348, 343, 337, 333, - 328, 321, 315, 309, 303, 298, 293, 287, 284, 281, 277, 273, 265, 261, 255, 251, 247, 241, 240, - 235, 229, 218, 217, 213, 212, 208, 206, 197, 193, 191, 189, 185, 184, 180, 177, 172, 170, 170, - 170, 166, 163, 159, 158, 156, 155, 151, 146, 141, 138, 136, 132, 130, 128, 125, 123, 122, 118, - 118, 118, 117, 115, 114, 108, 107, 105, 105, 105, 102, 97, 97, 95, 94, 93, 91, 88, 86, 83, 80, - 80, 79, 79, 79, 78, 76, 75, 72, 72, 71, 70, 68, 65, 63, 61, 61, 59, 59, 59, 58, 56, 55, 54, 54, - 52, 49, 48, 48, 48, 48, 45, 45, 45, 44, 43, 41, 41, 41, 41, 40, 40, 38, 37, 36, 34, 34, 34, 33, - 31, 29, 29, 29, 28, 28, 28, 28, 28, 28, 28, 27, 27, 27, 27, 27, 24, 24, 23, 23, 22, 21, 20, 20, - 19, 19, 19, 19, 19, 18, 18, 18, 18, 17, 17, 17, 17, 17, 16, 16, 15, 15, 14, 14, 14, 12, 12, 11, - 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 2, 2, 2, 2, - 2, 1, 1, 1, 1, 1, 1, 1 }; - int move_importance(int ply) { return MoveImportance[std::min(ply, 511)]; } + double move_importance(int ply) { + return pow((1 + exp((ply - xshift) / xscale)), -skewfactor) + DBL_MIN; // Ensure non-zero + } - /// Function Prototypes + template + int remaining(int myTime, int movesToGo, int currentPly, int slowMover) + { + const double TMaxRatio = (T == OptimumTime ? 1 : MaxRatio); + const double TStealRatio = (T == OptimumTime ? 0 : StealRatio); - enum TimeType { OptimumTime, MaxTime }; + double thisMoveImportance = (move_importance(currentPly) * slowMover) / 100; + double otherMovesImportance = 0; - template - int remaining(int myTime, int movesToGo, int fullMoveNumber, int slowMover); -} + for (int i = 1; i < movesToGo; ++i) + otherMovesImportance += move_importance(currentPly + 2 * i); + double ratio1 = (TMaxRatio * thisMoveImportance) / (TMaxRatio * thisMoveImportance + otherMovesImportance); + double ratio2 = (thisMoveImportance + TStealRatio * otherMovesImportance) / (thisMoveImportance + otherMovesImportance); -void TimeManager::pv_instability(double bestMoveChanges) { + return int(myTime * std::min(ratio1, ratio2)); + } - unstablePVExtraTime = int(bestMoveChanges * optimumSearchTime / 1.4); -} +} // namespace void TimeManager::init(const Search::LimitsType& limits, int currentPly, Color us) { - /* We support four different kind of time controls: + /* We support four different kinds of time controls: increment == 0 && movesToGo == 0 means: x basetime [sudden death!] increment == 0 && movesToGo != 0 means: x moves in y minutes @@ -108,15 +95,15 @@ void TimeManager::init(const Search::LimitsType& limits, int currentPly, Color u int minThinkingTime = Options["Minimum Thinking Time"]; int slowMover = Options["Slow Mover"]; - // Initialize to maximum values but unstablePVExtraTime that is reset - unstablePVExtraTime = 0; - optimumSearchTime = maximumSearchTime = limits.time[us]; + // Initialize unstablePvFactor to 1 and search times to maximum values + unstablePvFactor = 1; + optimumSearchTime = maximumSearchTime = std::max(limits.time[us], minThinkingTime); - // We calculate optimum time usage for different hypothetic "moves to go"-values and choose the + // We calculate optimum time usage for different hypothetical "moves to go"-values and choose the // minimum of calculated search time values. Usually the greatest hypMTG gives the minimum values. for (hypMTG = 1; hypMTG <= (limits.movestogo ? std::min(limits.movestogo, MoveHorizon) : MoveHorizon); ++hypMTG) { - // Calculate thinking time for hypothetic "moves to go"-value + // Calculate thinking time for hypothetical "moves to go"-value hypMyTime = limits.time[us] + limits.inc[us] * (hypMTG - 1) - emergencyBaseTime @@ -137,25 +124,3 @@ void TimeManager::init(const Search::LimitsType& limits, int currentPly, Color u // Make sure that maxSearchTime is not over absoluteMaxSearchTime optimumSearchTime = std::min(optimumSearchTime, maximumSearchTime); } - - -namespace { - - template - int remaining(int myTime, int movesToGo, int currentPly, int slowMover) - { - const double TMaxRatio = (T == OptimumTime ? 1 : MaxRatio); - const double TStealRatio = (T == OptimumTime ? 0 : StealRatio); - - double thisMoveImportance = double(move_importance(currentPly) * slowMover) / 100; - int otherMovesImportance = 0; - - for (int i = 1; i < movesToGo; ++i) - otherMovesImportance += move_importance(currentPly + 2 * i); - - double ratio1 = (TMaxRatio * thisMoveImportance) / (TMaxRatio * thisMoveImportance + otherMovesImportance); - double ratio2 = (thisMoveImportance + TStealRatio * otherMovesImportance) / (thisMoveImportance + otherMovesImportance); - - return int(floor(myTime * std::min(ratio1, ratio2))); - } -} diff --git a/DroidFish/jni/stockfish/timeman.h b/DroidFish/jni/stockfish/timeman.h index 92ab0e7..a15551a 100644 --- a/DroidFish/jni/stockfish/timeman.h +++ b/DroidFish/jni/stockfish/timeman.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,19 +21,19 @@ #define TIMEMAN_H_INCLUDED /// The TimeManager class computes the optimal time to think depending on the -/// maximum available time, the move game number and other parameters. +/// maximum available time, the game move number and other parameters. class TimeManager { public: void init(const Search::LimitsType& limits, int currentPly, Color us); - void pv_instability(double bestMoveChanges); - int available_time() const { return optimumSearchTime + unstablePVExtraTime; } + void pv_instability(double bestMoveChanges) { unstablePvFactor = 1 + bestMoveChanges; } + int available_time() const { return int(optimumSearchTime * unstablePvFactor * 0.71); } int maximum_time() const { return maximumSearchTime; } private: int optimumSearchTime; int maximumSearchTime; - int unstablePVExtraTime; + double unstablePvFactor; }; #endif // #ifndef TIMEMAN_H_INCLUDED diff --git a/DroidFish/jni/stockfish/tt.cpp b/DroidFish/jni/stockfish/tt.cpp index 2643680..3d2fe48 100644 --- a/DroidFish/jni/stockfish/tt.cpp +++ b/DroidFish/jni/stockfish/tt.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,11 +26,11 @@ TranspositionTable TT; // Our global transposition table -/// TranspositionTable::set_size() sets the size of the transposition table, +/// TranspositionTable::resize() sets the size of the transposition table, /// measured in megabytes. Transposition table consists of a power of 2 number /// of clusters and each cluster consists of ClusterSize number of TTEntry. -void TranspositionTable::set_size(size_t mbSize) { +void TranspositionTable::resize(uint64_t mbSize) { assert(msb((mbSize << 20) / sizeof(TTEntry)) < 32); @@ -70,12 +70,15 @@ void TranspositionTable::clear() { const TTEntry* TranspositionTable::probe(const Key key) const { - const TTEntry* tte = first_entry(key); + TTEntry* tte = first_entry(key); uint32_t key32 = key >> 32; for (unsigned i = 0; i < ClusterSize; ++i, ++tte) - if (tte->key() == key32) + if (tte->key32 == key32) + { + tte->generation8 = generation; // Refresh return tte; + } return NULL; } @@ -83,15 +86,14 @@ const TTEntry* TranspositionTable::probe(const Key key) const { /// TranspositionTable::store() writes a new entry containing position key and /// valuable information of current position. The lowest order bits of position -/// key are used to decide on which cluster the position will be placed. -/// When a new entry is written and there are no empty entries available in cluster, -/// it replaces the least valuable of entries. A TTEntry t1 is considered to be -/// more valuable than a TTEntry t2 if t1 is from the current search and t2 is from -/// a previous search, or if the depth of t1 is bigger than the depth of t2. +/// key are used to decide in which cluster the position will be placed. +/// When a new entry is written and there are no empty entries available in the +/// cluster, it replaces the least valuable of the entries. A TTEntry t1 is considered +/// to be more valuable than a TTEntry t2 if t1 is from the current search and t2 +/// is from a previous search, or if the depth of t1 is bigger than the depth of t2. void TranspositionTable::store(const Key key, Value v, Bound b, Depth d, Move m, Value statV) { - int c1, c2, c3; TTEntry *tte, *replace; uint32_t key32 = key >> 32; // Use the high 32 bits as key inside the cluster @@ -99,7 +101,7 @@ void TranspositionTable::store(const Key key, Value v, Bound b, Depth d, Move m, for (unsigned i = 0; i < ClusterSize; ++i, ++tte) { - if (!tte->key() || tte->key() == key32) // Empty or overwrite old + if (!tte->key32 || tte->key32 == key32) // Empty or overwrite old { if (!m) m = tte->move(); // Preserve any existing ttMove @@ -109,11 +111,9 @@ void TranspositionTable::store(const Key key, Value v, Bound b, Depth d, Move m, } // Implement replace strategy - c1 = (replace->generation() == generation ? 2 : 0); - c2 = (tte->generation() == generation || tte->bound() == BOUND_EXACT ? -2 : 0); - c3 = (tte->depth() < replace->depth() ? 1 : 0); - - if (c1 + c2 + c3 > 0) + if ( ( tte->generation8 == generation || tte->bound() == BOUND_EXACT) + - (replace->generation8 == generation) + - (tte->depth16 < replace->depth16) < 0) replace = tte; } diff --git a/DroidFish/jni/stockfish/tt.h b/DroidFish/jni/stockfish/tt.h index fb50ddf..eeb18e3 100644 --- a/DroidFish/jni/stockfish/tt.h +++ b/DroidFish/jni/stockfish/tt.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,40 +23,38 @@ #include "misc.h" #include "types.h" -/// The TTEntry is the 128 bit transposition table entry, defined as below: +/// The TTEntry is the 14 bytes transposition table entry, defined as below: /// -/// key: 32 bit -/// move: 16 bit -/// bound type: 8 bit -/// generation: 8 bit -/// value: 16 bit -/// depth: 16 bit -/// static value: 16 bit -/// static margin: 16 bit +/// key 32 bit +/// move 16 bit +/// bound type 8 bit +/// generation 8 bit +/// value 16 bit +/// depth 16 bit +/// eval value 16 bit struct TTEntry { - void save(uint32_t k, Value v, Bound b, Depth d, Move m, int g, Value ev) { - - key32 = (uint32_t)k; - move16 = (uint16_t)m; - bound8 = (uint8_t)b; - generation8 = (uint8_t)g; - value16 = (int16_t)v; - depth16 = (int16_t)d; - evalValue = (int16_t)ev; - } - void set_generation(uint8_t g) { generation8 = g; } - - uint32_t key() const { return key32; } - Depth depth() const { return (Depth)depth16; } - Move move() const { return (Move)move16; } - Value value() const { return (Value)value16; } - Bound bound() const { return (Bound)bound8; } - int generation() const { return (int)generation8; } - Value eval_value() const { return (Value)evalValue; } + Move move() const { return (Move )move16; } + Bound bound() const { return (Bound)bound8; } + Value value() const { return (Value)value16; } + Depth depth() const { return (Depth)depth16; } + Value eval_value() const { return (Value)evalValue; } private: + friend class TranspositionTable; + + void save(uint32_t k, Value v, Bound b, Depth d, Move m, uint8_t g, Value ev) { + + key32 = (uint32_t)k; + move16 = (uint16_t)m; + bound8 = (uint8_t)b; + generation8 = (uint8_t)g; + value16 = (int16_t)v; + depth16 = (int16_t)d; + evalValue = (int16_t)ev; + } + uint32_t key32; uint16_t move16; uint8_t bound8, generation8; @@ -66,13 +64,13 @@ private: /// A TranspositionTable consists of a power of 2 number of clusters and each /// cluster consists of ClusterSize number of TTEntry. Each non-empty entry -/// contains information of exactly one position. Size of a cluster shall not be -/// bigger than a cache line size. In case it is less, it should be padded to -/// guarantee always aligned accesses. +/// contains information of exactly one position. The size of a cluster should +/// not be bigger than a cache line size. In case it is less, it should be padded +/// to guarantee always aligned accesses. class TranspositionTable { - static const unsigned ClusterSize = 4; // A cluster is 64 Bytes + static const unsigned ClusterSize = 4; public: ~TranspositionTable() { free(mem); } @@ -80,8 +78,7 @@ public: const TTEntry* probe(const Key key) const; TTEntry* first_entry(const Key key) const; - void refresh(const TTEntry* tte) const; - void set_size(size_t mbSize); + void resize(uint64_t mbSize); void clear(); void store(const Key key, Value v, Bound type, Depth d, Move m, Value statV); @@ -104,13 +101,4 @@ inline TTEntry* TranspositionTable::first_entry(const Key key) const { return table + ((uint32_t)key & hashMask); } - -/// TranspositionTable::refresh() updates the 'generation' value of the TTEntry -/// to avoid aging. Normally called after a TT hit. - -inline void TranspositionTable::refresh(const TTEntry* tte) const { - - const_cast(tte)->set_generation(generation); -} - #endif // #ifndef TT_H_INCLUDED diff --git a/DroidFish/jni/stockfish/types.h b/DroidFish/jni/stockfish/types.h index ff37638..9910f10 100644 --- a/DroidFish/jni/stockfish/types.h +++ b/DroidFish/jni/stockfish/types.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ /// For Windows, part of the configuration is detected automatically, but some /// switches need to be set manually: /// -/// -DNDEBUG | Disable debugging mode. Use always. +/// -DNDEBUG | Disable debugging mode. Always use this. /// /// -DNO_PREFETCH | Disable use of prefetch asm-instruction. A must if you want /// | the executable to run on some very old machines. @@ -54,6 +54,12 @@ # include // Intel header for _mm_popcnt_u64() intrinsic #endif +#if defined(USE_PEXT) +# include // Header for _pext_u64() intrinsic +#else +# define _pext_u64(b, m) (0) +#endif + # if !defined(NO_PREFETCH) && (defined(__INTEL_COMPILER) || defined(_MSC_VER)) # include // Intel and Microsoft header for _mm_prefetch() # endif @@ -79,6 +85,12 @@ const bool HasPopCnt = true; const bool HasPopCnt = false; #endif +#ifdef USE_PEXT +const bool HasPext = true; +#else +const bool HasPext = false; +#endif + #ifdef IS_64BIT const bool Is64Bit = true; #else @@ -89,7 +101,7 @@ typedef uint64_t Key; typedef uint64_t Bitboard; const int MAX_MOVES = 256; -const int MAX_PLY = 100; +const int MAX_PLY = 120; const int MAX_PLY_PLUS_6 = MAX_PLY + 6; /// A move needs 16 bits to be stored @@ -97,7 +109,8 @@ const int MAX_PLY_PLUS_6 = MAX_PLY + 6; /// bit 0- 5: destination square (from 0 to 63) /// bit 6-11: origin square (from 0 to 63) /// bit 12-13: promotion piece type - 2 (from KNIGHT-2 to QUEEN-2) -/// bit 14-15: special move flag: promotion (1), en passant (2), castle (3) +/// bit 14-15: special move flag: promotion (1), en passant (2), castling (3) +/// NOTE: EN-PASSANT bit is set only when a pawn can be captured /// /// Special cases are MOVE_NONE and MOVE_NULL. We can sneak these in because in /// any normal move destination square is always different from origin square @@ -112,23 +125,31 @@ enum MoveType { NORMAL, PROMOTION = 1 << 14, ENPASSANT = 2 << 14, - CASTLE = 3 << 14 + CASTLING = 3 << 14 }; -enum CastleRight { // Defined as in PolyGlot book hash key - CASTLES_NONE, +enum Color { + WHITE, BLACK, NO_COLOR, COLOR_NB = 2 +}; + +enum CastlingSide { + KING_SIDE, QUEEN_SIDE, CASTLING_SIDE_NB = 2 +}; + +enum CastlingRight { // Defined as in PolyGlot book hash key + NO_CASTLING, WHITE_OO, WHITE_OOO = WHITE_OO << 1, BLACK_OO = WHITE_OO << 2, BLACK_OOO = WHITE_OO << 3, - ALL_CASTLES = WHITE_OO | WHITE_OOO | BLACK_OO | BLACK_OOO, - CASTLE_RIGHT_NB = 16 + ANY_CASTLING = WHITE_OO | WHITE_OOO | BLACK_OO | BLACK_OOO, + CASTLING_RIGHT_NB = 16 }; -enum CastlingSide { - KING_SIDE, - QUEEN_SIDE, - CASTLING_SIDE_NB = 2 +template struct MakeCastling { + static const CastlingRight + right = C == WHITE ? S == QUEEN_SIDE ? WHITE_OOO : WHITE_OO + : S == QUEEN_SIDE ? BLACK_OOO : BLACK_OO; }; enum Phase { @@ -138,10 +159,11 @@ enum Phase { }; enum ScaleFactor { - SCALE_FACTOR_DRAW = 0, - SCALE_FACTOR_NORMAL = 64, - SCALE_FACTOR_MAX = 128, - SCALE_FACTOR_NONE = 255 + SCALE_FACTOR_DRAW = 0, + SCALE_FACTOR_ONEPAWN = 48, + SCALE_FACTOR_NORMAL = 64, + SCALE_FACTOR_MAX = 128, + SCALE_FACTOR_NONE = 255 }; enum Bound { @@ -154,10 +176,10 @@ enum Bound { enum Value { VALUE_ZERO = 0, VALUE_DRAW = 0, - VALUE_KNOWN_WIN = 15000, - VALUE_MATE = 30000, - VALUE_INFINITE = 30001, - VALUE_NONE = 30002, + VALUE_KNOWN_WIN = 10000, + VALUE_MATE = 32000, + VALUE_INFINITE = 32001, + VALUE_NONE = 32002, VALUE_MATE_IN_MAX_PLY = VALUE_MATE - MAX_PLY, VALUE_MATED_IN_MAX_PLY = -VALUE_MATE + MAX_PLY, @@ -169,7 +191,9 @@ enum Value { KnightValueMg = 817, KnightValueEg = 846, BishopValueMg = 836, BishopValueEg = 857, RookValueMg = 1270, RookValueEg = 1278, - QueenValueMg = 2521, QueenValueEg = 2558 + QueenValueMg = 2521, QueenValueEg = 2558, + + MidgameLimit = 15581, EndgameLimit = 3998 }; enum PieceType { @@ -185,10 +209,6 @@ enum Piece { PIECE_NB = 16 }; -enum Color { - WHITE, BLACK, NO_COLOR, COLOR_NB = 2 -}; - enum Depth { ONE_PLY = 2, @@ -236,39 +256,42 @@ enum Rank { }; -/// Score enum keeps a midgame and an endgame value in a single integer (enum), -/// first LSB 16 bits are used to store endgame value, while upper bits are used -/// for midgame value. Compiler is free to choose the enum type as long as can -/// keep its data, so ensure Score to be an integer type. +/// The Score enum stores a middlegame and an endgame value in a single integer +/// (enum). The least significant 16 bits are used to store the endgame value +/// and the upper 16 bits are used to store the middlegame value. The compiler +/// is free to choose the enum type as long as it can store the data, so we +/// ensure that Score is an integer type by assigning some big int values. enum Score { SCORE_ZERO, SCORE_ENSURE_INTEGER_SIZE_P = INT_MAX, SCORE_ENSURE_INTEGER_SIZE_N = INT_MIN }; -inline Score make_score(int mg, int eg) { return Score((mg << 16) + eg); } +typedef union { + uint32_t full; + struct { int16_t eg, mg; } half; +} ScoreView; -/// Extracting the signed lower and upper 16 bits it not so trivial because -/// according to the standard a simple cast to short is implementation defined -/// and so is a right shift of a signed integer. -inline Value mg_value(Score s) { return Value(((s + 0x8000) & ~0xffff) / 0x10000); } - -/// On Intel 64 bit we have a small speed regression with the standard conforming -/// version, so use a faster code in this case that, although not 100% standard -/// compliant it seems to work for Intel and MSVC. -#if defined(IS_64BIT) && (!defined(__GNUC__) || defined(__INTEL_COMPILER)) - -inline Value eg_value(Score s) { return Value(int16_t(s & 0xffff)); } - -#else - -inline Value eg_value(Score s) { - return Value((int)(unsigned(s) & 0x7fffu) - (int)(unsigned(s) & 0x8000u)); +inline Score make_score(int mg, int eg) { + ScoreView v; + v.half.mg = (int16_t)(mg - (uint16_t(eg) >> 15)); + v.half.eg = (int16_t)eg; + return Score(v.full); } -#endif +inline Value mg_value(Score s) { + ScoreView v; + v.full = s; + return Value(v.half.mg + (uint16_t(v.half.eg) >> 15)); +} -#define ENABLE_SAFE_OPERATORS_ON(T) \ +inline Value eg_value(Score s) { + ScoreView v; + v.full = s; + return Value(v.half.eg); +} + +#define ENABLE_BASE_OPERATORS_ON(T) \ inline T operator+(const T d1, const T d2) { return T(int(d1) + int(d2)); } \ inline T operator-(const T d1, const T d2) { return T(int(d1) - int(d2)); } \ inline T operator*(int i, const T d) { return T(i * int(d)); } \ @@ -278,26 +301,32 @@ inline T& operator+=(T& d1, const T d2) { return d1 = d1 + d2; } \ inline T& operator-=(T& d1, const T d2) { return d1 = d1 - d2; } \ inline T& operator*=(T& d, int i) { return d = T(int(d) * i); } -#define ENABLE_OPERATORS_ON(T) ENABLE_SAFE_OPERATORS_ON(T) \ +ENABLE_BASE_OPERATORS_ON(Score) + +#define ENABLE_FULL_OPERATORS_ON(T) \ +ENABLE_BASE_OPERATORS_ON(T) \ inline T& operator++(T& d) { return d = T(int(d) + 1); } \ inline T& operator--(T& d) { return d = T(int(d) - 1); } \ inline T operator/(const T d, int i) { return T(int(d) / i); } \ inline T& operator/=(T& d, int i) { return d = T(int(d) / i); } -ENABLE_OPERATORS_ON(Value) -ENABLE_OPERATORS_ON(PieceType) -ENABLE_OPERATORS_ON(Piece) -ENABLE_OPERATORS_ON(Color) -ENABLE_OPERATORS_ON(Depth) -ENABLE_OPERATORS_ON(Square) -ENABLE_OPERATORS_ON(File) -ENABLE_OPERATORS_ON(Rank) +ENABLE_FULL_OPERATORS_ON(Value) +ENABLE_FULL_OPERATORS_ON(PieceType) +ENABLE_FULL_OPERATORS_ON(Piece) +ENABLE_FULL_OPERATORS_ON(Color) +ENABLE_FULL_OPERATORS_ON(Depth) +ENABLE_FULL_OPERATORS_ON(Square) +ENABLE_FULL_OPERATORS_ON(File) +ENABLE_FULL_OPERATORS_ON(Rank) -/// Added operators for adding integers to a Value +#undef ENABLE_FULL_OPERATORS_ON +#undef ENABLE_BASE_OPERATORS_ON + +/// Additional operators to add integers to a Value inline Value operator+(Value v, int i) { return Value(int(v) + i); } inline Value operator-(Value v, int i) { return Value(int(v) - i); } - -ENABLE_SAFE_OPERATORS_ON(Score) +inline Value& operator+=(Value& v, int i) { return v = v + i; } +inline Value& operator-=(Value& v, int i) { return v = v - i; } /// Only declared but not defined. We don't want to multiply two scores due to /// a very high risk of overflow. So user should explicitly convert to integer. @@ -308,18 +337,15 @@ inline Score operator/(Score s, int i) { return make_score(mg_value(s) / i, eg_value(s) / i); } -#undef ENABLE_OPERATORS_ON -#undef ENABLE_SAFE_OPERATORS_ON - extern Value PieceValue[PHASE_NB][PIECE_NB]; struct ExtMove { Move move; - int score; + Value value; }; inline bool operator<(const ExtMove& f, const ExtMove& s) { - return f.score < s.score; + return f.value < s.value; } inline Color operator~(Color c) { @@ -330,8 +356,8 @@ inline Square operator~(Square s) { return Square(s ^ SQ_A8); // Vertical flip SQ_A1 -> SQ_A8 } -inline Square operator|(File f, Rank r) { - return Square((r << 3) | f); +inline CastlingRight operator|(Color c, CastlingSide s) { + return CastlingRight(WHITE_OO << ((s == QUEEN_SIDE) + 2 * c)); } inline Value mate_in(int ply) { @@ -342,21 +368,21 @@ inline Value mated_in(int ply) { return -VALUE_MATE + ply; } +inline Square make_square(File f, Rank r) { + return Square((r << 3) | f); +} + inline Piece make_piece(Color c, PieceType pt) { return Piece((c << 3) | pt); } -inline CastleRight make_castle_right(Color c, CastlingSide s) { - return CastleRight(WHITE_OO << ((s == QUEEN_SIDE) + 2 * c)); +inline PieceType type_of(Piece pc) { + return PieceType(pc & 7); } -inline PieceType type_of(Piece p) { - return PieceType(p & 7); -} - -inline Color color_of(Piece p) { - assert(p != NO_PIECE); - return Color(p >> 3); +inline Color color_of(Piece pc) { + assert(pc != NO_PIECE); + return Color(pc >> 3); } inline bool is_ok(Square s) { @@ -388,11 +414,11 @@ inline bool opposite_colors(Square s1, Square s2) { return ((s >> 3) ^ s) & 1; } -inline char file_to_char(File f, bool tolower = true) { +inline char to_char(File f, bool tolower = true) { return char(f - FILE_A + (tolower ? 'a' : 'A')); } -inline char rank_to_char(Rank r) { +inline char to_char(Rank r) { return char(r - RANK_1 + '1'); } @@ -431,8 +457,8 @@ inline bool is_ok(Move m) { #include -inline const std::string square_to_string(Square s) { - char ch[] = { file_to_char(file_of(s)), rank_to_char(rank_of(s)), 0 }; +inline const std::string to_string(Square s) { + char ch[] = { to_char(file_of(s)), to_char(rank_of(s)), 0 }; return ch; } diff --git a/DroidFish/jni/stockfish/uci.cpp b/DroidFish/jni/stockfish/uci.cpp index caf1b5c..644fc47 100644 --- a/DroidFish/jni/stockfish/uci.cpp +++ b/DroidFish/jni/stockfish/uci.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,6 +27,7 @@ #include "position.h" #include "search.h" #include "thread.h" +#include "tt.h" #include "ucioption.h" using namespace std; @@ -38,96 +39,14 @@ namespace { // FEN string of the initial position, normal chess const char* StartFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1"; - // Keep track of position keys along the setup moves (from start position to the - // position just before to start searching). Needed by repetition draw detection. + // Keep a track of the position keys along the setup moves (from the start position + // to the position just before the search starts). This is needed by the repetition + // draw detection code. Search::StateStackPtr SetupStates; - void setoption(istringstream& up); - void position(Position& pos, istringstream& up); - void go(const Position& pos, istringstream& up); -} - - -/// Wait for a command from the user, parse this text string as an UCI command, -/// and call the appropriate functions. Also intercepts EOF from stdin to ensure -/// that we exit gracefully if the GUI dies unexpectedly. In addition to the UCI -/// commands, the function also supports a few debug commands. - -void UCI::loop(const string& args) { - - Position pos(StartFEN, false, Threads.main()); // The root position - string token, cmd = args; - - do { - if (args.empty() && !getline(cin, cmd)) // Block here waiting for input - cmd = "quit"; - - istringstream is(cmd); - - is >> skipws >> token; - - if (token == "quit" || token == "stop" || token == "ponderhit") - { - // GUI sends 'ponderhit' to tell us to ponder on the same move the - // opponent has played. In case Signals.stopOnPonderhit is set we are - // waiting for 'ponderhit' to stop the search (for instance because we - // already ran out of time), otherwise we should continue searching but - // switching from pondering to normal search. - if (token != "ponderhit" || Search::Signals.stopOnPonderhit) - { - Search::Signals.stop = true; - Threads.main()->notify_one(); // Could be sleeping - } - else - Search::Limits.ponder = false; - } - else if (token == "perft" && (is >> token)) // Read perft depth - { - stringstream ss; - - ss << Options["Hash"] << " " - << Options["Threads"] << " " << token << " current perft"; - - benchmark(pos, ss); - } - else if (token == "key") - sync_cout << hex << uppercase << setfill('0') - << "position key: " << setw(16) << pos.key() - << "\nmaterial key: " << setw(16) << pos.material_key() - << "\npawn key: " << setw(16) << pos.pawn_key() - << dec << sync_endl; - - else if (token == "uci") - sync_cout << "id name " << engine_info(true) - << "\n" << Options - << "\nuciok" << sync_endl; - - else if (token == "eval") - { - Search::RootColor = pos.side_to_move(); // Ensure it is set - sync_cout << Eval::trace(pos) << sync_endl; - } - else if (token == "ucinewgame") { /* Avoid returning "Unknown command" */ } - else if (token == "go") go(pos, is); - else if (token == "position") position(pos, is); - else if (token == "setoption") setoption(is); - else if (token == "flip") pos.flip(); - else if (token == "bench") benchmark(pos, is); - else if (token == "d") sync_cout << pos.pretty() << sync_endl; - else if (token == "isready") sync_cout << "readyok" << sync_endl; - else - sync_cout << "Unknown command: " << cmd << sync_endl; - - } while (token != "quit" && args.empty()); // Args have one-shot behaviour - - Threads.wait_for_think_finished(); // Cannot quit while search is running -} - - -namespace { // position() is called when engine receives the "position" UCI command. - // The function sets up the position described in the given fen string ("fen") + // The function sets up the position described in the given FEN string ("fen") // or the starting position ("startpos") and then makes the moves given in the // following move list ("moves"). @@ -192,14 +111,13 @@ namespace { void go(const Position& pos, istringstream& is) { Search::LimitsType limits; - vector searchMoves; string token; while (is >> token) { if (token == "searchmoves") while (is >> token) - searchMoves.push_back(move_from_uci(pos, token)); + limits.searchmoves.push_back(move_from_uci(pos, token)); else if (token == "wtime") is >> limits.time[WHITE]; else if (token == "btime") is >> limits.time[BLACK]; @@ -214,6 +132,88 @@ namespace { else if (token == "ponder") limits.ponder = true; } - Threads.start_thinking(pos, limits, searchMoves, SetupStates); + Threads.start_thinking(pos, limits, SetupStates); } + +} // namespace + + +/// Wait for a command from the user, parse this text string as an UCI command, +/// and call the appropriate functions. Also intercepts EOF from stdin to ensure +/// that we exit gracefully if the GUI dies unexpectedly. In addition to the UCI +/// commands, the function also supports a few debug commands. + +void UCI::loop(int argc, char* argv[]) { + + Position pos(StartFEN, false, Threads.main()); // The root position + string token, cmd; + + for (int i = 1; i < argc; ++i) + cmd += std::string(argv[i]) + " "; + + do { + if (argc == 1 && !getline(cin, cmd)) // Block here waiting for input + cmd = "quit"; + + istringstream is(cmd); + + is >> skipws >> token; + + if (token == "quit" || token == "stop" || token == "ponderhit") + { + // The GUI sends 'ponderhit' to tell us to ponder on the same move the + // opponent has played. In case Signals.stopOnPonderhit is set we are + // waiting for 'ponderhit' to stop the search (for instance because we + // already ran out of time), otherwise we should continue searching but + // switch from pondering to normal search. + if (token != "ponderhit" || Search::Signals.stopOnPonderhit) + { + Search::Signals.stop = true; + Threads.main()->notify_one(); // Could be sleeping + } + else + Search::Limits.ponder = false; + } + else if (token == "perft" || token == "divide") + { + int depth; + stringstream ss; + + is >> depth; + ss << Options["Hash"] << " " + << Options["Threads"] << " " << depth << " current " << token; + + benchmark(pos, ss); + } + else if (token == "key") + sync_cout << hex << uppercase << setfill('0') + << "position key: " << setw(16) << pos.key() + << "\nmaterial key: " << setw(16) << pos.material_key() + << "\npawn key: " << setw(16) << pos.pawn_key() + << dec << nouppercase << setfill(' ') << sync_endl; + + else if (token == "uci") + sync_cout << "id name " << engine_info(true) + << "\n" << Options + << "\nuciok" << sync_endl; + + else if (token == "eval") + { + Search::RootColor = pos.side_to_move(); // Ensure it is set + sync_cout << Eval::trace(pos) << sync_endl; + } + else if (token == "ucinewgame") { /* Avoid returning "Unknown command" */ } + else if (token == "go") go(pos, is); + else if (token == "position") position(pos, is); + else if (token == "setoption") setoption(is); + else if (token == "flip") pos.flip(); + else if (token == "bench") benchmark(pos, is); + else if (token == "d") sync_cout << pos.pretty() << sync_endl; + else if (token == "isready") sync_cout << "readyok" << sync_endl; + else + sync_cout << "Unknown command: " << cmd << sync_endl; + + } while (token != "quit" && argc == 1); // Passed args have one-shot behaviour + + Threads.wait_for_think_finished(); // Cannot quit whilst the search is running } diff --git a/DroidFish/jni/stockfish/ucioption.cpp b/DroidFish/jni/stockfish/ucioption.cpp index 08afa04..d5db2c9 100644 --- a/DroidFish/jni/stockfish/ucioption.cpp +++ b/DroidFish/jni/stockfish/ucioption.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -38,7 +38,7 @@ namespace UCI { void on_logger(const Option& o) { start_logger(o); } void on_eval(const Option&) { Eval::init(); } void on_threads(const Option&) { Threads.read_uci_options(); } -void on_hash_size(const Option& o) { TT.set_size(o); } +void on_hash_size(const Option& o) { TT.resize(o); } void on_clear_hash(const Option&) { TT.clear(); } @@ -50,42 +50,39 @@ bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const } -/// init() initializes the UCI options to their hard coded default values +/// init() initializes the UCI options to their hard-coded default values void init(OptionsMap& o) { - o["Write Debug Log"] = Option(false, on_logger); - o["Write Search Log"] = Option(false); - o["Search Log Filename"] = Option("SearchLog.txt"); - o["Book File"] = Option("book.bin"); - o["Best Book Move"] = Option(false); - o["Contempt Factor"] = Option(0, -50, 50); - o["Mobility (Midgame)"] = Option(100, 0, 200, on_eval); - o["Mobility (Endgame)"] = Option(100, 0, 200, on_eval); - o["Pawn Structure (Midgame)"] = Option(100, 0, 200, on_eval); - o["Pawn Structure (Endgame)"] = Option(100, 0, 200, on_eval); - o["Passed Pawns (Midgame)"] = Option(100, 0, 200, on_eval); - o["Passed Pawns (Endgame)"] = Option(100, 0, 200, on_eval); - o["Space"] = Option(100, 0, 200, on_eval); - o["Aggressiveness"] = Option(100, 0, 200, on_eval); - o["Cowardice"] = Option(100, 0, 200, on_eval); - o["Min Split Depth"] = Option(0, 0, 12, on_threads); - o["Max Threads per Split Point"] = Option(5, 4, 8, on_threads); - o["Threads"] = Option(1, 1, MAX_THREADS, on_threads); - o["Idle Threads Sleep"] = Option(true); - o["Hash"] = Option(32, 1, 8192, on_hash_size); - o["Clear Hash"] = Option(on_clear_hash); - o["Ponder"] = Option(true); - o["OwnBook"] = Option(false); - o["MultiPV"] = Option(1, 1, 500); - o["Skill Level"] = Option(20, 0, 20); - o["Emergency Move Horizon"] = Option(40, 0, 50); - o["Emergency Base Time"] = Option(60, 0, 30000); - o["Emergency Move Time"] = Option(30, 0, 5000); - o["Minimum Thinking Time"] = Option(20, 0, 5000); - o["Slow Mover"] = Option(70, 10, 1000); - o["UCI_Chess960"] = Option(false); - o["UCI_AnalyseMode"] = Option(false, on_eval); + o["Write Debug Log"] << Option(false, on_logger); + o["Write Search Log"] << Option(false); + o["Search Log Filename"] << Option("SearchLog.txt"); + o["Book File"] << Option("book.bin"); + o["Best Book Move"] << Option(false); + o["Contempt Factor"] << Option(0, -50, 50); + o["Mobility (Midgame)"] << Option(100, 0, 200, on_eval); + o["Mobility (Endgame)"] << Option(100, 0, 200, on_eval); + o["Pawn Structure (Midgame)"] << Option(100, 0, 200, on_eval); + o["Pawn Structure (Endgame)"] << Option(100, 0, 200, on_eval); + o["Passed Pawns (Midgame)"] << Option(100, 0, 200, on_eval); + o["Passed Pawns (Endgame)"] << Option(100, 0, 200, on_eval); + o["Space"] << Option(100, 0, 200, on_eval); + o["Aggressiveness"] << Option(100, 0, 200, on_eval); + o["Cowardice"] << Option(100, 0, 200, on_eval); + o["Min Split Depth"] << Option(0, 0, 12, on_threads); + o["Threads"] << Option(1, 1, MAX_THREADS, on_threads); + o["Hash"] << Option(32, 1, 16384, on_hash_size); + o["Clear Hash"] << Option(on_clear_hash); + o["Ponder"] << Option(true); + o["OwnBook"] << Option(false); + o["MultiPV"] << Option(1, 1, 500); + o["Skill Level"] << Option(20, 0, 20); + o["Emergency Move Horizon"] << Option(40, 0, 50); + o["Emergency Base Time"] << Option(60, 0, 30000); + o["Emergency Move Time"] << Option(30, 0, 5000); + o["Minimum Thinking Time"] << Option(20, 0, 5000); + o["Slow Mover"] << Option(80, 10, 1000); + o["UCI_Chess960"] << Option(false); } @@ -113,18 +110,18 @@ std::ostream& operator<<(std::ostream& os, const OptionsMap& om) { } -/// Option c'tors and conversion operators +/// Option class constructors and conversion operators -Option::Option(const char* v, Fn* f) : type("string"), min(0), max(0), idx(Options.size()), on_change(f) +Option::Option(const char* v, OnChange f) : type("string"), min(0), max(0), on_change(f) { defaultValue = currentValue = v; } -Option::Option(bool v, Fn* f) : type("check"), min(0), max(0), idx(Options.size()), on_change(f) +Option::Option(bool v, OnChange f) : type("check"), min(0), max(0), on_change(f) { defaultValue = currentValue = (v ? "true" : "false"); } -Option::Option(Fn* f) : type("button"), min(0), max(0), idx(Options.size()), on_change(f) +Option::Option(OnChange f) : type("button"), min(0), max(0), on_change(f) {} -Option::Option(int v, int minv, int maxv, Fn* f) : type("spin"), min(minv), max(maxv), idx(Options.size()), on_change(f) +Option::Option(int v, int minv, int maxv, OnChange f) : type("spin"), min(minv), max(maxv), on_change(f) { std::ostringstream ss; ss << v; defaultValue = currentValue = ss.str(); } @@ -139,6 +136,17 @@ Option::operator std::string() const { } +/// operator<<() inits options and assigns idx in the correct printing order + +void Option::operator<<(const Option& o) { + + static size_t insert_order = 0; + + *this = o; + idx = insert_order++; +} + + /// operator=() updates currentValue and triggers on_change() action. It's up to /// the GUI to check for option's limits, but we could receive the new value from /// the user by console window, so let's check the bounds anyway. @@ -156,7 +164,7 @@ Option& Option::operator=(const string& v) { currentValue = v; if (on_change) - (*on_change)(*this); + on_change(*this); return *this; } diff --git a/DroidFish/jni/stockfish/ucioption.h b/DroidFish/jni/stockfish/ucioption.h index efdfce6..87411a4 100644 --- a/DroidFish/jni/stockfish/ucioption.h +++ b/DroidFish/jni/stockfish/ucioption.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -38,15 +38,16 @@ typedef std::map OptionsMap; /// Option class implements an option as defined by UCI protocol class Option { - typedef void (Fn)(const Option&); + typedef void (*OnChange)(const Option&); public: - Option(Fn* = NULL); - Option(bool v, Fn* = NULL); - Option(const char* v, Fn* = NULL); - Option(int v, int min, int max, Fn* = NULL); + Option(OnChange = NULL); + Option(bool v, OnChange = NULL); + Option(const char* v, OnChange = NULL); + Option(int v, int min, int max, OnChange = NULL); Option& operator=(const std::string& v); + void operator<<(const Option& o); operator int() const; operator std::string() const; @@ -56,11 +57,11 @@ private: std::string defaultValue, currentValue, type; int min, max; size_t idx; - Fn* on_change; + OnChange on_change; }; void init(OptionsMap&); -void loop(const std::string&); +void loop(int argc, char* argv[]); } // namespace UCI