X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fuci.cpp;h=2dacd1c2f37b3b9a18a66c1d340d041342f4bb31;hb=351ef5c85b6d4b9c71e9da;hp=b03752edc4220e865d4087642e1523e53050d42a;hpb=8f59de48f559e477dc383d5b51a0b842986758d0;p=stockfish
diff --git a/src/uci.cpp b/src/uci.cpp
index b03752ed..2dacd1c2 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-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
@@ -17,311 +17,231 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
-
+#include
#include
#include
#include
-#include "book.h"
#include "evaluate.h"
#include "misc.h"
#include "move.h"
-#include "movegen.h"
#include "position.h"
-#include "san.h"
#include "search.h"
-#include "uci.h"
#include "ucioption.h"
-
-////
-//// Local definitions:
-////
+using namespace std;
namespace {
- // UCIInputParser is a class for parsing UCI input. The class
- // is actually a string stream built on a given input string.
+ // FEN string for the initial position
+ const string StartPositionFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
- typedef std::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;
+ // 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 get_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& up);
+ void set_position(Position& pos, UCIParser& up);
+ bool go(Position& pos, UCIParser& up);
+ void perft(Position& pos, UCIParser& up);
}
-////
-//// 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() {
+ static Position pos(StartPositionFEN, false, 0); // The root position
- RootPosition.from_fen(StartPosition);
+ UCIParser up(cmd);
+ string token;
- while (1)
- get_command();
-}
+ up >> token; // operator>>() skips any whitespace
+ if (token == "quit")
+ return false;
-////
-//// Local functions
-////
+ if (token == "go")
+ return go(pos, up);
-namespace {
+ if (token == "ucinewgame")
+ pos.from_fen(StartPositionFEN, false);
- // 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.
+ else if (token == "isready")
+ cout << "readyok" << endl;
- void get_command() {
+ else if (token == "position")
+ set_position(pos, up);
- std::string command;
+ else if (token == "setoption")
+ set_option(up);
- if (!std::getline(std::cin, command))
- command = "quit";
+ else if (token == "perft")
+ perft(pos, up);
- handle_command(command);
- }
+ else if (token == "d")
+ pos.print();
+ else if (token == "flip")
+ pos.flip();
- // 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.
+ else if (token == "eval")
+ {
+ read_evaluation_uci_options(pos.side_to_move());
+ cout << trace_evaluate(pos) << endl;
+ }
- void handle_command(const std::string &command) {
+ else if (token == "key")
+ cout << "key: " << hex << pos.get_key()
+ << "\nmaterial key: " << pos.get_material_key()
+ << "\npawn key: " << pos.get_pawn_key() << endl;
- UCIInputParser uip(command);
- std::string token;
+ else if (token == "uci")
+ cout << "id name " << engine_name()
+ << "\nid author " << engine_authors()
+ << "\n" << Options.print_all()
+ << "\nuciok" << endl;
+ else
+ cout << "Unknown command: " << cmd << endl;
- uip >> token; // operator >> skips any whitespace
+ return true;
+}
- if (token == "quit")
- {
- 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;
- 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.eof())
- {
- uip >> token;
- std::cout << token << std::endl;
- }
- }
- }
+namespace {
- // 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).
+ // set_position() is called when engine receives the "position" UCI
+ // command. The function sets up the position described in the given
+ // fen string ("fen") or the starting position ("startpos") and then
+ // makes the moves given in the following move list ("moves").
- void set_position(UCIInputParser &uip) {
+ void set_position(Position& pos, UCIParser& up) {
- std::string token;
+ string token, fen;
- uip >> token; // operator >> skips any whitespace
+ up >> token; // operator>>() skips any whitespace
if (token == "startpos")
- RootPosition.from_fen(StartPosition);
- else if (token == "fen")
{
- std::string fen;
- while (token != "moves" && !uip.eof())
- {
- uip >> token;
- fen += token;
- fen += ' ';
- }
- RootPosition.from_fen(fen);
+ pos.from_fen(StartPositionFEN, false);
+ up >> token; // Consume "moves" token if any
}
-
- if (!uip.eof())
+ else if (token == "fen")
{
- if (token != "moves")
- uip >> token;
- if (token == "moves")
- {
- Move move;
- StateInfo st;
- while (!uip.eof())
- {
- uip >> token;
- move = move_from_string(RootPosition, token);
- RootPosition.do_move(move, st);
- if (RootPosition.rule_50_counter() == 0)
- RootPosition.reset_game_ply();
- }
- }
+ while (up >> token && token != "moves")
+ fen += token + " ";
+
+ pos.from_fen(fen, Options["UCI_Chess960"].value());
}
+ else return;
+
+ // Parse move list (if any)
+ while (up >> token)
+ pos.do_setup_move(move_from_uci(pos, token));
}
- // 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).
+ // set_option() is called when engine receives the "setoption" UCI
+ // command. The function updates the corresponding UCI option ("name")
+ // to the given value ("value").
- void set_option(UCIInputParser &uip) {
+ void set_option(UCIParser& up) {
- std::string token, name;
+ string token, name;
+ string value = "true"; // UCI buttons don't have a "value" field
- uip >> token;
- if (token == "name")
- {
- uip >> name;
- uip >> token;
- while (!uip.eof() && token != "value")
- {
- name += (" " + token);
- uip >> token;
- }
- if (token == "value")
- {
- std::getline(uip, token); // reads until end of line
- set_option_value(name, token);
- } else
- push_button(name);
- }
- }
+ up >> token; // Consume "name" token
+ up >> name; // Read option name
+ // Handle names with included spaces
+ while (up >> token && token != "value")
+ name += " " + token;
- // 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
- // thinking time and other parameters from the input string, and
- // calls think() (defined in search.cpp) with the appropriate
- // parameters.
+ up >> value; // Read option value
- void go(UCIInputParser &uip) {
+ // Handle values with included spaces
+ while (up >> token)
+ value += " " + token;
- std::string token;
+ if (Options.find(name) != Options.end())
+ Options[name].set_value(value);
+ else
+ cout << "No such option: " << name << endl;
+ }
- 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];
- searchMoves[0] = MOVE_NONE;
+ // go() is called when engine receives the "go" UCI command. The
+ // function sets the thinking time and other parameters from the input
+ // string, and then calls think(). Returns false if a quit command
+ // is received while thinking, true otherwise.
- while (!uip.eof())
- {
- uip >> token;
+ bool go(Position& pos, UCIParser& up) {
+ string token;
+ SearchLimits limits;
+ Move searchMoves[MAX_MOVES], *cur = searchMoves;
+ int time[] = { 0, 0 }, inc[] = { 0, 0 };
+
+ while (up >> token)
+ {
if (token == "infinite")
- infinite = true;
+ limits.infinite = true;
else if (token == "ponder")
- ponder = true;
+ limits.ponder = true;
else if (token == "wtime")
- uip >> time[0];
+ up >> time[WHITE];
else if (token == "btime")
- uip >> time[1];
+ up >> time[BLACK];
else if (token == "winc")
- uip >> inc[0];
+ up >> inc[WHITE];
else if (token == "binc")
- uip >> inc[1];
+ up >> inc[BLACK];
else if (token == "movestogo")
- uip >> movesToGo;
+ up >> limits.movesToGo;
else if (token == "depth")
- uip >> depth;
+ up >> limits.maxDepth;
else if (token == "nodes")
- uip >> nodes;
+ up >> limits.maxNodes;
else if (token == "movetime")
- uip >> moveTime;
+ up >> limits.maxTime;
else if (token == "searchmoves")
- {
- int numOfMoves = 0;
- while (!uip.eof())
- {
- uip >> token;
- searchMoves[numOfMoves++] = move_from_string(RootPosition, token);
- }
- searchMoves[numOfMoves] = MOVE_NONE;
- }
+ while (up >> token)
+ *cur++ = move_from_uci(pos, token);
}
- if (moveTime)
- infinite = true; // HACK
+ *cur = MOVE_NONE;
+ limits.time = time[pos.side_to_move()];
+ limits.increment = inc[pos.side_to_move()];
+
+ assert(pos.is_ok());
+
+ return think(pos, limits, searchMoves);
+ }
+
+
+ // perft() is called when engine receives the "perft" command.
+ // The function calls perft() passing the required search depth
+ // then prints counted leaf nodes and elapsed time.
+
+ void perft(Position& pos, UCIParser& up) {
+
+ int depth, time;
+ int64_t n;
+
+ if (!(up >> depth))
+ return;
+
+ time = get_system_time();
+
+ n = perft(pos, depth * ONE_PLY);
+
+ time = get_system_time() - time;
- think(RootPosition, infinite, ponder, RootPosition.side_to_move(), time,
- inc, movesToGo, depth, nodes, moveTime, searchMoves);
+ std::cout << "\nNodes " << n
+ << "\nTime (ms) " << time
+ << "\nNodes/second " << int(n / (time / 1000.0)) << std::endl;
}
}