X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=4a333f70b7540b2d660070bf6579cfaafaa5cc50;hp=48459757dda217aaf117fc5fbc60211722555488;hb=5b1316f7bbb259b87cecc276e4a1ce78b1a0e51b;hpb=72af519e7ff93ca3524f82db1d429002d2d9ea72 diff --git a/src/uci.cpp b/src/uci.cpp index 48459757..4a333f70 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 Marco Costalba + Copyright (C) 2008-2009 Marco Costalba Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -38,6 +38,7 @@ #include "uci.h" #include "ucioption.h" +using namespace std; //// //// Local definitions: @@ -45,22 +46,21 @@ namespace { - // UCIInputParser is a class for parsing UCI input. The class + // UCIInputParser is a class for parsing UCI input. The class // is actually a string stream built on a given input string. - typedef std::istringstream UCIInputParser; + typedef istringstream UCIInputParser; - // The root position. This is set up when the user (or in practice, the GUI) - // sends the "position" UCI command. The root position is sent to the think() + // The root position. This is set up when the user (or in practice, the GUI) + // sends the "position" UCI command. The root position is sent to the think() // function when the program receives the "go" command. Position RootPosition; // Local functions - void get_command(); - void handle_command(const std::string &command); - void set_option(UCIInputParser &uip); - void set_position(UCIInputParser &uip); - void go(UCIInputParser &uip); + bool handle_command(const string& command); + void set_option(UCIInputParser& uip); + void set_position(UCIInputParser& uip); + bool go(UCIInputParser& uip); } @@ -68,17 +68,25 @@ namespace { //// Functions //// -/// uci_main_loop() is the only global function in this file. It is +/// uci_main_loop() is the only global function in this file. It is /// called immediately after the program has finished initializing. /// The program remains in this loop until it receives the "quit" UCI -/// command. +/// command. It waits for a command from the user, and passes this +/// command to handle_command and also intercepts EOF from stdin, +/// by translating EOF to the "quit" command. This ensures that Stockfish +/// exits gracefully if the GUI dies unexpectedly. void uci_main_loop() { RootPosition.from_fen(StartPosition); + string command; - while (1) - get_command(); + do { + // Wait for a command from stdin + if (!getline(cin, command)) + command = "quit"; + + } while (handle_command(command)); } @@ -88,49 +96,30 @@ void uci_main_loop() { namespace { - // get_command() waits for a command from the user, and passes - // this command to handle_command. get_command also intercepts - // EOF from stdin, by translating EOF to the "quit" command. This - // ensures that Stockfish exits gracefully if the GUI dies - // unexpectedly. - - void get_command() { - - std::string command; - - if (!std::getline(std::cin, command)) - command = "quit"; - - handle_command(command); - } - - // handle_command() takes a text string as input, uses a // UCIInputParser object to parse this text string as a UCI command, - // and calls the appropriate functions. In addition to the UCI + // and calls the appropriate functions. In addition to the UCI // commands, the function also supports a few debug commands. - void handle_command(const std::string &command) { + bool handle_command(const string& command) { UCIInputParser uip(command); - std::string token; + string token; - uip >> token; // operator >> skips any whitespace + uip >> token; // operator>>() skips any whitespace if (token == "quit") + return false; + + if (token == "go") + return go(uip); + + if (token == "uci") { - OpeningBook.close(); - stop_threads(); - quit_eval(); - exit(0); - } - else if (token == "uci") - { - std::cout << "id name " << engine_name() << std::endl - << "id author Tord Romstad, Marco Costalba" - << std::endl; + cout << "id name " << engine_name() + << "\nid author Tord Romstad, Marco Costalba\n"; print_uci_options(); - std::cout << "uciok" << std::endl; + cout << "uciok" << endl; } else if (token == "ucinewgame") { @@ -139,13 +128,11 @@ namespace { RootPosition.from_fen(StartPosition); } else if (token == "isready") - std::cout << "readyok" << std::endl; + cout << "readyok" << endl; else if (token == "position") set_position(uip); else if (token == "setoption") set_option(uip); - else if (token == "go") - go(uip); // The remaining commands are for debugging purposes only. // Perhaps they should be removed later in order to reduce the @@ -160,55 +147,49 @@ namespace { else if (token == "eval") { EvalInfo ei; - std::cout << "Incremental mg: " << RootPosition.mg_value() - << std::endl; - std::cout << "Incremental eg: " << RootPosition.eg_value() - << std::endl; - std::cout << "Full eval: " - << evaluate(RootPosition, ei, 0) - << std::endl; + cout << "Incremental mg: " << RootPosition.mg_value() + << "\nIncremental eg: " << RootPosition.eg_value() + << "\nFull eval: " << evaluate(RootPosition, ei, 0) << endl; } else if (token == "key") - { - std::cout << "key: " << std::hex << RootPosition.get_key() - << " material key: " << RootPosition.get_material_key() - << " pawn key: " << RootPosition.get_pawn_key() - << std::endl; - } + cout << "key: " << hex << RootPosition.get_key() + << "\nmaterial key: " << RootPosition.get_material_key() + << "\npawn key: " << RootPosition.get_pawn_key() << endl; else { - std::cout << "Unknown command: " << command << std::endl; + cout << "Unknown command: " << command << endl; while (!uip.eof()) { uip >> token; - std::cout << token << std::endl; + cout << token << endl; } } + return true; } // set_position() is called when Stockfish receives the "position" UCI - // command. The input parameter is a UCIInputParser. It is assumed + // command. The input parameter is a UCIInputParser. It is assumed // that this parser has consumed the first token of the UCI command // ("position"), and is ready to read the second token ("startpos" // or "fen", if the input is well-formed). - void set_position(UCIInputParser &uip) { + void set_position(UCIInputParser& uip) { - std::string token; + string token; - uip >> token; // operator >> skips any whitespace + uip >> token; // operator>>() skips any whitespace if (token == "startpos") RootPosition.from_fen(StartPosition); else if (token == "fen") { - std::string fen; + string fen; while (token != "moves" && !uip.eof()) { - uip >> token; - fen += token; - fen += ' '; + uip >> token; + fen += token; + fen += ' '; } RootPosition.from_fen(fen); } @@ -229,37 +210,39 @@ namespace { if (RootPosition.rule_50_counter() == 0) RootPosition.reset_game_ply(); } - // Our StateInfo st is about going out of scope, - // so save its content before they disappear. - RootPosition.setStartState(st); + // Our StateInfo st is about going out of scope so copy + // its content inside RootPosition before they disappear. + RootPosition.saveState(); } } } // set_option() is called when Stockfish receives the "setoption" UCI - // command. The input parameter is a UCIInputParser. It is assumed + // command. The input parameter is a UCIInputParser. It is assumed // that this parser has consumed the first token of the UCI command // ("setoption"), and is ready to read the second token ("name", if // the input is well-formed). - void set_option(UCIInputParser &uip) { + void set_option(UCIInputParser& uip) { - std::string token, name; + string token, name; uip >> token; if (token == "name") { uip >> name; - uip >> token; - while (!uip.eof() && token != "value") + while (!uip.eof()) { - name += (" " + token); - uip >> token; + uip >> token; + if (token == "value") + break; + + name += (" " + token); } if (token == "value") { - std::getline(uip, token); // reads until end of line + getline(uip, token); // reads until end of line set_option_value(name, token); } else push_button(name); @@ -267,17 +250,18 @@ namespace { } - // go() is called when Stockfish receives the "go" UCI command. The - // input parameter is a UCIInputParser. It is assumed that this + // go() is called when Stockfish receives the "go" UCI command. The + // input parameter is a UCIInputParser. It is assumed that this // parser has consumed the first token of the UCI command ("go"), - // and is ready to read the second token. The function sets the + // and is ready to read the second token. The function sets the // thinking time and other parameters from the input string, and // calls think() (defined in search.cpp) with the appropriate - // parameters. + // parameters. Returns false if a quit command is received while + // thinking, returns true otherwise. - void go(UCIInputParser &uip) { + bool go(UCIInputParser& uip) { - std::string token; + string token; int time[2] = {0, 0}, inc[2] = {0, 0}; int movesToGo = 0, depth = 0, nodes = 0, moveTime = 0; @@ -327,7 +311,8 @@ namespace { assert(RootPosition.is_ok()); - think(RootPosition, infinite, ponder, RootPosition.side_to_move(), time, - inc, movesToGo, depth, nodes, moveTime, searchMoves); + return think(RootPosition, infinite, ponder, RootPosition.side_to_move(), + time, inc, movesToGo, depth, nodes, moveTime, searchMoves); } + }