#include <string>
#include "evaluate.h"
-#include "misc.h"
+#include "notation.h"
#include "position.h"
#include "search.h"
#include "thread.h"
+#include "tt.h"
#include "ucioption.h"
using namespace std;
-extern void benchmark(istringstream& is);
+extern void benchmark(const Position& pos, istream& is);
namespace {
const char* StartFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
// Keep track of position keys along the setup moves (from start position to the
- // position just before to start searching). This is needed by draw detection
- // where, due to 50 moves rule, we need to check at most 100 plies back.
- StateInfo StateRingBuf[102], *SetupState = StateRingBuf;
+ // position just before to start searching). Needed by repetition draw detection.
+ Search::StateStackPtr SetupStates;
void set_option(istringstream& up);
void set_position(Position& pos, istringstream& up);
void go(Position& pos, istringstream& up);
- void perft(Position& pos, istringstream& up);
}
/// that we exit gracefully if the GUI dies unexpectedly. In addition to the UCI
/// commands, the function also supports a few debug commands.
-void uci_loop(const string& args) {
+void UCI::loop(const string& args) {
Position pos(StartFEN, false, Threads.main_thread()); // The root position
string cmd, token;
if (Search::Signals.stopOnPonderhit)
{
Search::Signals.stop = true;
- Threads.wait_for_search_finished(); // Wake up if is sleeping
+ Threads.main_thread()->wake_up(); // Could be sleeping
}
}
- else if (token == "go")
- go(pos, is);
-
- else if (token == "ucinewgame")
- { /* Avoid returning "Unknown command" */ }
-
- else if (token == "isready")
- cout << "readyok" << endl;
-
- else if (token == "position")
- set_position(pos, is);
-
- else if (token == "setoption")
- set_option(is);
-
- else if (token == "perft")
- perft(pos, is);
-
- else if (token == "d")
- pos.print();
-
- else if (token == "flip")
- pos.flip();
-
- else if (token == "eval")
- cout << Eval::trace(pos) << endl;
+ else if (token == "perft" && (is >> token)) // Read requested depth
+ {
+ stringstream ss;
- else if (token == "bench")
- benchmark(is);
+ ss << Options["Hash"] << " "
+ << Options["Threads"] << " " << token << " current perft";
- else if (token == "key")
- cout << "key: " << hex << pos.key()
- << "\nmaterial key: " << pos.material_key()
- << "\npawn key: " << pos.pawn_key() << endl;
+ benchmark(pos, ss);
+ }
- else if (token == "uci")
- cout << "id name " << engine_info(true)
- << "\n" << Options
- << "\nuciok" << endl;
+ else if (token == "key") sync_cout << "position key: " << hex << pos.key()
+ << "\nmaterial key: " << pos.material_key()
+ << "\npawn key: " << pos.pawn_key()
+ << sync_endl;
+
+ else if (token == "uci") sync_cout << "id name " << engine_info(true)
+ << "\n" << Options
+ << "\nuciok" << sync_endl;
+
+ else if (token == "ucinewgame") TT.clear();
+ else if (token == "go") go(pos, is);
+ else if (token == "position") set_position(pos, is);
+ else if (token == "setoption") set_option(is);
+ else if (token == "flip") pos.flip();
+ else if (token == "bench") benchmark(pos, is);
+ else if (token == "d") sync_cout << pos.pretty() << sync_endl;
+ else if (token == "isready") sync_cout << "readyok" << sync_endl;
+ else if (token == "eval") sync_cout << Eval::trace(pos) << sync_endl;
else
- cout << "Unknown command: " << cmd << endl;
+ sync_cout << "Unknown command: " << cmd << sync_endl;
if (!args.empty()) // Command line arguments have one-shot behaviour
{
namespace {
- // set_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").
+ // set_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 set_position(Position& pos, istringstream& is) {
else
return;
- pos.from_fen(fen, Options["UCI_Chess960"], Threads.main_thread());
+ pos.set(fen, Options["UCI_Chess960"], Threads.main_thread());
+ SetupStates = Search::StateStackPtr(new std::stack<StateInfo>());
// Parse move list (if any)
while (is >> token && (m = move_from_uci(pos, token)) != MOVE_NONE)
{
- pos.do_move(m, *SetupState);
-
- // Increment pointer to StateRingBuf circular buffer
- if (++SetupState - StateRingBuf >= 102)
- SetupState = StateRingBuf;
+ SetupStates->push(StateInfo());
+ pos.do_move(m, SetupStates->top());
}
}
if (Options.count(name))
Options[name] = value;
else
- cout << "No such option: " << name << endl;
+ sync_cout << "No such option: " << name << sync_endl;
}
while (is >> token)
{
- if (token == "wtime")
- is >> limits.time[WHITE];
- else if (token == "btime")
- is >> limits.time[BLACK];
- else if (token == "winc")
- is >> limits.inc[WHITE];
- else if (token == "binc")
- is >> limits.inc[BLACK];
- else if (token == "movestogo")
- is >> limits.movestogo;
- else if (token == "depth")
- is >> limits.depth;
- else if (token == "nodes")
- is >> limits.nodes;
- else if (token == "movetime")
- is >> limits.movetime;
- else if (token == "infinite")
- limits.infinite = true;
- else if (token == "ponder")
- limits.ponder = true;
- else if (token == "searchmoves")
+ if (token == "searchmoves")
while (is >> token)
searchMoves.push_back(move_from_uci(pos, token));
- }
- Threads.start_searching(pos, limits, searchMoves);
- }
-
-
- // perft() is called when engine receives the "perft" command. The function
- // calls perft() with the required search depth then prints counted leaf nodes
- // and elapsed time.
-
- void perft(Position& pos, istringstream& is) {
-
- int depth;
-
- if (!(is >> depth))
- return;
-
- Time time = Time::current_time();
-
- int64_t n = Search::perft(pos, depth * ONE_PLY);
-
- int e = time.elapsed();
+ else if (token == "wtime") is >> limits.time[WHITE];
+ else if (token == "btime") is >> limits.time[BLACK];
+ else if (token == "winc") is >> limits.inc[WHITE];
+ else if (token == "binc") is >> limits.inc[BLACK];
+ else if (token == "movestogo") is >> limits.movestogo;
+ else if (token == "depth") is >> limits.depth;
+ else if (token == "nodes") is >> limits.nodes;
+ else if (token == "movetime") is >> limits.movetime;
+ else if (token == "infinite") limits.infinite = true;
+ else if (token == "ponder") limits.ponder = true;
+ }
- cout << "\nNodes " << n
- << "\nTime (ms) " << e
- << "\nNodes/second " << int(n / (e / 1000.0)) << endl;
+ Threads.start_searching(pos, limits, searchMoves, SetupStates);
}
}
projects / stockfish / blobdiff