X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=07e1341ec354c77c2c973ef318a947012baa5064;hb=1aae35b8b7caec936c77fc981a8868d5b237d05b;hp=605c95ad6ba23a042169b5fe8e214bb9c7910d06;hpb=17bcdb9212e424a9539321b01c3d9f79e0d69a64;p=stockfish
diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 605c95ad..07e1341e 100644
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -17,7 +17,6 @@
along with this program. If not, see .
*/
-#include
#include
#include
#include
@@ -34,7 +33,7 @@ using namespace std;
namespace {
-const char* Defaults[] = {
+const vector Defaults = {
"rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1",
"r3k2r/p1ppqpb1/bn2pnp1/3PN3/1p2P3/2N2Q1p/PPPBBPPP/R3K2R w KQkq - 0 10",
"8/2p5/3p4/KP5r/1R3p1k/8/4P1P1/8 w - - 0 11",
@@ -105,22 +104,22 @@ void benchmark(const Position& current, istream& is) {
Options["Hash"] = ttSize;
Options["Threads"] = threads;
- TT.clear();
+ Search::reset();
if (limitType == "time")
- limits.movetime = atoi(limit.c_str()); // movetime is in ms
+ limits.movetime = stoi(limit); // movetime is in ms
else if (limitType == "nodes")
- limits.nodes = atoi(limit.c_str());
+ limits.nodes = stoi(limit);
else if (limitType == "mate")
- limits.mate = atoi(limit.c_str());
+ limits.mate = stoi(limit);
else
- limits.depth = atoi(limit.c_str());
+ limits.depth = stoi(limit);
if (fenFile == "default")
- fens.assign(Defaults, Defaults + 37);
+ fens = Defaults;
else if (fenFile == "current")
fens.push_back(current.fen());
@@ -128,7 +127,7 @@ void benchmark(const Position& current, istream& is) {
else
{
string fen;
- ifstream file(fenFile.c_str());
+ ifstream file(fenFile);
if (!file.is_open())
{
@@ -145,7 +144,7 @@ void benchmark(const Position& current, istream& is) {
uint64_t nodes = 0;
Search::StateStackPtr st;
- Time::point elapsed = Time::now();
+ TimePoint elapsed = now();
for (size_t i = 0; i < fens.size(); ++i)
{
@@ -159,12 +158,12 @@ void benchmark(const Position& current, istream& is) {
else
{
Threads.start_thinking(pos, limits, st);
- Threads.wait_for_think_finished();
+ Threads.main()->join();
nodes += Search::RootPos.nodes_searched();
}
}
- elapsed = std::max(Time::now() - elapsed, Time::point(1)); // Avoid a 'divide by zero'
+ elapsed = now() - elapsed + 1; // Ensure positivity to avoid a 'divide by zero'
dbg_print(); // Just before to exit