X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=8f6416bdcb7b866b984e53b5ac6be64c4a7e47b8;hp=91a2260e28a86c7f519d4204e4c00d689cfb058f;hb=44236f4ed9844598e1cb065937c3770a938964b2;hpb=d8f683760c9eb6d2c4714ec83e717dd2143de55c diff --git a/src/uci.cpp b/src/uci.cpp index 91a2260e..8f6416bd 100644 --- a/src/uci.cpp +++ b/src/uci.cpp @@ -18,6 +18,7 @@ along with this program. If not, see . */ +#include #include #include #include @@ -27,6 +28,7 @@ #include "position.h" #include "search.h" #include "thread.h" +#include "tt.h" #include "timeman.h" #include "uci.h" #include "syzygy/tbprobe.h" @@ -149,8 +151,9 @@ void UCI::loop(int argc, char* argv[]) { Position pos; string token, cmd; + Thread* uiThread = new Thread(); - pos.set(StartFEN, false, &States->back(), Threads.main()); + pos.set(StartFEN, false, &States->back(), uiThread); for (int i = 1; i < argc; ++i) cmd += std::string(argv[i]) + " "; @@ -165,15 +168,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") @@ -184,12 +187,7 @@ void UCI::loop(int argc, char* argv[]) { << "\n" << Options << "\nuciok" << sync_endl; - else if (token == "ucinewgame") - { - Search::clear(); - Tablebases::init(Options["SyzygyPath"]); - Time.availableNodes = 0; - } + else if (token == "ucinewgame") Search::clear(); else if (token == "isready") sync_cout << "readyok" << sync_endl; else if (token == "go") go(pos, is); else if (token == "position") position(pos, is); @@ -217,6 +215,7 @@ void UCI::loop(int argc, char* argv[]) { } while (token != "quit" && argc == 1); // Passed args have one-shot behaviour Threads.main()->wait_for_search_finished(); + delete uiThread; } @@ -229,6 +228,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)