X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=31d0a721ab38f2038bccce775c1413bb1621f68e;hp=126cd5c4c1e8a027e40a29573b3794495b4695af;hb=3df2c01b5769c7ae996fb5b992c06e4a5428ad35;hpb=ce5b9727362e18bbf1494cf801df8510f5bc6b9f

diff --git a/src/uci.cpp b/src/uci.cpp
index 126cd5c4..31d0a721 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -22,15 +22,16 @@
 #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 {
 
@@ -38,14 +39,12 @@ 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);
 }
 
 
@@ -54,7 +53,7 @@ namespace {
 /// 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;
@@ -95,7 +94,7 @@ void uci_loop(const string& args) {
           go(pos, is);
 
       else if (token == "ucinewgame")
-      { /* Avoid returning "Unknown command" */ }
+          TT.clear();
 
       else if (token == "isready")
           cout << "readyok" << endl;
@@ -106,9 +105,6 @@ void uci_loop(const string& args) {
       else if (token == "setoption")
           set_option(is);
 
-      else if (token == "perft")
-          perft(pos, is);
-
       else if (token == "d")
           pos.print();
 
@@ -119,7 +115,7 @@ void uci_loop(const string& args) {
           cout << Eval::trace(pos) << endl;
 
       else if (token == "bench")
-          benchmark(is);
+          benchmark(pos, is);
 
       else if (token == "key")
           cout << "key: " << hex     << pos.key()
@@ -130,6 +126,17 @@ void uci_loop(const string& args) {
           cout << "id name "     << engine_info(true)
                << "\n"           << Options
                << "\nuciok"      << endl;
+
+      else if (token == "perft" && (is >> token)) // Read depth
+      {
+          stringstream ss;
+
+          ss << Options["Hash"]    << " "
+             << Options["Threads"] << " " << token << " current perft";
+
+          benchmark(pos, ss);
+      }
+
       else
           cout << "Unknown command: " << cmd << endl;
 
@@ -144,10 +151,10 @@ void uci_loop(const string& args) {
 
 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) {
 
@@ -168,15 +175,13 @@ namespace {
         return;
 
     pos.from_fen(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());
     }
   }
 
@@ -242,29 +247,6 @@ namespace {
                 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();
-
-    cout << "\nNodes " << n
-         << "\nTime (ms) " << e
-         << "\nNodes/second " << int(n / (e / 1000.0)) << endl;
+    Threads.start_searching(pos, limits, searchMoves, SetupStates);
   }
 }