X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=2dacd1c2f37b3b9a18a66c1d340d041342f4bb31;hp=db9e6220fca0574ca8d449023c2212d81de07845;hb=b414fc0dfdced41aa14d4d86dd6a94ce3e2094f3;hpb=a8b9c11f5666a6298d684e21156f4ac9d89c8d8c
diff --git a/src/uci.cpp b/src/uci.cpp
index db9e6220..2dacd1c2 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -17,309 +17,231 @@
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 "ucioption.h"
using namespace std;
-////
-//// Local definitions:
-////
-
namespace {
- // UCIInputParser is a class for parsing UCI input. The class
+ // FEN string for the initial position
+ const string StartPositionFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
+
+ // UCIParser is a class for parsing UCI input. The class
// is actually a string stream built on a given input string.
+ typedef istringstream UCIParser;
- typedef istringstream UCIInputParser;
+ void set_option(UCIParser& up);
+ void set_position(Position& pos, UCIParser& up);
+ bool go(Position& pos, UCIParser& up);
+ void perft(Position& pos, UCIParser& 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);
-}
+/// execute_uci_command() takes a string as input, uses a UCIParser
+/// 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 execute_uci_command(const string& cmd) {
-////
-//// Functions
-////
+ static Position pos(StartPositionFEN, false, 0); // The root position
-/// 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.
+ UCIParser up(cmd);
+ string token;
-void uci_main_loop() {
+ up >> token; // operator>>() skips any whitespace
- RootPosition.from_fen(StartPosition);
- string command;
+ if (token == "quit")
+ return false;
- do {
- // Wait for a command from stdin
- if (!getline(cin, command))
- command = "quit";
+ if (token == "go")
+ return go(pos, up);
- } while (handle_command(command));
-}
+ if (token == "ucinewgame")
+ pos.from_fen(StartPositionFEN, false);
+ else if (token == "isready")
+ cout << "readyok" << endl;
-////
-//// Local functions
-////
+ else if (token == "position")
+ set_position(pos, up);
-namespace {
+ else if (token == "setoption")
+ set_option(up);
- // 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 == "perft")
+ perft(pos, up);
- bool handle_command(const string& command) {
+ else if (token == "d")
+ pos.print();
- UCIInputParser uip(command);
- string token;
+ else if (token == "flip")
+ pos.flip();
- if (!(uip >> token)) // operator>>() skips any whitespace
- return true;
+ else if (token == "eval")
+ {
+ read_evaluation_uci_options(pos.side_to_move());
+ cout << trace_evaluate(pos) << endl;
+ }
- if (token == "quit")
- return false;
+ else if (token == "key")
+ cout << "key: " << hex << pos.get_key()
+ << "\nmaterial key: " << pos.get_material_key()
+ << "\npawn key: " << pos.get_pawn_key() << endl;
- if (token == "go")
- return go(uip);
+ 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;
- 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");
- Position::init_piece_square_tables();
- RootPosition.from_fen(StartPosition);
- }
- 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")
- {
- EvalInfo ei;
- cout << "Incremental mg: " << mg_value(RootPosition.value())
- << "\nIncremental eg: " << eg_value(RootPosition.value())
- << "\nFull eval: " << evaluate(RootPosition, ei) << 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;
+ return true;
+}
- return true;
- }
+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, UCIParser& up) {
- string token;
+ string token, fen;
- if (!(uip >> token)) // operator>>() skips any whitespace
- return;
+ up >> token; // operator>>() skips any whitespace
if (token == "startpos")
- RootPosition.from_fen(StartPosition);
- else if (token == "fen")
{
- string fen;
- while (uip >> token && token != "moves")
- {
- fen += token;
- fen += ' ';
- }
- RootPosition.from_fen(fen);
+ pos.from_fen(StartPositionFEN, false);
+ up >> token; // Consume "moves" token if any
}
-
- if (uip.good())
+ else if (token == "fen")
{
- 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();
- }
- // Our StateInfo st is about going out of scope so copy
- // its content inside RootPosition before they disappear.
- RootPosition.detach();
- }
+ while (up >> token && token != "moves")
+ fen += token + " ";
+
+ pos.from_fen(fen, Options["UCI_Chess960"].value());
}
+ else return;
+
+ // Parse move list (if any)
+ while (up >> token)
+ pos.do_setup_move(move_from_uci(pos, token));
}
- // 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 corresponding UCI option ("name")
+ // to the given value ("value").
- void set_option(UCIInputParser& uip) {
+ void set_option(UCIParser& up) {
- string token, name, value;
+ string token, name;
+ string value = "true"; // UCI buttons don't have a "value" field
- if (!(uip >> token)) // operator>>() skips any whitespace
- return;
+ up >> token; // Consume "name" token
+ up >> name; // Read option name
- if (token == "name" && uip >> name)
- {
- while (uip >> token && token != "value")
- name += (" " + token);
+ // Handle names with included spaces
+ while (up >> token && token != "value")
+ name += " " + token;
- if (token == "value" && uip >> value)
- {
- while (uip >> token)
- value += (" " + token);
+ up >> value; // Read option value
- set_option_value(name, value);
- } else
- push_button(name);
- }
+ // Handle values with included spaces
+ while (up >> token)
+ value += " " + token;
+
+ if (Options.find(name) != Options.end())
+ Options[name].set_value(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 calls think(). Returns false if a quit command
+ // is received while thinking, true otherwise.
- bool go(UCIInputParser& uip) {
+ bool go(Position& pos, UCIParser& up) {
string token;
+ SearchLimits limits;
+ Move searchMoves[MAX_MOVES], *cur = 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 (up >> 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];
+ up >> time[WHITE];
else if (token == "btime")
- uip >> time[1];
+ up >> time[BLACK];
else if (token == "winc")
- uip >> inc[0];
+ up >> inc[WHITE];
else if (token == "binc")
- uip >> inc[1];
+ up >> inc[BLACK];
else if (token == "movestogo")
- uip >> movesToGo;
+ up >> limits.movesToGo;
else if (token == "depth")
- uip >> depth;
+ up >> limits.maxDepth;
else if (token == "nodes")
- uip >> nodes;
+ up >> limits.maxNodes;
else if (token == "movetime")
- uip >> moveTime;
+ up >> limits.maxTime;
else if (token == "searchmoves")
- {
- int numOfMoves = 0;
- while (uip >> token)
- searchMoves[numOfMoves++] = move_from_string(RootPosition, token);
-
- searchMoves[numOfMoves] = MOVE_NONE;
- }
+ while (up >> token)
+ *cur++ = move_from_uci(pos, token);
}
- assert(RootPosition.is_ok());
+ *cur = MOVE_NONE;
+ limits.time = time[pos.side_to_move()];
+ limits.increment = inc[pos.side_to_move()];
- return think(RootPosition, infinite, ponder, RootPosition.side_to_move(),
- time, inc, movesToGo, depth, nodes, moveTime, searchMoves);
+ assert(pos.is_ok());
+
+ return think(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() passing the required search depth
+ // then prints counted leaf nodes and elapsed time.
+
+ void perft(Position& pos, UCIParser& up) {
- if (!(uip >> depth))
+ int depth, time;
+ int64_t n;
+
+ if (!(up >> depth))
return;
- tm = get_system_time();
+ time = get_system_time();
+
+ n = perft(pos, depth * ONE_PLY);
- n = perft(pos, depth * OnePly);
+ time = get_system_time() - time;
- tm = get_system_time() - tm;
std::cout << "\nNodes " << n
- << "\nTime (ms) " << tm
- << "\nNodes/second " << (int)(n/(tm/1000.0)) << std::endl;
+ << "\nTime (ms) " << time
+ << "\nNodes/second " << int(n / (time / 1000.0)) << std::endl;
}
}