X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=f42c0e6c312460742dd944d1765398bd2f001788;hp=1491e222ea4b108bb726bdb557b7feae12349baa;hb=673bc5526fa3d352f823ad144fb521b5dc98f45c;hpb=a29dd88f7563c5af871d9adc137218c39586b09c

diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 1491e222..f42c0e6c 100644
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -19,7 +19,7 @@
 
 #include <fstream>
 #include <iostream>
-#include <set>
+#include <sstream>
 #include <vector>
 
 #include "misc.h"
@@ -29,7 +29,6 @@
 #include "ucioption.h"
 
 using namespace std;
-using namespace Search;
 
 static const char* Defaults[] = {
   "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1",
@@ -59,35 +58,34 @@ static const char* Defaults[] = {
 /// 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[]) {
+void benchmark(istringstream& is) {
 
-  vector<string> fens;
-  LimitsType limits;
-  int time;
-  int64_t nodes = 0;
+  string token;
+  Search::LimitsType limits;
+  vector<string> fens(Defaults, Defaults + 16);
 
   // Assign default values to missing arguments
-  string ttSize  = argc > 2 ? argv[2] : "128";
-  string threads = argc > 3 ? argv[3] : "1";
-  string valStr  = argc > 4 ? argv[4] : "12";
-  string fenFile = argc > 5 ? argv[5] : "default";
-  string valType = argc > 6 ? argv[6] : "depth";
+  string ttSize    = (is >> token) ? token : "128";
+  string threads   = (is >> token) ? token : "1";
+  string limit     = (is >> token) ? token : "12";
+  string fenFile   = (is >> token) ? token : "default";
+  string limitType = (is >> token) ? token : "depth";
 
   Options["Hash"]    = ttSize;
   Options["Threads"] = threads;
-  Options["OwnBook"] = false;
 
-  if (valType == "time")
-      limits.maxTime = 1000 * atoi(valStr.c_str()); // maxTime is in ms
+  if (limitType == "time")
+      limits.movetime = 1000 * atoi(limit.c_str()); // movetime is in ms
 
-  else if (valType == "nodes")
-      limits.maxNodes = atoi(valStr.c_str());
+  else if (limitType == "nodes")
+      limits.nodes = atoi(limit.c_str());
 
   else
-      limits.maxDepth = atoi(valStr.c_str());
+      limits.depth = atoi(limit.c_str());
 
   if (fenFile != "default")
   {
+      fens.clear();
       string fen;
       ifstream file(fenFile.c_str());
 
@@ -103,34 +101,34 @@ void benchmark(int argc, char* argv[]) {
 
       file.close();
   }
-  else
-      fens.assign(Defaults, Defaults + 16);
 
-  time = system_time();
+  int64_t nodes = 0;
+  Time time = Time::current_time();
 
   for (size_t i = 0; i < fens.size(); i++)
   {
-      Position pos(fens[i], false, 0);
+      Position pos(fens[i], false, NULL);
 
       cerr << "\nPosition: " << i + 1 << '/' << fens.size() << endl;
 
-      if (valType == "perft")
+      if (limitType == "perft")
       {
-          int64_t cnt = perft(pos, limits.maxDepth * ONE_PLY);
-          cerr << "\nPerft " << limits.maxDepth  << " leaf nodes: " << cnt << endl;
+          int64_t cnt = Search::perft(pos, limits.depth * ONE_PLY);
+          cerr << "\nPerft " << limits.depth  << " leaf nodes: " << cnt << endl;
           nodes += cnt;
       }
       else
       {
-          Threads.start_thinking(pos, limits, set<Move>(), false);
-          nodes += RootPosition.nodes_searched();
+          Threads.start_searching(pos, limits, vector<Move>());
+          Threads.wait_for_search_finished();
+          nodes += Search::RootPosition.nodes_searched();
       }
   }
 
-  time = system_time() - time;
+  int e = time.elapsed();
 
   cerr << "\n==========================="
-       << "\nTotal time (ms) : " << time
+       << "\nTotal time (ms) : " << e
        << "\nNodes searched  : " << nodes
-       << "\nNodes/second    : " << int(nodes / (time / 1000.0)) << endl;
+       << "\nNodes/second    : " << int(nodes / (e / 1000.0)) << endl;
 }