/*
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
vector<string> fens;
// Assign default values to missing arguments
- string ttSize = (is >> token) ? token : "128";
+ string ttSize = (is >> token) ? token : "32";
string threads = (is >> token) ? token : "1";
string limit = (is >> token) ? token : "12";
string fenFile = (is >> token) ? token : "default";
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());
fens.assign(Defaults, Defaults + 16);
else if (fenFile == "current")
- fens.push_back(current.to_fen());
+ fens.push_back(current.fen());
else
{
if (!file.is_open())
{
cerr << "Unable to open file " << fenFile << endl;
- exit(EXIT_FAILURE);
+ return;
}
while (getline(file, fen))
int64_t nodes = 0;
Search::StateStackPtr st;
- Time time = Time::now();
+ Time::point elapsed = Time::now();
for (size_t i = 0; i < fens.size(); i++)
{
}
else
{
- Threads.start_searching(pos, limits, vector<Move>(), st);
- Threads.wait_for_search_finished();
- nodes += Search::RootPosition.nodes_searched();
+ Threads.start_thinking(pos, limits, vector<Move>(), st);
+ Threads.wait_for_think_finished();
+ nodes += Search::RootPos.nodes_searched();
}
}
- int e = time.elapsed() + 1; // Assure positive to avoid a 'divide by zero'
+ elapsed = Time::now() - elapsed + 1; // Assure positive to avoid a 'divide by zero'
cerr << "\n==========================="
- << "\nTotal time (ms) : " << e
+ << "\nTotal time (ms) : " << elapsed
<< "\nNodes searched : " << nodes
- << "\nNodes/second : " << 1000 * nodes / e << endl;
+ << "\nNodes/second : " << 1000 * nodes / elapsed << endl;
}