X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=88c1229e320ea804c4ef277f29c7c0d4da95013c;hp=b029e12f17858e61651a7f87d9b0b62041338e56;hb=2f6927ac08887ff3b709cfe9228b27a85bdd1d88;hpb=5c81602d14539f8259a715477315e28b5de7cb54 diff --git a/src/uci.cpp b/src/uci.cpp index b029e12f..88c1229e 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-2009 Marco Costalba + Copyright (C) 2008-2010 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 @@ -38,6 +38,7 @@ #include "uci.h" #include "ucioption.h" +using namespace std; //// //// Local definitions: @@ -45,21 +46,22 @@ 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; + Position RootPosition(0); // Local functions - bool handle_command(const std::string& command); + bool handle_command(const string& command); void set_option(UCIInputParser& uip); void set_position(UCIInputParser& uip); bool go(UCIInputParser& uip); + void perft(UCIInputParser& uip); } @@ -78,11 +80,11 @@ namespace { void uci_main_loop() { RootPosition.from_fen(StartPosition); - std::string command; + string command; do { // Wait for a command from stdin - if (!std::getline(std::cin, command)) + if (!getline(cin, command)) command = "quit"; } while (handle_command(command)); @@ -100,12 +102,13 @@ namespace { // and calls the appropriate functions. In addition to the UCI // commands, the function also supports a few debug commands. - bool 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 + if (!(uip >> token)) // operator>>() skips any whitespace + return true; if (token == "quit") return false; @@ -115,20 +118,19 @@ namespace { 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, Joona Kiiski\n"; print_uci_options(); - std::cout << "uciok" << std::endl; + cout << "uciok" << endl; } else if (token == "ucinewgame") { - TT.clear(); + push_button("New Game"); Position::init_piece_square_tables(); 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") @@ -141,123 +143,110 @@ namespace { RootPosition.print(); else if (token == "flip") { - Position p(RootPosition); + Position p(RootPosition, RootPosition.thread()); RootPosition.flipped_copy(p); } 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: " << mg_value(RootPosition.value()) + << "\nIncremental eg: " << eg_value(RootPosition.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 if (token == "perft") + perft(uip); else - { - std::cout << "Unknown command: " << command << std::endl; - while (!uip.eof()) - { - uip >> token; - std::cout << token << std::endl; - } - } + cout << "Unknown command: " << command << 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) { - std::string token; + string token; - uip >> token; // operator >> skips any whitespace + if (!(uip >> token)) // operator>>() skips any whitespace + return; if (token == "startpos") RootPosition.from_fen(StartPosition); else if (token == "fen") { - std::string fen; - while (token != "moves" && !uip.eof()) + string fen; + while (uip >> token && token != "moves") { - uip >> token; - fen += token; - fen += ' '; + fen += token; + fen += ' '; } RootPosition.from_fen(fen); } - if (!uip.eof()) + if (uip.good()) { if (token != "moves") uip >> token; + if (token == "moves") { Move move; StateInfo st; - while (!uip.eof()) + while (uip >> token) { - uip >> token; move = move_from_string(RootPosition, token); RootPosition.do_move(move, st); if (RootPosition.rule_50_counter() == 0) - RootPosition.reset_game_ply(); + RootPosition.reset_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.detach(); } } } // 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) { - std::string token, name; + string token, name, value; - uip >> token; - if (token == "name") - { - uip >> name; - while (!uip.eof()) - { - uip >> token; - if (token == "value") - break; + if (!(uip >> token)) // operator>>() skips any whitespace + return; + if (token == "name" && uip >> name) + { + while (uip >> token && token != "value") name += (" " + token); - } - if (token == "value") + + if (token == "value" && uip >> value) { - std::getline(uip, token); // reads until end of line - set_option_value(name, token); + while (uip >> token) + value += (" " + token); + + set_option_value(name, value); } else push_button(name); } } - // go() is called when Stockfish receives the "go" UCI command. The + // 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 @@ -268,7 +257,7 @@ namespace { 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; @@ -277,10 +266,8 @@ namespace { searchMoves[0] = MOVE_NONE; - while (!uip.eof()) + while (uip >> token) { - uip >> token; - if (token == "infinite") infinite = true; else if (token == "ponder") @@ -304,21 +291,35 @@ namespace { else if (token == "searchmoves") { int numOfMoves = 0; - while (!uip.eof()) - { - uip >> token; + while (uip >> token) searchMoves[numOfMoves++] = move_from_string(RootPosition, token); - } + searchMoves[numOfMoves] = MOVE_NONE; } } - if (moveTime) - infinite = true; // HACK - assert(RootPosition.is_ok()); - return 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); + } + + void perft(UCIInputParser& uip) { + + string token; + int depth, tm, n; + Position pos(RootPosition, RootPosition.thread()); + + if (!(uip >> depth)) + return; + + tm = get_system_time(); + + n = perft(pos, depth * OnePly); + + tm = get_system_time() - tm; + std::cout << "\nNodes " << n + << "\nTime (ms) " << tm + << "\nNodes/second " << (int)(n/(tm/1000.0)) << std::endl; } }