#include "position.h"
#include "search.h"
#include "thread.h"
-#include "tt.h"
+#include "timeman.h"
#include "uci.h"
using namespace std;
return;
pos.set(fen, Options["UCI_Chess960"], Threads.main());
- SetupStates = Search::StateStackPtr(new std::stack<StateInfo>());
+ SetupStates = Search::StateStackPtr(new std::stack<StateInfo>);
// Parse move list (if any)
while (is >> token && (m = UCI::to_move(pos, token)) != MOVE_NONE)
// Read option name (can contain spaces)
while (is >> token && token != "value")
- name += string(" ", !name.empty()) + token;
+ name += string(" ", name.empty() ? 0 : 1) + token;
// Read option value (can contain spaces)
while (is >> token)
- value += string(" ", !value.empty()) + token;
+ value += string(" ", value.empty() ? 0 : 1) + token;
if (Options.count(name))
Options[name] = value;
else if (token == "nodes") is >> limits.nodes;
else if (token == "movetime") is >> limits.movetime;
else if (token == "mate") is >> limits.mate;
- else if (token == "infinite") limits.infinite = true;
- else if (token == "ponder") limits.ponder = true;
+ else if (token == "infinite") limits.infinite = 1;
+ else if (token == "ponder") limits.ponder = 1;
Threads.start_thinking(pos, limits, SetupStates);
}
Threads.main()->notify_one(); // Could be sleeping
}
else if (token == "ponderhit")
- Search::Limits.ponder = false; // Switch to normal search
+ Search::Limits.ponder = 0; // Switch to normal search
else if (token == "uci")
sync_cout << "id name " << engine_info(true)
<< "\n" << Options
<< "\nuciok" << sync_endl;
+ else if (token == "ucinewgame")
+ {
+ Search::reset();
+ Time.availableNodes = 0;
+ }
else if (token == "isready") sync_cout << "readyok" << sync_endl;
- else if (token == "ucinewgame") TT.clear();
else if (token == "go") go(pos, is);
else if (token == "position") position(pos, is);
else if (token == "setoption") setoption(is);
} while (token != "quit" && argc == 1); // Passed args have one-shot behaviour
- Threads.wait_for_think_finished(); // Cannot quit whilst the search is running
+ Threads.main()->join(); // Cannot quit whilst the search is running
}