X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fuci.cpp;h=81bf7aff768ae7b27288d3ed8e87a547a36f541e;hb=edb4ab924f09abd7c6836c7017365dceccd76b80;hp=ffe5e0576ea5c9af85914485d17f4e8e9b5e38c5;hpb=8192945870967fb9c8801247d0b040b2bc657443;p=stockfish
diff --git a/src/uci.cpp b/src/uci.cpp
index ffe5e057..81bf7aff 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -16,25 +16,30 @@
along with this program. If not, see .
*/
+#include "uci.h"
+
+#include
#include
+#include
#include
+#include
+#include
+#include
#include
+#include
+#include
#include
#include
+#include
#include "benchmark.h"
#include "evaluate.h"
+#include "misc.h"
#include "movegen.h"
+#include "nnue/evaluate_nnue.h"
#include "position.h"
#include "search.h"
#include "thread.h"
-#include "timeman.h"
-#include "tt.h"
-#include "uci.h"
-#include "syzygy/tbprobe.h"
-#include "nnue/evaluate_nnue.h"
-
-using namespace std;
namespace Stockfish {
@@ -49,10 +54,10 @@ namespace {
// the initial position ("startpos") and then makes the moves given in the following
// move list ("moves").
- void position(Position& pos, istringstream& is, StateListPtr& states) {
+ void position(Position& pos, std::istringstream& is, StateListPtr& states) {
Move m;
- string token, fen;
+ std::string token, fen;
is >> token;
@@ -96,11 +101,11 @@ namespace {
// setoption() is called when the engine receives the "setoption" UCI command.
// The function updates the UCI option ("name") to the given value ("value").
- void setoption(istringstream& is) {
+ void setoption(std::istringstream& is) {
Threads.main()->wait_for_search_finished();
- string token, name, value;
+ std::string token, name, value;
is >> token; // Consume the "name" token
@@ -123,10 +128,10 @@ namespace {
// sets the thinking time and other parameters from the input string, then starts
// with a search.
- void go(Position& pos, istringstream& is, StateListPtr& states) {
+ void go(Position& pos, std::istringstream& is, StateListPtr& states) {
Search::LimitsType limits;
- string token;
+ std::string token;
bool ponderMode = false;
limits.startTime = now(); // The search starts as early as possible
@@ -154,27 +159,27 @@ namespace {
// bench() is called when the engine receives the "bench" command.
- // Firstly, a list of UCI commands is set up according to the bench
+ // First, a list of UCI commands is set up according to the bench
// parameters, then it is run one by one, printing a summary at the end.
- void bench(Position& pos, istream& args, StateListPtr& states) {
+ void bench(Position& pos, std::istream& args, StateListPtr& states) {
- string token;
+ std::string token;
uint64_t num, nodes = 0, cnt = 1;
- vector list = setup_bench(pos, args);
- num = count_if(list.begin(), list.end(), [](const string& s) { return s.find("go ") == 0 || s.find("eval") == 0; });
+ std::vector list = setup_bench(pos, args);
+ num = count_if(list.begin(), list.end(), [](const std::string& s) { return s.find("go ") == 0 || s.find("eval") == 0; });
TimePoint elapsed = now();
for (const auto& cmd : list)
{
- istringstream is(cmd);
- is >> skipws >> token;
+ std::istringstream is(cmd);
+ is >> std::skipws >> token;
if (token == "go" || token == "eval")
{
- cerr << "\nPosition: " << cnt++ << '/' << num << " (" << pos.fen() << ")" << endl;
+ std::cerr << "\nPosition: " << cnt++ << '/' << num << " (" << pos.fen() << ")" << std::endl;
if (token == "go")
{
go(pos, is, states);
@@ -193,10 +198,10 @@ namespace {
dbg_print();
- cerr << "\n==========================="
- << "\nTotal time (ms) : " << elapsed
- << "\nNodes searched : " << nodes
- << "\nNodes/second : " << 1000 * nodes / elapsed << endl;
+ std::cerr << "\n==========================="
+ << "\nTotal time (ms) : " << elapsed
+ << "\nNodes searched : " << nodes
+ << "\nNodes/second : " << 1000 * nodes / elapsed << std::endl;
}
// The win rate model returns the probability of winning (in per mille units) given an
@@ -221,23 +226,23 @@ namespace {
// Transform the eval to centipawns with limited range
double x = std::clamp(double(v), -4000.0, 4000.0);
- // Return the win rate in per mille units rounded to the nearest value
+ // Return the win rate in per mille units, rounded to the nearest integer
return int(0.5 + 1000 / (1 + std::exp((a - x) / b)));
}
} // namespace
-/// UCI::loop() waits for a command from the stdin, parses it and then calls the appropriate
-/// function. It also intercepts an end-of-file (EOF) indication from the stdin to ensure a
-/// graceful exit if the GUI dies unexpectedly. When called with some command-line arguments,
-/// like running 'bench', the function returns immediately after the command is executed.
-/// In addition to the UCI ones, some additional debug commands are also supported.
+// UCI::loop() waits for a command from the stdin, parses it, and then calls the appropriate
+// function. It also intercepts an end-of-file (EOF) indication from the stdin to ensure a
+// graceful exit if the GUI dies unexpectedly. When called with some command-line arguments,
+// like running 'bench', the function returns immediately after the command is executed.
+// In addition to the UCI ones, some additional debug commands are also supported.
void UCI::loop(int argc, char* argv[]) {
Position pos;
- string token, cmd;
+ std::string token, cmd;
StateListPtr states(new std::deque(1));
pos.set(StartFEN, false, &states->back(), Threads.main());
@@ -246,13 +251,13 @@ void UCI::loop(int argc, char* argv[]) {
cmd += std::string(argv[i]) + " ";
do {
- if (argc == 1 && !getline(cin, cmd)) // Wait for an input or an end-of-file (EOF) indication
+ if (argc == 1 && !getline(std::cin, cmd)) // Wait for an input or an end-of-file (EOF) indication
cmd = "quit";
- istringstream is(cmd);
+ std::istringstream is(cmd);
token.clear(); // Avoid a stale if getline() returns nothing or a blank line
- is >> skipws >> token;
+ is >> std::skipws >> token;
if ( token == "quit"
|| token == "stop")
@@ -287,7 +292,7 @@ void UCI::loop(int argc, char* argv[]) {
{
std::optional filename;
std::string f;
- if (is >> skipws >> f)
+ if (is >> std::skipws >> f)
filename = f;
Eval::NNUE::save_eval(filename);
}
@@ -305,24 +310,24 @@ void UCI::loop(int argc, char* argv[]) {
}
-/// Turns a Value to an integer centipawn number,
-/// without treatment of mate and similar special scores.
+// Turns a Value to an integer centipawn number,
+// without treatment of mate and similar special scores.
int UCI::to_cp(Value v) {
return 100 * v / UCI::NormalizeToPawnValue;
}
-/// UCI::value() converts a Value to a string by adhering to the UCI protocol specification:
-///
-/// cp The score from the engine's point of view in centipawns.
-/// mate Mate in 'y' moves (not plies). If the engine is getting mated,
-/// uses negative values for 'y'.
+// UCI::value() converts a Value to a string by adhering to the UCI protocol specification:
+//
+// cp The score from the engine's point of view in centipawns.
+// mate Mate in 'y' moves (not plies). If the engine is getting mated,
+// uses negative values for 'y'.
-string UCI::value(Value v) {
+std::string UCI::value(Value v) {
assert(-VALUE_INFINITE < v && v < VALUE_INFINITE);
- stringstream ss;
+ std::stringstream ss;
if (abs(v) < VALUE_TB_WIN_IN_MAX_PLY)
ss << "cp " << UCI::to_cp(v);
@@ -338,12 +343,12 @@ string UCI::value(Value v) {
}
-/// UCI::wdl() reports the win-draw-loss (WDL) statistics given an evaluation
-/// and a game ply based on the data gathered for fishtest LTC games.
+// UCI::wdl() reports the win-draw-loss (WDL) statistics given an evaluation
+// and a game ply based on the data gathered for fishtest LTC games.
-string UCI::wdl(Value v, int ply) {
+std::string UCI::wdl(Value v, int ply) {
- stringstream ss;
+ std::stringstream ss;
int wdl_w = win_rate_model( v, ply);
int wdl_l = win_rate_model(-v, ply);
@@ -354,19 +359,19 @@ string UCI::wdl(Value v, int ply) {
}
-/// UCI::square() converts a Square to a string in algebraic notation (g1, a7, etc.)
+// UCI::square() converts a Square to a string in algebraic notation (g1, a7, etc.)
std::string UCI::square(Square s) {
return std::string{ char('a' + file_of(s)), char('1' + rank_of(s)) };
}
-/// UCI::move() converts a Move to a string in coordinate notation (g1f3, a7a8q).
-/// The only special case is castling where the e1g1 notation is printed in
-/// standard chess mode and in e1h1 notation it is printed in Chess960 mode.
-/// Internally, all castling moves are always encoded as 'king captures rook'.
+// UCI::move() converts a Move to a string in coordinate notation (g1f3, a7a8q).
+// The only special case is castling where the e1g1 notation is printed in
+// standard chess mode and in e1h1 notation it is printed in Chess960 mode.
+// Internally, all castling moves are always encoded as 'king captures rook'.
-string UCI::move(Move m, bool chess960) {
+std::string UCI::move(Move m, bool chess960) {
if (m == MOVE_NONE)
return "(none)";
@@ -380,7 +385,7 @@ string UCI::move(Move m, bool chess960) {
if (type_of(m) == CASTLING && !chess960)
to = make_square(to > from ? FILE_G : FILE_C, rank_of(from));
- string move = UCI::square(from) + UCI::square(to);
+ std::string move = UCI::square(from) + UCI::square(to);
if (type_of(m) == PROMOTION)
move += " pnbrqk"[promotion_type(m)];
@@ -389,10 +394,10 @@ string UCI::move(Move m, bool chess960) {
}
-/// UCI::to_move() converts a string representing a move in coordinate notation
-/// (g1f3, a7a8q) to the corresponding legal Move, if any.
+// UCI::to_move() converts a string representing a move in coordinate notation
+// (g1f3, a7a8q) to the corresponding legal Move, if any.
-Move UCI::to_move(const Position& pos, string& str) {
+Move UCI::to_move(const Position& pos, std::string& str) {
if (str.length() == 5)
str[4] = char(tolower(str[4])); // The promotion piece character must be lowercased