X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=4c3faf05c02c07999017594728c1249213dd4b2d;hp=9948eb62b4114670d826ec7e32c3f9012f53e0e0;hb=0439a79566d03065317b2025b9b479b9ae9f2d65;hpb=81cd417b4584b0e3830940c5cb122c898afde08a diff --git a/src/uci.cpp b/src/uci.cpp index 9948eb62..4c3faf05 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-2010 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2012 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 @@ -20,7 +20,6 @@ #include #include #include -#include #include "evaluate.h" #include "misc.h" @@ -31,6 +30,8 @@ using namespace std; +extern void benchmark(istringstream& is); + namespace { // FEN string of the initial position, normal chess @@ -53,14 +54,17 @@ namespace { /// 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() { +void uci_loop(const string& args) { Position pos(StartFEN, false, 0); // The root position string cmd, token; while (token != "quit") { - if (!getline(cin, cmd)) // Block here waiting for input + if (!args.empty()) + cmd = args; + + else if (!getline(cin, cmd)) // Block here waiting for input cmd = "quit"; istringstream is(cmd); @@ -70,7 +74,7 @@ void uci_loop() { if (token == "quit" || token == "stop") { Search::Signals.stop = true; - Threads[0].wake_up(); // In case is waiting for stop or ponderhit + Threads.wait_for_search_finished(); // Cannot quit while threads are running } else if (token == "ponderhit") @@ -81,16 +85,17 @@ void uci_loop() { Search::Limits.ponder = false; if (Search::Signals.stopOnPonderhit) + { Search::Signals.stop = true; - - Threads[0].wake_up(); // In case is waiting for stop or ponderhit + Threads.wait_for_search_finished(); // Wake up if is sleeping + } } else if (token == "go") go(pos, is); else if (token == "ucinewgame") - pos.from_fen(StartFEN, false); + { /* Avoid returning "Unknown command" */ } else if (token == "isready") cout << "readyok" << endl; @@ -108,26 +113,31 @@ void uci_loop() { pos.print(); else if (token == "flip") - pos.flip_me(); + pos.flip(); else if (token == "eval") - { - read_evaluation_uci_options(pos.side_to_move()); - cout << trace_evaluate(pos) << endl; - } + cout << Eval::trace(pos) << endl; + + else if (token == "bench") + benchmark(is); else if (token == "key") - cout << "key: " << hex << pos.get_key() - << "\nmaterial key: " << pos.get_material_key() - << "\npawn key: " << pos.get_pawn_key() << endl; + cout << "key: " << hex << pos.key() + << "\nmaterial key: " << pos.material_key() + << "\npawn key: " << pos.pawn_key() << endl; else if (token == "uci") - cout << "id name " << engine_name() - << "\nid author " << engine_authors() - << "\n" << Options.print_all() + cout << "id name " << engine_info(true) + << "\n" << Options << "\nuciok" << endl; else cout << "Unknown command: " << cmd << endl; + + if (!args.empty()) // Command line arguments have one-shot behaviour + { + Threads.wait_for_search_finished(); + break; + } } } @@ -157,7 +167,7 @@ namespace { else return; - pos.from_fen(fen, Options["UCI_Chess960"].value()); + pos.from_fen(fen, Options["UCI_Chess960"]); // Parse move list (if any) while (is >> token && (m = move_from_uci(pos, token)) != MOVE_NONE) @@ -188,8 +198,8 @@ namespace { while (is >> token) value += string(" ", !value.empty()) + token; - if (Options.find(name) != Options.end()) - Options[name].set_value(value.empty() ? "true" : value); // UCI buttons don't have "value" + if (Options.count(name)) + Options[name] = value; else cout << "No such option: " << name << endl; } @@ -197,47 +207,42 @@ namespace { // go() is called when engine receives the "go" UCI command. The function sets // the thinking time and other parameters from the input string, and then starts - // the main searching thread. + // the search. void go(Position& pos, istringstream& is) { - string token; Search::LimitsType limits; - std::vector searchMoves; - int time[] = { 0, 0 }, inc[] = { 0, 0 }; + vector searchMoves; + string token; while (is >> token) { - if (token == "infinite") - limits.infinite = true; - else if (token == "ponder") - limits.ponder = true; - else if (token == "wtime") - is >> time[WHITE]; + if (token == "wtime") + is >> limits.time[WHITE]; else if (token == "btime") - is >> time[BLACK]; + is >> limits.time[BLACK]; else if (token == "winc") - is >> inc[WHITE]; + is >> limits.inc[WHITE]; else if (token == "binc") - is >> inc[BLACK]; + is >> limits.inc[BLACK]; else if (token == "movestogo") - is >> limits.movesToGo; + is >> limits.movestogo; else if (token == "depth") - is >> limits.maxDepth; + is >> limits.depth; else if (token == "nodes") - is >> limits.maxNodes; + is >> limits.nodes; else if (token == "movetime") - is >> limits.maxTime; + is >> limits.movetime; + else if (token == "infinite") + limits.infinite = true; + else if (token == "ponder") + limits.ponder = true; else if (token == "searchmoves") while (is >> token) searchMoves.push_back(move_from_uci(pos, token)); } - searchMoves.push_back(MOVE_NONE); - limits.time = time[pos.side_to_move()]; - limits.increment = inc[pos.side_to_move()]; - - Threads.start_thinking(pos, limits, searchMoves, true); + Threads.start_searching(pos, limits, searchMoves); } @@ -247,19 +252,19 @@ namespace { void perft(Position& pos, istringstream& is) { - int depth, time; + int depth; if (!(is >> depth)) return; - time = get_system_time(); + Time time = Time::current_time(); int64_t n = Search::perft(pos, depth * ONE_PLY); - time = get_system_time() - time; + int e = time.elapsed(); - std::cout << "\nNodes " << n - << "\nTime (ms) " << time - << "\nNodes/second " << int(n / (time / 1000.0)) << std::endl; + cout << "\nNodes " << n + << "\nTime (ms) " << e + << "\nNodes/second " << int(n / (e / 1000.0)) << endl; } }