X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=f3b5f54c60f0d9c0acbdbc2358008146f339afe4;hp=4ae6662017768d5127dc44ea63c79d4dd25f22ff;hb=7edd1f7ccd500ad3fb6959ca18415ed4b8808313;hpb=ca14345ba26fc40e1039029659f57028f510502f diff --git a/src/uci.cpp b/src/uci.cpp index 4ae66620..f3b5f54c 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()); } } @@ -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) @@ -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)