Tidy up middle game specific evaluation

[stockfish] / src / benchmark.cpp

diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 058291732567b10cf71e2a1a29e5be0aa304fe0c..d922c048c9adb8ad251a8ea6b97c2bc90a719b01 100644 (file)
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -20,7 +20,9 @@
 ////
 //// Includes
 ////
 ////
 //// Includes
 ////

+#include <fstream>

 #include <sstream>
 #include <sstream>

+#include <vector>

 
 #include "benchmark.h"
 #include "search.h"
 
 #include "benchmark.h"
 #include "search.h"


@@ -32,7 +34,8 @@
 //// Variables
 ////
 
 //// Variables
 ////
 

-const std::string BenchmarkPositions[15] = {
+const std::string BenchmarkPositions[16] = {
+  "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1"

   "r4rk1/1b2qppp/p1n1p3/1p6/1b1PN3/3BRN2/PP3PPP/R2Q2K1 b - - 7 16",
   "4r1k1/ppq3pp/3b4/2pP4/2Q1p3/4B1P1/PP5P/R5K1 b - - 0 20",
   "4rrk1/pp1n3p/3q2pQ/2p1pb2/2PP4/2P3N1/P2B2PP/4RRK1 b - - 7 19",
   "r4rk1/1b2qppp/p1n1p3/1p6/1b1PN3/3BRN2/PP3PPP/R2Q2K1 b - - 7 16",
   "4r1k1/ppq3pp/3b4/2pP4/2Q1p3/4B1P1/PP5P/R5K1 b - - 0 20",
   "4rrk1/pp1n3p/3q2pQ/2p1pb2/2PP4/2P3N1/P2B2PP/4RRK1 b - - 7 19",


@@ -55,19 +58,20 @@ const std::string BenchmarkPositions[15] = {
 //// Functions
 ////
 
 //// Functions
 ////
 

-/// benchmark() runs a simple benchmark by letting Glaurung analyze 15
-/// positions for 60 seconds each.  There are two parameters; the
-/// transposition table size and the number of search threads that should
-/// be used.  The analysis is written to a file named bench.txt.
+/// benchmark() runs a simple benchmark by letting Glaurung analyze a set
+/// of positions for a given time each.  There are four parameters; the
+/// transposition table size, the number of search threads that should
+/// be used, the time in seconds spent for each position (optional, default
+/// is 60) and an optional file name where to look for positions in fen
+/// format (default are the BenchmarkPositions defined above).
+/// The analysis is written to a file named bench.txt.

 
 void benchmark(const std::string& commandLine) {
 
 
 void benchmark(const std::string& commandLine) {
 

-  Position pos;
-  Move moves[1] = {MOVE_NONE};
-  std::string ttSize, threads, fileName;

   std::istringstream csVal(commandLine);
   std::istringstream csStr(commandLine);
   std::istringstream csVal(commandLine);
   std::istringstream csStr(commandLine);

-  int val, time;
+  std::string ttSize, threads, fileName;
+  int val, secsPerPos;

 
   csStr >> ttSize;
   csVal >> val;
 
   csStr >> ttSize;
   csVal >> val;


@@ -90,15 +94,38 @@ void benchmark(const std::string& commandLine) {
   set_option_value("Use Search Log", "true");
   set_option_value("Search Log Filename", "bench.txt");
 
   set_option_value("Use Search Log", "true");
   set_option_value("Search Log Filename", "bench.txt");
 

-  csVal >> time; // In seconds
+  csVal >> secsPerPos;

   csVal >> fileName;
   csVal >> fileName;

+
+  std::vector<std::string> positions;

   
   if (fileName != "default")
   
   if (fileName != "default")

-      exit(0);
+  {
+      std::ifstream fenFile(fileName.c_str());
+      if (!fenFile.is_open())
+      {
+          std::cerr << "Unable to open positions file " << fileName
+                    << std::endl;
+          exit(EXIT_FAILURE);
+      }        
+      std::string pos;
+      while (fenFile.good())
+      {
+          std::getline(fenFile, pos);
+          if (!pos.empty())
+              positions.push_back(pos);
+      }
+      fenFile.close();
+  } else
+      for (int i = 0; i < 16; i++)
+          positions.push_back(std::string(BenchmarkPositions[i]));

 
 

-  for (int i = 0; i < 15; i++)
+  std::vector<std::string>::iterator it;
+  for (it = positions.begin(); it != positions.end(); ++it)\r

   {
   {

-      pos.from_fen(BenchmarkPositions[i]);
-      think(pos, true, false, 0, 0, 0, 0, 0, time * 1000, moves);
+      Move moves[1] = {MOVE_NONE};\r
+      int dummy[2] = {0, 0};\r
+      Position pos(*it);      
+      think(pos, true, false, 0, dummy, dummy, 0, 0, 0, secsPerPos * 1000, moves);\r

   }
 }
   }
 }