X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fuci.cpp;h=5e85098504d30c3a4ecbc8d7cce412f265e28ac5;hb=61c03b9d22de0c1ccf0c60af4e223775d4b3f7cc;hp=f45be99330064ab13604f0049ca56cc08fe1be89;hpb=d22aeb1cc02597c801c3ca5da094a39b1494a22b;p=stockfish
diff --git a/src/uci.cpp b/src/uci.cpp
index f45be993..5e850985 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -1,17 +1,18 @@
/*
- Glaurung, a UCI chess playing engine.
- Copyright (C) 2004-2008 Tord Romstad
+ 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
- Glaurung is free software: you can redistribute it and/or modify
+ Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
-
- Glaurung is distributed in the hope that it will be useful,
+
+ Stockfish is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
@@ -21,11 +22,11 @@
//// Includes
////
+#include
#include
#include
#include
-#include "book.h"
#include "evaluate.h"
#include "misc.h"
#include "move.h"
@@ -33,353 +34,271 @@
#include "position.h"
#include "san.h"
#include "search.h"
-#include "uci.h"
#include "ucioption.h"
+using namespace std;
-////
-//// Local definitions:
-////
namespace {
- // UCIInputParser is a class for parsing UCI input. The class is
- // very simple, and basically just consist of a string stream
- // built on a given input string. There are methods for checking
- // if we are at the end of the line, for getting the next token
- // (defined as any whitespace-delimited sequence of characters),
- // and for getting the rest of the line as a single string.
-
- class UCIInputParser {
-
- public:
- UCIInputParser(const std::string &line);
- std::string get_next_token();
- std::string get_rest_of_line();
- bool at_end_of_line();
-
- private:
- std::istringstream inputLineStream;
-
- };
-
+ // FEN string for the initial position
+ const string StartPositionFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
- // 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;
+ // UCIParser is a class for parsing UCI input. The class
+ // is actually a string stream built on a given input string.
+ typedef istringstream UCIParser;
// Local functions
- void wait_for_command();
- void handle_command(const std::string &command);
- void set_option(UCIInputParser &uip);
- void set_position(UCIInputParser &uip);
- void go(UCIInputParser &uip);
+ void set_option(UCIParser& uip);
+ void set_position(Position& pos, UCIParser& uip);
+ bool go(Position& pos, UCIParser& uip);
+ void perft(Position& pos, UCIParser& uip);
}
-////
-//// Functions
-////
+/// execute_uci_command() takes a string as input, uses a UCIParser
+/// object to parse this text string as a UCI command, and calls
+/// the appropriate functions. In addition to the UCI commands,
+/// the function also supports a few debug commands.
-/// 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.
+bool execute_uci_command(const string& cmd) {
-void uci_main_loop() {
- RootPosition.from_fen(StartPosition);
- while(1) wait_for_command();
-}
+ static Position pos(StartPositionFEN, 0); // The root position
+ UCIParser up(cmd);
+ string token;
+ if (!(up >> token)) // operator>>() skips any whitespace
+ return true;
-////
-//// Local functions
-////
-
-namespace {
-
- ///
- /// Implementation of the UCIInputParser class.
- ///
+ if (token == "quit")
+ return false;
- // Constructor for the UCIInputParser class. The constructor takes a
- // text string containing a single UCI command as input.
-
- UCIInputParser::UCIInputParser(const std::string &line) : inputLineStream(line) { }
+ if (token == "go")
+ return go(pos, up);
+ if (token == "uci")
+ {
+ cout << "id name " << engine_name()
+ << "\nid author Tord Romstad, Marco Costalba, Joona Kiiski\n";
+ print_uci_options();
+ cout << "uciok" << endl;
+ }
+ else if (token == "ucinewgame")
+ pos.from_fen(StartPositionFEN);
- // UCIInputParser::get_next_token() gets the next token in an UCI
- // command. A 'token' in an UCI command is simply any
- // whitespace-delimited sequence of characters.
+ else if (token == "isready")
+ cout << "readyok" << endl;
- std::string UCIInputParser::get_next_token() {
+ else if (token == "position")
+ set_position(pos, up);
- std::string token;
+ else if (token == "setoption")
+ set_option(up);
- inputLineStream >> token; // operator >> skips any whitespace
+ // The remaining commands are for debugging purposes only
+ else if (token == "d")
+ pos.print();
- return token;
+ else if (token == "flip")
+ {
+ Position p(pos, pos.thread());
+ pos.flipped_copy(p);
}
+ else if (token == "eval")
+ {
+ 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 << pos.get_key()
+ << "\nmaterial key: " << pos.get_material_key()
+ << "\npawn key: " << pos.get_pawn_key() << endl;
+ else if (token == "perft")
+ perft(pos, up);
- // UCIInputParser::get_rest_of_line() returns the rest of the input
- // line (from the current location) as a single string.
-
- std::string UCIInputParser::get_rest_of_line() {
-
- std::string tail;
-
- std::getline(inputLineStream, tail);
-
- return tail;
- }
+ else
+ cout << "Unknown command: " << cmd << endl;
+ return true;
+}
- // UCIInputParser::at_end_of_line() tests whether we have reached the
- // end of the input string, i.e. if any more input remains to be
- // parsed.
- bool UCIInputParser::at_end_of_line() {
+////
+//// Local functions
+////
- return inputLineStream.eof();
- }
+namespace {
+ // set_position() is called when Stockfish receives the "position" UCI
+ // command. The input parameter is a UCIParser. 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).
- ///
- /// Other functions
- ///
+ void set_position(Position& pos, UCIParser& up) {
+ string token;
- // wait_for_command() waits for a command from the user, and passes
- // this command to handle_command. wait_for_command also intercepts
- // EOF from stdin, by translating EOF to the "quit" command. This
- // ensures that Glaurung exits gracefully if the GUI dies
- // unexpectedly.
+ if (!(up >> token) || (token != "startpos" && token != "fen"))
+ return;
- void wait_for_command() {
+ if (token == "startpos")
+ {
+ pos.from_fen(StartPositionFEN);
+ if (!(up >> token))
+ return;
+ }
+ else // fen
+ {
+ string fen;
+ while (up >> token && token != "moves")
+ {
+ fen += token;
+ fen += ' ';
+ }
+ pos.from_fen(fen);
+ }
- std::string command;
+ if (token != "moves")
+ return;
- if (!std::getline(std::cin, command))
- command = "quit";
+ // Parse optional move list
+ Move move;
+ StateInfo st;
+ while (up >> token)
+ {
+ move = move_from_uci(pos, token);
+ pos.do_move(move, st);
+ if (pos.rule_50_counter() == 0)
+ pos.reset_game_ply();
- handle_command(command);
+ 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 pos before it disappears.
+ pos.detach();
}
- // 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
- // commands, the function also supports a few debug commands.
-
- void handle_command(const std::string &command) {
+ // set_option() is called when Stockfish receives the "setoption" UCI
+ // command. The input parameter is a UCIParser. 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).
- UCIInputParser uip(command);
- std::string token = uip.get_next_token();
+ void set_option(UCIParser& up) {
- if(token == "quit") {
- OpeningBook.close();
- stop_threads();
- quit_eval();
- exit(0);
- }
- else if(token == "uci") {
- std::cout << "id name " << engine_name() << std::endl;
- std::cout << "id author Tord Romstad" << std::endl;
- print_uci_options();
- std::cout << "uciok" << std::endl;
- }
- else if(token == "ucinewgame") {
- TT.clear();
- Position::init_piece_square_tables();
- RootPosition.from_fen(StartPosition);
- }
- else if(token == "isready")
- std::cout << "readyok" << std::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
- // size of the program binary.
- else if(token == "d")
- RootPosition.print();
- else if(token == "flip") {
- Position p(RootPosition);
- 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;
- }
- else if(token == "key") {
- std::cout << "key: " << RootPosition.get_key()
- << " material key: " << RootPosition.get_material_key()
- << " pawn key: " << RootPosition.get_pawn_key()
- << std::endl;
- }
- else {
- std::cout << "Unknown command: " << command << std::endl;
- while(!uip.at_end_of_line()) {
- std::cout << uip.get_next_token() << std::endl;
- }
- }
- }
+ string token, name, value;
+ if (!(up >> token) || token != "name") // operator>>() skips any whitespace
+ return;
- // set_position() is called when Glaurung receives the "position" UCI
- // 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).
+ if (!(up >> name))
+ return;
- void set_position(UCIInputParser &uip) {
-
- std::string token;
-
- token = uip.get_next_token();
- if(token == "startpos")
- RootPosition.from_fen(StartPosition);
- else if(token == "fen") {
- std::string fen;
- while(token != "moves" && !uip.at_end_of_line()) {
- token = uip.get_next_token();
- fen += token;
- fen += ' ';
- }
- RootPosition.from_fen(fen);
+ // Handle names with included spaces
+ while (up >> token && token != "value")
+ name += (" " + token);
+
+ if (Options.find(name) == Options.end())
+ {
+ cout << "No such option: " << name << endl;
+ return;
}
- if(!uip.at_end_of_line()) {
- if(token != "moves")
- token = uip.get_next_token();
- if(token == "moves") {
- Move move;
- UndoInfo u;
- while(!uip.at_end_of_line()) {
- token = uip.get_next_token();
- move = move_from_string(RootPosition, token);
- RootPosition.do_move(move, u);
- if(RootPosition.rule_50_counter() == 0)
- RootPosition.reset_game_ply();
- }
- }
+ // Is a button ?
+ if (token != "value")
+ {
+ Options[name].set_value("true");
+ return;
}
- }
+ if (!(up >> value))
+ return;
- // set_option() is called when Glaurung receives the "setoption" UCI
- // 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).
+ // Handle values with included spaces
+ while (up >> token)
+ value += (" " + token);
- void set_option(UCIInputParser &uip) {
-
- std::string token;
-
- if(!uip.at_end_of_line()) {
- token = uip.get_next_token();
- if(token == "name" && !uip.at_end_of_line()) {
- std::string name = uip.get_next_token();
- std::string nextToken;
- while(!uip.at_end_of_line()
- && (nextToken = uip.get_next_token()) != "value")
- name += (" " + nextToken);
- if(nextToken == "value")
- set_option_value(name, uip.get_rest_of_line());
- else
- push_button(name);
- }
- }
+ Options[name].set_value(value);
}
- // go() is called when Glaurung 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 UCIParser. 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(Position& pos, UCIParser& up) {
- std::string token;
+ string token;
- int time[2] = {0, 0}, inc[2] = {0, 0}, movesToGo = 0, depth = 0, nodes = 0;
- int moveTime = 0;
+ int time[2] = {0, 0}, inc[2] = {0, 0};
+ int movesToGo = 0, depth = 0, nodes = 0, moveTime = 0;
bool infinite = false, ponder = false;
- Move searchMoves[500];
+ Move searchMoves[MOVES_MAX];
searchMoves[0] = MOVE_NONE;
- while(!uip.at_end_of_line()) {
- token = uip.get_next_token();
-
- if(token == "infinite")
- infinite = true;
- else if(token == "ponder")
- ponder = true;
- else if(token == "wtime") {
- if(!uip.at_end_of_line())
- time[0] = atoi(uip.get_next_token().c_str());
- }
- else if(token == "btime") {
- if(!uip.at_end_of_line())
- time[1] = atoi(uip.get_next_token().c_str());
- }
- else if(token == "winc") {
- if(!uip.at_end_of_line())
- inc[0] = atoi(uip.get_next_token().c_str());
- }
- else if(token == "binc") {
- if(!uip.at_end_of_line())
- inc[1] = atoi(uip.get_next_token().c_str());
- }
- else if(token == "movestogo") {
- if(!uip.at_end_of_line())
- movesToGo = atoi(uip.get_next_token().c_str());
- }
- else if(token == "depth") {
- if(!uip.at_end_of_line())
- depth = atoi(uip.get_next_token().c_str());
- }
- else if(token == "nodes") {
- if(!uip.at_end_of_line())
- nodes = atoi(uip.get_next_token().c_str());
- }
- else if(token == "movetime") {
- if(!uip.at_end_of_line())
- moveTime = atoi(uip.get_next_token().c_str());
- }
- else if(token == "searchmoves" && !uip.at_end_of_line()) {
- int numOfMoves = 0;
- while(!uip.at_end_of_line()) {
- token = uip.get_next_token();
- searchMoves[numOfMoves++] = move_from_string(RootPosition, token);
+ while (up >> token)
+ {
+ if (token == "infinite")
+ infinite = true;
+ else if (token == "ponder")
+ ponder = true;
+ else if (token == "wtime")
+ up >> time[0];
+ else if (token == "btime")
+ up >> time[1];
+ else if (token == "winc")
+ up >> inc[0];
+ else if (token == "binc")
+ up >> inc[1];
+ else if (token == "movestogo")
+ up >> movesToGo;
+ else if (token == "depth")
+ up >> depth;
+ else if (token == "nodes")
+ up >> nodes;
+ else if (token == "movetime")
+ up >> moveTime;
+ else if (token == "searchmoves")
+ {
+ int numOfMoves = 0;
+ while (up >> token)
+ searchMoves[numOfMoves++] = move_from_uci(pos, token);
+
+ searchMoves[numOfMoves] = MOVE_NONE;
}
- searchMoves[numOfMoves] = MOVE_NONE;
- }
}
- if(moveTime)
- infinite = true; // HACK
+ assert(pos.is_ok());
+
+ return think(pos, infinite, ponder, time, inc, movesToGo,
+ depth, nodes, moveTime, searchMoves);
+ }
+
+ void perft(Position& pos, UCIParser& up) {
+
+ int depth, tm, n;
+
+ if (!(up >> depth))
+ return;
+
+ tm = get_system_time();
+
+ n = perft(pos, depth * ONE_PLY);
- think(RootPosition, infinite, ponder, time[RootPosition.side_to_move()],
- inc[RootPosition.side_to_move()], movesToGo, depth, nodes, moveTime,
- searchMoves);
+ tm = get_system_time() - tm;
+ std::cout << "\nNodes " << n
+ << "\nTime (ms) " << tm
+ << "\nNodes/second " << int(n / (tm / 1000.0)) << std::endl;
}
-
}