X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fuci.cpp;h=f3b5f54c60f0d9c0acbdbc2358008146f339afe4;hb=6d89d0b64a99003576d3e0ed616b43333c9eca01;hp=ff3a64ece151aafe690695445066494cbee25d1d;hpb=65f46794af41534e0dc744c6f7531a4c43eca857;p=stockfish
diff --git a/src/uci.cpp b/src/uci.cpp
index ff3a64ec..f3b5f54c 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -2,6 +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-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
@@ -17,6 +18,7 @@
along with this program. If not, see .
*/
+#include
#include
#include
#include
@@ -27,7 +29,9 @@
#include "search.h"
#include "thread.h"
#include "tt.h"
+#include "timeman.h"
#include "uci.h"
+#include "syzygy/tbprobe.h"
using namespace std;
@@ -38,10 +42,10 @@ 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
+ // A list 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;
+ StateListPtr States(new std::deque(1));
// position() is called when engine receives the "position" UCI command.
@@ -67,14 +71,14 @@ namespace {
else
return;
- pos.set(fen, Options["UCI_Chess960"], Threads.main());
- SetupStates = Search::StateStackPtr(new std::stack());
+ States = StateListPtr(new std::deque(1));
+ 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());
+ States->push_back(StateInfo());
+ pos.do_move(m, States->back());
}
}
@@ -90,11 +94,11 @@ namespace {
// Read option name (can contain spaces)
while (is >> token && token != "value")
- name += string(" ", !name.empty()) + token;
+ name += string(" ", name.empty() ? 0 : 1) + token;
// Read option value (can contain spaces)
while (is >> token)
- value += string(" ", !value.empty()) + token;
+ value += string(" ", value.empty() ? 0 : 1) + token;
if (Options.count(name))
Options[name] = value;
@@ -107,11 +111,13 @@ 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) {
Search::LimitsType limits;
string token;
+ limits.startTime = now(); // As early as possible!
+
while (is >> token)
if (token == "searchmoves")
while (is >> token)
@@ -126,10 +132,19 @@ namespace {
else if (token == "nodes") is >> limits.nodes;
else if (token == "movetime") is >> limits.movetime;
else if (token == "mate") is >> limits.mate;
- else if (token == "infinite") limits.infinite = true;
- else if (token == "ponder") limits.ponder = true;
+ else if (token == "infinite") limits.infinite = 1;
+ else if (token == "ponder") limits.ponder = 1;
+
+ Threads.start_thinking(pos, States, limits);
+ }
+
+ // On ucinewgame following steps are needed to reset the state
+ void newgame() {
- Threads.start_thinking(pos, limits, SetupStates);
+ TT.resize(Options["Hash"]);
+ Search::clear();
+ Tablebases::init(Options["SyzygyPath"]);
+ Time.availableNodes = 0;
}
} // namespace
@@ -143,9 +158,13 @@ namespace {
void UCI::loop(int argc, char* argv[]) {
- Position pos(StartFEN, false, Threads.main()); // The root position
+ Position pos;
string token, cmd;
+ newgame(); // Implied ucinewgame before the first position command
+
+ pos.set(StartFEN, false, &States->back(), Threads.main());
+
for (int i = 1; i < argc; ++i)
cmd += std::string(argv[i]) + " ";
@@ -168,18 +187,18 @@ void UCI::loop(int argc, char* argv[]) {
|| (token == "ponderhit" && Search::Signals.stopOnPonderhit))
{
Search::Signals.stop = true;
- Threads.main()->notify_one(); // Could be sleeping
+ Threads.main()->start_searching(true); // Could be sleeping
}
else if (token == "ponderhit")
- Search::Limits.ponder = false; // Switch to normal search
+ Search::Limits.ponder = 0; // Switch to normal search
else if (token == "uci")
sync_cout << "id name " << engine_info(true)
<< "\n" << Options
<< "\nuciok" << sync_endl;
+ else if (token == "ucinewgame") newgame();
else if (token == "isready") sync_cout << "readyok" << sync_endl;
- else if (token == "ucinewgame") TT.clear();
else if (token == "go") go(pos, is);
else if (token == "position") position(pos, is);
else if (token == "setoption") setoption(is);
@@ -205,7 +224,7 @@ void UCI::loop(int argc, char* argv[]) {
} while (token != "quit" && argc == 1); // Passed args have one-shot behaviour
- Threads.wait_for_think_finished(); // Cannot quit whilst the search is running
+ Threads.main()->wait_for_search_finished();
}
@@ -218,6 +237,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)