X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=7c2bd1e5696cfccb68f2842700868fb52f8c1cbe;hp=ebb74d439f0bb3d852db7f45e488af8575e5e4cf;hb=3d0d0237c52474fa7b5e4d9f52d985a69d87df2c;hpb=ed04c010eb4a569532f322f5030d468380b3ab57
diff --git a/src/uci.cpp b/src/uci.cpp
index ebb74d43..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,15 +17,12 @@
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"
@@ -35,8 +32,8 @@ using namespace std;
namespace {
- // FEN string for the initial position
- const char* StarFEN = "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
@@ -51,36 +48,46 @@ namespace {
/// Wait for a command from the user, parse this text string as an UCI command,
-/// and calls 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.
+/// 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() {
- Position pos(StarFEN, false, 0); // The root position
+ Position pos(StartFEN, false, 0); // The root position
string cmd, token;
- bool quit = false;
- while (!quit && getline(cin, cmd))
+ while (token != "quit")
{
+ if (!getline(cin, cmd)) // Block here waiting for input
+ cmd = "quit";
+
istringstream is(cmd);
is >> skipws >> token;
- quit = (token == "quit");
+ if (token == "quit" || token == "stop")
+ {
+ Search::Signals.stop = true;
- if (token == "quit" || token == "stop" || token == "ponderhit")
+ if (token == "quit") // Cannot quit while threads are still running
+ Threads.wait_for_search_finished();
+ }
+
+ else if (token == "ponderhit")
{
- uci_async_command(token);
- Threads[0].wake_up(); // In case is waiting for stop or 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;
+
+ if (Search::Signals.stopOnPonderhit)
+ Search::Signals.stop = true;
}
else if (token == "go")
go(pos, is);
- else if (token == "ucinewgame")
- pos.from_fen(StarFEN, false);
-
else if (token == "isready")
cout << "readyok" << endl;
@@ -100,20 +107,16 @@ void uci_loop() {
pos.flip_me();
else if (token == "eval")
- {
- read_evaluation_uci_options(pos.side_to_move());
- cout << trace_evaluate(pos) << endl;
- }
+ cout << Eval::trace(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;
+ cout << "key: " << hex << pos.key()
+ << "\nmaterial key: " << pos.material_key()
+ << "\npawn key: " << pos.pawn_key() << endl;
else if (token == "uci")
- cout << "id name " << engine_name()
- << "\nid author " << engine_authors()
- << "\n" << Options.print_all()
+ cout << "id name " << engine_info(true)
+ << "\n" << Options
<< "\nuciok" << endl;
else
cout << "Unknown command: " << cmd << endl;
@@ -137,7 +140,7 @@ namespace {
if (token == "startpos")
{
- fen = StarFEN;
+ fen = StartFEN;
is >> token; // Consume "moves" token if any
}
else if (token == "fen")
@@ -146,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)
@@ -160,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) {
@@ -178,33 +180,30 @@ 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 main searching thread.
void go(Position& pos, istringstream& is) {
string token;
+ Search::LimitsType limits;
+ std::set searchMoves;
int time[] = { 0, 0 }, inc[] = { 0, 0 };
- memset(&Limits, 0, sizeof(SearchLimits));
- SearchMoves.clear();
- RootPosition = &pos;
-
while (is >> token)
{
if (token == "infinite")
- Limits.infinite = true;
+ limits.infinite = true;
else if (token == "ponder")
- Limits.ponder = true;
+ limits.ponder = true;
else if (token == "wtime")
is >> time[WHITE];
else if (token == "btime")
@@ -214,46 +213,44 @@ namespace {
else if (token == "binc")
is >> inc[BLACK];
else if (token == "movestogo")
- is >> Limits.movesToGo;
+ is >> limits.movesToGo;
else if (token == "depth")
- is >> Limits.maxDepth;
+ is >> limits.maxDepth;
else if (token == "nodes")
- is >> Limits.maxNodes;
+ is >> limits.maxNodes;
else if (token == "movetime")
- is >> Limits.maxTime;
+ is >> limits.maxTime;
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()];
+ limits.time = time[pos.side_to_move()];
+ limits.increment = inc[pos.side_to_move()];
- Threads.start_thinking();
+ 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;
}
}