X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fuci.cpp;h=3bd3c1a531c91db0b7e3668728915defdd48c606;hb=12c0dfc11364f915d90032a3dfbac3ed8f39db0a;hp=5721e93f7390acf3393361d066e87786354864fd;hpb=588670e8d2ed5735300c5549ef754ceb09f1f461;p=stockfish
diff --git a/src/uci.cpp b/src/uci.cpp
index 5721e93f..3bd3c1a5 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-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2013 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,6 +17,7 @@
along with this program. If not, see .
*/
+#include
#include
#include
#include
@@ -42,9 +43,9 @@ namespace {
// position just before to start searching). Needed by repetition draw detection.
Search::StateStackPtr SetupStates;
- void set_option(istringstream& up);
- void set_position(Position& pos, istringstream& up);
- void go(Position& pos, istringstream& up);
+ void setoption(istringstream& up);
+ void position(Position& pos, istringstream& up);
+ void go(const Position& pos, istringstream& up);
}
@@ -90,19 +91,22 @@ void UCI::loop(const string& args) {
benchmark(pos, ss);
}
- else if (token == "key") sync_cout << "position key: " << hex << pos.key()
- << "\nmaterial key: " << pos.material_key()
- << "\npawn key: " << pos.pawn_key()
- << sync_endl;
-
- else if (token == "uci") sync_cout << "id name " << engine_info(true)
- << "\n" << Options
- << "\nuciok" << sync_endl;
+ else if (token == "key")
+ sync_cout << hex << uppercase << setfill('0')
+ << "position key: " << setw(16) << pos.key()
+ << "\nmaterial key: " << setw(16) << pos.material_key()
+ << "\npawn key: " << setw(16) << pos.pawn_key()
+ << dec << sync_endl;
+
+ else if (token == "uci")
+ sync_cout << "id name " << engine_info(true)
+ << "\n" << Options
+ << "\nuciok" << sync_endl;
else if (token == "ucinewgame") TT.clear();
else if (token == "go") go(pos, is);
- else if (token == "position") set_position(pos, is);
- else if (token == "setoption") set_option(is);
+ else if (token == "position") position(pos, is);
+ else if (token == "setoption") setoption(is);
else if (token == "flip") pos.flip();
else if (token == "bench") benchmark(pos, is);
else if (token == "d") sync_cout << pos.pretty() << sync_endl;
@@ -119,12 +123,12 @@ void UCI::loop(const string& args) {
namespace {
- // set_position() is called when engine receives the "position" UCI command.
+ // 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(Position& pos, istringstream& is) {
+ void position(Position& pos, istringstream& is) {
Move m;
string token, fen;
@@ -154,10 +158,10 @@ namespace {
}
- // set_option() is called when engine receives the "setoption" UCI command. The
+ // setoption() is called when engine receives the "setoption" UCI command. The
// function updates the UCI option ("name") to the given value ("value").
- void set_option(istringstream& is) {
+ void setoption(istringstream& is) {
string token, name, value;
@@ -182,7 +186,7 @@ namespace {
// the thinking time and other parameters from the input string, and starts
// the search.
- void go(Position& pos, istringstream& is) {
+ void go(const Position& pos, istringstream& is) {
Search::LimitsType limits;
vector searchMoves;