X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=7c2bd1e5696cfccb68f2842700868fb52f8c1cbe;hp=0225a85a49c68ba29189e1eb32dd6fc17a3ce93b;hb=3d0d0237c52474fa7b5e4d9f52d985a69d87df2c;hpb=15d265cc664e0e49fa82cccb7471da0a5612ce25
diff --git a/src/uci.cpp b/src/uci.cpp
index 0225a85a..7c2bd1e5 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,240 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
-
-#include
#include
#include
#include
-#include "book.h"
#include "evaluate.h"
#include "misc.h"
-#include "move.h"
-#include "movegen.h"
#include "position.h"
-#include "san.h"
#include "search.h"
-#include "uci.h"
+#include "thread.h"
#include "ucioption.h"
using namespace std;
-////
-//// Local definitions:
-////
-
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.
+ // 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
+ // where, due to 50 moves rule, we need to check at most 100 plies back.
+ StateInfo StateRingBuf[102], *SetupState = StateRingBuf;
- typedef istringstream UCIInputParser;
+ void set_option(istringstream& up);
+ void set_position(Position& pos, istringstream& up);
+ void go(Position& pos, istringstream& up);
+ void perft(Position& pos, istringstream& up);
+}
- // The root position. This is set up when the user (or in practice, the GUI)
- // sends the "position" UCI command. The root position is sent to the think()
- // function when the program receives the "go" command.
- Position RootPosition(0);
- // Local functions
- bool handle_command(const string& command);
- void set_option(UCIInputParser& uip);
- void set_position(UCIInputParser& uip);
- bool go(UCIInputParser& uip);
- void perft(UCIInputParser& uip);
-}
+/// 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() {
-////
-//// Functions
-////
+ Position pos(StartFEN, false, 0); // The root position
+ string cmd, token;
-/// 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.
+ while (token != "quit")
+ {
+ if (!getline(cin, cmd)) // Block here waiting for input
+ cmd = "quit";
-void uci_main_loop() {
+ istringstream is(cmd);
- RootPosition.from_fen(StartPositionFEN);
- string command;
+ is >> skipws >> token;
- do {
- // Wait for a command from stdin
- if (!getline(cin, command))
- command = "quit";
+ if (token == "quit" || token == "stop")
+ {
+ Search::Signals.stop = true;
- } while (handle_command(command));
-}
+ if (token == "quit") // Cannot quit while threads are still running
+ Threads.wait_for_search_finished();
+ }
+ 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;
-////
-//// Local functions
-////
+ if (Search::Signals.stopOnPonderhit)
+ Search::Signals.stop = true;
+ }
-namespace {
+ else if (token == "go")
+ go(pos, is);
- // 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.
+ else if (token == "isready")
+ cout << "readyok" << endl;
- bool handle_command(const string& command) {
+ else if (token == "position")
+ set_position(pos, is);
- UCIInputParser uip(command);
- string token;
+ else if (token == "setoption")
+ set_option(is);
- if (!(uip >> token)) // operator>>() skips any whitespace
- return true;
+ else if (token == "perft")
+ perft(pos, is);
- if (token == "quit")
- return false;
+ else if (token == "d")
+ pos.print();
- if (token == "go")
- return go(uip);
+ else if (token == "flip")
+ pos.flip_me();
- 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")
- {
- push_button("New Game");
- RootPosition.from_fen(StartPositionFEN);
- }
- else if (token == "isready")
- cout << "readyok" << endl;
- else if (token == "position")
- set_position(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")
- RootPosition.print();
- else if (token == "flip")
- {
- Position p(RootPosition, RootPosition.thread());
- RootPosition.flipped_copy(p);
- }
- else if (token == "eval")
- {
- Value margins[2];
- cout << "Incremental mg: " << mg_value(RootPosition.value())
- << "\nIncremental eg: " << eg_value(RootPosition.value())
- << "\nFull eval: " << evaluate(RootPosition, margins) << endl;
- }
- else if (token == "key")
- cout << "key: " << hex << RootPosition.get_key()
- << "\nmaterial key: " << RootPosition.get_material_key()
- << "\npawn key: " << RootPosition.get_pawn_key() << endl;
- else if (token == "perft")
- perft(uip);
- else
- cout << "Unknown command: " << command << endl;
+ else if (token == "eval")
+ cout << Eval::trace(pos) << endl;
+
+ else if (token == "key")
+ cout << "key: " << hex << pos.key()
+ << "\nmaterial key: " << pos.material_key()
+ << "\npawn key: " << pos.pawn_key() << endl;
- return true;
+ else if (token == "uci")
+ cout << "id name " << engine_info(true)
+ << "\n" << Options
+ << "\nuciok" << endl;
+ else
+ cout << "Unknown command: " << cmd << endl;
}
+}
+
+namespace {
- // 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).
+ // 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(UCIInputParser& uip) {
+ void set_position(Position& pos, istringstream& is) {
- string token;
+ Move m;
+ string token, fen;
- if (!(uip >> token)) // operator>>() skips any whitespace
- return;
+ is >> token;
if (token == "startpos")
- RootPosition.from_fen(StartPositionFEN);
- else if (token == "fen")
{
- string fen;
- while (uip >> token && token != "moves")
- {
- fen += token;
- fen += ' ';
- }
- RootPosition.from_fen(fen);
+ fen = StartFEN;
+ is >> token; // Consume "moves" token if any
}
+ else if (token == "fen")
+ while (is >> token && token != "moves")
+ fen += token + " ";
+ else
+ return;
+
+ pos.from_fen(fen, Options["UCI_Chess960"]);
- 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(RootPosition, token);
- RootPosition.do_move(move, st);
- if (RootPosition.rule_50_counter() == 0)
- RootPosition.reset_game_ply();
-
- RootPosition.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 RootPosition before it disappears.
- RootPosition.detach();
- }
+ pos.do_move(m, *SetupState);
+
+ // Increment pointer to StateRingBuf circular buffer
+ if (++SetupState - StateRingBuf >= 102)
+ SetupState = StateRingBuf;
}
}
- // 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)
- {
- while (uip >> token && token != "value")
- name += (" " + token);
+ // Read option name (can contain spaces)
+ while (is >> token && token != "value")
+ name += string(" ", !name.empty()) + token;
- if (token == "value" && uip >> value)
- {
- while (uip >> token)
- value += (" " + token);
+ // Read option value (can contain spaces)
+ while (is >> token)
+ value += string(" ", !value.empty()) + token;
- set_option_value(name, value);
- } else
- push_button(name);
- }
+ if (Options.count(name))
+ Options[name] = value;
+ else
+ cout << "No such option: " << name << 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 then starts
+ // the main searching thread.
- bool go(UCIInputParser& uip) {
+ void go(Position& pos, istringstream& is) {
string token;
+ Search::LimitsType limits;
+ std::set searchMoves;
+ int time[] = { 0, 0 }, inc[] = { 0, 0 };
- 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[500];
-
- searchMoves[0] = MOVE_NONE;
-
- while (uip >> token)
+ while (is >> token)
{
if (token == "infinite")
- infinite = true;
+ limits.infinite = true;
else if (token == "ponder")
- ponder = true;
+ limits.ponder = true;
else if (token == "wtime")
- uip >> time[0];
+ is >> time[WHITE];
else if (token == "btime")
- uip >> time[1];
+ is >> time[BLACK];
else if (token == "winc")
- uip >> inc[0];
+ is >> inc[WHITE];
else if (token == "binc")
- uip >> inc[1];
+ is >> inc[BLACK];
else if (token == "movestogo")
- uip >> movesToGo;
+ is >> limits.movesToGo;
else if (token == "depth")
- uip >> depth;
+ is >> limits.maxDepth;
else if (token == "nodes")
- uip >> nodes;
+ is >> limits.maxNodes;
else if (token == "movetime")
- uip >> moveTime;
+ is >> limits.maxTime;
else if (token == "searchmoves")
- {
- int numOfMoves = 0;
- while (uip >> token)
- searchMoves[numOfMoves++] = move_from_string(RootPosition, token);
-
- searchMoves[numOfMoves] = MOVE_NONE;
- }
+ while (is >> token)
+ searchMoves.insert(move_from_uci(pos, token));
}
- assert(RootPosition.is_ok());
+ limits.time = time[pos.side_to_move()];
+ limits.increment = inc[pos.side_to_move()];
- return think(RootPosition, infinite, ponder, time, inc, movesToGo,
- depth, nodes, moveTime, searchMoves);
+ Threads.start_searching(pos, limits, searchMoves);
}
- void perft(UCIInputParser& uip) {
- string token;
- int depth, tm, n;
- Position pos(RootPosition, RootPosition.thread());
+ // perft() is called when engine receives the "perft" command. The function
+ // calls perft() with the required search depth then prints counted leaf nodes
+ // and elapsed time.
+
+ void perft(Position& pos, istringstream& is) {
- if (!(uip >> depth))
+ int depth;
+
+ if (!(is >> depth))
return;
- tm = get_system_time();
+ Time time = Time::current_time();
+
+ int64_t n = Search::perft(pos, depth * ONE_PLY);
- n = perft(pos, depth * ONE_PLY);
+ int e = time.elapsed();
- tm = get_system_time() - tm;
std::cout << "\nNodes " << n
- << "\nTime (ms) " << tm
- << "\nNodes/second " << (int)(n/(tm/1000.0)) << std::endl;
+ << "\nTime (ms) " << e
+ << "\nNodes/second " << int(n / (e / 1000.0)) << std::endl;
}
}