Store moves sent with "position" UCI command

Store all the game moves until current position.

This will be used by next patch.

No functional change.

diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 25dab6cc7d7bd8b026b57633e6b31364b76bbb9b..fa0aa3e9e761d7afdd986413d0be8617380b2818 100644 (file)
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -114,6 +114,7 @@ void benchmark(const Position& current, istream& is) {
 
   int64_t nodes = 0;
   Search::StateStackPtr st;
 
   int64_t nodes = 0;
   Search::StateStackPtr st;

+  Search::MovesVectPtr mv;

   Time::point elapsed = Time::now();
 
   for (size_t i = 0; i < fens.size(); i++)
   Time::point elapsed = Time::now();
 
   for (size_t i = 0; i < fens.size(); i++)


@@ -130,7 +131,7 @@ void benchmark(const Position& current, istream& is) {
       }
       else
       {
       }
       else
       {

-          Threads.start_thinking(pos, limits, vector<Move>(), st);
+          Threads.start_thinking(pos, limits, vector<Move>(), st, mv);

           Threads.wait_for_think_finished();
           nodes += Search::RootPos.nodes_searched();
       }
           Threads.wait_for_think_finished();
           nodes += Search::RootPos.nodes_searched();
       }

diff --git a/src/search.cpp b/src/search.cpp
index 76653ff99bf5fed6963d13b88a47ea202c17f4a2..15f09bc92743de1cc2eab9fcdfabfd76a4cba82b 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -44,6 +44,7 @@ namespace Search {
   Color RootColor;
   Time::point SearchTime;
   StateStackPtr SetupStates;
   Color RootColor;
   Time::point SearchTime;
   StateStackPtr SetupStates;

+  MovesVectPtr SetupMoves;

 }
 
 using std::string;
 }
 
 using std::string;

diff --git a/src/search.h b/src/search.h
index bd21023747f53d2e480003933566c86fbd844bf8..73fa79aea88e6c4adda13665095696d14bb9ec4b 100644 (file)
--- a/src/search.h
+++ b/src/search.h
@@ -93,6 +93,7 @@ struct SignalsType {
 };
 
 typedef std::auto_ptr<std::stack<StateInfo> > StateStackPtr;
 };
 
 typedef std::auto_ptr<std::stack<StateInfo> > StateStackPtr;

+typedef std::auto_ptr<std::vector<Move> > MovesVectPtr;

 
 extern volatile SignalsType Signals;
 extern LimitsType Limits;
 
 extern volatile SignalsType Signals;
 extern LimitsType Limits;


@@ -101,6 +102,7 @@ extern Position RootPos;
 extern Color RootColor;
 extern Time::point SearchTime;
 extern StateStackPtr SetupStates;
 extern Color RootColor;
 extern Time::point SearchTime;
 extern StateStackPtr SetupStates;

+extern MovesVectPtr SetupMoves;

 
 extern void init();
 extern size_t perft(Position& pos, Depth depth);
 
 extern void init();
 extern size_t perft(Position& pos, Depth depth);

diff --git a/src/thread.cpp b/src/thread.cpp
index f5b8b5e275aff3313b74ae061fd8b4455d98dab8..0d8070f202b0774d5077b4ec26962d54f438f7c4 100644 (file)
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -357,8 +357,8 @@ void ThreadPool::wait_for_think_finished() {
 // start_thinking() wakes up the main thread sleeping in MainThread::idle_loop()
 // so to start a new search, then returns immediately.
 
 // start_thinking() wakes up the main thread sleeping in MainThread::idle_loop()
 // so to start a new search, then returns immediately.
 

-void ThreadPool::start_thinking(const Position& pos, const LimitsType& limits,
-                                const std::vector<Move>& searchMoves, StateStackPtr& states) {
+void ThreadPool::start_thinking(const Position& pos, const LimitsType& limits, const std::vector<Move>& searchMoves,
+                                StateStackPtr& setupStates, MovesVectPtr& setupMoves) {

   wait_for_think_finished();
 
   SearchTime = Time::now(); // As early as possible
   wait_for_think_finished();
 
   SearchTime = Time::now(); // As early as possible


@@ -368,7 +368,8 @@ void ThreadPool::start_thinking(const Position& pos, const LimitsType& limits,
 
   RootPos = pos;
   Limits = limits;
 
   RootPos = pos;
   Limits = limits;

-  SetupStates = states; // Ownership transfer here
+  SetupStates = setupStates; // Ownership transfer here
+  SetupMoves = setupMoves;   // Ownership transfer here

   RootMoves.clear();
 
   for (MoveList<LEGAL> ml(pos); !ml.end(); ++ml)
   RootMoves.clear();
 
   for (MoveList<LEGAL> ml(pos); !ml.end(); ++ml)

diff --git a/src/thread.h b/src/thread.h
index fbd3b7f4af2e58509ae1530ab6ad6efe8bbbbb76..ac6040f285cb8705bac9881a6c0988840497db07 100644 (file)
--- a/src/thread.h
+++ b/src/thread.h
@@ -151,8 +151,8 @@ struct ThreadPool : public std::vector<Thread*> {
   void read_uci_options();
   Thread* available_slave(Thread* master) const;
   void wait_for_think_finished();
   void read_uci_options();
   Thread* available_slave(Thread* master) const;
   void wait_for_think_finished();

-  void start_thinking(const Position&, const Search::LimitsType&,
-                      const std::vector<Move>&, Search::StateStackPtr&);
+  void start_thinking(const Position&, const Search::LimitsType&, const std::vector<Move>&,
+                      Search::StateStackPtr&, Search::MovesVectPtr&);

 
   bool sleepWhileIdle;
   Depth minimumSplitDepth;
 
   bool sleepWhileIdle;
   Depth minimumSplitDepth;

diff --git a/src/uci.cpp b/src/uci.cpp
index c8f504463cef969db7a72c9816d3c23fd6f18b94..3a33b9f4a07170828a9f55ac5af228a1aa930257 100644 (file)
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -42,6 +42,7 @@ namespace {
   // 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.
   Search::StateStackPtr SetupStates;
   // 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.
   Search::StateStackPtr SetupStates;

+  Search::MovesVectPtr SetupMoves;

 
   void set_option(istringstream& up);
   void set_position(Position& pos, istringstream& up);
 
   void set_option(istringstream& up);
   void set_position(Position& pos, istringstream& up);


@@ -148,10 +149,13 @@ namespace {
 
     pos.set(fen, Options["UCI_Chess960"], Threads.main_thread());
     SetupStates = Search::StateStackPtr(new std::stack<StateInfo>());
 
     pos.set(fen, Options["UCI_Chess960"], Threads.main_thread());
     SetupStates = Search::StateStackPtr(new std::stack<StateInfo>());

+    SetupMoves = Search::MovesVectPtr(new std::vector<Move>());
+    SetupMoves->reserve(200); // Try to avoid reallocations

 
     // Parse move list (if any)
     while (is >> token && (m = move_from_uci(pos, token)) != MOVE_NONE)
     {
 
     // Parse move list (if any)
     while (is >> token && (m = move_from_uci(pos, token)) != MOVE_NONE)
     {

+        SetupMoves->push_back(m);

         SetupStates->push(StateInfo());
         pos.do_move(m, SetupStates->top());
     }
         SetupStates->push(StateInfo());
         pos.do_move(m, SetupStates->top());
     }


@@ -211,6 +215,6 @@ namespace {
         else if (token == "ponder")    limits.ponder = true;
     }
 
         else if (token == "ponder")    limits.ponder = true;
     }
 

-    Threads.start_thinking(pos, limits, searchMoves, SetupStates);
+    Threads.start_thinking(pos, limits, searchMoves, SetupStates, SetupMoves);

   }
 }
   }
 }