Use a std::vector to store searchMoves

A std::set (that is a rb_tree) seems really
overkill to store at most a handful of moves
and nothing in the common case.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index fbf5a46d61d808037634476079e635a01c340fb3..c31609bbf090589f05fe5356813cc7e39444b100 100644 (file)
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -118,7 +118,7 @@ void benchmark(istringstream& is) {
       }
       else
       {
-          Threads.start_searching(pos, limits);
+          Threads.start_searching(pos, limits, vector<Move>());
           Threads.wait_for_search_finished();
           nodes += Search::RootPosition.nodes_searched();
       }

diff --git a/src/main.cpp b/src/main.cpp
index 087f6dd647b5f3166e0a3392539d4835bb4a969d..6e8898836713f8377e2c43f9012d34c831ce7a37 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -46,7 +46,7 @@ int main(int argc, char* argv[]) {
   std::string args;
 
   for (int i = 1; i < argc; i++)
-      args += std::string(" ") + argv[i];
+      args += std::string(argv[i]) + " ";
 
   uci_loop(args);
 }

diff --git a/src/thread.cpp b/src/thread.cpp
index 2dcbf91093dc7379d0281ccae235838d9c99f031..8d66988029dd2ebc98a8e882e7eed10da0df0f0e 100644 (file)
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -429,7 +429,7 @@ void ThreadsManager::wait_for_search_finished() {
 // main_loop() so to start a new search, then returns immediately.
 
 void ThreadsManager::start_searching(const Position& pos, const LimitsType& limits,
-                                     const std::set<Move>& searchMoves) {
+                                     const std::vector<Move>& searchMoves) {
   wait_for_search_finished();
 
   SearchTime.restart(); // As early as possible
@@ -442,7 +442,7 @@ void ThreadsManager::start_searching(const Position& pos, const LimitsType& limi
   RootMoves.clear();
 
   for (MoveList<MV_LEGAL> ml(pos); !ml.end(); ++ml)
-      if (searchMoves.empty() || searchMoves.count(ml.move()))
+      if (searchMoves.empty() || count(searchMoves.begin(), searchMoves.end(), ml.move()))
           RootMoves.push_back(RootMove(ml.move()));
 
   threads[0]->do_sleep = false;

diff --git a/src/thread.h b/src/thread.h
index 3d175483169c6fea6ad4d7e6810fdff3588b168f..fe2cf42592e4c88d50323b16f11daef000c1e135 100644 (file)
--- a/src/thread.h
+++ b/src/thread.h
@@ -20,7 +20,6 @@
 #if !defined(THREAD_H_INCLUDED)
 #define THREAD_H_INCLUDED
 
-#include <set>
 #include <vector>
 
 #include "material.h"
@@ -126,7 +125,7 @@ public:
   void set_timer(int msec);
   void wait_for_search_finished();
   void start_searching(const Position& pos, const Search::LimitsType& limits,
-                       const std::set<Move>& = std::set<Move>());
+                       const std::vector<Move>& searchMoves);
 
   template <bool Fake>
   Value split(Position& pos, Search::Stack* ss, Value alpha, Value beta, Value bestValue, Move* bestMove,

diff --git a/src/uci.cpp b/src/uci.cpp
index a2998e62abaed2611dd24851bcf076dae9247b96..a10920a9714ab381a4a2d4b94fbdf51140b627b8 100644 (file)
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -212,7 +212,7 @@ namespace {
   void go(Position& pos, istringstream& is) {
 
     Search::LimitsType limits;
-    std::set<Move> searchMoves;
+    vector<Move> searchMoves;
     string token;
 
     while (is >> token)
@@ -239,7 +239,7 @@ namespace {
             limits.ponder = true;
         else if (token == "searchmoves")
             while (is >> token)
-                searchMoves.insert(move_from_uci(pos, token));
+                searchMoves.push_back(move_from_uci(pos, token));
     }
 
     Threads.start_searching(pos, limits, searchMoves);
@@ -263,8 +263,8 @@ namespace {
 
     int e = time.elapsed();
 
-    std::cout << "\nNodes " << n
-              << "\nTime (ms) " << e
-              << "\nNodes/second " << int(n / (e / 1000.0)) << std::endl;
+    cout << "\nNodes " << n
+         << "\nTime (ms) " << e
+         << "\nNodes/second " << int(n / (e / 1000.0)) << endl;
   }
 }