//// Includes
////
#include <fstream>
+#include <iostream>
#include <vector>
#include "search.h"
"3r1rk1/p5pp/bpp1pp2/8/q1PP1P2/b3P3/P2NQRPP/1R2B1K1 b - - 6 22",
"r1q2rk1/2p1bppp/2Pp4/p6b/Q1PNp3/4B3/PP1R1PPP/2K4R w - - 2 18",
"4k2r/1pb2ppp/1p2p3/1R1p4/3P4/2r1PN2/P4PPP/1R4K1 b - - 3 22",
- "3q2k1/pb3p1p/4pbp1/2r5/PpN2N2/1P2P2P/5PP1/Q2R2K1 b - - 4 26"
+ "3q2k1/pb3p1p/4pbp1/2r5/PpN2N2/1P2P2P/5PP1/Q2R2K1 b - - 4 26",
+ ""
};
vector<string> positions;
string ttSize, threads, valStr, posFile, valType;
- int val, secsPerPos, maxDepth, maxNodes;
+ int val, maxTime, maxDepth, maxNodes;
ttSize = argc > 2 ? argv[2] : "128";
threads = argc > 3 ? argv[3] : "1";
Options["Use Search Log"].set_value("true");
Options["Search Log Filename"].set_value("bench.txt");
- secsPerPos = maxDepth = maxNodes = 0;
+ maxTime = maxDepth = maxNodes = 0;
val = atoi(valStr.c_str());
if (valType == "depth" || valType == "perft")
maxDepth = val;
else if (valType == "time")
- secsPerPos = val * 1000;
+ maxTime = val * 1000;
else
maxNodes = val;
if (!fenFile.is_open())
{
cerr << "Unable to open positions file " << posFile << endl;
- Application::exit_with_failure();
+ exit(EXIT_FAILURE);
}
string pos;
while (fenFile.good())
}
fenFile.close();
} else
- for (int i = 0; i < 16; i++)
- positions.push_back(string(BenchmarkPositions[i]));
+ for (int i = 0; !BenchmarkPositions[i].empty(); i++)
+ positions.push_back(BenchmarkPositions[i]);
vector<string>::iterator it;
int cnt = 1;
for (it = positions.begin(); it != positions.end(); ++it, ++cnt)
{
- Move moves[1] = { MOVE_NONE };
- int dummy[2] = { 0, 0 };
- Position pos(*it, 0);
+ Move moves[] = { MOVE_NONE };
+ Position pos(*it, false, 0);
cerr << "\nBench position: " << cnt << '/' << positions.size() << endl << endl;
if (valType == "perft")
{
cerr << "\nPerft " << maxDepth << " result (nodes searched): " << perftCnt << endl << endl;
totalNodes += perftCnt;
} else {
- if (!think(pos, false, false, dummy, dummy, 0, maxDepth, maxNodes, secsPerPos, moves))
+ if (!think(pos, SearchLimits(0, 0, 0, maxTime, maxDepth, maxNodes, false, false), moves))
break;
totalNodes += pos.nodes_searched();
}