Retire uci.h and benchmark.h

[stockfish] / src / benchmark.cpp

diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 27bc0b071c081ee07b353743f0829083f363583d..e2f7c5a296dbf50dd306e6c501e01ebd03e3137f 100644 (file)
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -25,7 +25,6 @@
 #include <sstream>
 #include <vector>
 
-#include "benchmark.h"
 #include "search.h"
 #include "thread.h"
 #include "ucioption.h"
@@ -89,11 +88,11 @@ void benchmark(const string& commandLine) {
       cerr << "The number of threads must be between 1 and " << MAX_THREADS << endl;
       Application::exit_with_failure();
   }
-  set_option_value("Hash", ttSize);
-  set_option_value("Threads", threads);
-  set_option_value("OwnBook", "false");
-  set_option_value("Use Search Log", "true");
-  set_option_value("Search Log Filename", "bench.txt");
+  Options["Hash"].set_value(ttSize);
+  Options["Threads"].set_value(threads);
+  Options["OwnBook"].set_value("false");
+  Options["Use Search Log"].set_value("true");
+  Options["Search Log Filename"].set_value("bench.txt");
 
   csVal >> val;
   csVal >> fileName;
@@ -161,7 +160,7 @@ void benchmark(const string& commandLine) {
       } else {
           if (!think(pos, false, false, dummy, dummy, 0, maxDepth, maxNodes, secsPerPos, moves))
               break;
-          totalNodes += nodes_searched();
+          totalNodes += pos.nodes_searched();
       }
   }