kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-30 16:53:09 +00:00
Code Issues Releases Wiki Activity

Rename Option in UCIOPtion

Browse source 
No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2011-04-29 09:18:54 +02:00
parent bb7713c8e9
commit 0bf475ec55
2 changed files with 45 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
src/ucioption.cpp
View file

@ -68,39 +68,39 @@ OptionsMap::OptionsMap() {
OptionsMap& o = *this; OptionsMap& o = *this;
o["Use Search Log"] = Option(false); o["Use Search Log"] = UCIOption(false);
o["Search Log Filename"] = Option("SearchLog.txt"); o["Search Log Filename"] = UCIOption("SearchLog.txt");
o["Book File"] = Option("book.bin"); o["Book File"] = UCIOption("book.bin");
o["Best Book Move"] = Option(false); o["Best Book Move"] = UCIOption(false);
o["Mobility (Middle Game)"] = Option(100, 0, 200); o["Mobility (Middle Game)"] = UCIOption(100, 0, 200);
o["Mobility (Endgame)"] = Option(100, 0, 200); o["Mobility (Endgame)"] = UCIOption(100, 0, 200);
o["Pawn Structure (Middle Game)"] = Option(100, 0, 200); o["Pawn Structure (Middle Game)"] = UCIOption(100, 0, 200);
o["Pawn Structure (Endgame)"] = Option(100, 0, 200); o["Pawn Structure (Endgame)"] = UCIOption(100, 0, 200);
o["Passed Pawns (Middle Game)"] = Option(100, 0, 200); o["Passed Pawns (Middle Game)"] = UCIOption(100, 0, 200);
o["Passed Pawns (Endgame)"] = Option(100, 0, 200); o["Passed Pawns (Endgame)"] = UCIOption(100, 0, 200);
o["Space"] = Option(100, 0, 200); o["Space"] = UCIOption(100, 0, 200);
o["Aggressiveness"] = Option(100, 0, 200); o["Aggressiveness"] = UCIOption(100, 0, 200);
o["Cowardice"] = Option(100, 0, 200); o["Cowardice"] = UCIOption(100, 0, 200);
o["Minimum Split Depth"] = Option(4, 4, 7); o["Minimum Split Depth"] = UCIOption(4, 4, 7);
o["Maximum Number of Threads per Split Point"] = Option(5, 4, 8); o["Maximum Number of Threads per Split Point"] = UCIOption(5, 4, 8);
o["Threads"] = Option(1, 1, MAX_THREADS); o["Threads"] = UCIOption(1, 1, MAX_THREADS);
o["Use Sleeping Threads"] = Option(true); o["Use Sleeping Threads"] = UCIOption(true);
o["Hash"] = Option(32, 4, 8192); o["Hash"] = UCIOption(32, 4, 8192);
o["Clear Hash"] = Option(false, "button"); o["Clear Hash"] = UCIOption(false, "button");
o["Ponder"] = Option(true); o["Ponder"] = UCIOption(true);
o["OwnBook"] = Option(true); o["OwnBook"] = UCIOption(true);
o["MultiPV"] = Option(1, 1, 500); o["MultiPV"] = UCIOption(1, 1, 500);
o["Skill level"] = Option(20, 0, 20); o["Skill level"] = UCIOption(20, 0, 20);
o["Emergency Move Horizon"] = Option(40, 0, 50); o["Emergency Move Horizon"] = UCIOption(40, 0, 50);
o["Emergency Base Time"] = Option(200, 0, 30000); o["Emergency Base Time"] = UCIOption(200, 0, 30000);
o["Emergency Move Time"] = Option(70, 0, 5000); o["Emergency Move Time"] = UCIOption(70, 0, 5000);
o["Minimum Thinking Time"] = Option(20, 0, 5000); o["Minimum Thinking Time"] = UCIOption(20, 0, 5000);
o["UCI_Chess960"] = Option(false); o["UCI_Chess960"] = UCIOption(false);
o["UCI_AnalyseMode"] = Option(false); o["UCI_AnalyseMode"] = UCIOption(false);
// Set some SMP parameters accordingly to the detected CPU count // Set some SMP parameters accordingly to the detected CPU count
Option& thr = o["Threads"]; UCIOption& thr = o["Threads"];
Option& msd = o["Minimum Split Depth"]; UCIOption& msd = o["Minimum Split Depth"];
thr.defaultValue = thr.currentValue = stringify(cpu_count()); thr.defaultValue = thr.currentValue = stringify(cpu_count());
@ -120,7 +120,7 @@ string OptionsMap::print_all() const {
for (OptionsMap::const_iterator it = begin(); it != end(); ++it) for (OptionsMap::const_iterator it = begin(); it != end(); ++it)
if (it->second.idx == i) if (it->second.idx == i)
{ {
const Option& o = it->second; const UCIOption& o = it->second;
s << "\noption name " << it->first << " type " << o.type; s << "\noption name " << it->first << " type " << o.type;
if (o.type != "button") if (o.type != "button")
@ -137,13 +137,13 @@ string OptionsMap::print_all() const {
/// Option class c'tors /// Option class c'tors
Option::Option(const char* def) : type("string"), minValue(0), maxValue(0), idx(Options.size()) UCIOption::UCIOption(const char* def) : type("string"), minValue(0), maxValue(0), idx(Options.size())
{ defaultValue = currentValue = def; } { defaultValue = currentValue = def; }
Option::Option(bool def, string t) : type(t), minValue(0), maxValue(0), idx(Options.size()) UCIOption::UCIOption(bool def, string t) : type(t), minValue(0), maxValue(0), idx(Options.size())
{ defaultValue = currentValue = (def ? "true" : "false"); } { defaultValue = currentValue = (def ? "true" : "false"); }
Option::Option(int def, int minv, int maxv) : type("spin"), minValue(minv), maxValue(maxv), idx(Options.size()) UCIOption::UCIOption(int def, int minv, int maxv) : type("spin"), minValue(minv), maxValue(maxv), idx(Options.size())
{ defaultValue = currentValue = stringify(def); } { defaultValue = currentValue = stringify(def); }
@ -151,7 +151,7 @@ Option::Option(int def, int minv, int maxv) : type("spin"), minValue(minv), maxV
/// the GUI to check for option's limits, but we could receive the new value /// the GUI to check for option's limits, but we could receive the new value
/// directly from the user by teminal window. So let's check the bounds anyway. /// directly from the user by teminal window. So let's check the bounds anyway.
void Option::set_value(const string& v) { void UCIOption::set_value(const string& v) {
assert(!type.empty()); assert(!type.empty());

18
src/ucioption.h
View file

@ -25,12 +25,12 @@
#include <map> #include <map>
#include <string> #include <string>
class Option { class UCIOption {
public: public:
Option() {} // To be used in a std::map UCIOption() {} // To be used in a std::map
Option(const char* defaultValue); UCIOption(const char* defaultValue);
Option(bool defaultValue, std::string type = "check"); UCIOption(bool defaultValue, std::string type = "check");
Option(int defaultValue, int minValue, int maxValue); UCIOption(int defaultValue, int minValue, int maxValue);
void set_value(const std::string& v); void set_value(const std::string& v);
template<typename T> T value() const; template<typename T> T value() const;
@ -51,7 +51,7 @@ struct CaseInsensitiveLess {
/// Our options container is actually a map with a customized c'tor /// Our options container is actually a map with a customized c'tor
class OptionsMap : public std::map<std::string, Option, CaseInsensitiveLess> { class OptionsMap : public std::map<std::string, UCIOption, CaseInsensitiveLess> {
public: public:
OptionsMap(); OptionsMap();
std::string print_all() const; std::string print_all() const;
@ -62,21 +62,21 @@ extern OptionsMap Options;
/// Option::value() definition and specializations /// Option::value() definition and specializations
template<typename T> template<typename T>
T Option::value() const { T UCIOption::value() const {
assert(type == "spin"); assert(type == "spin");
return T(atoi(currentValue.c_str())); return T(atoi(currentValue.c_str()));
} }
template<> template<>
inline std::string Option::value<std::string>() const { inline std::string UCIOption::value<std::string>() const {
assert(type == "string"); assert(type == "string");
return currentValue; return currentValue;
} }
template<> template<>
inline bool Option::value<bool>() const { inline bool UCIOption::value<bool>() const {
assert(type == "check" || type == "button"); assert(type == "check" || type == "button");
return currentValue == "true"; return currentValue == "true";