X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=b875eaf7f1840bd3d3b41553dbeed55538dc1730;hp=d7c65e10e066810811def3763f3685c24ca10492;hb=c2d42ea8339b49e52a116e488214a14fda09d413;hpb=dab1cd8af9c95c119500e97920f927ae4aafc24f
diff --git a/src/uci.cpp b/src/uci.cpp
index d7c65e10..b875eaf7 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -17,7 +17,6 @@
along with this program. If not, see .
*/
-#include
#include
#include
#include
@@ -25,17 +24,17 @@
#include "evaluate.h"
#include "misc.h"
-#include "move.h"
#include "position.h"
#include "search.h"
+#include "thread.h"
#include "ucioption.h"
using namespace std;
namespace {
- // FEN string for the initial position
- const char* StarFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
+ // 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). This is needed by draw detection
@@ -44,35 +43,54 @@ namespace {
void set_option(istringstream& up);
void set_position(Position& pos, istringstream& up);
- bool go(Position& pos, istringstream& up);
+ void go(Position& pos, istringstream& up);
void perft(Position& pos, istringstream& up);
}
/// Wait for a command from the user, parse this text string as an UCI command,
-/// and calls the appropriate functions. Also intercepts EOF from stdin to
-/// ensure that we exit gracefully if the GUI dies unexpectedly. In addition to
-/// the UCI commands, the function also supports a few debug commands.
+/// and call the appropriate functions. Also intercepts EOF from stdin to ensure
+/// 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() {
- Position pos(StarFEN, false, 0); // The root position
+ Position pos(StartFEN, false, 0); // The root position
string cmd, token;
- while (getline(cin, cmd))
+ while (token != "quit")
{
+ if (!getline(cin, cmd)) // Block here waiting for input
+ cmd = "quit";
+
istringstream is(cmd);
is >> skipws >> token;
- if (token == "quit")
- break;
+ if (token == "quit" || token == "stop")
+ {
+ Search::Signals.stop = true;
+ Threads[0].wake_up(); // In case is waiting for stop or ponderhit
+ }
+
+ else if (token == "ponderhit")
+ {
+ // The opponent has played the expected move. GUI sends "ponderhit" if
+ // we were told to ponder on the same move the opponent has played. We
+ // should continue searching but switching from pondering to normal search.
+ Search::Limits.ponder = false;
+
+ if (Search::Signals.stopOnPonderhit)
+ Search::Signals.stop = true;
+
+ Threads[0].wake_up(); // In case is waiting for stop or ponderhit
+ }
- if (token == "go" && !go(pos, is))
- break;
+ else if (token == "go")
+ go(pos, is);
- if (token == "ucinewgame")
- pos.from_fen(StarFEN, false);
+ else if (token == "ucinewgame")
+ pos.from_fen(StartFEN, false);
else if (token == "isready")
cout << "readyok" << endl;
@@ -90,7 +108,7 @@ void uci_loop() {
pos.print();
else if (token == "flip")
- pos.flip();
+ pos.flip_me();
else if (token == "eval")
{
@@ -99,9 +117,9 @@ void uci_loop() {
}
else if (token == "key")
- cout << "key: " << hex << pos.get_key()
- << "\nmaterial key: " << pos.get_material_key()
- << "\npawn key: " << pos.get_pawn_key() << endl;
+ cout << "key: " << hex << pos.key()
+ << "\nmaterial key: " << pos.material_key()
+ << "\npawn key: " << pos.pawn_key() << endl;
else if (token == "uci")
cout << "id name " << engine_name()
@@ -130,7 +148,7 @@ namespace {
if (token == "startpos")
{
- fen = StarFEN;
+ fen = StartFEN;
is >> token; // Consume "moves" token if any
}
else if (token == "fen")
@@ -153,9 +171,8 @@ namespace {
}
- // set_option() is called when engine receives the "setoption" UCI
- // command. The function updates the corresponding UCI option ("name")
- // to the given value ("value").
+ // set_option() 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) {
@@ -178,15 +195,14 @@ namespace {
}
- // go() is called when engine receives the "go" UCI command. The
- // function sets the thinking time and other parameters from the input
- // string, and then calls think(). Returns false if a quit command
- // is received while thinking, true otherwise.
+ // go() is called when engine receives the "go" UCI command. The function sets
+ // the thinking time and other parameters from the input string, and then starts
+ // the main searching thread.
- bool go(Position& pos, istringstream& is) {
+ void go(Position& pos, istringstream& is) {
string token;
- SearchLimits limits;
+ Search::LimitsType limits;
std::vector searchMoves;
int time[] = { 0, 0 }, inc[] = { 0, 0 };
@@ -217,31 +233,29 @@ namespace {
searchMoves.push_back(move_from_uci(pos, token));
}
- searchMoves.push_back(MOVE_NONE);
limits.time = time[pos.side_to_move()];
limits.increment = inc[pos.side_to_move()];
- return think(pos, limits, &searchMoves[0]);
+ Threads.start_thinking(pos, limits, searchMoves, true);
}
- // perft() is called when engine receives the "perft" command.
- // The function calls perft() passing the required search depth
- // then prints counted leaf nodes and elapsed time.
+ // 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, time;
- int64_t n;
if (!(is >> depth))
return;
- time = get_system_time();
+ time = system_time();
- n = perft(pos, depth * ONE_PLY);
+ int64_t n = Search::perft(pos, depth * ONE_PLY);
- time = get_system_time() - time;
+ time = system_time() - time;
std::cout << "\nNodes " << n
<< "\nTime (ms) " << time