From 925f97f4e761136c8a845d98f55303137fade589 Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Thu, 18 Sep 2008 09:55:35 +0100 Subject: [PATCH 1/1] Teach Benchmark to read positions from a file This comes handy to test the engine on different sets of positions, not only the 15 default ones. Signed-off-by: Marco Costalba --- src/benchmark.cpp | 51 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/src/benchmark.cpp b/src/benchmark.cpp index 05829173..fe701a9c 100644 --- a/src/benchmark.cpp +++ b/src/benchmark.cpp @@ -20,7 +20,9 @@ //// //// Includes //// +#include #include +#include #include "benchmark.h" #include "search.h" @@ -55,19 +57,20 @@ const std::string BenchmarkPositions[15] = { //// 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) { - Position pos; - Move moves[1] = {MOVE_NONE}; - std::string ttSize, threads, fileName; std::istringstream csVal(commandLine); std::istringstream csStr(commandLine); - int val, time; + std::string ttSize, threads, fileName; + int val, secsPerPos; csStr >> ttSize; csVal >> val; @@ -90,15 +93,37 @@ void benchmark(const std::string& commandLine) { set_option_value("Use Search Log", "true"); set_option_value("Search Log Filename", "bench.txt"); - csVal >> time; // In seconds + csVal >> secsPerPos; csVal >> fileName; + + std::vector positions; 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 < 15; i++) + positions.push_back(std::string(BenchmarkPositions[i])); - for (int i = 0; i < 15; i++) + std::vector::iterator it; + for (it = positions.begin(); it != positions.end(); ++it) { - pos.from_fen(BenchmarkPositions[i]); - think(pos, true, false, 0, 0, 0, 0, 0, time * 1000, moves); + Move moves[1] = {MOVE_NONE}; + Position pos(*it); + think(pos, true, false, 0, 0, 0, 0, 0, secsPerPos * 1000, moves); } } -- 2.39.2