X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fuci.cpp;h=c18cfc35309a3ac9a4a0ab039e6097b5ba47aef2;hb=189b6fc270f91f4111c1a8049c97455093f8be97;hp=b17cf08920c0a10eddf5c1d1b5d1818c2bb34861;hpb=3185c36a6554390d9061f1d74eb16a6c39caefb4;p=stockfish
diff --git a/src/uci.cpp b/src/uci.cpp
index b17cf089..c18cfc35 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-2012 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,236 +17,236 @@
along with this program. If not, see .
*/
-#include
#include
#include
#include
-#include
#include "evaluate.h"
-#include "misc.h"
-#include "move.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";
+ // 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). This is needed by draw detection.
- std::vector SetupState;
-
- // UCIParser is a class for parsing UCI input. The class
- // is actually a string stream built on a given input string.
- typedef istringstream UCIParser;
+ // position just before to start searching). Needed by repetition draw detection.
+ Search::StateStackPtr SetupStates;
- void set_option(UCIParser& up);
- void set_position(Position& pos, UCIParser& up);
- bool go(Position& pos, UCIParser& up);
- void perft(Position& pos, UCIParser& up);
+ void set_option(istringstream& up);
+ void set_position(Position& pos, istringstream& up);
+ void go(Position& pos, istringstream& 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.
+/// 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.
-bool execute_uci_command(const string& cmd) {
+void UCI::loop(const string& args) {
- static Position pos(StartPositionFEN, false, 0); // The root position
+ Position pos(StartFEN, false, Threads.main_thread()); // The root position
+ string cmd, token;
- UCIParser up(cmd);
- string token;
+ while (token != "quit")
+ {
+ if (!args.empty())
+ cmd = args;
- up >> skipws >> token;
+ else if (!getline(cin, cmd)) // Block here waiting for input
+ cmd = "quit";
- if (token == "quit")
- return false;
+ istringstream is(cmd);
- if (token == "go")
- return go(pos, up);
+ is >> skipws >> token;
- if (token == "ucinewgame")
- pos.from_fen(StartPositionFEN, false);
+ if (token == "quit" || token == "stop")
+ {
+ Search::Signals.stop = true;
+ Threads.wait_for_search_finished(); // Cannot quit while threads are running
+ }
- else if (token == "isready")
- cout << "readyok" << endl;
+ else if (token == "ponderhit")
+ {
+ // The opponent has played the expected move. GUI sends "ponderhit" if
+ // we were told to ponder on the same move the opponent has played. We
+ // should continue searching but switching from pondering to normal search.
+ Search::Limits.ponder = false;
- else if (token == "position")
- set_position(pos, up);
+ if (Search::Signals.stopOnPonderhit)
+ {
+ Search::Signals.stop = true;
+ Threads.main_thread()->wake_up(); // Could be sleeping
+ }
+ }
- else if (token == "setoption")
- set_option(up);
+ else if (token == "go")
+ go(pos, is);
- else if (token == "perft")
- perft(pos, up);
+ else if (token == "ucinewgame")
+ TT.clear();
- else if (token == "d")
- pos.print();
+ else if (token == "isready")
+ sync_cout << "readyok" << sync_endl;
- else if (token == "flip")
- pos.flip();
+ else if (token == "position")
+ set_position(pos, is);
- else if (token == "eval")
- {
- read_evaluation_uci_options(pos.side_to_move());
- cout << trace_evaluate(pos) << endl;
- }
+ else if (token == "setoption")
+ set_option(is);
+
+ else if (token == "d")
+ pos.print();
+
+ else if (token == "flip")
+ pos.flip();
+
+ else if (token == "eval")
+ sync_cout << Eval::trace(pos) << sync_endl;
+
+ else if (token == "bench")
+ benchmark(pos, is);
+
+ else if (token == "key")
+ sync_cout << "key: " << hex << pos.key()
+ << "\nmaterial key: " << pos.material_key()
+ << "\npawn key: " << pos.pawn_key() << sync_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 == "uci")
+ sync_cout << "id name " << engine_info(true)
+ << "\n" << Options
+ << "\nuciok" << sync_endl;
- else if (token == "uci")
- cout << "id name " << engine_name()
- << "\nid author " << engine_authors()
- << "\n" << Options.print_all()
- << "\nuciok" << endl;
- else
- cout << "Unknown command: " << cmd << endl;
+ else if (token == "perft" && (is >> token)) // Read depth
+ {
+ stringstream ss;
- return true;
+ ss << Options["Hash"] << " "
+ << Options["Threads"] << " " << token << " current perft";
+
+ benchmark(pos, ss);
+ }
+
+ else
+ sync_cout << "Unknown command: " << cmd << sync_endl;
+
+ if (!args.empty()) // Command line arguments have one-shot behaviour
+ {
+ Threads.wait_for_search_finished();
+ break;
+ }
+ }
}
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") or the starting position ("startpos") and then
- // makes the moves given in the following move list ("moves").
+ // set_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 set_position(Position& pos, istringstream& is) {
Move m;
string token, fen;
- up >> token;
+ is >> token;
if (token == "startpos")
{
- pos.from_fen(StartPositionFEN, false);
- up >> token; // Consume "moves" token if any
+ 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;
-
- SetupState.clear();
+ pos.from_fen(fen, Options["UCI_Chess960"], Threads.main_thread());
+ SetupStates = Search::StateStackPtr(new std::stack());
// Parse move list (if any)
- while (up >> token && (m = move_from_uci(pos, token)) != MOVE_NONE)
+ while (is >> token && (m = move_from_uci(pos, token)) != MOVE_NONE)
{
- SetupState.push_back(StateInfo());
- pos.do_move(m, SetupState.back());
+ SetupStates->push(StateInfo());
+ pos.do_move(m, SetupStates->top());
}
}
- // set_option() is called when engine receives the "setoption" UCI
- // command. The function updates the corresponding UCI option ("name")
- // to the given value ("value").
+ // set_option() is called when engine receives the "setoption" UCI command. The
+ // function updates the UCI option ("name") to the given value ("value").
- void set_option(UCIParser& up) {
+ void set_option(istringstream& is) {
string token, name, value;
- up >> token; // Consume "name" token
+ is >> token; // Consume "name" token
// Read option name (can contain spaces)
- while (up >> token && token != "value")
+ while (is >> token && token != "value")
name += string(" ", !name.empty()) + token;
// Read option value (can contain spaces)
- while (up >> token)
+ while (is >> token)
value += string(" ", !value.empty()) + token;
- if (Options.find(name) != Options.end())
- Options[name].set_value(value.empty() ? "true" : value); // UCI buttons don't have "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 engine receives the "go" UCI command. The
- // function sets the thinking time and other parameters from the input
- // string, and then calls think(). Returns false if a quit command
- // is received while thinking, 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 then starts
+ // the search.
- bool go(Position& pos, UCIParser& up) {
+ void go(Position& pos, istringstream& is) {
+ Search::LimitsType limits;
+ vector searchMoves;
string token;
- SearchLimits limits;
- Move searchMoves[MAX_MOVES], *cur = searchMoves;
- int time[] = { 0, 0 }, inc[] = { 0, 0 };
- while (up >> token)
+ while (is >> token)
{
- if (token == "infinite")
- limits.infinite = true;
- else if (token == "ponder")
- limits.ponder = true;
- else if (token == "wtime")
- up >> time[WHITE];
+ if (token == "wtime")
+ is >> limits.time[WHITE];
else if (token == "btime")
- up >> time[BLACK];
+ is >> limits.time[BLACK];
else if (token == "winc")
- up >> inc[WHITE];
+ is >> limits.inc[WHITE];
else if (token == "binc")
- up >> inc[BLACK];
+ is >> limits.inc[BLACK];
else if (token == "movestogo")
- up >> limits.movesToGo;
+ is >> limits.movestogo;
else if (token == "depth")
- up >> limits.maxDepth;
+ is >> limits.depth;
else if (token == "nodes")
- up >> limits.maxNodes;
+ is >> limits.nodes;
else if (token == "movetime")
- up >> limits.maxTime;
+ is >> limits.movetime;
+ else if (token == "infinite")
+ limits.infinite = true;
+ else if (token == "ponder")
+ limits.ponder = true;
else if (token == "searchmoves")
- while (up >> token)
- *cur++ = move_from_uci(pos, token);
+ while (is >> token)
+ searchMoves.push_back(move_from_uci(pos, token));
}
- *cur = MOVE_NONE;
- limits.time = time[pos.side_to_move()];
- limits.increment = inc[pos.side_to_move()];
-
- return think(pos, limits, searchMoves);
- }
-
-
- // perft() is called when engine receives the "perft" command.
- // The function calls perft() passing the required search depth
- // then prints counted leaf nodes and elapsed time.
-
- void perft(Position& pos, UCIParser& up) {
-
- int depth, time;
- int64_t n;
-
- if (!(up >> depth))
- return;
-
- time = get_system_time();
-
- n = perft(pos, depth * ONE_PLY);
-
- time = get_system_time() - time;
-
- std::cout << "\nNodes " << n
- << "\nTime (ms) " << time
- << "\nNodes/second " << int(n / (time / 1000.0)) << std::endl;
+ Threads.start_searching(pos, limits, searchMoves, SetupStates);
}
}