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-2017 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
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <cassert>
#include <iostream>
#include <sstream>
#include <string>
#include "position.h"
#include "search.h"
#include "thread.h"
-#include "tt.h"
+#include "timeman.h"
#include "uci.h"
+#include "syzygy/tbprobe.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";
- // 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());
+ States->push_back(StateInfo());
+ pos.do_move(m, States->back());
}
}
// 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;
// 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;
+ 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.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 = 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();
+ Tablebases::init(Options["SyzygyPath"]);
+ 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()->wait_for_search_finished();
}
string UCI::value(Value v) {
+ assert(-VALUE_INFINITE < v && v < VALUE_INFINITE);
+
stringstream ss;
if (abs(v) < VALUE_MATE - MAX_PLY)
/// 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;
}
projects / stockfish / blobdiff