X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fuci.cpp;h=3cb97b7fafdcc7e8c214a98f2a41a2702371fe05;hb=2d63f2157e294cae397e7e78c0396bb3b30c203c;hp=5ba31e7050598e44b24192be76640633daf94f5b;hpb=debc8153520f95c25c1045b723c70ddb4b0d7f80;p=stockfish diff --git a/src/uci.cpp b/src/uci.cpp index 5ba31e70..3cb97b7f 100644 --- a/src/uci.cpp +++ b/src/uci.cpp @@ -27,7 +27,6 @@ #include #include -#include "book.h" #include "evaluate.h" #include "misc.h" #include "move.h" @@ -35,7 +34,6 @@ #include "position.h" #include "san.h" #include "search.h" -#include "uci.h" #include "ucioption.h" using namespace std; @@ -49,22 +47,16 @@ namespace { // FEN string for the initial position const string StartPositionFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1"; - // UCIInputParser is a class for parsing UCI input. The class + // UCIParser is a class for parsing UCI input. The class // is actually a string stream built on a given input string. - - typedef istringstream UCIInputParser; - - // 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); + 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); + bool handle_command(Position& pos, const string& command); + void set_option(UCIParser& uip); + void set_position(Position& pos, UCIParser& uip); + bool go(Position& pos, UCIParser& uip); + void perft(Position& pos, UCIParser& uip); } @@ -76,13 +68,13 @@ namespace { /// 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, +/// 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. void uci_main_loop() { - RootPosition.from_fen(StartPositionFEN); + Position pos(StartPositionFEN, 0); // The root position string command; do { @@ -90,7 +82,7 @@ void uci_main_loop() { if (!getline(cin, command)) command = "quit"; - } while (handle_command(command)); + } while (handle_command(pos, command)); } @@ -100,24 +92,24 @@ void uci_main_loop() { namespace { - // 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. + // handle_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 handle_command(const string& command) { + bool handle_command(Position& pos, const string& command) { - UCIInputParser uip(command); + UCIParser up(command); string token; - if (!(uip >> token)) // operator>>() skips any whitespace + if (!(up >> token)) // operator>>() skips any whitespace return true; if (token == "quit") return false; if (token == "go") - return go(uip); + return go(pos, up); if (token == "uci") { @@ -127,40 +119,41 @@ namespace { cout << "uciok" << endl; } else if (token == "ucinewgame") - { - push_button("New Game"); - RootPosition.from_fen(StartPositionFEN); - } + pos.from_fen(StartPositionFEN); + else if (token == "isready") cout << "readyok" << endl; + else if (token == "position") - set_position(uip); + set_position(pos, up); + else if (token == "setoption") - set_option(uip); + set_option(up); - // The remaining commands are for debugging purposes only. - // Perhaps they should be removed later in order to reduce the - // size of the program binary. + // The remaining commands are for debugging purposes only else if (token == "d") - RootPosition.print(); + pos.print(); + else if (token == "flip") { - Position p(RootPosition, RootPosition.thread()); - RootPosition.flipped_copy(p); + Position p(pos, pos.thread()); + pos.flipped_copy(p); } else if (token == "eval") { Value evalMargin; - cout << "Incremental mg: " << mg_value(RootPosition.value()) - << "\nIncremental eg: " << eg_value(RootPosition.value()) - << "\nFull eval: " << evaluate(RootPosition, evalMargin) << endl; + cout << "Incremental mg: " << mg_value(pos.value()) + << "\nIncremental eg: " << eg_value(pos.value()) + << "\nFull eval: " << evaluate(pos, evalMargin) << endl; } else if (token == "key") - cout << "key: " << hex << RootPosition.get_key() - << "\nmaterial key: " << RootPosition.get_material_key() - << "\npawn key: " << RootPosition.get_pawn_key() << endl; + cout << "key: " << hex << pos.get_key() + << "\nmaterial key: " << pos.get_material_key() + << "\npawn key: " << pos.get_pawn_key() << endl; + else if (token == "perft") - perft(uip); + perft(pos, up); + else cout << "Unknown command: " << command << endl; @@ -169,89 +162,103 @@ 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; - if (!(uip >> token)) // operator>>() skips any whitespace + if (!(up >> token)) // operator>>() skips any whitespace return; if (token == "startpos") - RootPosition.from_fen(StartPositionFEN); + pos.from_fen(StartPositionFEN); else if (token == "fen") { string fen; - while (uip >> token && token != "moves") + while (up >> token && token != "moves") { fen += token; fen += ' '; } - RootPosition.from_fen(fen); + pos.from_fen(fen); } - if (uip.good()) + if (up.good()) { if (token != "moves") - uip >> token; + up >> token; if (token == "moves") { Move move; StateInfo st; - while (uip >> token) + while (up >> token) { - move = move_from_string(RootPosition, token); - RootPosition.do_move(move, st); - if (RootPosition.rule_50_counter() == 0) - RootPosition.reset_game_ply(); + move = move_from_uci(pos, token); + pos.do_move(move, st); + if (pos.rule_50_counter() == 0) + pos.reset_game_ply(); - RootPosition.inc_startpos_ply_counter(); //FIXME: make from_fen to support this and rule50 + pos.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(); + // its content inside pos before it disappears. + pos.detach(); } } } // 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; - if (!(uip >> token)) // operator>>() skips any whitespace + if (!(up >> token) || token != "name") // operator>>() skips any whitespace return; - if (token == "name" && uip >> name) - { - while (uip >> token && token != "value") - name += (" " + token); + if (!(up >> name)) + return; - if (token == "value" && uip >> value) - { - while (uip >> token) - value += (" " + token); + // Handle names with included spaces + while (up >> token && token != "value") + name += (" " + token); + + if (Options.find(name) == Options.end()) + { + cout << "No such option: " << name << endl; + return; + } - set_option_value(name, value); - } else - push_button(name); + // Is a button ? + if (token != "value") + { + Options[name].set_value("true"); + return; } + + if (!(up >> value)) + return; + + // Handle values with included spaces + while (up >> token) + value += (" " + token); + + Options[name].set_value(value); } // 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 @@ -259,62 +266,60 @@ 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; 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]; + Move searchMoves[MOVES_MAX]; searchMoves[0] = MOVE_NONE; - while (uip >> token) + while (up >> token) { if (token == "infinite") infinite = true; else if (token == "ponder") ponder = true; else if (token == "wtime") - uip >> time[0]; + up >> time[0]; else if (token == "btime") - uip >> time[1]; + up >> time[1]; else if (token == "winc") - uip >> inc[0]; + up >> inc[0]; else if (token == "binc") - uip >> inc[1]; + up >> inc[1]; else if (token == "movestogo") - uip >> movesToGo; + up >> movesToGo; else if (token == "depth") - uip >> depth; + up >> depth; else if (token == "nodes") - uip >> nodes; + up >> nodes; else if (token == "movetime") - uip >> moveTime; + up >> moveTime; else if (token == "searchmoves") { int numOfMoves = 0; - while (uip >> token) - searchMoves[numOfMoves++] = move_from_string(RootPosition, token); + while (up >> token) + searchMoves[numOfMoves++] = move_from_uci(pos, token); searchMoves[numOfMoves] = MOVE_NONE; } } - assert(RootPosition.is_ok()); + assert(pos.is_ok()); - return think(RootPosition, infinite, ponder, time, inc, movesToGo, + return think(pos, infinite, ponder, time, inc, movesToGo, depth, nodes, moveTime, searchMoves); } - void perft(UCIInputParser& uip) { + void perft(Position& pos, UCIParser& up) { - string token; int depth, tm, n; - Position pos(RootPosition, RootPosition.thread()); - if (!(uip >> depth)) + if (!(up >> depth)) return; tm = get_system_time(); @@ -324,6 +329,6 @@ namespace { 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; } }