With a little fall out in siblings functions...
No functional change.
Signed-off-by: Marco Costalba <mcostalba@gmail.com>
if (argc <= 1)
{
// Print copyright notice
if (argc <= 1)
{
// Print copyright notice
- cout << engine_name()
- << " by Tord Romstad, Marco Costalba, Joona Kiiski" << endl;
+ cout << engine_name() << " by " << engine_author() << endl;
if (CpuHasPOPCNT)
cout << "Good! CPU has hardware POPCNT." << endl;
if (CpuHasPOPCNT)
cout << "Good! CPU has hardware POPCNT." << endl;
+const string engine_author() { return "Tord Romstad, Marco Costalba and Joona Kiiski"; }
+
/// get_system_time() returns the current system time, measured in
/// milliseconds.
/// get_system_time() returns the current system time, measured in
/// milliseconds.
////
extern const std::string engine_name();
////
extern const std::string engine_name();
+extern const std::string engine_author();
extern int get_system_time();
extern int cpu_count();
extern int input_available();
extern int get_system_time();
extern int cpu_count();
extern int input_available();
static Position pos(StartPositionFEN, false, 0); // The root position
UCIParser up(cmd);
static Position pos(StartPositionFEN, false, 0); // The root position
UCIParser up(cmd);
- if (!(up >> token)) // operator>>() skips any whitespace
- return true;
+ up >> token; // operator>>() skips any whitespace
if (token == "quit")
return false;
if (token == "quit")
return false;
+ else if (token == "go")
- if (token == "uci")
- {
+ else if (token == "uci")
cout << "id name " << engine_name()
cout << "id name " << engine_name()
- << "\nid author Tord Romstad, Marco Costalba, Joona Kiiski\n";
- print_uci_options();
- cout << "uciok" << endl;
- }
+ << "\nid author " << engine_author()
+ << "\n" << options_to_uci()
+ << "\nuciok" << endl;
+
else if (token == "ucinewgame")
pos.from_fen(StartPositionFEN, false);
else if (token == "ucinewgame")
pos.from_fen(StartPositionFEN, false);
else if (token == "setoption")
set_option(up);
else if (token == "setoption")
set_option(up);
- // The remaining commands are for debugging purposes only
else if (token == "d")
pos.print();
else if (token == "d")
pos.print();
- else if (token == "flip")
- {
- Position p(pos, pos.thread());
- pos.flipped_copy(p);
- }
else if (token == "eval")
else if (token == "eval")
cout << "Incremental mg: " << mg_value(pos.value())
<< "\nIncremental eg: " << eg_value(pos.value())
cout << "Incremental mg: " << mg_value(pos.value())
<< "\nIncremental eg: " << eg_value(pos.value())
- << "\nFull eval: " << evaluate(pos, evalMargin) << endl;
- }
+ << "\nFull eval: " << evaluate(pos, dummy) << endl;
+
- cout << "key: " << hex << pos.get_key()
+ cout << "key: " << hex << pos.get_key()
<< "\nmaterial key: " << pos.get_material_key()
<< "\nmaterial key: " << pos.get_material_key()
- << "\npawn key: " << pos.get_pawn_key() << endl;
+ << "\npawn key: " << pos.get_pawn_key() << endl;
else if (token == "perft")
perft(pos, up);
else if (token == "perft")
perft(pos, up);
+ else if (token == "flip")
+ {
+ Position p(pos, pos.thread());
+ pos.flipped_copy(p);
+ }
else
cout << "Unknown command: " << cmd << endl;
else
cout << "Unknown command: " << cmd << endl;
bool go(Position& pos, UCIParser& up) {
string token;
bool go(Position& pos, UCIParser& up) {
string token;
-
- int time[2] = {0, 0}, inc[2] = {0, 0};
- int movesToGo = 0, depth = 0, nodes = 0, moveTime = 0;
- bool infinite = false, ponder = false;
Move searchMoves[MOVES_MAX];
Move searchMoves[MOVES_MAX];
+ int movesToGo, depth, nodes, moveTime, numOfMoves;
+ bool infinite, ponder;
+ int time[2] = {0, 0}, inc[2] = {0, 0};
searchMoves[0] = MOVE_NONE;
searchMoves[0] = MOVE_NONE;
+ infinite = ponder = false;
+ movesToGo = depth = nodes = moveTime = numOfMoves = 0;
up >> moveTime;
else if (token == "searchmoves")
{
up >> moveTime;
else if (token == "searchmoves")
{
while (up >> token)
searchMoves[numOfMoves++] = move_from_uci(pos, token);
while (up >> token)
searchMoves[numOfMoves++] = move_from_uci(pos, token);
-/// print_uci_options() prints all the UCI options to the standard output,
-/// in chronological insertion order (the idx field) and in the format
-/// defined by the UCI protocol.
+/// options_to_uci() returns a string with all the UCI options in chronological
+/// insertion order (the idx field) and in the format defined by the UCI protocol.
-void print_uci_options() {
+string options_to_uci() {
+
+ std::stringstream s;
for (size_t i = 0; i <= Options.size(); i++)
for (OptionsMap::const_iterator it = Options.begin(); it != Options.end(); ++it)
if (it->second.idx == i)
{
const Option& o = it->second;
for (size_t i = 0; i <= Options.size(); i++)
for (OptionsMap::const_iterator it = Options.begin(); it != Options.end(); ++it)
if (it->second.idx == i)
{
const Option& o = it->second;
- cout << "\noption name " << it->first << " type " << o.type;
+ s << "\noption name " << it->first << " type " << o.type;
- cout << " default " << o.defaultValue;
+ s << " default " << o.defaultValue;
- cout << " min " << o.minValue << " max " << o.maxValue;
+ s << " min " << o.minValue << " max " << o.maxValue;
private:
friend void init_uci_options();
private:
friend void init_uci_options();
- friend void print_uci_options();
+ friend std::string options_to_uci();
std::string defaultValue, currentValue, type;
size_t idx;
std::string defaultValue, currentValue, type;
size_t idx;
extern OptionsMap Options;
extern void init_uci_options();
extern OptionsMap Options;
extern void init_uci_options();
-extern void print_uci_options();
+extern std::string options_to_uci();
#endif // !defined(UCIOPTION_H_INCLUDED)
#endif // !defined(UCIOPTION_H_INCLUDED)