X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fuci.cpp;h=1b7705065cd5de4dc6fefca0b2a1f9912cb07dd9;hb=cc2b3ece5c5d8d1183f8526fbb0ee4e1ea7a69fe;hp=8f8dd7be7f8f082f17a706f734e4df885f44fe3f;hpb=5b0c6b9bc0687c2f3618fb588b5dc3617f6e2a29;p=stockfish
diff --git a/src/uci.cpp b/src/uci.cpp
index 8f8dd7be..1b770506 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,25 +17,23 @@
along with this program. If not, see .
*/
-#include
#include
#include
#include
-#include
#include "evaluate.h"
#include "misc.h"
-#include "move.h"
#include "position.h"
#include "search.h"
+#include "thread.h"
#include "ucioption.h"
using namespace std;
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
@@ -44,71 +42,85 @@ namespace {
void set_option(istringstream& up);
void set_position(Position& pos, istringstream& up);
- bool go(Position& pos, istringstream& up);
+ void go(Position& pos, istringstream& up);
void perft(Position& pos, istringstream& up);
}
-/// execute_uci_command() takes a string as input, parses this text string as
-/// an 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() {
- static Position pos(StartPositionFEN, false, 0); // The root position
+ Position pos(StartFEN, false, 0); // The root position
+ string cmd, token;
- istringstream is(cmd);
- string token;
+ while (token != "quit")
+ {
+ if (!getline(cin, cmd)) // Block here waiting for input
+ cmd = "quit";
- is >> skipws >> token;
+ istringstream is(cmd);
- if (token == "quit")
- return false;
+ is >> skipws >> token;
- if (token == "go")
- return go(pos, is);
+ if (token == "quit" || token == "stop")
+ {
+ Search::Signals.stop = true;
- if (token == "ucinewgame")
- pos.from_fen(StartPositionFEN, false);
+ if (token == "quit") // Cannot quit while threads are still running
+ Threads.wait_for_search_finished();
+ }
- 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, is);
+ if (Search::Signals.stopOnPonderhit)
+ Search::Signals.stop = true;
+ }
- else if (token == "setoption")
- set_option(is);
+ else if (token == "go")
+ go(pos, is);
- else if (token == "perft")
- perft(pos, is);
+ else if (token == "isready")
+ cout << "readyok" << endl;
- else if (token == "d")
- pos.print();
+ else if (token == "position")
+ set_position(pos, is);
- else if (token == "flip")
- pos.flip();
+ else if (token == "setoption")
+ set_option(is);
- else if (token == "eval")
- {
- read_evaluation_uci_options(pos.side_to_move());
- cout << trace_evaluate(pos) << endl;
- }
+ else if (token == "perft")
+ perft(pos, is);
+
+ else if (token == "d")
+ pos.print();
- 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 == "flip")
+ pos.flip_me();
- 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 == "eval")
+ cout << Eval::trace(pos) << endl;
- return true;
+ else if (token == "key")
+ cout << "key: " << hex << pos.key()
+ << "\nmaterial key: " << pos.material_key()
+ << "\npawn key: " << pos.pawn_key() << endl;
+
+ else if (token == "uci")
+ cout << "id name " << engine_info(true)
+ << "\n" << Options
+ << "\nuciok" << endl;
+ else
+ cout << "Unknown command: " << cmd << endl;
+ }
}
@@ -128,7 +140,7 @@ namespace {
if (token == "startpos")
{
- fen = StartPositionFEN;
+ fen = StartFEN;
is >> token; // Consume "moves" token if any
}
else if (token == "fen")
@@ -137,7 +149,7 @@ namespace {
else
return;
- pos.from_fen(fen, Options["UCI_Chess960"].value());
+ pos.from_fen(fen, Options["UCI_Chess960"]);
// Parse move list (if any)
while (is >> token && (m = move_from_uci(pos, token)) != MOVE_NONE)
@@ -151,9 +163,8 @@ namespace {
}
- // 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(istringstream& is) {
@@ -169,80 +180,73 @@ namespace {
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;
}
- // 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, istringstream& is) {
+ void go(Position& pos, istringstream& is) {
+ Search::LimitsType limits;
+ std::set searchMoves;
string token;
- SearchLimits limits;
- std::vector searchMoves;
- int time[] = { 0, 0 }, inc[] = { 0, 0 };
while (is >> token)
{
- if (token == "infinite")
- limits.infinite = true;
- else if (token == "ponder")
- limits.ponder = true;
- else if (token == "wtime")
- is >> time[WHITE];
+ if (token == "wtime")
+ is >> limits.times[WHITE];
else if (token == "btime")
- is >> time[BLACK];
+ is >> limits.times[BLACK];
else if (token == "winc")
- is >> inc[WHITE];
+ is >> limits.incs[WHITE];
else if (token == "binc")
- is >> inc[BLACK];
+ is >> limits.incs[BLACK];
else if (token == "movestogo")
- is >> limits.movesToGo;
+ is >> limits.movestogo;
else if (token == "depth")
- is >> limits.maxDepth;
+ is >> limits.depth;
else if (token == "nodes")
- is >> limits.maxNodes;
+ is >> limits.nodes;
else if (token == "movetime")
- is >> limits.maxTime;
+ is >> limits.movetime;
+ else if (token == "infinite")
+ limits.infinite = true;
+ else if (token == "ponder")
+ limits.ponder = true;
else if (token == "searchmoves")
while (is >> token)
- searchMoves.push_back(move_from_uci(pos, token));
+ searchMoves.insert(move_from_uci(pos, token));
}
- searchMoves.push_back(MOVE_NONE);
- limits.time = time[pos.side_to_move()];
- limits.increment = inc[pos.side_to_move()];
-
- return think(pos, limits, &searchMoves[0]);
+ Threads.start_searching(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.
+ // 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) {
- int depth, time;
- int64_t n;
+ int depth;
if (!(is >> depth))
return;
- time = get_system_time();
+ Time time = Time::current_time();
- n = perft(pos, depth * ONE_PLY);
+ int64_t n = Search::perft(pos, depth * ONE_PLY);
- time = get_system_time() - time;
+ int e = time.elapsed();
std::cout << "\nNodes " << n
- << "\nTime (ms) " << time
- << "\nNodes/second " << int(n / (time / 1000.0)) << std::endl;
+ << "\nTime (ms) " << e
+ << "\nNodes/second " << int(n / (e / 1000.0)) << std::endl;
}
}