#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)
{
SetupStates->push(StateInfo());
- pos.do_move(m, SetupStates->top());
+ pos.do_move(m, SetupStates->top(), pos.gives_check(m, CheckInfo(pos)));
}
}
// 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;
Search::LimitsType limits;
string token;
+ limits.startTime = now(); // As early as possible!
+
while (is >> token)
if (token == "searchmoves")
while (is >> token)
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::clear();
+ 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
}
/// UCI::square() converts a Square to a string in algebraic notation (g1, a7, etc.)
std::string UCI::square(Square s) {
-
- char sq[] = { char('a' + file_of(s)), char('1' + rank_of(s)), 0 }; // NULL terminated
- return sq;
+ return std::string{ char('a' + file_of(s)), char('1' + rank_of(s)) };
}
if (str.length() == 5) // Junior could send promotion piece in uppercase
str[4] = char(tolower(str[4]));
- for (MoveList<LEGAL> it(pos); *it; ++it)
- if (str == UCI::move(*it, pos.is_chess960()))
- return *it;
+ for (const auto& m : MoveList<LEGAL>(pos))
+ if (str == UCI::move(m, pos.is_chess960()))
+ return m;
return MOVE_NONE;
}