X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=23b0cc27e93be1bd8d837a52de9a9e5cc6e60a8e;hp=2f600037d0857fb34fab51d1a05671ad41d06adc;hb=ecc100d1bb59609eb6e4307d721ce3452bedb948;hpb=6ef44d4c4e1a81a55eb764438f3fc2f28429309c
diff --git a/src/uci.cpp b/src/uci.cpp
index 2f600037..23b0cc27 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,6 +22,7 @@
//// Includes
////
+#include
#include
#include
#include
@@ -36,6 +38,7 @@
#include "uci.h"
#include "ucioption.h"
+using namespace std;
////
//// Local definitions:
@@ -43,22 +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;
// 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);
+ void perft(UCIInputParser& uip);
}
@@ -66,17 +69,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;
+
+ do {
+ // Wait for a command from stdin
+ if (!getline(cin, command))
+ command = "quit";
- while (1)
- get_command();
+ } while (handle_command(command));
}
@@ -86,63 +97,44 @@ 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 Glaurung 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
+ if (!(uip >> token)) // operator>>() skips any whitespace
+ return true;
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;
- std::cout << "id author Tord Romstad" << 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")
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
@@ -157,121 +149,115 @@ 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: " << mg_value(RootPosition.value())
+ << "\nIncremental eg: " << eg_value(RootPosition.value())
+ << "\nFull eval: " << evaluate(RootPosition, ei, 0) << 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.eof())
- {
- uip >> token;
- std::cout << token << 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
+ cout << "Unknown command: " << command << endl;
+
+ return true;
}
- // set_position() is called when Glaurung receives the "position" UCI
- // command. The input parameter is a UCIInputParser. It is assumed
+ // set_position() is called when Stockfish 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).
- void set_position(UCIInputParser &uip) {
+ 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;
- UndoInfo u;
- while (!uip.eof())
+ StateInfo st;
+ while (uip >> token)
{
- uip >> token;
move = move_from_string(RootPosition, token);
- RootPosition.do_move(move, u);
+ RootPosition.do_move(move, st);
if (RootPosition.rule_50_counter() == 0)
RootPosition.reset_game_ply();
}
+ // 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 Glaurung receives the "setoption" UCI
- // command. The input parameter is a UCIInputParser. It is assumed
+ // set_option() is called when Stockfish 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).
- void set_option(UCIInputParser &uip) {
+ void set_option(UCIInputParser& uip) {
+
+ string token, name, value;
- std::string token, name;
+ if (!(uip >> token)) // operator>>() skips any whitespace
+ return;
- uip >> token;
- if (token == "name")
+ if (token == "name" && uip >> name)
{
- uip >> name;
- uip >> token;
- while (!uip.eof() && token != "value")
- {
- name += (" " + token);
- uip >> token;
- }
- if (token == "value")
+ while (uip >> token && token != "value")
+ name += (" " + token);
+
+ 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 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 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;
@@ -280,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")
@@ -307,20 +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);
+ }
+
+ void perft(UCIInputParser& uip) {
+
+ string token;
+ int depth, tm, n;
+ Position pos(RootPosition);
+
+ if (!(uip >> depth))
+ return;
+
+ tm = get_system_time();
+
+ n = perft(pos, depth * OnePly);
- 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;
}
}