summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
dab1cd8)
No functional change.
Signed-off-by: Marco Costalba <mcostalba@gmail.com>
/// benchmark() runs a simple benchmark by letting Stockfish analyze a set
/// benchmark() runs a simple benchmark by letting Stockfish analyze a set
-/// of positions for a given limit each. There are five parameters; the
+/// of positions for a given limit each. There are five parameters; the
/// transposition table size, the number of search threads that should
/// transposition table size, the number of search threads that should
-/// be used, the limit value spent for each position (optional, default
-/// is ply 12), an optional file name where to look for positions in fen
-/// format (default are the BenchmarkPositions defined above) and the type
-/// of the limit value: depth (default), time in secs or number of nodes.
-/// The analysis is written to a file named bench.txt.
+/// be used, the limit value spent for each position (optional, default is
+/// depth 12), an optional file name where to look for positions in fen
+/// 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(int argc, char* argv[]) {
void benchmark(int argc, char* argv[]) {
int64_t totalNodes;
int time;
int64_t totalNodes;
int time;
- // Load default positions
- for (int i = 0; !Defaults[i].empty(); i++)
- fenList.push_back(Defaults[i]);
-
// Assign default values to missing arguments
string ttSize = argc > 2 ? argv[2] : "128";
string threads = argc > 3 ? argv[3] : "1";
// Assign default values to missing arguments
string ttSize = argc > 2 ? argv[2] : "128";
string threads = argc > 3 ? argv[3] : "1";
else
limits.maxDepth = atoi(valStr.c_str());
else
limits.maxDepth = atoi(valStr.c_str());
- // Do we need to load positions from a given FEN file ?
+ // Do we need to load positions from a given FEN file?
if (fenFile != "default")
{
string fen;
ifstream f(fenFile.c_str());
if (fenFile != "default")
{
string fen;
ifstream f(fenFile.c_str());
- if (f.is_open())
- {
- fenList.clear();
-
- while (getline(f, fen))
- if (!fen.empty())
- fenList.push_back(fen);
-
- f.close();
- }
- else
- cerr << "Unable to open FEN file " << fenFile << endl;
+ cerr << "Unable to open file " << fenFile << endl;
+
+ while (getline(f, fen))
+ if (!fen.empty())
+ fenList.push_back(fen);
+
+ f.close();
+ else // Load default positions
+ for (int i = 0; !Defaults[i].empty(); i++)
+ fenList.push_back(Defaults[i]);
// Ok, let's start the benchmark !
totalNodes = 0;
// Ok, let's start the benchmark !
totalNodes = 0;
if (valType == "perft")
{
int64_t cnt = perft(pos, limits.maxDepth * ONE_PLY);
if (valType == "perft")
{
int64_t cnt = perft(pos, limits.maxDepth * ONE_PLY);
- cerr << "\nPerft " << limits.maxDepth << " nodes counted: " << cnt << endl;
+ cerr << "\nPerft " << limits.maxDepth
+ << " nodes counted: " << cnt << endl;
+
+ totalNodes += cnt;
-// stringify() converts a numeric value of type T to a std::string
-template<typename T>
-static string stringify(const T& v) {
+// An helper to convert an integer value to a std::string
+static string int_to_string(int v) {
std::ostringstream ss;
ss << v;
std::ostringstream ss;
ss << v;
UCIOption& thr = o["Threads"];
UCIOption& msd = o["Minimum Split Depth"];
UCIOption& thr = o["Threads"];
UCIOption& msd = o["Minimum Split Depth"];
- thr.defaultValue = thr.currentValue = stringify(cpu_count());
+ thr.defaultValue = thr.currentValue = int_to_string(cpu_count());
- msd.defaultValue = msd.currentValue = stringify(7);
+ msd.defaultValue = msd.currentValue = int_to_string(7);
{ defaultValue = currentValue = (def ? "true" : "false"); }
UCIOption::UCIOption(int def, int minv, int maxv) : type("spin"), minValue(minv), maxValue(maxv), idx(Options.size())
{ defaultValue = currentValue = (def ? "true" : "false"); }
UCIOption::UCIOption(int def, int minv, int maxv) : type("spin"), minValue(minv), maxValue(maxv), idx(Options.size())
-{ defaultValue = currentValue = stringify(def); }
+{ defaultValue = currentValue = int_to_string(def); }
/// set_value() updates currentValue of the Option object. Normally it's up to
/// set_value() updates currentValue of the Option object. Normally it's up to