X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=8f8dd7be7f8f082f17a706f734e4df885f44fe3f;hp=673d661878a7b1b12ea687c9f9f9909bc355b227;hb=5b0c6b9bc0687c2f3618fb588b5dc3617f6e2a29;hpb=b8eb699db7aafb3c00165ef26015e9ad562d787e diff --git a/src/uci.cpp b/src/uci.cpp index 673d6618..8f8dd7be 100644 --- a/src/uci.cpp +++ b/src/uci.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include "evaluate.h" #include "misc.h" @@ -36,36 +37,36 @@ namespace { // 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; + // 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 + // where, due to 50 moves rule, we need to check at most 100 plies back. + StateInfo StateRingBuf[102], *SetupState = StateRingBuf; - void set_option(UCIParser& up); - void set_position(Position& pos, UCIParser& up); - bool go(Position& pos, UCIParser& up); - void perft(Position& pos, UCIParser& up); + void set_option(istringstream& up); + void set_position(Position& pos, istringstream& up); + bool go(Position& pos, istringstream& up); + void perft(Position& pos, istringstream& up); } -/// 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. +/// execute_uci_command() takes a string as input, parses this text string as +/// an 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) { static Position pos(StartPositionFEN, false, 0); // The root position - UCIParser up(cmd); + istringstream is(cmd); string token; - up >> token; // operator>>() skips any whitespace + is >> skipws >> token; if (token == "quit") return false; if (token == "go") - return go(pos, up); + return go(pos, is); if (token == "ucinewgame") pos.from_fen(StartPositionFEN, false); @@ -74,13 +75,13 @@ bool execute_uci_command(const string& cmd) { cout << "readyok" << endl; else if (token == "position") - set_position(pos, up); + set_position(pos, is); else if (token == "setoption") - set_option(up); + set_option(is); else if (token == "perft") - perft(pos, up); + perft(pos, is); else if (token == "d") pos.print(); @@ -118,30 +119,35 @@ namespace { // fen string ("fen") or the starting position ("startpos") and then // makes the moves given in the following move list ("moves"). - void set_position(Position& pos, UCIParser& up) { + void set_position(Position& pos, istringstream& is) { Move m; string token, fen; - up >> token; // operator>>() skips any whitespace + is >> token; if (token == "startpos") { - pos.from_fen(StartPositionFEN, false); - up >> token; // Consume "moves" token if any + fen = StartPositionFEN; + is >> token; // Consume "moves" token if any } else if (token == "fen") - { - while (up >> token && token != "moves") + while (is >> token && token != "moves") fen += token + " "; + else + return; - pos.from_fen(fen, Options["UCI_Chess960"].value()); - } - else return; + pos.from_fen(fen, Options["UCI_Chess960"].value()); // Parse move list (if any) - while (up >> token && (m = move_from_uci(pos, token)) != MOVE_NONE) - pos.do_setup_move(m); + while (is >> token && (m = move_from_uci(pos, token)) != MOVE_NONE) + { + pos.do_move(m, *SetupState); + + // Increment pointer to StateRingBuf circular buffer + if (++SetupState - StateRingBuf >= 102) + SetupState = StateRingBuf; + } } @@ -149,26 +155,22 @@ namespace { // command. The function updates the corresponding UCI option ("name") // to the given value ("value"). - void set_option(UCIParser& up) { - - string token, name; - string value = "true"; // UCI buttons don't have a "value" field + void set_option(istringstream& is) { - up >> token; // Consume "name" token - up >> name; // Read option name + string token, name, value; - // Handle names with included spaces - while (up >> token && token != "value") - name += " " + token; + is >> token; // Consume "name" token - up >> value; // Read option value + // Read option name (can contain spaces) + while (is >> token && token != "value") + name += string(" ", !name.empty()) + token; - // Handle values with included spaces - while (up >> token) - value += " " + token; + // Read option value (can contain spaces) + while (is >> token) + value += string(" ", !value.empty()) + token; if (Options.find(name) != Options.end()) - Options[name].set_value(value); + Options[name].set_value(value.empty() ? "true" : value); // UCI buttons don't have "value" else cout << "No such option: " << name << endl; } @@ -179,45 +181,45 @@ namespace { // string, and then calls think(). Returns false if a quit command // is received while thinking, true otherwise. - bool go(Position& pos, UCIParser& up) { + bool go(Position& pos, istringstream& is) { string token; SearchLimits limits; - Move searchMoves[MAX_MOVES], *cur = searchMoves; + std::vector searchMoves; int time[] = { 0, 0 }, inc[] = { 0, 0 }; - while (up >> token) + while (is >> token) { if (token == "infinite") limits.infinite = true; else if (token == "ponder") limits.ponder = true; else if (token == "wtime") - up >> time[WHITE]; + is >> time[WHITE]; else if (token == "btime") - up >> time[BLACK]; + is >> time[BLACK]; else if (token == "winc") - up >> inc[WHITE]; + is >> inc[WHITE]; else if (token == "binc") - up >> inc[BLACK]; + is >> inc[BLACK]; else if (token == "movestogo") - up >> limits.movesToGo; + is >> limits.movesToGo; else if (token == "depth") - up >> limits.maxDepth; + is >> limits.maxDepth; else if (token == "nodes") - up >> limits.maxNodes; + is >> limits.maxNodes; else if (token == "movetime") - up >> limits.maxTime; + is >> limits.maxTime; else if (token == "searchmoves") - while (up >> token) - *cur++ = move_from_uci(pos, token); + while (is >> token) + searchMoves.push_back(move_from_uci(pos, token)); } - *cur = MOVE_NONE; + searchMoves.push_back(MOVE_NONE); limits.time = time[pos.side_to_move()]; limits.increment = inc[pos.side_to_move()]; - return think(pos, limits, searchMoves); + return think(pos, limits, &searchMoves[0]); } @@ -225,12 +227,12 @@ namespace { // The function calls perft() passing the required search depth // then prints counted leaf nodes and elapsed time. - void perft(Position& pos, UCIParser& up) { + void perft(Position& pos, istringstream& is) { int depth, time; int64_t n; - if (!(up >> depth)) + if (!(is >> depth)) return; time = get_system_time();