X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=fa0aa3e9e761d7afdd986413d0be8617380b2818;hb=3ce43c20dee3d0c7afc4ff3b4c67e0530ab2138f;hp=47face7ff24e95c6f6be225aa2b68d71adffb958;hpb=239d7b3fd144d2b493bb47ea97a436cec8ae5990;p=stockfish diff --git a/src/benchmark.cpp b/src/benchmark.cpp index 47face7f..fa0aa3e9 100644 --- a/src/benchmark.cpp +++ b/src/benchmark.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -82,6 +82,9 @@ void benchmark(const Position& current, istream& is) { else if (limitType == "nodes") limits.nodes = atoi(limit.c_str()); + else if (limitType == "mate") + limits.mate = atoi(limit.c_str()); + else limits.depth = atoi(limit.c_str()); @@ -99,7 +102,7 @@ void benchmark(const Position& current, istream& is) { if (!file.is_open()) { cerr << "Unable to open file " << fenFile << endl; - exit(EXIT_FAILURE); + return; } while (getline(file, fen)) @@ -111,6 +114,7 @@ void benchmark(const Position& current, istream& is) { int64_t nodes = 0; Search::StateStackPtr st; + Search::MovesVectPtr mv; Time::point elapsed = Time::now(); for (size_t i = 0; i < fens.size(); i++) @@ -127,8 +131,8 @@ void benchmark(const Position& current, istream& is) { } else { - Threads.start_searching(pos, limits, vector(), st); - Threads.wait_for_search_finished(); + Threads.start_thinking(pos, limits, vector(), st, mv); + Threads.wait_for_think_finished(); nodes += Search::RootPos.nodes_searched(); } }