X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbenchmark.cpp;h=f22ea6dada5d2ca7246039d45454c9e5e7e01a63;hp=4d9e35956cf02e7a5440a5b80864bad0f42019be;hb=55948623e7b8ad1fc6624cd06733b16d295eecb8;hpb=22715259a04497743afe7e33f5cf1e3b13bb097e diff --git a/src/benchmark.cpp b/src/benchmark.cpp index 4d9e3595..f22ea6da 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()); @@ -89,7 +92,7 @@ void benchmark(const Position& current, istream& is) { fens.assign(Defaults, Defaults + 16); else if (fenFile == "current") - fens.push_back(current.to_fen()); + fens.push_back(current.fen()); else { @@ -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)) @@ -115,7 +118,7 @@ void benchmark(const Position& current, istream& is) { for (size_t i = 0; i < fens.size(); i++) { - Position pos(fens[i], Options["UCI_Chess960"], Threads.main_thread()); + Position pos(fens[i], Options["UCI_Chess960"], Threads.main()); cerr << "\nPosition: " << i + 1 << '/' << fens.size() << endl; @@ -127,8 +130,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); + Threads.wait_for_think_finished(); nodes += Search::RootPos.nodes_searched(); } }