UCIParser up(cmd);
string token;
- if (!(up >> token)) // operator>>() skips any whitespace
- return true;
+ up >> token; // operator>>() skips any whitespace
if (token == "quit")
return false;
- if (token == "go")
+ else if (token == "go")
return go(pos, up);
- if (token == "uci")
- {
+ else if (token == "uci")
cout << "id name " << engine_name()
- << "\nid author Tord Romstad, Marco Costalba, Joona Kiiski\n";
- print_uci_options();
- cout << "uciok" << endl;
- }
+ << "\nid author " << engine_authors()
+ << "\n" << Options.print_all()
+ << "\nuciok" << endl;
+
else if (token == "ucinewgame")
pos.from_fen(StartPositionFEN, false);
else if (token == "setoption")
set_option(up);
- // The remaining commands are for debugging purposes only
else if (token == "d")
pos.print();
- 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;
+ read_evaluation_uci_options(pos.side_to_move());
+ cout << trace_evaluate(pos) << endl;
}
+
else if (token == "key")
- cout << "key: " << hex << pos.get_key()
+ cout << "key: " << hex << pos.get_key()
<< "\nmaterial key: " << pos.get_material_key()
- << "\npawn key: " << pos.get_pawn_key() << endl;
+ << "\npawn key: " << pos.get_pawn_key() << endl;
else if (token == "perft")
perft(pos, up);
+ else if (token == "flip")
+ {
+ Position p(pos, pos.thread());
+ pos.flipped_copy(p);
+ }
else
cout << "Unknown command: " << cmd << endl;
string fen, token;
- if (!(up >> token) || (token != "startpos" && token != "fen"))
- return;
+ up >> token; // operator>>() skips any whitespace
if (token == "startpos")
{
pos.from_fen(StartPositionFEN, false);
up >> token; // Consume "moves" token
}
- else // fen
+ else if (token == "fen")
{
while (up >> token && token != "moves")
- fen += token + string(" ");
+ fen += token + " ";
pos.from_fen(fen, Options["UCI_Chess960"].value<bool>());
}
+ else return;
// Parse move list (if any)
while (up >> token)
void set_option(UCIParser& up) {
- string token, name, value;
-
- if (!(up >> token) || token != "name") // operator>>() skips any whitespace
- return;
+ string value = "true"; // UCI buttons don't have a "value" field
+ string token, name;
- if (!(up >> name))
- return;
+ up >> token; // Consume "name" token
+ up >> name; // Read option name
// 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;
- }
-
- // Is a button ?
- if (token != "value")
- {
- Options[name].set_value("true");
- return;
- }
+ name += " " + token;
- if (!(up >> value))
- return;
+ up >> value; // Read option value
// Handle values with included spaces
while (up >> token)
- value += (" " + token);
+ value += " " + token;
- Options[name].set_value(value);
+ if (Options.find(name) != Options.end())
+ Options[name].set_value(value);
+ else
+ cout << "No such option: " << name << endl;
}
bool go(Position& pos, UCIParser& up) {
string token;
-
- 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[MOVES_MAX];
+ int movesToGo, depth, nodes, moveTime, numOfMoves;
+ bool infinite, ponder;
+ int time[2] = {0, 0}, inc[2] = {0, 0};
searchMoves[0] = MOVE_NONE;
+ infinite = ponder = false;
+ movesToGo = depth = nodes = moveTime = numOfMoves = 0;
while (up >> token)
{
up >> moveTime;
else if (token == "searchmoves")
{
- int numOfMoves = 0;
while (up >> token)
searchMoves[numOfMoves++] = move_from_uci(pos, token);