X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fuci.cpp;h=4604c52b92f0a6eb839cf04f323d72fedbafbd6a;hb=bdeda52efd55c97d0f5da908267c01f973371e5d;hp=4d12ca40c30dc43d11ea64c5b22fadc39503f9d9;hpb=d4af15f682c1967450233ab62cba1a6c5d601df6;p=stockfish
diff --git a/src/uci.cpp b/src/uci.cpp
index 4d12ca40..4604c52b 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -2,7 +2,7 @@
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
- Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+ Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
along with this program. If not, see .
*/
+#include
#include
#include
#include
@@ -27,8 +28,10 @@
#include "position.h"
#include "search.h"
#include "thread.h"
+#include "tt.h"
#include "timeman.h"
#include "uci.h"
+#include "syzygy/tbprobe.h"
using namespace std;
@@ -39,18 +42,13 @@ namespace {
// FEN string of the initial position, normal chess
const char* StartFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
- // Stack to keep track of the position states along the setup moves (from the
- // start position to the position just before the search starts). Needed by
- // 'draw by repetition' detection.
- Search::StateStackPtr SetupStates;
-
// position() is called when engine receives the "position" UCI command.
// 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").
- void position(Position& pos, istringstream& is) {
+ void position(Position& pos, istringstream& is, StateListPtr& states) {
Move m;
string token, fen;
@@ -68,14 +66,14 @@ namespace {
else
return;
- pos.set(fen, Options["UCI_Chess960"], Threads.main());
- SetupStates = Search::StateStackPtr(new std::stack);
+ states = StateListPtr(new std::deque(1)); // Drop old and create a new one
+ pos.set(fen, Options["UCI_Chess960"], &states->back(), Threads.main());
// Parse move list (if any)
while (is >> token && (m = UCI::to_move(pos, token)) != MOVE_NONE)
{
- SetupStates->push(StateInfo());
- pos.do_move(m, SetupStates->top(), pos.gives_check(m, CheckInfo(pos)));
+ states->emplace_back();
+ pos.do_move(m, states->back());
}
}
@@ -108,10 +106,11 @@ namespace {
// the thinking time and other parameters from the input string, then starts
// the search.
- void go(const Position& pos, istringstream& is) {
+ void go(Position& pos, istringstream& is, StateListPtr& states) {
Search::LimitsType limits;
string token;
+ bool ponderMode = false;
limits.startTime = now(); // As early as possible!
@@ -130,9 +129,9 @@ namespace {
else if (token == "movetime") is >> limits.movetime;
else if (token == "mate") is >> limits.mate;
else if (token == "infinite") limits.infinite = 1;
- else if (token == "ponder") limits.ponder = 1;
+ else if (token == "ponder") ponderMode = true;
- Threads.start_thinking(pos, limits, SetupStates);
+ Threads.start_thinking(pos, states, limits, ponderMode);
}
} // namespace
@@ -146,8 +145,12 @@ namespace {
void UCI::loop(int argc, char* argv[]) {
- Position pos(StartFEN, false, Threads.main()); // The root position
+ Position pos;
string token, cmd;
+ StateListPtr states(new std::deque(1));
+ auto uiThread = std::make_shared(0);
+
+ pos.set(StartFEN, false, &states->back(), uiThread.get());
for (int i = 1; i < argc; ++i)
cmd += std::string(argv[i]) + " ";
@@ -158,61 +161,53 @@ void UCI::loop(int argc, char* argv[]) {
istringstream is(cmd);
- token.clear(); // getline() could return empty or blank line
+ token.clear(); // Avoid a stale if getline() returns empty or blank line
is >> skipws >> token;
- // 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
- // switching from pondering to normal search.
+ // The GUI sends 'ponderhit' to tell us the user has played the expected move.
+ // So 'ponderhit' will be sent if we were told to ponder on the same move the
+ // user has played. We should continue searching but switch from pondering to
+ // normal search. In case Threads.stopOnPonderhit is set we are waiting for
+ // 'ponderhit' to stop the search, for instance if max search depth is reached.
if ( token == "quit"
|| token == "stop"
- || (token == "ponderhit" && Search::Signals.stopOnPonderhit))
- {
- Search::Signals.stop = true;
- Threads.main()->start_searching(true); // Could be sleeping
- }
+ || (token == "ponderhit" && Threads.stopOnPonderhit))
+ Threads.stop = true;
+
else if (token == "ponderhit")
- Search::Limits.ponder = 0; // Switch to normal search
+ Threads.ponder = false; // Switch to normal search
else if (token == "uci")
sync_cout << "id name " << engine_info(true)
<< "\n" << Options
<< "\nuciok" << sync_endl;
- else if (token == "ucinewgame")
- {
- Search::clear();
- Time.availableNodes = 0;
- }
- else if (token == "isready") sync_cout << "readyok" << sync_endl;
- else if (token == "go") go(pos, is);
- else if (token == "position") position(pos, is);
else if (token == "setoption") setoption(is);
+ else if (token == "go") go(pos, is, states);
+ else if (token == "position") position(pos, is, states);
+ else if (token == "ucinewgame") Search::clear();
+ else if (token == "isready") sync_cout << "readyok" << sync_endl;
- // Additional custom non-UCI commands, useful for debugging
- else if (token == "flip") pos.flip();
- else if (token == "bench") benchmark(pos, is);
- else if (token == "d") sync_cout << pos << sync_endl;
- else if (token == "eval") sync_cout << Eval::trace(pos) << sync_endl;
+ // Additional custom non-UCI commands, mainly for debugging
+ else if (token == "flip") pos.flip();
+ else if (token == "bench") benchmark(pos, is);
+ else if (token == "d") sync_cout << pos << sync_endl;
+ else if (token == "eval") sync_cout << Eval::trace(pos) << sync_endl;
else if (token == "perft")
{
int depth;
stringstream ss;
is >> depth;
- ss << Options["Hash"] << " "
- << Options["Threads"] << " " << depth << " current perft";
+ ss << Options["Hash"] << " " << Options["Threads"]
+ << " " << depth << " current perft";
benchmark(pos, ss);
}
else
sync_cout << "Unknown command: " << cmd << sync_endl;
- } while (token != "quit" && argc == 1); // Passed args have one-shot behaviour
-
- Threads.main()->wait_for_search_finished();
+ } while (token != "quit" && argc == 1); // Command line args are one-shot
}
@@ -225,6 +220,8 @@ void UCI::loop(int argc, char* argv[]) {
string UCI::value(Value v) {
+ assert(-VALUE_INFINITE < v && v < VALUE_INFINITE);
+
stringstream ss;
if (abs(v) < VALUE_MATE - MAX_PLY)