X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=e59df6dd737f79b9f66eb832b6ef6eeaa68a35a6;hp=0a1de3127ae8aa167d6db35032549ee3e5329ac9;hb=cfca92cd7c0537b6b808e802919779c7470d5197;hpb=8225fdd5bb6f74172ba0307d7db12c5ce8416eea diff --git a/src/uci.cpp b/src/uci.cpp index 0a1de312..e59df6dd 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 @@ -46,21 +46,19 @@ using namespace std; namespace { + // FEN string for the initial position + const string StartPositionFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1"; + // UCIInputParser is a class for parsing UCI input. The class // is actually a string stream built on a given input string. - 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() - // function when the program receives the "go" command. - Position RootPosition; - // Local functions - bool handle_command(const string& command); + bool handle_command(Position& pos, const string& command); void set_option(UCIInputParser& uip); - void set_position(UCIInputParser& uip); - bool go(UCIInputParser& uip); + void set_position(Position& pos, UCIInputParser& uip); + bool go(Position& pos, UCIInputParser& uip); + void perft(Position& pos, UCIInputParser& uip); } @@ -78,7 +76,7 @@ namespace { void uci_main_loop() { - RootPosition.from_fen(StartPosition); + Position pos(StartPositionFEN, 0); // The root position string command; do { @@ -86,7 +84,7 @@ void uci_main_loop() { if (!getline(cin, command)) command = "quit"; - } while (handle_command(command)); + } while (handle_command(pos, command)); } @@ -101,18 +99,19 @@ namespace { // and calls the appropriate functions. In addition to the UCI // commands, the function also supports a few debug commands. - bool handle_command(const string& command) { + bool handle_command(Position& pos, const string& command) { UCIInputParser uip(command); string token; - uip >> token; // operator>>() skips any whitespace + if (!(uip >> token)) // operator>>() skips any whitespace + return true; if (token == "quit") return false; if (token == "go") - return go(uip); + return go(pos, uip); if (token == "uci") { @@ -123,14 +122,13 @@ namespace { } else if (token == "ucinewgame") { - push_button("Clear Hash"); - Position::init_piece_square_tables(); - RootPosition.from_fen(StartPosition); + push_button("New Game"); + pos.from_fen(StartPositionFEN); } else if (token == "isready") cout << "readyok" << endl; else if (token == "position") - set_position(uip); + set_position(pos, uip); else if (token == "setoption") set_option(uip); @@ -138,32 +136,28 @@ namespace { // Perhaps they should be removed later in order to reduce the // size of the program binary. else if (token == "d") - RootPosition.print(); + pos.print(); else if (token == "flip") { - Position p(RootPosition); - RootPosition.flipped_copy(p); + Position p(pos, pos.thread()); + pos.flipped_copy(p); } else if (token == "eval") { - EvalInfo ei; - cout << "Incremental mg: " << RootPosition.mg_value() - << "\nIncremental eg: " << RootPosition.eg_value() - << "\nFull eval: " << evaluate(RootPosition, ei, 0) << endl; + Value evalMargin; + cout << "Incremental mg: " << mg_value(pos.value()) + << "\nIncremental eg: " << eg_value(pos.value()) + << "\nFull eval: " << evaluate(pos, evalMargin) << endl; } else if (token == "key") - cout << "key: " << hex << RootPosition.get_key() - << "\nmaterial key: " << RootPosition.get_material_key() - << "\npawn key: " << RootPosition.get_pawn_key() << endl; + cout << "key: " << hex << pos.get_key() + << "\nmaterial key: " << pos.get_material_key() + << "\npawn key: " << pos.get_pawn_key() << endl; + else if (token == "perft") + perft(pos, uip); else - { cout << "Unknown command: " << command << endl; - while (!uip.eof()) - { - uip >> token; - cout << token << endl; - } - } + return true; } @@ -174,45 +168,47 @@ namespace { // ("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(Position& pos, UCIInputParser& uip) { string token; - uip >> token; // operator>>() skips any whitespace + if (!(uip >> token)) // operator>>() skips any whitespace + return; if (token == "startpos") - RootPosition.from_fen(StartPosition); + pos.from_fen(StartPositionFEN); else if (token == "fen") { string fen; - while (token != "moves" && !uip.eof()) + while (uip >> token && token != "moves") { - uip >> token; fen += token; fen += ' '; } - RootPosition.from_fen(fen); + pos.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(); + move = move_from_string(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 RootPosition before they disappear. - RootPosition.saveState(); + // its content inside pos before it disappears. + pos.detach(); } } } @@ -226,24 +222,22 @@ namespace { void set_option(UCIInputParser& uip) { - 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) { - 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); } @@ -259,7 +253,7 @@ namespace { // parameters. Returns false if a quit command is received while // thinking, returns true otherwise. - bool go(UCIInputParser& uip) { + bool go(Position& pos, UCIInputParser& uip) { string token; @@ -270,10 +264,8 @@ namespace { searchMoves[0] = MOVE_NONE; - while (!uip.eof()) + while (uip >> token) { - uip >> token; - if (token == "infinite") infinite = true; else if (token == "ponder") @@ -297,22 +289,34 @@ namespace { else if (token == "searchmoves") { int numOfMoves = 0; - while (!uip.eof()) - { - uip >> token; - searchMoves[numOfMoves++] = move_from_string(RootPosition, token); - } + while (uip >> token) + searchMoves[numOfMoves++] = move_from_string(pos, token); + searchMoves[numOfMoves] = MOVE_NONE; } } - if (moveTime) - infinite = true; // HACK - - assert(RootPosition.is_ok()); + assert(pos.is_ok()); - return think(RootPosition, infinite, ponder, RootPosition.side_to_move(), - time, inc, movesToGo, depth, nodes, moveTime, searchMoves); + return think(pos, infinite, ponder, time, inc, movesToGo, + depth, nodes, moveTime, searchMoves); } + void perft(Position& pos, UCIInputParser& uip) { + + string token; + int depth, tm, n; + + if (!(uip >> depth)) + return; + + tm = get_system_time(); + + n = perft(pos, depth * ONE_PLY); + + tm = get_system_time() - tm; + std::cout << "\nNodes " << n + << "\nTime (ms) " << tm + << "\nNodes/second " << (int)(n/(tm/1000.0)) << std::endl; + } }