X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=ad7a8d133f95eb9e897e1da3a6eea2e4d78d8acb;hp=6adaf3929b1a530f133dc501e00223856975c44b;hb=81cd7d787ef2b9d914c9c09ddbed59dffb78ec77;hpb=d2ad5acddda723430971f4ce06916db645f7e06f
diff --git a/src/uci.cpp b/src/uci.cpp
index 6adaf392..ad7a8d13 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,313 +17,196 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
-
-#include
#include
#include
#include
#include "evaluate.h"
-#include "misc.h"
-#include "move.h"
-#include "movegen.h"
+#include "notation.h"
#include "position.h"
-#include "san.h"
#include "search.h"
-#include "uci.h"
+#include "thread.h"
+#include "tt.h"
#include "ucioption.h"
using namespace std;
-////
-//// Local definitions:
-////
+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";
- // UCIInputParser is a class for parsing UCI input. The class
- // is actually a string stream built on a given input string.
- typedef istringstream UCIInputParser;
+ // 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;
- // Local functions
- bool handle_command(Position& pos, const string& command);
- void set_option(UCIInputParser& uip);
- void set_position(Position& pos, UCIInputParser& uip);
- bool go(Position& pos, UCIInputParser& uip);
- void perft(Position& pos, UCIInputParser& uip);
+ void set_option(istringstream& up);
+ void set_position(Position& pos, istringstream& up);
+ void go(Position& pos, istringstream& up);
}
-////
-//// Functions
-////
+/// 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.
-/// uci_main_loop() is the only global function in this file. It is
-/// called immediately after the program has finished initializing.
-/// The program remains in this loop until it receives the "quit" UCI
-/// command. It waits for a command from the user, and passes this
-/// command to handle_command and also intercepts EOF from stdin,
-/// by translating EOF to the "quit" command. This ensures that Stockfish
-/// exits gracefully if the GUI dies unexpectedly.
+void UCI::loop(const string& args) {
-void uci_main_loop() {
-
- Position pos(StartPositionFEN, 0); // The root position
- string command;
+ Position pos(StartFEN, false, Threads.main_thread()); // The root position
+ string token, cmd = args;
do {
- // Wait for a command from stdin
- if (!getline(cin, command))
- command = "quit";
-
- } while (handle_command(pos, command));
+ 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_search_finished(); // Cannot quit while search is running
}
-////
-//// Local functions
-////
-
namespace {
- // handle_command() takes a text string as input, uses a
- // UCIInputParser 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 handle_command(Position& pos, const string& command) {
+ // 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").
- UCIInputParser uip(command);
- string token;
+ void set_position(Position& pos, istringstream& is) {
- if (!(uip >> token)) // operator>>() skips any whitespace
- return true;
+ Move m;
+ string token, fen;
- if (token == "quit")
- return false;
+ is >> token;
- if (token == "go")
- return go(pos, uip);
-
- if (token == "uci")
- {
- cout << "id name " << engine_name()
- << "\nid author Tord Romstad, Marco Costalba, Joona Kiiski\n";
- print_uci_options();
- cout << "uciok" << endl;
- }
- else if (token == "ucinewgame")
- {
- Options["New Game"].set_value("true");
- pos.from_fen(StartPositionFEN);
- }
- else if (token == "isready")
- cout << "readyok" << endl;
- else if (token == "position")
- set_position(pos, uip);
- else if (token == "setoption")
- set_option(uip);
-
- // The remaining commands are for debugging purposes only.
- // Perhaps they should be removed later in order to reduce the
- // size of the program binary.
- else if (token == "d")
- pos.print();
- else if (token == "flip")
- {
- Position p(pos, pos.thread());
- pos.flipped_copy(p);
- }
- else if (token == "eval")
+ if (token == "startpos")
{
- Value evalMargin;
- cout << "Incremental mg: " << mg_value(pos.value())
- << "\nIncremental eg: " << eg_value(pos.value())
- << "\nFull eval: " << evaluate(pos, evalMargin) << endl;
+ fen = StartFEN;
+ is >> token; // Consume "moves" token if any
}
- 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, uip);
+ else if (token == "fen")
+ while (is >> token && token != "moves")
+ fen += token + " ";
else
- cout << "Unknown command: " << command << endl;
-
- return true;
- }
-
-
- // set_position() is called when Stockfish receives the "position" UCI
- // command. The input parameter is a UCIInputParser. 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).
-
- void set_position(Position& pos, UCIInputParser& uip) {
-
- string token;
-
- if (!(uip >> token)) // operator>>() skips any whitespace
return;
- if (token == "startpos")
- pos.from_fen(StartPositionFEN);
- else if (token == "fen")
- {
- string fen;
- while (uip >> token && token != "moves")
- {
- fen += token;
- fen += ' ';
- }
- pos.from_fen(fen);
- }
+ pos.set(fen, Options["UCI_Chess960"], Threads.main_thread());
+ SetupStates = Search::StateStackPtr(new std::stack());
- if (uip.good())
+ // Parse move list (if any)
+ while (is >> token && (m = move_from_uci(pos, token)) != MOVE_NONE)
{
- if (token != "moves")
- uip >> token;
-
- if (token == "moves")
- {
- Move move;
- StateInfo st;
- while (uip >> token)
- {
- move = move_from_string(pos, token);
- pos.do_move(move, st);
- if (pos.rule_50_counter() == 0)
- pos.reset_game_ply();
-
- pos.inc_startpos_ply_counter(); //FIXME: make from_fen to support this and rule50
- }
- // Our StateInfo st is about going out of scope so copy
- // its content inside pos before it disappears.
- pos.detach();
- }
+ 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 UCIInputParser. 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).
+ // 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(UCIInputParser& uip) {
+ void set_option(istringstream& is) {
string token, name, value;
- if (!(uip >> token)) // operator>>() skips any whitespace
- return;
+ is >> token; // Consume "name" token
- if (token != "name" || !(uip >> name))
- return;
-
- while (uip >> token && token != "value")
- name += (" " + token);
-
- if (Options.find(name) == Options.end())
- {
- cout << "No such option: " << name << endl;
- return;
- }
-
- if (token != "value" || !(uip >> value))
- {
- Options[name].set_value("true");
- return;
- }
+ // Read option name (can contain spaces)
+ while (is >> token && token != "value")
+ name += string(" ", !name.empty()) + token;
- while (uip >> token)
- value += (" " + token);
+ // Read option value (can contain spaces)
+ while (is >> token)
+ value += string(" ", !value.empty()) + token;
- Options[name].set_value(value);
+ if (Options.count(name))
+ Options[name] = value;
+ else
+ sync_cout << "No such option: " << name << sync_endl;
}
- // go() is called when Stockfish receives the "go" UCI command. The
- // input parameter is a UCIInputParser. 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, UCIInputParser& uip) {
+ void go(Position& pos, istringstream& is) {
+ Search::LimitsType limits;
+ vector searchMoves;
string token;
- int time[2] = {0, 0}, inc[2] = {0, 0};
- int movesToGo = 0, depth = 0, nodes = 0, moveTime = 0;
- bool infinite = false, ponder = false;
- Move searchMoves[MOVES_MAX];
-
- searchMoves[0] = MOVE_NONE;
-
- while (uip >> token)
+ while (is >> token)
{
- if (token == "infinite")
- infinite = true;
- else if (token == "ponder")
- ponder = true;
- else if (token == "wtime")
- uip >> time[0];
- else if (token == "btime")
- uip >> time[1];
- else if (token == "winc")
- uip >> inc[0];
- else if (token == "binc")
- uip >> inc[1];
- else if (token == "movestogo")
- uip >> movesToGo;
- else if (token == "depth")
- uip >> depth;
- else if (token == "nodes")
- uip >> nodes;
- else if (token == "movetime")
- uip >> moveTime;
- else if (token == "searchmoves")
- {
- int numOfMoves = 0;
- while (uip >> token)
- searchMoves[numOfMoves++] = move_from_string(pos, token);
-
- searchMoves[numOfMoves] = MOVE_NONE;
- }
+ if (token == "searchmoves")
+ while (is >> token)
+ 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);
- }
-
- void perft(Position& pos, UCIInputParser& uip) {
-
- string token;
- int depth, tm, n;
-
- if (!(uip >> 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;
+ Threads.start_searching(pos, limits, searchMoves, SetupStates);
}
}