Revert "Store moves sent with "position" UCI command"

mcostalba · mcostalba · commit db322e6a6345 · 2013-03-04T09:29:46.000+01:00
This reverts commit 0d68b52. After easy move semplification this machinery is not needed anymore (because of we don't need to know if a root move is a recapture) No functional change.
diff --git a/src/benchmark.cpp b/src/benchmark.cpp
@@ -114,7 +114,6 @@ void benchmark(const Position& current, istream& is) {
 
   int64_t nodes = 0;
   Search::StateStackPtr st;
-  Search::MovesVectPtr mv;
   Time::point elapsed = Time::now();
 
   for (size_t i = 0; i < fens.size(); i++)
@@ -131,7 +130,7 @@ void benchmark(const Position& current, istream& is) {
       }
       else
       {
-          Threads.start_thinking(pos, limits, vector<Move>(), st, mv);
+          Threads.start_thinking(pos, limits, vector<Move>(), st);
           Threads.wait_for_think_finished();
           nodes += Search::RootPos.nodes_searched();
       }
diff --git a/src/search.cpp b/src/search.cpp
@@ -44,7 +44,6 @@ namespace Search {
   Color RootColor;
   Time::point SearchTime;
   StateStackPtr SetupStates;
-  MovesVectPtr SetupMoves;
 }
 
 using std::string;
diff --git a/src/search.h b/src/search.h
@@ -93,7 +93,6 @@ struct SignalsType {
 };
 
 typedef std::auto_ptr<std::stack<StateInfo> > StateStackPtr;
-typedef std::auto_ptr<std::vector<Move> > MovesVectPtr;
 
 extern volatile SignalsType Signals;
 extern LimitsType Limits;
@@ -102,7 +101,6 @@ extern Position RootPos;
 extern Color RootColor;
 extern Time::point SearchTime;
 extern StateStackPtr SetupStates;
-extern MovesVectPtr SetupMoves;
 
 extern void init();
 extern size_t perft(Position& pos, Depth depth);
diff --git 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.
 
-void ThreadPool::start_thinking(const Position& pos, const LimitsType& limits, const std::vector<Move>& searchMoves,
-                                StateStackPtr& setupStates, MovesVectPtr& setupMoves) {
+void ThreadPool::start_thinking(const Position& pos, const LimitsType& limits,
+                                const std::vector<Move>& searchMoves, StateStackPtr& states) {
   wait_for_think_finished();
 
   SearchTime = Time::now(); // As early as possible
@@ -368,8 +368,7 @@ void ThreadPool::start_thinking(const Position& pos, const LimitsType& limits, c
 
   RootPos = pos;
   Limits = limits;
-  SetupStates = setupStates; // Ownership transfer here
-  SetupMoves = setupMoves;   // Ownership transfer here
+  SetupStates = states; // Ownership transfer here
   RootMoves.clear();
 
   for (MoveList<LEGAL> ml(pos); !ml.end(); ++ml)
diff --git 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 start_thinking(const Position&, const Search::LimitsType&, const std::vector<Move>&,
-                      Search::StateStackPtr&, Search::MovesVectPtr&);
+  void start_thinking(const Position&, const Search::LimitsType&,
+                      const std::vector<Move>&, Search::StateStackPtr&);
 
   bool sleepWhileIdle;
   Depth minimumSplitDepth;
diff --git a/src/uci.cpp b/src/uci.cpp
@@ -42,7 +42,6 @@ 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;
-  Search::MovesVectPtr SetupMoves;
 
   void set_option(istringstream& up);
   void set_position(Position& pos, istringstream& up);
@@ -149,13 +148,10 @@ namespace {
 
     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)
     {
-        SetupMoves->push_back(m);
         SetupStates->push(StateInfo());
         pos.do_move(m, SetupStates->top());
     }
@@ -215,6 +211,6 @@ namespace {
         else if (token == "ponder")    limits.ponder = true;
     }
 
-    Threads.start_thinking(pos, limits, searchMoves, SetupStates, SetupMoves);
+    Threads.start_thinking(pos, limits, searchMoves, SetupStates);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,6 @@ void benchmark(const Position& current, istream& is) {`
`114`	`114`
`115`	`115`	`int64_t nodes = 0;`
`116`	`116`	`Search::StateStackPtr st;`
`117`		`- Search::MovesVectPtr mv;`
`118`	`117`	`Time::point elapsed = Time::now();`
`119`	`118`
`120`	`119`	`for (size_t i = 0; i < fens.size(); i++)`
`@@ -131,7 +130,7 @@ void benchmark(const Position& current, istream& is) {`
`131`	`130`	`}`
`132`	`131`	`else`
`133`	`132`	`{`
`134`		`- Threads.start_thinking(pos, limits, vector<Move>(), st, mv);`
	`133`	`+ Threads.start_thinking(pos, limits, vector<Move>(), st);`
`135`	`134`	`Threads.wait_for_think_finished();`
`136`	`135`	`nodes += Search::RootPos.nodes_searched();`
`137`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@ namespace Search {`
`44`	`44`	`Color RootColor;`
`45`	`45`	`Time::point SearchTime;`
`46`	`46`	`StateStackPtr SetupStates;`
`47`		`- MovesVectPtr SetupMoves;`
`48`	`47`	`}`
`49`	`48`
`50`	`49`	`using std::string;`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@ namespace {`
`42`	`42`	`// Keep track of position keys along the setup moves (from start position to the`
`43`	`43`	`// position just before to start searching). Needed by repetition draw detection.`
`44`	`44`	`Search::StateStackPtr SetupStates;`
`45`		`- Search::MovesVectPtr SetupMoves;`
`46`	`45`
`47`	`46`	`void set_option(istringstream& up);`
`48`	`47`	`void set_position(Position& pos, istringstream& up);`
`@@ -149,13 +148,10 @@ namespace {`
`149`	`148`
`150`	`149`	`pos.set(fen, Options["UCI_Chess960"], Threads.main_thread());`
`151`	`150`	`SetupStates = Search::StateStackPtr(new std::stack<StateInfo>());`
`152`		`- SetupMoves = Search::MovesVectPtr(new std::vector<Move>());`
`153`		`- SetupMoves->reserve(200); // Try to avoid reallocations`
`154`	`151`
`155`	`152`	`// Parse move list (if any)`
`156`	`153`	`while (is >> token && (m = move_from_uci(pos, token)) != MOVE_NONE)`
`157`	`154`	`{`
`158`		`- SetupMoves->push_back(m);`
`159`	`155`	`SetupStates->push(StateInfo());`
`160`	`156`	`pos.do_move(m, SetupStates->top());`
`161`	`157`	`}`
`@@ -215,6 +211,6 @@ namespace {`
`215`	`211`	`else if (token == "ponder") limits.ponder = true;`
`216`	`212`	`}`
`217`	`213`
`218`		`- Threads.start_thinking(pos, limits, searchMoves, SetupStates, SetupMoves);`
	`214`	`+ Threads.start_thinking(pos, limits, searchMoves, SetupStates);`
`219`	`215`	`}`
`220`	`216`	`}`