#include <fstream>
#include <iostream>
-#include <sstream>
+#include <istream>
#include <vector>
#include "misc.h"
#include "position.h"
#include "search.h"
#include "thread.h"
+#include "tt.h"
#include "ucioption.h"
using namespace std;
/// 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(istringstream& is) {
+void benchmark(const Position& current, istream& is) {
string token;
Search::LimitsType limits;
- vector<string> fens(Defaults, Defaults + 16);
+ 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";
Options["Hash"] = ttSize;
Options["Threads"] = threads;
+ TT.clear();
if (limitType == "time")
limits.movetime = 1000 * atoi(limit.c_str()); // movetime is in ms
else
limits.depth = atoi(limit.c_str());
- if (fenFile != "default")
+ if (fenFile == "default")
+ fens.assign(Defaults, Defaults + 16);
+
+ else if (fenFile == "current")
+ fens.push_back(current.fen());
+
+ else
{
- fens.clear();
string fen;
ifstream file(fenFile.c_str());
}
int64_t nodes = 0;
- Time time = Time::current_time();
+ Search::StateStackPtr st;
+ Time::point elapsed = Time::now();
for (size_t i = 0; i < fens.size(); i++)
{
- Position pos(fens[i], false, Threads.main_thread());
+ Position pos(fens[i], Options["UCI_Chess960"], Threads.main_thread());
cerr << "\nPosition: " << i + 1 << '/' << fens.size() << endl;
if (limitType == "perft")
{
- int64_t cnt = Search::perft(pos, limits.depth * ONE_PLY);
+ size_t cnt = Search::perft(pos, limits.depth * ONE_PLY);
cerr << "\nPerft " << limits.depth << " leaf nodes: " << cnt << endl;
nodes += cnt;
}
else
{
- Threads.start_searching(pos, limits, vector<Move>());
+ Threads.start_searching(pos, limits, vector<Move>(), st);
Threads.wait_for_search_finished();
- nodes += Search::RootPosition.nodes_searched();
+ nodes += Search::RootPos.nodes_searched();
}
}
- int e = time.elapsed();
+ 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 : " << int(nodes / (e / 1000.0)) << endl;
+ << "\nNodes/second : " << 1000 * nodes / elapsed << endl;
}