X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fuci.cpp;h=f3b5f54c60f0d9c0acbdbc2358008146f339afe4;hb=336901fdb02dcd473e99be1e13df5725895616b0;hp=6027295d94d67ed507de3de614db236d26f9e3b2;hpb=535f70088e6fbf19f4775490edab050006734814;p=stockfish
diff --git a/src/uci.cpp b/src/uci.cpp
index 6027295d..f3b5f54c 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -1,7 +1,8 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, 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,18 +18,20 @@
along with this program. If not, see .
*/
-#include
+#include
#include
#include
#include
#include "evaluate.h"
-#include "notation.h"
+#include "movegen.h"
#include "position.h"
#include "search.h"
#include "thread.h"
#include "tt.h"
-#include "ucioption.h"
+#include "timeman.h"
+#include "uci.h"
+#include "syzygy/tbprobe.h"
using namespace std;
@@ -39,10 +42,10 @@ namespace {
// FEN string of the initial position, normal chess
const char* StartFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
- // Keep a track of the position keys along the setup moves (from the start position
- // to the position just before the search starts). This is needed by the repetition
- // draw detection code.
- Search::StateStackPtr SetupStates;
+ // A list to keep track of the position states along the setup moves (from the
+ // start position to the position just before the search starts). Needed by
+ // 'draw by repetition' detection.
+ StateListPtr States(new std::deque(1));
// position() is called when engine receives the "position" UCI command.
@@ -68,14 +71,14 @@ namespace {
else
return;
- pos.set(fen, Options["UCI_Chess960"], Threads.main());
- SetupStates = Search::StateStackPtr(new std::stack());
+ States = StateListPtr(new std::deque(1));
+ pos.set(fen, Options["UCI_Chess960"], &States->back(), Threads.main());
// Parse move list (if any)
- while (is >> token && (m = move_from_uci(pos, token)) != MOVE_NONE)
+ while (is >> token && (m = UCI::to_move(pos, token)) != MOVE_NONE)
{
- SetupStates->push(StateInfo());
- pos.do_move(m, SetupStates->top());
+ States->push_back(StateInfo());
+ pos.do_move(m, States->back());
}
}
@@ -91,11 +94,11 @@ namespace {
// Read option name (can contain spaces)
while (is >> token && token != "value")
- name += string(" ", !name.empty()) + token;
+ name += string(" ", name.empty() ? 0 : 1) + token;
// Read option value (can contain spaces)
while (is >> token)
- value += string(" ", !value.empty()) + token;
+ value += string(" ", value.empty() ? 0 : 1) + token;
if (Options.count(name))
Options[name] = value;
@@ -105,19 +108,20 @@ namespace {
// 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 thinking time and other parameters from the input string, then starts
// the search.
- void go(const Position& pos, istringstream& is) {
+ void go(Position& pos, istringstream& is) {
Search::LimitsType limits;
string token;
+ limits.startTime = now(); // As early as possible!
+
while (is >> token)
- {
if (token == "searchmoves")
while (is >> token)
- limits.searchmoves.push_back(move_from_uci(pos, token));
+ limits.searchmoves.push_back(UCI::to_move(pos, token));
else if (token == "wtime") is >> limits.time[WHITE];
else if (token == "btime") is >> limits.time[BLACK];
@@ -128,88 +132,170 @@ namespace {
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;
- }
+ else if (token == "infinite") limits.infinite = 1;
+ else if (token == "ponder") limits.ponder = 1;
+
+ Threads.start_thinking(pos, States, limits);
+ }
+
+ // On ucinewgame following steps are needed to reset the state
+ void newgame() {
- Threads.start_thinking(pos, limits, SetupStates);
+ TT.resize(Options["Hash"]);
+ Search::clear();
+ Tablebases::init(Options["SyzygyPath"]);
+ Time.availableNodes = 0;
}
} // namespace
-/// 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::loop() waits for a command from stdin, parses it and calls the appropriate
+/// function. Also intercepts EOF from stdin to ensure gracefully exiting if the
+/// GUI dies unexpectedly. When called with some command line arguments, e.g. to
+/// run 'bench', once the command is executed the function returns immediately.
+/// In addition to the UCI ones, also some additional debug commands are supported.
void UCI::loop(int argc, char* argv[]) {
- Position pos(StartFEN, false, Threads.main()); // The root position
+ Position pos;
string token, cmd;
+ newgame(); // Implied ucinewgame before the first position command
+
+ pos.set(StartFEN, false, &States->back(), Threads.main());
+
for (int i = 1; i < argc; ++i)
cmd += std::string(argv[i]) + " ";
do {
- if (argc == 1 && !getline(cin, cmd)) // Block here waiting for input
+ if (argc == 1 && !getline(cin, cmd)) // Block here waiting for input or EOF
cmd = "quit";
istringstream is(cmd);
+ token.clear(); // getline() could return empty or blank line
is >> skipws >> token;
- if (token == "quit" || token == "stop" || token == "ponderhit")
+ // The 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 == "quit"
+ || token == "stop"
+ || (token == "ponderhit" && Search::Signals.stopOnPonderhit))
{
- // The 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
- // switch from pondering to normal search.
- if (token != "ponderhit" || Search::Signals.stopOnPonderhit)
- {
- Search::Signals.stop = true;
- Threads.main()->notify_one(); // Could be sleeping
- }
- else
- Search::Limits.ponder = false;
+ Search::Signals.stop = true;
+ Threads.main()->start_searching(true); // Could be sleeping
}
- else if (token == "perft")
- {
- int depth;
- stringstream ss;
-
- is >> depth;
- ss << Options["Hash"] << " "
- << Options["Threads"] << " " << depth << " current " << token;
-
- benchmark(pos, ss);
- }
- else if (token == "key")
- sync_cout << hex << uppercase << setfill('0')
- << "position key: " << setw(16) << pos.key()
- << "\nmaterial key: " << setw(16) << pos.material_key()
- << "\npawn key: " << setw(16) << pos.pawn_key()
- << dec << nouppercase << setfill(' ') << sync_endl;
+ else if (token == "ponderhit")
+ Search::Limits.ponder = 0; // Switch to normal search
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 == "ucinewgame") newgame();
+ else if (token == "isready") sync_cout << "readyok" << sync_endl;
else if (token == "go") go(pos, is);
else if (token == "position") position(pos, is);
else if (token == "setoption") setoption(is);
+
+ // Additional custom non-UCI commands, useful for debugging
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 == "d") sync_cout << pos << sync_endl;
else if (token == "eval") sync_cout << Eval::trace(pos) << sync_endl;
+ else if (token == "perft")
+ {
+ int depth;
+ stringstream ss;
+
+ is >> depth;
+ ss << Options["Hash"] << " "
+ << Options["Threads"] << " " << depth << " current perft";
+
+ benchmark(pos, ss);
+ }
else
sync_cout << "Unknown command: " << cmd << sync_endl;
} while (token != "quit" && argc == 1); // Passed args have one-shot behaviour
- Threads.wait_for_think_finished(); // Cannot quit whilst the search is running
+ Threads.main()->wait_for_search_finished();
+}
+
+
+/// UCI::value() converts a Value to a string suitable for use with the UCI
+/// protocol specification:
+///
+/// cp The score from the engine's point of view in centipawns.
+/// mate Mate in y moves, not plies. If the engine is getting mated
+/// use negative values for y.
+
+string UCI::value(Value v) {
+
+ assert(-VALUE_INFINITE < v && v < VALUE_INFINITE);
+
+ stringstream ss;
+
+ if (abs(v) < VALUE_MATE - MAX_PLY)
+ ss << "cp " << v * 100 / PawnValueEg;
+ else
+ ss << "mate " << (v > 0 ? VALUE_MATE - v + 1 : -VALUE_MATE - v) / 2;
+
+ return ss.str();
+}
+
+
+/// UCI::square() converts a Square to a string in algebraic notation (g1, a7, etc.)
+
+std::string UCI::square(Square s) {
+ return std::string{ char('a' + file_of(s)), char('1' + rank_of(s)) };
+}
+
+
+/// UCI::move() converts a Move to a string in coordinate notation (g1f3, a7a8q).
+/// The only special case is castling, where we print in the e1g1 notation in
+/// normal chess mode, and in e1h1 notation in chess960 mode. Internally all
+/// castling moves are always encoded as 'king captures rook'.
+
+string UCI::move(Move m, bool chess960) {
+
+ Square from = from_sq(m);
+ Square to = to_sq(m);
+
+ if (m == MOVE_NONE)
+ return "(none)";
+
+ if (m == MOVE_NULL)
+ return "0000";
+
+ if (type_of(m) == CASTLING && !chess960)
+ to = make_square(to > from ? FILE_G : FILE_C, rank_of(from));
+
+ string move = UCI::square(from) + UCI::square(to);
+
+ if (type_of(m) == PROMOTION)
+ move += " pnbrqk"[promotion_type(m)];
+
+ return move;
+}
+
+
+/// UCI::to_move() converts a string representing a move in coordinate notation
+/// (g1f3, a7a8q) to the corresponding legal Move, if any.
+
+Move UCI::to_move(const Position& pos, string& str) {
+
+ if (str.length() == 5) // Junior could send promotion piece in uppercase
+ str[4] = char(tolower(str[4]));
+
+ for (const auto& m : MoveList(pos))
+ if (str == UCI::move(m, pos.is_chess960()))
+ return m;
+
+ return MOVE_NONE;
}