#include <cmath>
#include <cstring>
#include <fstream>
+#include <iomanip>
#include <iostream>
#include <sstream>
#include <vector>
using std::cout;
using std::endl;
+using std::string;
namespace {
const bool FakeSplit = false;
// Different node types, used as template parameter
- enum NodeType { Root, PV, NonPV, SplitPointPV, SplitPointNonPV };
+ enum NodeType { Root, PV, NonPV, SplitPointRoot, SplitPointPV, SplitPointNonPV };
// RootMove struct is used for moves at the root of the tree. For each root
- // move, we store two scores, a node count, and a PV (really a refutation
- // in the case of moves which fail low). Value pv_score is normally set at
- // -VALUE_INFINITE for all non-pv moves, while non_pv_score is computed
- // according to the order in which moves are returned by MovePicker.
+ // move, we store a score, a node count, and a PV (really a refutation
+ // in the case of moves which fail low). Score is normally set at
+ // -VALUE_INFINITE for all non-pv moves.
struct RootMove {
- RootMove();
- RootMove(const RootMove& rm) { *this = rm; }
- RootMove& operator=(const RootMove& rm);
-
// RootMove::operator<() is the comparison function used when
// sorting the moves. A move m1 is considered to be better
- // than a move m2 if it has an higher pv_score, or if it has
- // equal pv_score but m1 has the higher non_pv_score. In this way
- // we are guaranteed that PV moves are always sorted as first.
- bool operator<(const RootMove& m) const {
- return pv_score != m.pv_score ? pv_score < m.pv_score
- : non_pv_score < m.non_pv_score;
- }
+ // than a move m2 if it has an higher score
+ bool operator<(const RootMove& m) const { return score < m.score; }
void extract_pv_from_tt(Position& pos);
void insert_pv_in_tt(Position& pos);
int64_t nodes;
- Value pv_score;
- Value non_pv_score;
- Move pv[PLY_MAX_PLUS_2];
+ Value score;
+ Value prevScore;
+ std::vector<Move> pv;
};
- // RootMoveList struct is just a vector of RootMove objects,
- // with an handful of methods above the standard ones.
+ // RootMoveList struct is mainly a std::vector of RootMove objects
struct RootMoveList : public std::vector<RootMove> {
- typedef std::vector<RootMove> Base;
-
void init(Position& pos, Move searchMoves[]);
- void sort() { insertion_sort<RootMove, Base::iterator>(begin(), end()); }
- void sort_first(int n) { insertion_sort<RootMove, Base::iterator>(begin(), begin() + n); }
+ RootMove* find(const Move& m, int startIndex = 0);
int bestMoveChanges;
};
RootMoveList Rml;
// MultiPV mode
- int MultiPV, UCIMultiPV;
+ int MultiPV, UCIMultiPV, MultiPVIteration;
// Time management variables
bool StopOnPonderhit, FirstRootMove, StopRequest, QuitRequest, AspirationFailLow;
bool connected_moves(const Position& pos, Move m1, Move m2);
Value value_to_tt(Value v, int ply);
Value value_from_tt(Value v, int ply);
- bool ok_to_use_TT(const TTEntry* tte, Depth depth, Value beta, int ply);
+ bool can_return_tt(const TTEntry* tte, Depth depth, Value beta, int ply);
bool connected_threat(const Position& pos, Move m, Move threat);
Value refine_eval(const TTEntry* tte, Value defaultEval, int ply);
void update_history(const Position& pos, Move move, Depth depth, Move movesSearched[], int moveCount);
void do_skill_level(Move* best, Move* ponder);
int current_search_time(int set = 0);
- std::string score_to_uci(Value v, Value alpha, Value beta);
- std::string speed_to_uci(int64_t nodes);
- std::string pv_to_uci(Move pv[], int pvNum);
- std::string depth_to_uci(Depth depth);
+ string score_to_uci(Value v, Value alpha = -VALUE_INFINITE, Value beta = VALUE_INFINITE);
+ string speed_to_uci(int64_t nodes);
+ string pv_to_uci(const Move pv[], int pvNum, bool chess960);
+ string pretty_pv(Position& pos, int depth, Value score, int time, Move pv[]);
+ string depth_to_uci(Depth depth);
void poll(const Position& pos);
void wait_for_stop_or_ponderhit();
// MovePickerExt template class extends MovePicker and allows to choose at compile
// time the proper moves source according to the type of node. In the default case
// we simply create and use a standard MovePicker object.
- template<NodeType> struct MovePickerExt : public MovePicker {
+ template<bool SpNode> struct MovePickerExt : public MovePicker {
MovePickerExt(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss, Value b)
: MovePicker(p, ttm, d, h, ss, b) {}
-
- RootMove& current() { assert(false); return Rml[0]; } // Dummy, needed to compile
};
// In case of a SpNode we use split point's shared MovePicker object as moves source
- template<> struct MovePickerExt<SplitPointNonPV> : public MovePickerExt<NonPV> {
+ template<> struct MovePickerExt<true> : public MovePicker {
MovePickerExt(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss, Value b)
- : MovePickerExt<NonPV>(p, ttm, d, h, ss, b), mp(ss->sp->mp) {}
+ : MovePicker(p, ttm, d, h, ss, b), mp(ss->sp->mp) {}
Move get_next_move() { return mp->get_next_move(); }
MovePicker* mp;
};
- template<> struct MovePickerExt<SplitPointPV> : public MovePickerExt<SplitPointNonPV> {
-
- MovePickerExt(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss, Value b)
- : MovePickerExt<SplitPointNonPV>(p, ttm, d, h, ss, b) {}
- };
-
- // In case of a Root node we use RootMoveList as moves source
- template<> struct MovePickerExt<Root> : public MovePicker {
-
- MovePickerExt(const Position&, Move, Depth, const History&, SearchStack*, Value);
- RootMove& current() { return Rml[cur]; }
- Move get_next_move() { return ++cur < (int)Rml.size() ? Rml[cur].pv[0] : MOVE_NONE; }
-
- int cur;
- };
-
// Overload operator<<() to make it easier to print moves in a coordinate
// notation compatible with UCI protocol.
std::ostream& operator<<(std::ostream& os, Move m) {
NodesSincePoll = 0;
current_search_time(get_system_time());
Limits = limits;
- TimeMgr.init(Limits, pos.full_moves());
+ TimeMgr.init(Limits, pos.startpos_ply_counter());
// Set output steram in normal or chess960 mode
cout << set960(pos.is_chess960());
// Look for a book move
if (Options["OwnBook"].value<bool>())
{
- if (Options["Book File"].value<std::string>() != book.name())
- book.open(Options["Book File"].value<std::string>());
+ if (Options["Book File"].value<string>() != book.name())
+ book.open(Options["Book File"].value<string>());
Move bookMove = book.get_move(pos, Options["Best Book Move"].value<bool>());
if (bookMove != MOVE_NONE)
// Write to log file and keep it open to be accessed during the search
if (Options["Use Search Log"].value<bool>())
{
- std::string name = Options["Search Log Filename"].value<std::string>();
+ string name = Options["Search Log Filename"].value<string>();
LogFile.open(name.c_str(), std::ios::out | std::ios::app);
if (LogFile.is_open())
H.clear();
*ponderMove = bestMove = easyMove = skillBest = skillPonder = MOVE_NONE;
depth = aspirationDelta = 0;
- alpha = -VALUE_INFINITE, beta = VALUE_INFINITE;
+ value = alpha = -VALUE_INFINITE, beta = VALUE_INFINITE;
ss->currentMove = MOVE_NULL; // Hack to skip update_gains()
// Moves to search are verified and copied
// Iterative deepening loop until requested to stop or target depth reached
while (!StopRequest && ++depth <= PLY_MAX && (!Limits.maxDepth || depth <= Limits.maxDepth))
{
+ // Save last iteration's scores, this needs to be done now, because in
+ // the following MultiPV loop Rml moves could be reordered.
+ for (size_t i = 0; i < Rml.size(); i++)
+ Rml[i].prevScore = Rml[i].score;
+
Rml.bestMoveChanges = 0;
- // Calculate dynamic aspiration window based on previous iterations
- if (MultiPV == 1 && depth >= 5 && abs(bestValues[depth - 1]) < VALUE_KNOWN_WIN)
+ // MultiPV iteration loop
+ for (MultiPVIteration = 0; MultiPVIteration < Min(MultiPV, (int)Rml.size()); MultiPVIteration++)
{
- int prevDelta1 = bestValues[depth - 1] - bestValues[depth - 2];
- int prevDelta2 = bestValues[depth - 2] - bestValues[depth - 3];
-
- aspirationDelta = Min(Max(abs(prevDelta1) + abs(prevDelta2) / 2, 16), 24);
- aspirationDelta = (aspirationDelta + 7) / 8 * 8; // Round to match grainSize
+ // Calculate dynamic aspiration window based on previous iterations
+ if (depth >= 5 && abs(Rml[MultiPVIteration].prevScore) < VALUE_KNOWN_WIN)
+ {
+ int prevDelta1 = bestValues[depth - 1] - bestValues[depth - 2];
+ int prevDelta2 = bestValues[depth - 2] - bestValues[depth - 3];
- alpha = Max(bestValues[depth - 1] - aspirationDelta, -VALUE_INFINITE);
- beta = Min(bestValues[depth - 1] + aspirationDelta, VALUE_INFINITE);
- }
+ aspirationDelta = Min(Max(abs(prevDelta1) + abs(prevDelta2) / 2, 16), 24);
+ aspirationDelta = (aspirationDelta + 7) / 8 * 8; // Round to match grainSize
- // Start with a small aspiration window and, in case of fail high/low,
- // research with bigger window until not failing high/low anymore.
- do {
- // Search starting from ss+1 to allow calling update_gains()
- value = search<Root>(pos, ss+1, alpha, beta, depth * ONE_PLY);
-
- // Write PV back to transposition table in case the relevant entries
- // have been overwritten during the search.
- for (int i = 0; i < Min(MultiPV, (int)Rml.size()); i++)
- Rml[i].insert_pv_in_tt(pos);
-
- // Value cannot be trusted. Break out immediately!
- if (StopRequest)
- break;
-
- // Send full PV info to GUI if we are going to leave the loop or
- // if we have a fail high/low and we are deep in the search.
- if ((value > alpha && value < beta) || current_search_time() > 2000)
- for (int i = 0; i < Min(UCIMultiPV, (int)Rml.size()); i++)
- cout << "info"
- << depth_to_uci(depth * ONE_PLY)
- << score_to_uci(Rml[i].pv_score, alpha, beta)
- << speed_to_uci(pos.nodes_searched())
- << pv_to_uci(Rml[i].pv, i + 1) << endl;
-
- // In case of failing high/low increase aspiration window and research,
- // otherwise exit the fail high/low loop.
- if (value >= beta)
- {
- beta = Min(beta + aspirationDelta, VALUE_INFINITE);
- aspirationDelta += aspirationDelta / 2;
+ alpha = Max(Rml[MultiPVIteration].prevScore - aspirationDelta, -VALUE_INFINITE);
+ beta = Min(Rml[MultiPVIteration].prevScore + aspirationDelta, VALUE_INFINITE);
}
- else if (value <= alpha)
+ else
{
- AspirationFailLow = true;
- StopOnPonderhit = false;
-
- alpha = Max(alpha - aspirationDelta, -VALUE_INFINITE);
- aspirationDelta += aspirationDelta / 2;
+ alpha = -VALUE_INFINITE;
+ beta = VALUE_INFINITE;
}
- else
- break;
- } while (abs(value) < VALUE_KNOWN_WIN);
+ // Start with a small aspiration window and, in case of fail high/low,
+ // research with bigger window until not failing high/low anymore.
+ do {
+ // Search starting from ss+1 to allow referencing (ss-1). This is
+ // needed by update_gains() and ss copy when splitting at Root.
+ value = search<Root>(pos, ss+1, alpha, beta, depth * ONE_PLY);
+
+ // It is critical that sorting is done with a stable algorithm
+ // because all the values but the first are usually set to
+ // -VALUE_INFINITE and we want to keep the same order for all
+ // the moves but the new PV that goes to head.
+ sort<RootMove>(Rml.begin() + MultiPVIteration, Rml.end());
+
+ // In case we have found an exact score reorder the PV moves
+ // before leaving the fail high/low loop, otherwise leave the
+ // last PV move in its position so to be searched again.
+ if (value > alpha && value < beta)
+ sort<RootMove>(Rml.begin(), Rml.begin() + MultiPVIteration);
+
+ // Write PV back to transposition table in case the relevant entries
+ // have been overwritten during the search.
+ for (int i = 0; i <= MultiPVIteration; i++)
+ Rml[i].insert_pv_in_tt(pos);
+
+ // Value cannot be trusted. Break out immediately!
+ if (StopRequest)
+ break;
+
+ // Send full PV info to GUI if we are going to leave the loop or
+ // if we have a fail high/low and we are deep in the search.
+ if ((value > alpha && value < beta) || current_search_time() > 2000)
+ for (int i = 0; i < Min(UCIMultiPV, MultiPVIteration + 1); i++)
+ cout << "info"
+ << depth_to_uci(depth * ONE_PLY)
+ << (i == MultiPVIteration ? score_to_uci(Rml[i].score, alpha, beta) :
+ score_to_uci(Rml[i].score))
+ << speed_to_uci(pos.nodes_searched())
+ << pv_to_uci(&Rml[i].pv[0], i + 1, pos.is_chess960())
+ << endl;
+
+ // In case of failing high/low increase aspiration window and research,
+ // otherwise exit the fail high/low loop.
+ if (value >= beta)
+ {
+ beta = Min(beta + aspirationDelta, VALUE_INFINITE);
+ aspirationDelta += aspirationDelta / 2;
+ }
+ else if (value <= alpha)
+ {
+ AspirationFailLow = true;
+ StopOnPonderhit = false;
+
+ alpha = Max(alpha - aspirationDelta, -VALUE_INFINITE);
+ aspirationDelta += aspirationDelta / 2;
+ }
+ else
+ break;
+
+ } while (abs(value) < VALUE_KNOWN_WIN);
+ }
// Collect info about search result
bestMove = Rml[0].pv[0];
do_skill_level(&skillBest, &skillPonder);
if (LogFile.is_open())
- LogFile << pretty_pv(pos, depth, value, current_search_time(), Rml[0].pv) << endl;
+ LogFile << pretty_pv(pos, depth, value, current_search_time(), &Rml[0].pv[0]) << endl;
// Init easyMove after first iteration or drop if differs from the best move
- if (depth == 1 && (Rml.size() == 1 || Rml[0].pv_score > Rml[1].pv_score + EasyMoveMargin))
+ if (depth == 1 && (Rml.size() == 1 || Rml[0].score > Rml[1].score + EasyMoveMargin))
easyMove = bestMove;
else if (bestMove != easyMove)
easyMove = MOVE_NONE;
// Check for some early stop condition
if (!StopRequest && Limits.useTimeManagement())
{
- // Stop search early when the last two iterations returned a mate score
- if ( depth >= 5
- && abs(bestValues[depth]) >= VALUE_MATE_IN_PLY_MAX
- && abs(bestValues[depth - 1]) >= VALUE_MATE_IN_PLY_MAX)
- StopRequest = true;
-
// Stop search early if one move seems to be much better than the
// others or if there is only a single legal move. Also in the latter
// case we search up to some depth anyway to get a proper score.
template <NodeType NT>
Value search(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth) {
- const bool PvNode = (NT == PV || NT == Root || NT == SplitPointPV);
- const bool SpNode = (NT == SplitPointPV || NT == SplitPointNonPV);
- const bool RootNode = (NT == Root);
+ 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);
assert(alpha >= -VALUE_INFINITE && alpha <= VALUE_INFINITE);
assert(beta > alpha && beta <= VALUE_INFINITE);
if (PvNode && thread.maxPly < ss->ply)
thread.maxPly = ss->ply;
- if (SpNode)
+ // Step 1. Initialize node and poll. Polling can abort search
+ if (!SpNode)
+ {
+ ss->currentMove = ss->bestMove = threatMove = (ss+1)->excludedMove = MOVE_NONE;
+ (ss+1)->skipNullMove = false; (ss+1)->reduction = DEPTH_ZERO;
+ (ss+2)->killers[0] = (ss+2)->killers[1] = MOVE_NONE;
+ }
+ else
{
sp = ss->sp;
tte = NULL;
goto split_point_start;
}
- // Step 1. Initialize node and poll. Polling can abort search
- ss->currentMove = ss->bestMove = threatMove = (ss+1)->excludedMove = MOVE_NONE;
- (ss+1)->skipNullMove = false; (ss+1)->reduction = DEPTH_ZERO;
- (ss+2)->killers[0] = (ss+2)->killers[1] = MOVE_NONE;
-
if (pos.thread() == 0 && ++NodesSincePoll > NodesBetweenPolls)
{
NodesSincePoll = 0;
excludedMove = ss->excludedMove;
posKey = excludedMove ? pos.get_exclusion_key() : pos.get_key();
tte = TT.probe(posKey);
- ttMove = tte ? tte->move() : MOVE_NONE;
+ ttMove = RootNode ? Rml[MultiPVIteration].pv[0] : tte ? tte->move() : MOVE_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
- // smooth experience in analysis mode.
- if (tte && (PvNode ? tte->depth() >= depth && tte->type() == VALUE_TYPE_EXACT
- : ok_to_use_TT(tte, depth, beta, ss->ply)))
+ // smooth experience in analysis mode. We don't probe at Root nodes otherwise
+ // we should also update RootMoveList to avoid bogus output.
+ if (!RootNode && tte && (PvNode ? tte->depth() >= depth && tte->type() == VALUE_TYPE_EXACT
+ : can_return_tt(tte, depth, beta, ss->ply)))
{
TT.refresh(tte);
ss->bestMove = ttMove; // Can be MOVE_NONE
split_point_start: // At split points actual search starts from here
// Initialize a MovePicker object for the current position
- MovePickerExt<NT> mp(pos, ttMove, depth, H, ss, PvNode ? -VALUE_INFINITE : beta);
+ MovePickerExt<SpNode> mp(pos, ttMove, depth, H, ss, PvNode ? -VALUE_INFINITE : beta);
CheckInfo ci(pos);
ss->bestMove = MOVE_NONE;
futilityBase = ss->eval + ss->evalMargin;
if (move == excludedMove)
continue;
+ // At root obey the "searchmoves" option and skip moves not listed in Root Move List.
+ // Also in MultiPV mode we skip moves which already have got an exact score
+ // in previous MultiPV Iteration. Finally any illegal move is skipped here.
+ if (RootNode && !Rml.find(move, MultiPVIteration))
+ continue;
+
// At PV and SpNode nodes we want all moves to be legal since the beginning
if ((PvNode || SpNode) && !pos.pl_move_is_legal(move, ci.pinned))
continue;
// If it's time to send nodes info, do it here where we have the
// correct accumulated node counts searched by each thread.
- if (SendSearchedNodes)
+ if (!SpNode && SendSearchedNodes)
{
SendSearchedNodes = false;
cout << "info" << speed_to_uci(pos.nodes_searched()) << endl;
}
// For long searches send current move info to GUI
- if (current_search_time() > 2000)
+ if (pos.thread() == 0 && current_search_time() > 2000)
cout << "info" << depth_to_uci(depth)
- << " currmove " << move << " currmovenumber " << moveCount << endl;
+ << " currmove " << move
+ << " currmovenumber " << moveCount + MultiPVIteration << endl;
}
// At Root and at first iteration do a PV search on all the moves to score root moves
- isPvMove = (PvNode && moveCount <= (!RootNode ? 1 : depth <= ONE_PLY ? MAX_MOVES : MultiPV));
+ isPvMove = (PvNode && moveCount <= (RootNode && depth <= ONE_PLY ? MAX_MOVES : 1));
givesCheck = pos.move_gives_check(move, ci);
captureOrPromotion = pos.move_is_capture_or_promotion(move);
alpha = sp->alpha;
}
- if (value > bestValue)
- {
- bestValue = value;
- ss->bestMove = move;
-
- if ( !RootNode
- && PvNode
- && value > alpha
- && value < beta) // We want always alpha < beta
- alpha = value;
-
- if (SpNode && !thread.cutoff_occurred())
- {
- sp->bestValue = value;
- sp->ss->bestMove = move;
- sp->alpha = alpha;
- sp->is_betaCutoff = (value >= beta);
- }
- }
-
- if (RootNode)
+ // Finished searching the move. If StopRequest 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.
+ if (RootNode && !StopRequest)
{
- // Finished searching the move. If StopRequest 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 break out of the loop without updating the best
- // move and/or PV.
- if (StopRequest)
- break;
-
// Remember searched nodes counts for this move
- mp.current().nodes += pos.nodes_searched() - nodes;
+ RootMove* rm = Rml.find(move);
+ rm->nodes += pos.nodes_searched() - nodes;
// PV move or new best move ?
if (isPvMove || value > alpha)
{
// Update PV
- mp.current().pv_score = value;
- mp.current().extract_pv_from_tt(pos);
+ rm->score = value;
+ rm->extract_pv_from_tt(pos);
// We record how often the best move has been changed in each
// iteration. This information is used for time management: When
// the best move changes frequently, we allocate some more time.
if (!isPvMove && MultiPV == 1)
Rml.bestMoveChanges++;
-
- // It is critical that sorting is done with a stable algorithm
- // because all the values but the first are usually set to
- // -VALUE_INFINITE and we want to keep the same order for all
- // the moves but the new PV that goes to head.
- Rml.sort_first(moveCount);
-
- // Update alpha. In multi-pv we don't use aspiration window, so set
- // alpha equal to minimum score among the PV lines searched so far.
- if (MultiPV > 1)
- alpha = Rml[Min(moveCount, MultiPV) - 1].pv_score;
- else if (value > alpha)
- alpha = value;
}
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.
- mp.current().pv_score = -VALUE_INFINITE;
+ rm->score = -VALUE_INFINITE;
} // RootNode
+ if (value > bestValue)
+ {
+ bestValue = value;
+ ss->bestMove = move;
+
+ if ( PvNode
+ && value > alpha
+ && value < beta) // We want always alpha < beta
+ alpha = value;
+
+ if (SpNode && !thread.cutoff_occurred())
+ {
+ sp->bestValue = value;
+ sp->ss->bestMove = move;
+ sp->alpha = alpha;
+ sp->is_betaCutoff = (value >= beta);
+ }
+ }
+
// Step 19. Check for split
- if ( !RootNode
- && !SpNode
+ if ( !SpNode
&& depth >= Threads.min_split_depth()
&& bestValue < beta
&& Threads.available_slave_exists(pos.thread())
&& !StopRequest
&& !thread.cutoff_occurred())
- Threads.split<FakeSplit>(pos, ss, &alpha, beta, &bestValue, depth,
- threatMove, moveCount, &mp, PvNode);
+ bestValue = Threads.split<FakeSplit>(pos, ss, alpha, beta, bestValue, depth,
+ threatMove, moveCount, &mp, NT);
}
// Step 20. Check for mate and stalemate
tte = TT.probe(pos.get_key());
ttMove = (tte ? tte->move() : MOVE_NONE);
- if (!PvNode && tte && ok_to_use_TT(tte, ttDepth, beta, ss->ply))
+ if (!PvNode && tte && can_return_tt(tte, ttDepth, beta, ss->ply))
{
ss->bestMove = ttMove; // Can be MOVE_NONE
return value_from_tt(tte->value(), ss->ply);
bool connected_moves(const Position& pos, Move m1, Move m2) {
Square f1, t1, f2, t2;
- Piece p;
+ Piece p1, p2;
+ Square ksq;
assert(m1 && move_is_ok(m1));
assert(m2 && move_is_ok(m2));
return true;
// Case 3: Moving through the vacated square
- if ( piece_is_slider(pos.piece_on(f2))
+ p2 = pos.piece_on(f2);
+ if ( piece_is_slider(p2)
&& bit_is_set(squares_between(f2, t2), f1))
return true;
// Case 4: The destination square for m2 is defended by the moving piece in m1
- p = pos.piece_on(t1);
- if (bit_is_set(pos.attacks_from(p, t1), t2))
+ p1 = pos.piece_on(t1);
+ if (bit_is_set(pos.attacks_from(p1, t1), t2))
return true;
// Case 5: Discovered check, checking piece is the piece moved in m1
- if ( piece_is_slider(p)
- && bit_is_set(squares_between(t1, pos.king_square(pos.side_to_move())), f2)
- && !bit_is_set(squares_between(t1, pos.king_square(pos.side_to_move())), t2))
+ ksq = pos.king_square(pos.side_to_move());
+ if ( piece_is_slider(p1)
+ && bit_is_set(squares_between(t1, ksq), f2))
{
- // discovered_check_candidates() works also if the Position's side to
- // move is the opposite of the checking piece.
- Color them = opposite_color(pos.side_to_move());
- Bitboard dcCandidates = pos.discovered_check_candidates(them);
-
- if (bit_is_set(dcCandidates, f2))
+ Bitboard occ = pos.occupied_squares();
+ clear_bit(&occ, f2);
+ if (bit_is_set(pos.attacks_from(p1, t1, occ), ksq))
return true;
}
return false;
}
- // ok_to_use_TT() returns true if a transposition table score
- // can be used at a given point in search.
+ // can_return_tt() returns true if a transposition table score
+ // can be used to cut-off at a given point in search.
- bool ok_to_use_TT(const TTEntry* tte, Depth depth, Value beta, int ply) {
+ bool can_return_tt(const TTEntry* tte, Depth depth, Value beta, int ply) {
Value v = value_from_tt(tte->value(), ply);
// mate <y> Mate in y moves, not plies. If the engine is getting mated
// use negative values for y.
- std::string score_to_uci(Value v, Value alpha, Value beta) {
+ string score_to_uci(Value v, Value alpha, Value beta) {
std::stringstream s;
// speed_to_uci() returns a string with time stats of current search suitable
// to be sent to UCI gui.
- std::string speed_to_uci(int64_t nodes) {
+ string speed_to_uci(int64_t nodes) {
std::stringstream s;
int t = current_search_time();
// pv_to_uci() returns a string with information on the current PV line
// formatted according to UCI specification.
- std::string pv_to_uci(Move pv[], int pvNum) {
+ string pv_to_uci(const Move pv[], int pvNum, bool chess960) {
std::stringstream s;
- s << " multipv " << pvNum << " pv ";
+ s << " multipv " << pvNum << " pv " << set960(chess960);
for ( ; *pv != MOVE_NONE; pv++)
s << *pv << " ";
// depth_to_uci() returns a string with information on the current depth and
// seldepth formatted according to UCI specification.
- std::string depth_to_uci(Depth depth) {
+ string depth_to_uci(Depth depth) {
std::stringstream s;
return s.str();
}
+ string time_to_string(int millisecs) {
+
+ const int MSecMinute = 1000 * 60;
+ const int MSecHour = 1000 * 60 * 60;
+
+ int hours = millisecs / MSecHour;
+ int minutes = (millisecs % MSecHour) / MSecMinute;
+ int seconds = ((millisecs % MSecHour) % MSecMinute) / 1000;
+
+ std::stringstream s;
+
+ if (hours)
+ s << hours << ':';
+
+ s << std::setfill('0') << std::setw(2) << minutes << ':' << std::setw(2) << seconds;
+ return s.str();
+ }
+
+ string score_to_string(Value v) {
+
+ std::stringstream s;
+
+ if (v >= VALUE_MATE_IN_PLY_MAX)
+ s << "#" << (VALUE_MATE - v + 1) / 2;
+ else if (v <= VALUE_MATED_IN_PLY_MAX)
+ s << "-#" << (VALUE_MATE + v) / 2;
+ else
+ s << std::setprecision(2) << std::fixed << std::showpos << float(v) / PawnValueMidgame;
+
+ return s.str();
+ }
+
+ // pretty_pv() creates a human-readable string from a position and a PV.
+ // It is used to write search information to the log file (which is created
+ // when the UCI parameter "Use Search Log" is "true").
+
+ string pretty_pv(Position& pos, int depth, Value value, int time, Move pv[]) {
+
+ const int64_t K = 1000;
+ const int64_t M = 1000000;
+ const int startColumn = 28;
+ const size_t maxLength = 80 - startColumn;
+
+ StateInfo state[PLY_MAX_PLUS_2], *st = state;
+ Move* m = pv;
+ string san;
+ std::stringstream s;
+ size_t length = 0;
+
+ // First print depth, score, time and searched nodes...
+ s << set960(pos.is_chess960())
+ << std::setw(2) << depth
+ << std::setw(8) << score_to_string(value)
+ << std::setw(8) << time_to_string(time);
+
+ if (pos.nodes_searched() < M)
+ s << std::setw(8) << pos.nodes_searched() / 1 << " ";
+ else if (pos.nodes_searched() < K * M)
+ s << std::setw(7) << pos.nodes_searched() / K << "K ";
+ else
+ s << std::setw(7) << pos.nodes_searched() / M << "M ";
+
+ // ...then print the full PV line in short algebraic notation
+ while (*m != MOVE_NONE)
+ {
+ san = move_to_san(pos, *m);
+ length += san.length() + 1;
+
+ if (length > maxLength)
+ {
+ length = san.length() + 1;
+ s << "\n" + string(startColumn, ' ');
+ }
+ s << san << ' ';
+
+ pos.do_move(*m++, *st++);
+ }
+
+ // Restore original position before to leave
+ while (m != pv) pos.undo_move(*--m);
+
+ return s.str();
+ }
// poll() performs two different functions: It polls for user input, and it
// looks at the time consumed so far and decides if it's time to abort the
if (input_available())
{
// We are line oriented, don't read single chars
- std::string command;
+ string command;
if (!std::getline(std::cin, command) || command == "quit")
{
void wait_for_stop_or_ponderhit() {
- std::string command;
+ string command;
// Wait for a command from stdin
while ( std::getline(std::cin, command)
static RKISS rk;
- // Rml list is already sorted by pv_score in descending order
+ // Rml list is already sorted by score in descending order
int s;
int max_s = -VALUE_INFINITE;
int size = Min(MultiPV, (int)Rml.size());
- int max = Rml[0].pv_score;
- int var = Min(max - Rml[size - 1].pv_score, PawnValueMidgame);
+ int max = Rml[0].score;
+ int var = Min(max - Rml[size - 1].score, PawnValueMidgame);
int wk = 120 - 2 * SkillLevel;
// PRNG sequence should be non deterministic
// then we choose the move with the resulting highest score.
for (int i = 0; i < size; i++)
{
- s = Rml[i].pv_score;
+ s = Rml[i].score;
// Don't allow crazy blunders even at very low skills
- if (i > 0 && Rml[i-1].pv_score > s + EasyMoveMargin)
+ if (i > 0 && Rml[i-1].score > s + EasyMoveMargin)
break;
// This is our magical formula
/// RootMove and RootMoveList method's definitions
- RootMove::RootMove() {
-
- nodes = 0;
- pv_score = non_pv_score = -VALUE_INFINITE;
- pv[0] = MOVE_NONE;
- }
-
- RootMove& RootMove::operator=(const RootMove& rm) {
-
- const Move* src = rm.pv;
- Move* dst = pv;
-
- // Avoid a costly full rm.pv[] copy
- do *dst++ = *src; while (*src++ != MOVE_NONE);
-
- nodes = rm.nodes;
- pv_score = rm.pv_score;
- non_pv_score = rm.non_pv_score;
- return *this;
- }
-
void RootMoveList::init(Position& pos, Move searchMoves[]) {
Move* sm;
continue;
RootMove rm;
- rm.pv[0] = ml.move();
- rm.pv[1] = MOVE_NONE;
- rm.pv_score = -VALUE_INFINITE;
+ rm.pv.push_back(ml.move());
+ rm.pv.push_back(MOVE_NONE);
+ rm.score = rm.prevScore = -VALUE_INFINITE;
+ rm.nodes = 0;
push_back(rm);
}
}
+ RootMove* RootMoveList::find(const Move& m, int startIndex) {
+
+ for (size_t i = startIndex; i < size(); i++)
+ if ((*this)[i].pv[0] == m)
+ return &(*this)[i];
+
+ return NULL;
+ }
+
// extract_pv_from_tt() builds a PV by adding moves from the transposition table.
// We consider also failing high nodes and not only VALUE_TYPE_EXACT nodes. This
// allow to always have a ponder move even when we fail high at root and also a
StateInfo state[PLY_MAX_PLUS_2], *st = state;
TTEntry* tte;
int ply = 1;
+ Move m = pv[0];
- assert(pv[0] != MOVE_NONE && pos.move_is_pl(pv[0]));
+ assert(m != MOVE_NONE && pos.move_is_pl(m));
- pos.do_move(pv[0], *st++);
+ pv.clear();
+ pv.push_back(m);
+ pos.do_move(m, *st++);
while ( (tte = TT.probe(pos.get_key())) != NULL
&& tte->move() != MOVE_NONE
&& pos.move_is_pl(tte->move())
- && pos.pl_move_is_legal(tte->move(), pos.pinned_pieces(pos.side_to_move()))
+ && pos.pl_move_is_legal(tte->move(), pos.pinned_pieces())
&& ply < PLY_MAX
&& (!pos.is_draw<false>() || ply < 2))
{
- pv[ply] = tte->move();
- pos.do_move(pv[ply++], *st++);
+ pv.push_back(tte->move());
+ pos.do_move(tte->move(), *st++);
+ ply++;
}
- pv[ply] = MOVE_NONE;
+ pv.push_back(MOVE_NONE);
do pos.undo_move(pv[--ply]); while (ply);
}
do pos.undo_move(pv[--ply]); while (ply);
}
-
- // Specializations for MovePickerExt in case of Root node
- MovePickerExt<Root>::MovePickerExt(const Position& p, Move ttm, Depth d,
- const History& h, SearchStack* ss, Value b)
- : MovePicker(p, ttm, d, h, ss, b), cur(-1) {
- Move move;
- Value score = VALUE_ZERO;
-
- // Score root moves using standard ordering used in main search, the moves
- // are scored according to the order in which they are returned by MovePicker.
- // This is the second order score that is used to compare the moves when
- // the first orders pv_score of both moves are equal.
- while ((move = MovePicker::get_next_move()) != MOVE_NONE)
- for (RootMoveList::iterator rm = Rml.begin(); rm != Rml.end(); ++rm)
- if (rm->pv[0] == move)
- {
- rm->non_pv_score = score--;
- break;
- }
-
- Rml.sort();
- }
-
} // namespace
memcpy(ss, tsp->ss - 1, 4 * sizeof(SearchStack));
(ss+1)->sp = tsp;
- if (tsp->pvNode)
+ if (tsp->nodeType == Root)
+ search<SplitPointRoot>(pos, ss+1, tsp->alpha, tsp->beta, tsp->depth);
+ else if (tsp->nodeType == PV)
search<SplitPointPV>(pos, ss+1, tsp->alpha, tsp->beta, tsp->depth);
- else
+ else if (tsp->nodeType == NonPV)
search<SplitPointNonPV>(pos, ss+1, tsp->alpha, tsp->beta, tsp->depth);
+ else
+ assert(false);
assert(threads[threadID].state == Thread::SEARCHING);
// In helpful master concept a master can help only a sub-tree, and
// because here is all finished is not possible master is booked.
assert(threads[threadID].state == Thread::AVAILABLE);
-
- threads[threadID].state = Thread::SEARCHING;
return;
}
}
projects / stockfish / blobdiff