X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fuci.cpp;h=b82eeff556bacbf1b2a66b0dbdd0341d9bb6f8f3;hb=85b08ce3adafbb1a70cd371cadb1e136e8879ebf;hp=cec9ccf10d8e40e0d560ad43e0a5030e3eb64310;hpb=0c775fae4b758844f9446f125a3e6eed964ecaf0;p=stockfish
diff --git a/src/uci.cpp b/src/uci.cpp
index cec9ccf1..b82eeff5 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-2010 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,253 +17,199 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
-
-#include
-#include
+#include
#include
#include
#include
#include "evaluate.h"
-#include "misc.h"
-#include "move.h"
-#include "movegen.h"
+#include "notation.h"
#include "position.h"
#include "search.h"
+#include "thread.h"
+#include "tt.h"
#include "ucioption.h"
using namespace std;
+extern void benchmark(const Position& pos, istream& is);
namespace {
- // FEN string for the initial position
- const string StartPositionFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
-
- // UCIParser is a class for parsing UCI input. The class
- // is actually a string stream built on a given input string.
- typedef istringstream UCIParser;
-
- // Local functions
- void set_option(UCIParser& up);
- void set_position(Position& pos, UCIParser& up);
- bool go(Position& pos, UCIParser& up);
- void perft(Position& pos, UCIParser& up);
-}
-
-
-/// execute_uci_command() takes a string as input, uses a UCIParser
-/// object to parse this text string as a UCI command, and calls
-/// the appropriate functions. In addition to the UCI commands,
-/// the function also supports a few debug commands.
-
-bool execute_uci_command(const string& cmd) {
-
- static Position pos(StartPositionFEN, false, 0); // The root position
- UCIParser up(cmd);
- string token;
-
- up >> token; // operator>>() skips any whitespace
-
- if (token == "quit")
- return false;
-
- else if (token == "go")
- return go(pos, up);
-
- else if (token == "uci")
- cout << "id name " << engine_name()
- << "\nid author " << engine_author()
- << "\n" << options_to_uci()
- << "\nuciok" << endl;
-
- else if (token == "ucinewgame")
- pos.from_fen(StartPositionFEN, false);
-
- else if (token == "isready")
- cout << "readyok" << endl;
-
- else if (token == "position")
- set_position(pos, up);
-
- else if (token == "setoption")
- set_option(up);
-
- else if (token == "d")
- pos.print();
-
- else if (token == "eval")
- {
- read_evaluation_uci_options(pos.side_to_move());
- cout << trace_evaluate(pos) << endl;
- }
-
- else if (token == "key")
- cout << "key: " << hex << pos.get_key()
- << "\nmaterial key: " << pos.get_material_key()
- << "\npawn key: " << pos.get_pawn_key() << endl;
-
- else if (token == "perft")
- perft(pos, up);
+ // FEN string of the initial position, normal chess
+ const char* StartFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
- else if (token == "flip")
- {
- Position p(pos, pos.thread());
- pos.flipped_copy(p);
- }
- else
- cout << "Unknown command: " << cmd << endl;
-
- return true;
-}
+ // 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;
-////
-//// Local functions
-////
-
-namespace {
-
- // set_position() is called when Stockfish receives the "position" UCI
- // command. The input parameter is a UCIParser. It is assumed
- // that this parser has consumed the first token of the UCI command
- // ("position"), and is ready to read the second token ("startpos"
- // or "fen", if the input is well-formed).
+ // 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, UCIParser& up) {
+ void position(Position& pos, istringstream& is) {
- string fen, token;
+ Move m;
+ string token, fen;
- up >> token; // operator>>() skips any whitespace
+ is >> token;
if (token == "startpos")
{
- pos.from_fen(StartPositionFEN, false);
- up >> token; // Consume "moves" token
+ fen = StartFEN;
+ is >> token; // Consume "moves" token if any
}
else if (token == "fen")
- {
- while (up >> token && token != "moves")
+ while (is >> token && token != "moves")
fen += token + " ";
+ else
+ return;
- pos.from_fen(fen, Options["UCI_Chess960"].value());
- }
- else return;
+ pos.set(fen, Options["UCI_Chess960"], Threads.main());
+ SetupStates = Search::StateStackPtr(new std::stack());
// Parse move list (if any)
- while (up >> token)
- pos.do_setup_move(move_from_uci(pos, token));
+ while (is >> token && (m = move_from_uci(pos, token)) != MOVE_NONE)
+ {
+ SetupStates->push(StateInfo());
+ pos.do_move(m, SetupStates->top());
+ }
}
- // set_option() is called when Stockfish receives the "setoption" UCI
- // command. The input parameter is a UCIParser. It is assumed
- // that this parser has consumed the first token of the UCI command
- // ("setoption"), and is ready to read the second token ("name", if
- // the input is well-formed).
-
- void set_option(UCIParser& up) {
+ // setoption() is called when engine receives the "setoption" UCI command. The
+ // function updates the UCI option ("name") to the given value ("value").
- string value = "true"; // UCI buttons don't have a "value" field
- string token, name;
+ void setoption(istringstream& is) {
- up >> token; // Consume "name" token
- up >> name; // Read option name
+ string token, name, value;
- // Handle names with included spaces
- while (up >> token && token != "value")
- name += " " + token;
+ is >> token; // Consume "name" token
- up >> value; // Read option value
+ // Read option name (can contain spaces)
+ while (is >> token && token != "value")
+ name += string(" ", !name.empty()) + token;
- // Handle values with included spaces
- while (up >> token)
- value += " " + token;
+ // Read option value (can contain spaces)
+ while (is >> token)
+ value += string(" ", !value.empty()) + token;
- if (Options.find(name) != Options.end())
- Options[name].set_value(value);
+ if (Options.count(name))
+ Options[name] = value;
else
- cout << "No such option: " << name << endl;
+ sync_cout << "No such option: " << name << sync_endl;
}
- // go() is called when Stockfish receives the "go" UCI command. The
- // input parameter is a UCIParser. It is assumed that this
- // parser has consumed the first token of the UCI command ("go"),
- // and is ready to read the second token. The function sets the
- // thinking time and other parameters from the input string, and
- // calls think() (defined in search.cpp) with the appropriate
- // parameters. Returns false if a quit command is received while
- // thinking, returns true otherwise.
+ // go() is called when engine receives the "go" UCI command. The function sets
+ // the thinking time and other parameters from the input string, and starts
+ // the search.
- bool go(Position& pos, UCIParser& up) {
+ void go(const Position& pos, istringstream& is) {
+ Search::LimitsType limits;
string token;
- Move searchMoves[MOVES_MAX];
- int movesToGo, depth, nodes, moveTime, numOfMoves;
- bool infinite, ponder;
- int time[2] = {0, 0}, inc[2] = {0, 0};
-
- searchMoves[0] = MOVE_NONE;
- infinite = ponder = false;
- movesToGo = depth = nodes = moveTime = numOfMoves = 0;
- while (up >> token)
+ while (is >> token)
{
- if (token == "infinite")
- infinite = true;
- else if (token == "ponder")
- ponder = true;
- else if (token == "wtime")
- up >> time[0];
- else if (token == "btime")
- up >> time[1];
- else if (token == "winc")
- up >> inc[0];
- else if (token == "binc")
- up >> inc[1];
- else if (token == "movestogo")
- up >> movesToGo;
- else if (token == "depth")
- up >> depth;
- else if (token == "nodes")
- up >> nodes;
- else if (token == "movetime")
- up >> moveTime;
- else if (token == "searchmoves")
- {
- while (up >> token)
- searchMoves[numOfMoves++] = move_from_uci(pos, token);
-
- searchMoves[numOfMoves] = MOVE_NONE;
- }
+ if (token == "searchmoves")
+ while (is >> 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];
+ else if (token == "winc") is >> limits.inc[WHITE];
+ else if (token == "binc") is >> limits.inc[BLACK];
+ else if (token == "movestogo") is >> limits.movestogo;
+ else if (token == "depth") is >> limits.depth;
+ else if (token == "nodes") is >> limits.nodes;
+ else if (token == "movetime") is >> limits.movetime;
+ else if (token == "mate") is >> limits.mate;
+ else if (token == "infinite") limits.infinite = true;
+ else if (token == "ponder") limits.ponder = true;
}
- assert(pos.is_ok());
-
- return think(pos, infinite, ponder, time, inc, movesToGo,
- depth, nodes, moveTime, searchMoves);
+ Threads.start_thinking(pos, limits, SetupStates);
}
- void perft(Position& pos, UCIParser& up) {
-
- int depth, tm;
- int64_t n;
-
- if (!(up >> depth))
- return;
-
- tm = get_system_time();
-
- n = perft(pos, depth * ONE_PLY);
-
- tm = get_system_time() - tm;
- std::cout << "\nNodes " << n
- << "\nTime (ms) " << tm
- << "\nNodes/second " << int(n / (tm / 1000.0)) << std::endl;
- }
+} // 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" || token == "divide")
+ {
+ 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
}