UCIInputParser uip(command);
string token;
- uip >> token; // operator>>() skips any whitespace
+ if (!(uip >> token)) // operator>>() skips any whitespace
+ return true;
if (token == "quit")
return false;
}
else if (token == "ucinewgame")
{
- push_button("Clear Hash");
+ push_button("New Game");
Position::init_piece_square_tables();
RootPosition.from_fen(StartPosition);
}
else if (token == "perft")
perft(uip);
else
- {
cout << "Unknown command: " << command << endl;
- while (!uip.eof())
- {
- uip >> token;
- cout << token << endl;
- }
- }
+
return true;
}
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")
{
string fen;
- while (token != "moves" && !uip.eof())
+ while (uip >> token && token != "moves")
{
- uip >> token;
fen += token;
fen += ' ';
}
RootPosition.from_fen(fen);
}
- if (!uip.eof())
+ if (uip.good())
{
if (token != "moves")
uip >> token;
+
if (token == "moves")
{
Move move;
StateInfo st;
- while (!uip.eof())
+ while (uip >> token)
{
- uip >> token;
move = move_from_string(RootPosition, token);
RootPosition.do_move(move, st);
if (RootPosition.rule_50_counter() == 0)
}
// Our StateInfo st is about going out of scope so copy
// its content inside RootPosition before they disappear.
- RootPosition.saveState();
+ RootPosition.detach();
}
}
}
void set_option(UCIInputParser& uip) {
- string token, name;
+ string token, name, value;
- uip >> token;
- if (token == "name")
- {
- uip >> name;
- while (!uip.eof())
- {
- uip >> token;
- if (token == "value")
- break;
+ if (!(uip >> token)) // operator>>() skips any whitespace
+ return;
+ if (token == "name" && uip >> name)
+ {
+ while (uip >> token && token != "value")
name += (" " + token);
- }
- if (token == "value")
+
+ if (token == "value" && uip >> value)
{
- // Reads until end of line and left trim white space
- getline(uip, token);
- token.erase(0, token.find_first_not_of(" \n\r\t"));
+ while (uip >> token)
+ value += (" " + token);
- set_option_value(name, token);
+ set_option_value(name, value);
} else
push_button(name);
}
searchMoves[0] = MOVE_NONE;
- while (!uip.eof())
+ while (uip >> token)
{
- uip >> token;
-
if (token == "infinite")
infinite = true;
else if (token == "ponder")
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(),
void perft(UCIInputParser& uip) {
string token;
- int depth = 0;
+ int depth, tm, n;
+ Position pos(RootPosition);
- while (!uip.eof())
- {
- uip >> token;
+ if (!(uip >> depth))
+ return;
+
+ tm = get_system_time();
+
+ n = perft(pos, depth * OnePly);
- if (token == "depth")
- uip >> depth;
- }
- Position pos = RootPosition;
- int tm = get_system_time();
- int n = perft(pos, depth * OnePly);
tm = get_system_time() - tm;
std::cout << "\nNodes " << n
<< "\nTime (ms) " << tm