X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=34a26586a6a8295f0617b22d4945bfc16dc6af65;hp=af8b01f708728b7bc68d92193aa19d7b8b86ff52;hb=09d01ee9dc16f20962d5f5ffcb61ade56d4fa579;hpb=c0616d773dcb967dad755de74c36937fc5753b63 diff --git a/src/uci.cpp b/src/uci.cpp index af8b01f7..34a26586 100644 --- a/src/uci.cpp +++ b/src/uci.cpp @@ -23,232 +23,176 @@ //// #include +#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 - // is actually a string stream built on a given input string. - - typedef istringstream UCIInputParser; + // FEN string for the initial position + const string StartPositionFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1"; - // 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); + // UCIParser is a class for parsing UCI input. The class + // is actually a string stream built on a given input string. + typedef istringstream UCIParser; // 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); + void set_option(UCIParser& up); + void set_position(Position& pos, UCIParser& up); + bool go(Position& pos, UCIParser& up); + void perft(Position& pos, UCIParser& up); } -//// -//// Functions -//// +/// 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. -/// 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. +bool execute_uci_command(const string& cmd) { -void uci_main_loop() { + static Position pos(StartPositionFEN, false, 0); // The root position + UCIParser up(cmd); + string token; - RootPosition.from_fen(StartPositionFEN); - string command; + up >> token; // operator>>() skips any whitespace - do { - // Wait for a command from stdin - if (!getline(cin, command)) - command = "quit"; - - } while (handle_command(command)); -} + if (token == "quit") + return false; + else if (token == "go") + return go(pos, up); -//// -//// Local functions -//// + else if (token == "uci") + cout << "id name " << engine_name() + << "\nid author " << engine_authors() + << "\n" << Options.print_all() + << "\nuciok" << endl; -namespace { + else if (token == "ucinewgame") + pos.from_fen(StartPositionFEN, false); - // 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, up); - UCIInputParser uip(command); - string token; + else if (token == "setoption") + set_option(up); - if (!(uip >> token)) // operator>>() skips any whitespace - return true; + else if (token == "d") + pos.print(); - if (token == "quit") - return false; + else if (token == "eval") + { + read_evaluation_uci_options(pos.side_to_move()); + cout << trace_evaluate(pos) << endl; + } - if (token == "go") - return go(uip); + 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 == "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") - { - 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; + else if (token == "perft") + perft(pos, up); - return true; + else if (token == "flip") + { + Position p(pos, pos.thread()); + pos.flipped_copy(p); } + else + cout << "Unknown command: " << cmd << endl; + + return true; +} +//// +//// Local functions +//// + +namespace { + // set_position() is called when Stockfish receives the "position" UCI - // command. The input parameter is a UCIInputParser. It is assumed + // command. The input parameter is a UCIParser. 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). - void set_position(UCIInputParser& uip) { + void set_position(Position& pos, UCIParser& up) { - string token; + string fen, token; - if (!(uip >> token)) // operator>>() skips any whitespace - return; + up >> token; // operator>>() skips any whitespace 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); + pos.from_fen(StartPositionFEN, false); + up >> token; // Consume "moves" token } - - if (uip.good()) + else if (token == "fen") { - if (token != "moves") - uip >> token; + while (up >> token && token != "moves") + fen += 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.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 + // command. The input parameter is a UCIParser. 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). - void set_option(UCIInputParser& uip) { + void set_option(UCIParser& up) { - string token, name, value; + string value = "true"; // UCI buttons don't have a "value" field + string token, name; - 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 + // input parameter is a UCIParser. 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 @@ -256,71 +200,68 @@ namespace { // parameters. Returns false if a quit command is received while // thinking, returns true otherwise. - bool go(UCIInputParser& uip) { + bool go(Position& pos, UCIParser& up) { string token; + SearchLimits limits; + Move searchMoves[MAX_MOVES] = { MOVE_NONE }; + Move* 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); + while (up >> token) + *cur++ = move_from_uci(pos, token); - searchMoves[numOfMoves] = MOVE_NONE; + *cur = MOVE_NONE; } } - assert(RootPosition.is_ok()); + assert(pos.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); + return think(pos, limits, searchMoves); } - void perft(UCIInputParser& uip) { + void perft(Position& pos, UCIParser& up) { - string token; - int depth, tm, n; - Position pos(RootPosition, RootPosition.thread()); + int depth, tm; + int64_t n; - if (!(uip >> depth)) + if (!(up >> depth)) return; tm = get_system_time(); - n = perft(pos, depth * OnePly); + n = perft(pos, depth * ONE_PLY); tm = get_system_time() - tm; std::cout << "\nNodes " << n << "\nTime (ms) " << tm - << "\nNodes/second " << (int)(n/(tm/1000.0)) << std::endl; + << "\nNodes/second " << int(n / (tm / 1000.0)) << std::endl; } }