X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=9b2e81e1a1f335aaf2cc83ed65894ed9c60b7204;hp=b9cd4058aca8296eca14d9fe18aa7b2242a0e1a4;hb=c645aca199ac7db2ffcfc229b3cda8dafa6fb835;hpb=2f99de0c6c3b9eb7531ec34dbbaf026697cb4fe4 diff --git a/src/benchmark.cpp b/src/benchmark.cpp index b9cd4058..9b2e81e1 100644 --- a/src/benchmark.cpp +++ b/src/benchmark.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include "misc.h" @@ -58,11 +58,11 @@ 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(istringstream& is) { +void benchmark(const Position& current, istream& is) { string token; Search::LimitsType limits; - vector fens(Defaults, Defaults + 16); + vector fens; // Assign default values to missing arguments string ttSize = (is >> token) ? token : "128"; @@ -83,9 +83,14 @@ void benchmark(istringstream& is) { else limits.depth = atoi(limit.c_str()); - if (fenFile != "default") + if (fenFile == "default") + fens.assign(Defaults, Defaults + 16); + + else if (fenFile == "current") + fens.push_back(current.to_fen()); + + else { - fens.clear(); string fen; ifstream file(fenFile.c_str()); @@ -107,7 +112,7 @@ void benchmark(istringstream& is) { for (size_t i = 0; i < fens.size(); i++) { - Position pos(fens[i], false, 0); + Position pos(fens[i], Options["UCI_Chess960"], Threads.main_thread()); cerr << "\nPosition: " << i + 1 << '/' << fens.size() << endl;