X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=248601b5de3b5db960a664f589b7ccdb0c47ecc4;hp=5e85098504d30c3a4ecbc8d7cce412f265e28ac5;hb=c9d7e99de682516c560009b550c41da9ae2008b8;hpb=6afcfd00f29973f3169dae18aa439f90c2614256 diff --git a/src/uci.cpp b/src/uci.cpp index 5e850985..248601b5 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" @@ -49,10 +49,10 @@ namespace { typedef istringstream UCIParser; // Local functions - void set_option(UCIParser& uip); - void set_position(Position& pos, UCIParser& uip); - bool go(Position& pos, UCIParser& uip); - void perft(Position& pos, UCIParser& 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); } @@ -63,28 +63,26 @@ namespace { bool execute_uci_command(const string& cmd) { - static Position pos(StartPositionFEN, 0); // The root position + static Position pos(StartPositionFEN, false, 0); // The root position 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.print_all() + << "\nuciok" << endl; + else if (token == "ucinewgame") - pos.from_fen(StartPositionFEN); + pos.from_fen(StartPositionFEN, false); else if (token == "isready") cout << "readyok" << endl; @@ -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,46 +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); - if (!(up >> token)) - return; + pos.from_fen(StartPositionFEN, false); + up >> token; // Consume "moves" token } - else // fen + else if (token == "fen") { - string fen; while (up >> token && token != "moves") - { - fen += token; - fen += ' '; - } - pos.from_fen(fen); - } + fen += token + " "; - if (token != "moves") - return; + pos.from_fen(fen, Options["UCI_Chess960"].value()); + } + else 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_move(move, st); - if (pos.rule_50_counter() == 0) - pos.reset_game_ply(); - - 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 pos before it disappears. - pos.detach(); + pos.do_setup_move(move_from_uci(pos, token)); } @@ -191,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; } @@ -239,55 +203,54 @@ 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]; - - searchMoves[0] = MOVE_NONE; + int time[] = { 0, 0 }, inc[] = { 0, 0 }; + SearchLimits limits(0, 0, 0, 0, 0, 0, false, false); + Move searchMoves[MAX_MOVES] = { MOVE_NONE }; + Move* cur = searchMoves; while (up >> token) { if (token == "infinite") - infinite = true; + limits.infinite = true; else if (token == "ponder") - ponder = true; + limits.ponder = true; else if (token == "wtime") - up >> time[0]; + up >> time[WHITE]; else if (token == "btime") - up >> time[1]; + up >> time[BLACK]; else if (token == "winc") - up >> inc[0]; + up >> inc[WHITE]; else if (token == "binc") - up >> inc[1]; + up >> inc[BLACK]; else if (token == "movestogo") - up >> movesToGo; + up >> limits.movesToGo; else if (token == "depth") - up >> depth; + up >> limits.maxDepth; else if (token == "nodes") - up >> nodes; + up >> limits.maxNodes; else if (token == "movetime") - up >> moveTime; + up >> limits.maxTime; else if (token == "searchmoves") { - int numOfMoves = 0; while (up >> token) - searchMoves[numOfMoves++] = move_from_uci(pos, token); + *cur++ = move_from_uci(pos, token); - searchMoves[numOfMoves] = MOVE_NONE; + *cur = MOVE_NONE; } } assert(pos.is_ok()); - return think(pos, infinite, ponder, time, inc, movesToGo, - depth, nodes, moveTime, searchMoves); + limits.time = time[pos.side_to_move()]; + limits.increment = inc[pos.side_to_move()]; + + return think(pos, limits, searchMoves); } void perft(Position& pos, UCIParser& up) { - int depth, tm, n; + int depth, tm; + int64_t n; if (!(up >> depth)) return;