X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=afc775c1f60173b20c1bde05890ad45207504688;hp=a9811a9af7352ae74308979a4751721b6bfcc042;hb=36a93d90f76d32e16a5f2acb09b7de2d67225021;hpb=94e41274bba2d8a2f2d58aaa711df5872309d66c
diff --git a/src/uci.cpp b/src/uci.cpp
index a9811a9a..afc775c1 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;
@@ -75,7 +78,7 @@ namespace {
while (is >> token && (m = UCI::to_move(pos, token)) != MOVE_NONE)
{
States->push_back(StateInfo());
- pos.do_move(m, States->back(), pos.gives_check(m, CheckInfo(pos)));
+ pos.do_move(m, States->back());
}
}
@@ -108,7 +111,7 @@ 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;
@@ -135,6 +138,15 @@ namespace {
Threads.start_thinking(pos, States, limits);
}
+ // On ucinewgame following steps are needed to reset the state
+ void newgame() {
+
+ TT.resize(Options["Hash"]);
+ Search::clear();
+ Tablebases::init(Options["SyzygyPath"]);
+ Time.availableNodes = 0;
+ }
+
} // namespace
@@ -149,6 +161,8 @@ void UCI::loop(int argc, char* argv[]) {
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)
@@ -164,15 +178,15 @@ void UCI::loop(int argc, char* argv[]) {
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
+ // opponent has played. In case Threads.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 == "quit"
|| token == "stop"
- || (token == "ponderhit" && Search::Signals.stopOnPonderhit))
+ || (token == "ponderhit" && Threads.stopOnPonderhit))
{
- Search::Signals.stop = true;
+ Threads.stop = true;
Threads.main()->start_searching(true); // Could be sleeping
}
else if (token == "ponderhit")
@@ -183,11 +197,7 @@ void UCI::loop(int argc, char* argv[]) {
<< "\n" << Options
<< "\nuciok" << sync_endl;
- else if (token == "ucinewgame")
- {
- Search::clear();
- Time.availableNodes = 0;
- }
+ else if (token == "ucinewgame") newgame();
else if (token == "isready") sync_cout << "readyok" << sync_endl;
else if (token == "go") go(pos, is);
else if (token == "position") position(pos, is);
@@ -227,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)