Tidy up benchmark.cpp

No functional change.

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

diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 4b3e417eb734b5c6c41068328c5ee0f9ff6d19a8..95dd88ac01fad7b525eb65a90d3e0cce1ab40e54 100644 (file)
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -49,13 +49,12 @@ static const string Defaults[] = {
 
 
 /// benchmark() runs a simple benchmark by letting Stockfish analyze a set
-/// of positions for a given limit each.  There are five parameters; the
+/// of positions for a given limit each. There are five parameters; the
 /// transposition table size, the number of search threads that should
-/// be used, the limit value spent for each position (optional, default
-/// is ply 12), an optional file name where to look for positions in fen
-/// format (default are the BenchmarkPositions defined above) and the type
-/// of the limit value: depth (default), time in secs or number of nodes.
-/// The analysis is written to a file named bench.txt.
+/// be used, the limit value spent for each position (optional, default is
+/// depth 12), an optional file name where to look for positions in fen
+/// format (defaults are the positions defined above) and the type of the
+/// limit value: depth (default), time in secs or number of nodes.
 
 void benchmark(int argc, char* argv[]) {
 
@@ -64,10 +63,6 @@ void benchmark(int argc, char* argv[]) {
   int64_t totalNodes;
   int time;
 
-  // Load default positions
-  for (int i = 0; !Defaults[i].empty(); i++)
-      fenList.push_back(Defaults[i]);
-
   // Assign default values to missing arguments
   string ttSize  = argc > 2 ? argv[2] : "128";
   string threads = argc > 3 ? argv[3] : "1";
@@ -87,28 +82,27 @@ void benchmark(int argc, char* argv[]) {
   else
       limits.maxDepth = atoi(valStr.c_str());
 
-  // Do we need to load positions from a given FEN file ?
+  // Do we need to load positions from a given FEN file?
   if (fenFile != "default")
   {
       string fen;
       ifstream f(fenFile.c_str());
 
-      if (f.is_open())
-      {
-          fenList.clear();
-
-          while (getline(f, fen))
-              if (!fen.empty())
-                  fenList.push_back(fen);
-
-          f.close();
-      }
-      else
+      if (!f.is_open())
       {
-          cerr << "Unable to open FEN file " << fenFile << endl;
+          cerr << "Unable to open file " << fenFile << endl;
           exit(EXIT_FAILURE);
       }
+
+      while (getline(f, fen))
+          if (!fen.empty())
+              fenList.push_back(fen);
+
+      f.close();
   }
+  else // Load default positions
+      for (int i = 0; !Defaults[i].empty(); i++)
+          fenList.push_back(Defaults[i]);
 
   // Ok, let's start the benchmark !
   totalNodes = 0;
@@ -124,9 +118,11 @@ void benchmark(int argc, char* argv[]) {
       if (valType == "perft")
       {
           int64_t cnt = perft(pos, limits.maxDepth * ONE_PLY);
-          totalNodes += cnt;
 
-          cerr << "\nPerft " << limits.maxDepth << " nodes counted: " << cnt << endl;
+          cerr << "\nPerft " << limits.maxDepth
+               << " nodes counted: " << cnt << endl;
+
+          totalNodes += cnt;
       }
       else
       {

diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index eae549ad63f413b077ea9d6828cf6887ea86be54..1dfc474a9c0a3098ce82e0aa181dfb1bfa89195a 100644 (file)
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -50,9 +50,8 @@ bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const
 }
 
 
-// stringify() converts a numeric value of type T to a std::string
-template<typename T>
-static string stringify(const T& v) {
+// An helper to convert an integer value to a std::string
+static string int_to_string(int v) {
 
   std::ostringstream ss;
   ss << v;
@@ -100,10 +99,10 @@ OptionsMap::OptionsMap() {
   UCIOption& thr = o["Threads"];
   UCIOption& msd = o["Minimum Split Depth"];
 
-  thr.defaultValue = thr.currentValue = stringify(cpu_count());
+  thr.defaultValue = thr.currentValue = int_to_string(cpu_count());
 
   if (cpu_count() >= 8)
-      msd.defaultValue = msd.currentValue = stringify(7);
+      msd.defaultValue = msd.currentValue = int_to_string(7);
 }
 
 
@@ -142,7 +141,7 @@ UCIOption::UCIOption(bool def, string t) : type(t), minValue(0), maxValue(0), id
 { defaultValue = currentValue = (def ? "true" : "false"); }
 
 UCIOption::UCIOption(int def, int minv, int maxv) : type("spin"), minValue(minv), maxValue(maxv), idx(Options.size())
-{ defaultValue = currentValue = stringify(def); }
+{ defaultValue = currentValue = int_to_string(def); }
 
 
 /// set_value() updates currentValue of the Option object. Normally it's up to