X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=683aac6d8d07a282428a9564f57152115fc7b569;hp=6593d5ad25a6fe71f14b9b2c57f0c6071285f42e;hb=7f367e6019289e65b902a5ebf7e3686db5cefdef;hpb=b08ba446f655ba6292cb0b5a1012e790e4ad8d7d diff --git a/src/uci.cpp b/src/uci.cpp index 6593d5ad..683aac6d 100644 --- a/src/uci.cpp +++ b/src/uci.cpp @@ -23,6 +23,7 @@ //// #include +#include #include #include #include @@ -32,7 +33,6 @@ #include "move.h" #include "movegen.h" #include "position.h" -#include "san.h" #include "search.h" #include "ucioption.h" @@ -67,22 +67,20 @@ bool execute_uci_command(const string& cmd) { UCIParser up(cmd); string token; - if (!(up >> token)) // operator>>() skips any whitespace - return true; + up >> token; // operator>>() skips any whitespace if (token == "quit") return false; - if (token == "go") + else if (token == "go") return go(pos, up); - if (token == "uci") - { + else if (token == "uci") cout << "id name " << engine_name() - << "\nid author Tord Romstad, Marco Costalba, Joona Kiiski\n"; - print_uci_options(); - cout << "uciok" << endl; - } + << "\nid author " << engine_authors() + << "\n" << options_to_uci() + << "\nuciok" << endl; + else if (token == "ucinewgame") pos.from_fen(StartPositionFEN, false); @@ -95,30 +93,28 @@ bool execute_uci_command(const string& cmd) { else if (token == "setoption") set_option(up); - // The remaining commands are for debugging purposes only else if (token == "d") pos.print(); - else if (token == "flip") - { - Position p(pos, pos.thread()); - pos.flipped_copy(p); - } else if (token == "eval") { - Value evalMargin; - cout << "Incremental mg: " << mg_value(pos.value()) - << "\nIncremental eg: " << eg_value(pos.value()) - << "\nFull eval: " << evaluate(pos, evalMargin) << endl; + read_evaluation_uci_options(pos.side_to_move()); + cout << trace_evaluate(pos) << endl; } + else if (token == "key") - cout << "key: " << hex << pos.get_key() + cout << "key: " << hex << pos.get_key() << "\nmaterial key: " << pos.get_material_key() - << "\npawn key: " << pos.get_pawn_key() << endl; + << "\npawn key: " << pos.get_pawn_key() << endl; else if (token == "perft") perft(pos, up); + else if (token == "flip") + { + Position p(pos, pos.thread()); + pos.flipped_copy(p); + } else cout << "Unknown command: " << cmd << endl; @@ -140,42 +136,27 @@ namespace { void set_position(Position& pos, UCIParser& up) { - string token; + string fen, token; - if (!(up >> token) || (token != "startpos" && token != "fen")) - return; + up >> token; // operator>>() skips any whitespace if (token == "startpos") { pos.from_fen(StartPositionFEN, false); - if (!(up >> token)) - return; + up >> token; // Consume "moves" token } - else // fen + else if (token == "fen") { - string fen; while (up >> token && token != "moves") - { - fen += token; - fen += ' '; - } + fen += token + " "; + pos.from_fen(fen, Options["UCI_Chess960"].value()); } + else return; - if (token != "moves") - return; - - // Parse optional move list - Move move; - StateInfo st; + // Parse move list (if any) while (up >> token) - { - move = move_from_uci(pos, token); - pos.do_setup_move(move, st); - } - // Our StateInfo st is about going out of scope so copy - // its content inside pos before it disappears. - pos.detach(); + pos.do_setup_move(move_from_uci(pos, token)); } @@ -187,39 +168,26 @@ namespace { void set_option(UCIParser& up) { - string token, name, value; - - if (!(up >> token) || token != "name") // operator>>() skips any whitespace - return; + string value = "true"; // UCI buttons don't have a "value" field + string token, name; - if (!(up >> name)) - return; + up >> token; // Consume "name" token + up >> name; // Read option name // 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; - } - - // Is a button ? - if (token != "value") - { - Options[name].set_value("true"); - return; - } + name += " " + token; - if (!(up >> value)) - return; + up >> value; // Read option value // Handle values with included spaces while (up >> token) - value += (" " + token); + value += " " + token; - Options[name].set_value(value); + if (Options.find(name) != Options.end()) + Options[name].set_value(value); + else + cout << "No such option: " << name << endl; } @@ -235,13 +203,14 @@ namespace { 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[MOVES_MAX]; + int movesToGo, depth, nodes, moveTime, numOfMoves; + bool infinite, ponder; + int time[2] = {0, 0}, inc[2] = {0, 0}; searchMoves[0] = MOVE_NONE; + infinite = ponder = false; + movesToGo = depth = nodes = moveTime = numOfMoves = 0; while (up >> token) { @@ -267,7 +236,6 @@ namespace { up >> moveTime; else if (token == "searchmoves") { - int numOfMoves = 0; while (up >> token) searchMoves[numOfMoves++] = move_from_uci(pos, token);