Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, 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
// FEN string of the initial position, normal chess
const char* StartFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
- // Stack to keep track of the position states along the setup moves (from the
+ // 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.
- Search::StateStackPtr SetupStates;
+ StateListPtr States(new std::deque<StateInfo>(1));
// position() is called when engine receives the "position" UCI command.
else
return;
- pos.set(fen, Options["UCI_Chess960"], Threads.main());
- SetupStates = Search::StateStackPtr(new std::stack<StateInfo>);
+ States = StateListPtr(new std::deque<StateInfo>(1));
+ 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)
{
- SetupStates->push(StateInfo());
- pos.do_move(m, SetupStates->top(), pos.gives_check(m, CheckInfo(pos)));
+ States->push_back(StateInfo());
+ pos.do_move(m, States->back(), pos.gives_check(m));
}
}
// the thinking time and other parameters from the input string, then starts
// the search.
- void go(const Position& pos, istringstream& is) {
+ void go(Position& pos, istringstream& is) {
Search::LimitsType limits;
string token;
else if (token == "infinite") limits.infinite = 1;
else if (token == "ponder") limits.ponder = 1;
- Threads.start_thinking(pos, limits, SetupStates);
+ Threads.start_thinking(pos, States, limits);
}
} // namespace
void UCI::loop(int argc, char* argv[]) {
- Position pos(StartFEN, false, Threads.main()); // The root position
+ Position pos;
string token, cmd;
+ pos.set(StartFEN, false, &States->back(), Threads.main());
+
for (int i = 1; i < argc; ++i)
cmd += std::string(argv[i]) + " ";
|| (token == "ponderhit" && Search::Signals.stopOnPonderhit))
{
Search::Signals.stop = true;
- Threads.main()->notify_one(); // Could be sleeping
+ Threads.main()->start_searching(true); // Could be sleeping
}
else if (token == "ponderhit")
Search::Limits.ponder = 0; // Switch to normal search
} while (token != "quit" && argc == 1); // Passed args have one-shot behaviour
- Threads.main()->join(); // Cannot quit whilst the search is running
+ Threads.main()->wait_for_search_finished();
}