X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=6027295d94d67ed507de3de614db236d26f9e3b2;hp=6aea40682d98b499f36916e712718a2c5c78483c;hb=535f70088e6fbf19f4775490edab050006734814;hpb=431c3ac485386cc10413fc8a3c7d338dcc71602d diff --git a/src/uci.cpp b/src/uci.cpp index 6aea4068..6027295d 100644 --- a/src/uci.cpp +++ b/src/uci.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -44,89 +44,6 @@ namespace { // draw detection code. Search::StateStackPtr SetupStates; - void setoption(istringstream& up); - void position(Position& pos, istringstream& up); - void go(const Position& pos, istringstream& up); -} - - -/// Wait for a command from the user, parse this text string as an UCI command, -/// and call the appropriate functions. Also intercepts EOF from stdin to ensure -/// that we exit gracefully if the GUI dies unexpectedly. In addition to the UCI -/// commands, the function also supports a few debug commands. - -void UCI::loop(const string& args) { - - Position pos(StartFEN, false, Threads.main()); // The root position - string token, cmd = args; - - do { - if (args.empty() && !getline(cin, cmd)) // Block here waiting for input - cmd = "quit"; - - istringstream is(cmd); - - is >> skipws >> token; - - if (token == "quit" || token == "stop" || token == "ponderhit") - { - // The GUI sends 'ponderhit' to tell us to ponder on the same move the - // opponent has played. In case Signals.stopOnPonderhit is set we are - // waiting for 'ponderhit' to stop the search (for instance because we - // already ran out of time), otherwise we should continue searching but - // switch from pondering to normal search. - if (token != "ponderhit" || Search::Signals.stopOnPonderhit) - { - Search::Signals.stop = true; - Threads.main()->notify_one(); // Could be sleeping - } - else - Search::Limits.ponder = false; - } - else if (token == "perft" && (is >> token)) // Read perft depth - { - stringstream ss; - - ss << Options["Hash"] << " " - << Options["Threads"] << " " << token << " current perft"; - - benchmark(pos, ss); - } - else if (token == "key") - sync_cout << hex << uppercase << setfill('0') - << "position key: " << setw(16) << pos.key() - << "\nmaterial key: " << setw(16) << pos.material_key() - << "\npawn key: " << setw(16) << pos.pawn_key() - << dec << sync_endl; - - else if (token == "uci") - sync_cout << "id name " << engine_info(true) - << "\n" << Options - << "\nuciok" << sync_endl; - - else if (token == "eval") - { - Search::RootColor = pos.side_to_move(); // Ensure it is set - sync_cout << Eval::trace(pos) << sync_endl; - } - else if (token == "ucinewgame") TT.clear(); - else if (token == "go") go(pos, is); - else if (token == "position") position(pos, is); - else if (token == "setoption") setoption(is); - else if (token == "flip") pos.flip(); - else if (token == "bench") benchmark(pos, is); - else if (token == "d") sync_cout << pos.pretty() << sync_endl; - else if (token == "isready") sync_cout << "readyok" << sync_endl; - else - sync_cout << "Unknown command: " << cmd << sync_endl; - - } while (token != "quit" && args.empty()); // Args have one-shot behaviour - - Threads.wait_for_think_finished(); // Cannot quit whilst the search is running -} - - -namespace { // position() is called when engine receives the "position" UCI command. // The function sets up the position described in the given FEN string ("fen") @@ -194,14 +111,13 @@ namespace { void go(const Position& pos, istringstream& is) { Search::LimitsType limits; - vector searchMoves; string token; while (is >> token) { if (token == "searchmoves") while (is >> token) - searchMoves.push_back(move_from_uci(pos, token)); + limits.searchmoves.push_back(move_from_uci(pos, token)); else if (token == "wtime") is >> limits.time[WHITE]; else if (token == "btime") is >> limits.time[BLACK]; @@ -216,6 +132,84 @@ namespace { else if (token == "ponder") limits.ponder = true; } - Threads.start_thinking(pos, limits, searchMoves, SetupStates); + Threads.start_thinking(pos, limits, SetupStates); } + +} // namespace + + +/// Wait for a command from the user, parse this text string as an UCI command, +/// and call the appropriate functions. Also intercepts EOF from stdin to ensure +/// that we exit gracefully if the GUI dies unexpectedly. In addition to the UCI +/// commands, the function also supports a few debug commands. + +void UCI::loop(int argc, char* argv[]) { + + Position pos(StartFEN, false, Threads.main()); // The root position + string token, cmd; + + for (int i = 1; i < argc; ++i) + cmd += std::string(argv[i]) + " "; + + do { + if (argc == 1 && !getline(cin, cmd)) // Block here waiting for input + cmd = "quit"; + + istringstream is(cmd); + + is >> skipws >> token; + + if (token == "quit" || token == "stop" || token == "ponderhit") + { + // The GUI sends 'ponderhit' to tell us to ponder on the same move the + // opponent has played. In case Signals.stopOnPonderhit is set we are + // waiting for 'ponderhit' to stop the search (for instance because we + // already ran out of time), otherwise we should continue searching but + // switch from pondering to normal search. + if (token != "ponderhit" || Search::Signals.stopOnPonderhit) + { + Search::Signals.stop = true; + Threads.main()->notify_one(); // Could be sleeping + } + else + Search::Limits.ponder = false; + } + else if (token == "perft") + { + int depth; + stringstream ss; + + is >> depth; + ss << Options["Hash"] << " " + << Options["Threads"] << " " << depth << " current " << token; + + benchmark(pos, ss); + } + else if (token == "key") + sync_cout << hex << uppercase << setfill('0') + << "position key: " << setw(16) << pos.key() + << "\nmaterial key: " << setw(16) << pos.material_key() + << "\npawn key: " << setw(16) << pos.pawn_key() + << dec << nouppercase << setfill(' ') << sync_endl; + + else if (token == "uci") + sync_cout << "id name " << engine_info(true) + << "\n" << Options + << "\nuciok" << sync_endl; + + else if (token == "ucinewgame") TT.clear(); + else if (token == "go") go(pos, is); + else if (token == "position") position(pos, is); + else if (token == "setoption") setoption(is); + else if (token == "flip") pos.flip(); + else if (token == "bench") benchmark(pos, is); + else if (token == "d") sync_cout << pos.pretty() << sync_endl; + else if (token == "isready") sync_cout << "readyok" << sync_endl; + else if (token == "eval") sync_cout << Eval::trace(pos) << sync_endl; + else + sync_cout << "Unknown command: " << cmd << sync_endl; + + } while (token != "quit" && argc == 1); // Passed args have one-shot behaviour + + Threads.wait_for_think_finished(); // Cannot quit whilst the search is running }