/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, 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
#include "position.h"
#include "search.h"
#include "thread.h"
+#include "tt.h"
#include "ucioption.h"
using namespace std;
// FEN string of the initial position, normal chess
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). Needed by repetition draw detection.
+ // Keep a track of the position keys along the setup moves (from the start position
+ // to the position just before the search starts). This is needed by the repetition
+ // draw detection code.
Search::StateStackPtr SetupStates;
- void set_option(istringstream& up);
- void set_position(Position& pos, istringstream& up);
+ void setoption(istringstream& up);
+ void position(Position& pos, istringstream& up);
void go(const Position& pos, istringstream& up);
}
void UCI::loop(const string& args) {
- Position pos(StartFEN, false, Threads.main_thread()); // The root position
+ Position pos(StartFEN, false, Threads.main()); // The root position
string token, cmd = args;
do {
if (token == "quit" || token == "stop" || token == "ponderhit")
{
- // GUI sends 'ponderhit' to tell us to ponder on the same move the
+ // The GUI sends 'ponderhit' to tell us to ponder on the same move the
// opponent has played. In case Signals.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.
+ // switch from pondering to normal search.
if (token != "ponderhit" || Search::Signals.stopOnPonderhit)
{
Search::Signals.stop = true;
- Threads.main_thread()->notify_one(); // Could be sleeping
+ Threads.main()->notify_one(); // Could be sleeping
}
else
Search::Limits.ponder = false;
<< "\n" << Options
<< "\nuciok" << sync_endl;
- else if (token == "ucinewgame") { /* Avoid returning "Unknown command" */ }
+ else if (token == "eval")
+ {
+ Search::RootColor = pos.side_to_move(); // Ensure it is set
+ sync_cout << Eval::trace(pos) << 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 == "position") position(pos, is);
+ else if (token == "setoption") setoption(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
sync_cout << "Unknown command: " << cmd << sync_endl;
} while (token != "quit" && args.empty()); // Args have one-shot behaviour
- Threads.wait_for_think_finished(); // Cannot quit while search is running
+ Threads.wait_for_think_finished(); // Cannot quit whilst the search is running
}
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")
+ // 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) {
+ void position(Position& pos, istringstream& is) {
Move m;
string token, fen;
else
return;
- pos.set(fen, Options["UCI_Chess960"], Threads.main_thread());
+ pos.set(fen, Options["UCI_Chess960"], Threads.main());
SetupStates = Search::StateStackPtr(new std::stack<StateInfo>());
// Parse move list (if any)
}
- // set_option() is called when engine receives the "setoption" UCI command. The
+ // setoption() is called when engine receives the "setoption" UCI command. The
// function updates the UCI option ("name") to the given value ("value").
- void set_option(istringstream& is) {
+ void setoption(istringstream& is) {
string token, name, value;