X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=3895c7a1d49aa001535430616d97c58920179697;hp=ac58b43c2454495ff42cad4649704159b0a94139;hb=0a18adb02ac375f7d7fc31ef76b59e13a0263773;hpb=8991a6f0057ff8e9abf8989426f97753405bb301
diff --git a/src/uci.cpp b/src/uci.cpp
index ac58b43c..3895c7a1 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -17,7 +17,6 @@
along with this program. If not, see .
*/
-#include
#include
#include
#include
@@ -27,7 +26,6 @@
#include "position.h"
#include "search.h"
#include "thread.h"
-#include "tt.h"
#include "ucioption.h"
using namespace std;
@@ -39,6 +37,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";
+ // Keep track of position keys along the setup moves (from start position to the
+ // position just before to start searching). Needed by repetition draw detection.
+ Search::StateStackPtr SetupStates;
+
void set_option(istringstream& up);
void set_position(Position& pos, istringstream& up);
void go(Position& pos, istringstream& up);
@@ -91,10 +93,10 @@ void UCI::loop(const string& args) {
go(pos, is);
else if (token == "ucinewgame")
- TT.clear();
+ { /* Avoid returning "Unknown command" */ }
else if (token == "isready")
- cout << "readyok" << endl;
+ sync_cout << "readyok" << sync_endl;
else if (token == "position")
set_position(pos, is);
@@ -109,20 +111,20 @@ void UCI::loop(const string& args) {
pos.flip();
else if (token == "eval")
- cout << Eval::trace(pos) << endl;
+ sync_cout << Eval::trace(pos) << sync_endl;
else if (token == "bench")
benchmark(pos, is);
else if (token == "key")
- cout << "key: " << hex << pos.key()
- << "\nmaterial key: " << pos.material_key()
- << "\npawn key: " << pos.pawn_key() << endl;
+ sync_cout << "key: " << hex << pos.key()
+ << "\nmaterial key: " << pos.material_key()
+ << "\npawn key: " << pos.pawn_key() << sync_endl;
else if (token == "uci")
- cout << "id name " << engine_info(true)
- << "\n" << Options
- << "\nuciok" << endl;
+ sync_cout << "id name " << engine_info(true)
+ << "\n" << Options
+ << "\nuciok" << sync_endl;
else if (token == "perft" && (is >> token)) // Read depth
{
@@ -135,7 +137,7 @@ void UCI::loop(const string& args) {
}
else
- cout << "Unknown command: " << cmd << endl;
+ sync_cout << "Unknown command: " << cmd << sync_endl;
if (!args.empty()) // Command line arguments have one-shot behaviour
{
@@ -155,10 +157,6 @@ namespace {
void set_position(Position& pos, istringstream& is) {
- // Keep track of position keys along the setup moves (from start position to the
- // position just before to start searching). Needed by repetition draw detection.
- static std::deque st;
-
Move m;
string token, fen;
@@ -176,13 +174,13 @@ namespace {
return;
pos.from_fen(fen, Options["UCI_Chess960"], Threads.main_thread());
- st.clear();
+ SetupStates = Search::StateStackPtr(new std::stack());
// Parse move list (if any)
while (is >> token && (m = move_from_uci(pos, token)) != MOVE_NONE)
{
- st.push_back(StateInfo());
- pos.do_move(m, st.back());
+ SetupStates->push(StateInfo());
+ pos.do_move(m, SetupStates->top());
}
}
@@ -207,7 +205,7 @@ namespace {
if (Options.count(name))
Options[name] = value;
else
- cout << "No such option: " << name << endl;
+ sync_cout << "No such option: " << name << sync_endl;
}
@@ -248,6 +246,6 @@ namespace {
searchMoves.push_back(move_from_uci(pos, token));
}
- Threads.start_searching(pos, limits, searchMoves);
+ Threads.start_searching(pos, limits, searchMoves, SetupStates);
}
}