X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=6027295d94d67ed507de3de614db236d26f9e3b2;hp=10519bb1c0a004fabc12777cd78f4334ec7551df;hb=15e21911110f9d459c4fef2bb17903d97345d0b9;hpb=a7cdf7299a771949332f8c7ef77ae8fd125d0f08
diff --git a/src/uci.cpp b/src/uci.cpp
index 10519bb1..6027295d 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -1,7 +1,7 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, 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 +17,7 @@
along with this program. If not, see .
*/
+#include
#include
#include
#include
@@ -38,93 +39,18 @@ 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.
+ // Keep a track of the position keys along the setup moves (from the start position
+ // to the position just before the search starts). This is needed by the repetition
+ // draw detection code.
Search::StateStackPtr SetupStates;
- void set_option(istringstream& up);
- void set_position(Position& pos, istringstream& up);
- void go(const Position& pos, istringstream& up);
-}
-
-
-/// Wait for a command from the user, parse this text string as an UCI command,
-/// and call the appropriate functions. Also intercepts EOF from stdin to ensure
-/// that we exit gracefully if the GUI dies unexpectedly. In addition to the UCI
-/// commands, the function also supports a few debug commands.
-
-void UCI::loop(const string& args) {
-
- Position pos(StartFEN, false, Threads.main_thread()); // The root position
- string token, cmd = args;
-
- do {
- if (args.empty() && !getline(cin, cmd)) // Block here waiting for input
- cmd = "quit";
-
- istringstream is(cmd);
-
- is >> skipws >> token;
-
- if (token == "quit" || token == "stop" || token == "ponderhit")
- {
- // GUI sends 'ponderhit' to tell us to ponder on the same move the
- // opponent has played. In case Signals.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 != "ponderhit" || Search::Signals.stopOnPonderhit)
- {
- Search::Signals.stop = true;
- Threads.main_thread()->notify_one(); // Could be sleeping
- }
- else
- Search::Limits.ponder = false;
- }
- else if (token == "perft" && (is >> token)) // Read perft depth
- {
- stringstream ss;
-
- ss << Options["Hash"] << " "
- << Options["Threads"] << " " << token << " current perft";
-
- benchmark(pos, ss);
- }
- else if (token == "key") sync_cout << "position key: " << hex << pos.key()
- << "\nmaterial key: " << pos.material_key()
- << "\npawn key: " << pos.pawn_key()
- << sync_endl;
-
- else if (token == "uci") sync_cout << "id name " << engine_info(true)
- << "\n" << Options
- << "\nuciok" << sync_endl;
-
- else if (token == "ucinewgame") TT.clear();
- else if (token == "go") go(pos, is);
- else if (token == "position") set_position(pos, is);
- else if (token == "setoption") set_option(is);
- else if (token == "flip") pos.flip();
- else if (token == "bench") benchmark(pos, is);
- else if (token == "d") sync_cout << pos.pretty() << sync_endl;
- else if (token == "isready") sync_cout << "readyok" << sync_endl;
- else if (token == "eval") sync_cout << Eval::trace(pos) << sync_endl;
- else
- sync_cout << "Unknown command: " << cmd << sync_endl;
-
- } while (token != "quit" && args.empty()); // Args have one-shot behaviour
-
- Threads.wait_for_think_finished(); // Cannot quit while search is running
-}
-
-namespace {
-
- // set_position() is called when engine receives the "position" UCI command.
- // The function sets up the position described in the given fen string ("fen")
+ // position() is called when engine receives the "position" UCI command.
+ // The function sets up the position described in the given FEN string ("fen")
// or the starting position ("startpos") and then makes the moves given in the
// following move list ("moves").
- void set_position(Position& pos, istringstream& is) {
+ void position(Position& pos, istringstream& is) {
Move m;
string token, fen;
@@ -142,7 +68,7 @@ namespace {
else
return;
- pos.set(fen, Options["UCI_Chess960"], Threads.main_thread());
+ pos.set(fen, Options["UCI_Chess960"], Threads.main());
SetupStates = Search::StateStackPtr(new std::stack());
// Parse move list (if any)
@@ -154,10 +80,10 @@ namespace {
}
- // set_option() is called when engine receives the "setoption" UCI command. The
+ // setoption() is called when engine receives the "setoption" UCI command. The
// function updates the UCI option ("name") to the given value ("value").
- void set_option(istringstream& is) {
+ void setoption(istringstream& is) {
string token, name, value;
@@ -185,14 +111,13 @@ namespace {
void go(const Position& pos, istringstream& is) {
Search::LimitsType limits;
- vector searchMoves;
string token;
while (is >> token)
{
if (token == "searchmoves")
while (is >> token)
- searchMoves.push_back(move_from_uci(pos, token));
+ limits.searchmoves.push_back(move_from_uci(pos, token));
else if (token == "wtime") is >> limits.time[WHITE];
else if (token == "btime") is >> limits.time[BLACK];
@@ -207,6 +132,84 @@ namespace {
else if (token == "ponder") limits.ponder = true;
}
- Threads.start_thinking(pos, limits, searchMoves, SetupStates);
+ Threads.start_thinking(pos, limits, SetupStates);
}
+
+} // namespace
+
+
+/// Wait for a command from the user, parse this text string as an UCI command,
+/// and call the appropriate functions. Also intercepts EOF from stdin to ensure
+/// that we exit gracefully if the GUI dies unexpectedly. In addition to the UCI
+/// commands, the function also supports a few debug commands.
+
+void UCI::loop(int argc, char* argv[]) {
+
+ Position pos(StartFEN, false, Threads.main()); // The root position
+ string token, cmd;
+
+ for (int i = 1; i < argc; ++i)
+ cmd += std::string(argv[i]) + " ";
+
+ do {
+ if (argc == 1 && !getline(cin, cmd)) // Block here waiting for input
+ cmd = "quit";
+
+ istringstream is(cmd);
+
+ is >> skipws >> token;
+
+ if (token == "quit" || token == "stop" || token == "ponderhit")
+ {
+ // 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
+ // waiting for 'ponderhit' to stop the search (for instance because we
+ // already ran out of time), otherwise we should continue searching but
+ // switch from pondering to normal search.
+ if (token != "ponderhit" || Search::Signals.stopOnPonderhit)
+ {
+ Search::Signals.stop = true;
+ Threads.main()->notify_one(); // Could be sleeping
+ }
+ else
+ Search::Limits.ponder = false;
+ }
+ else if (token == "perft")
+ {
+ int depth;
+ stringstream ss;
+
+ is >> depth;
+ ss << Options["Hash"] << " "
+ << Options["Threads"] << " " << depth << " current " << token;
+
+ benchmark(pos, ss);
+ }
+ else if (token == "key")
+ sync_cout << hex << uppercase << setfill('0')
+ << "position key: " << setw(16) << pos.key()
+ << "\nmaterial key: " << setw(16) << pos.material_key()
+ << "\npawn key: " << setw(16) << pos.pawn_key()
+ << dec << nouppercase << setfill(' ') << sync_endl;
+
+ else if (token == "uci")
+ sync_cout << "id name " << engine_info(true)
+ << "\n" << Options
+ << "\nuciok" << 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);
+ else if (token == "flip") pos.flip();
+ else if (token == "bench") benchmark(pos, is);
+ else if (token == "d") sync_cout << pos.pretty() << sync_endl;
+ else if (token == "isready") sync_cout << "readyok" << sync_endl;
+ else if (token == "eval") sync_cout << Eval::trace(pos) << sync_endl;
+ else
+ sync_cout << "Unknown command: " << cmd << sync_endl;
+
+ } while (token != "quit" && argc == 1); // Passed args have one-shot behaviour
+
+ Threads.wait_for_think_finished(); // Cannot quit whilst the search is running
}