// FEN string of the initial position, normal chess
const char* StartFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
- // A list to keep track of the position states along the setup moves (from the
- // start position to the position just before the search starts). Needed by
- // 'draw by repetition' detection.
- StateListPtr States(new std::deque<StateInfo>(1));
-
// 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 position(Position& pos, istringstream& is) {
+ void position(Position& pos, istringstream& is, StateListPtr& states) {
Move m;
string token, fen;
else
return;
- States = StateListPtr(new std::deque<StateInfo>(1));
- pos.set(fen, Options["UCI_Chess960"], &States->back(), Threads.main());
+ states = StateListPtr(new std::deque<StateInfo>(1)); // Drop old and create a new one
+ pos.set(fen, Options["UCI_Chess960"], &states->back(), Threads.main());
// Parse move list (if any)
while (is >> token && (m = UCI::to_move(pos, token)) != MOVE_NONE)
{
- States->push_back(StateInfo());
- pos.do_move(m, States->back());
+ states->emplace_back();
+ pos.do_move(m, states->back());
}
}
// the thinking time and other parameters from the input string, then starts
// the search.
- void go(Position& pos, istringstream& is) {
+ void go(Position& pos, istringstream& is, StateListPtr& states) {
Search::LimitsType limits;
string token;
+ bool ponderMode = false;
limits.startTime = now(); // As early as possible!
else if (token == "movetime") is >> limits.movetime;
else if (token == "mate") is >> limits.mate;
else if (token == "infinite") limits.infinite = 1;
- else if (token == "ponder") limits.ponder = 1;
+ else if (token == "ponder") ponderMode = true;
- Threads.start_thinking(pos, States, limits);
+ Threads.start_thinking(pos, states, limits, ponderMode);
}
} // namespace
Position pos;
string token, cmd;
- Thread* uiThread = new Thread();
+ StateListPtr states(new std::deque<StateInfo>(1));
+ auto uiThread = std::make_shared<Thread>(0);
- pos.set(StartFEN, false, &States->back(), uiThread);
+ pos.set(StartFEN, false, &states->back(), uiThread.get());
for (int i = 1; i < argc; ++i)
cmd += std::string(argv[i]) + " ";
istringstream is(cmd);
- token.clear(); // getline() could return empty or blank line
+ token.clear(); // Avoid a stale if getline() returns empty or blank line
is >> skipws >> token;
- // The GUI sends 'ponderhit' to tell us to ponder on the same move the
- // opponent has played. In case Threads.stopOnPonderhit is set we are
- // waiting for 'ponderhit' to stop the search (for instance because we
- // already ran out of time), otherwise we should continue searching but
- // switching from pondering to normal search.
+ // The GUI sends 'ponderhit' to tell us the user has played the expected move.
+ // So 'ponderhit' will be sent if we were told to ponder on the same move the
+ // user has played. We should continue searching but switch from pondering to
+ // normal search. In case Threads.stopOnPonderhit is set we are waiting for
+ // 'ponderhit' to stop the search, for instance if max search depth is reached.
if ( token == "quit"
|| token == "stop"
|| (token == "ponderhit" && Threads.stopOnPonderhit))
- {
Threads.stop = true;
- Threads.main()->start_searching(true); // Could be sleeping
- }
+
else if (token == "ponderhit")
- Search::Limits.ponder = 0; // Switch to normal search
+ Threads.ponder = false; // Switch to normal search
else if (token == "uci")
sync_cout << "id name " << engine_info(true)
<< "\n" << Options
<< "\nuciok" << sync_endl;
+ else if (token == "setoption") setoption(is);
+ else if (token == "go") go(pos, is, states);
+ else if (token == "position") position(pos, is, states);
else if (token == "ucinewgame") Search::clear();
else if (token == "isready") sync_cout << "readyok" << sync_endl;
- else if (token == "go") go(pos, is);
- else if (token == "position") position(pos, is);
- else if (token == "setoption") setoption(is);
- // Additional custom non-UCI commands, useful for debugging
- else if (token == "flip") pos.flip();
- else if (token == "bench") benchmark(pos, is);
- else if (token == "d") sync_cout << pos << sync_endl;
- else if (token == "eval") sync_cout << Eval::trace(pos) << sync_endl;
+ // Additional custom non-UCI commands, mainly for debugging
+ else if (token == "flip") pos.flip();
+ else if (token == "bench") benchmark(pos, is);
+ else if (token == "d") sync_cout << pos << sync_endl;
+ else if (token == "eval") sync_cout << Eval::trace(pos) << sync_endl;
else if (token == "perft")
{
int depth;
stringstream ss;
is >> depth;
- ss << Options["Hash"] << " "
- << Options["Threads"] << " " << depth << " current perft";
+ ss << Options["Hash"] << " " << Options["Threads"]
+ << " " << depth << " current perft";
benchmark(pos, ss);
}
else
sync_cout << "Unknown command: " << cmd << sync_endl;
- } while (token != "quit" && argc == 1); // Passed args have one-shot behaviour
-
- Threads.main()->wait_for_search_finished();
- delete uiThread;
+ } while (token != "quit" && argc == 1); // Command line args are one-shot
}