X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.cpp;h=006c4c56a59e2e223a4cafa441259e1463fa5f1d;hp=c31a49e78ae9b62e4cbfb7872baf0edf8db31c1a;hb=fbca16da570756f5220b229845e566bd05aa3ce8;hpb=fad772f38753ef3f0ac745ace5f339073a6517b6 diff --git a/src/ucioption.cpp b/src/ucioption.cpp index c31a49e7..006c4c56 100644 --- a/src/ucioption.cpp +++ b/src/ucioption.cpp @@ -38,7 +38,7 @@ //// Variables //// -bool Chess960 = false; +bool Chess960; //// @@ -59,16 +59,16 @@ namespace { std::string name, defaultValue, currentValue; OptionType type; + size_t idx; int minValue, maxValue; ComboValues comboValues; - size_t idx; Option(); - Option(const std::string& defaultValue, OptionType = STRING); + Option(const char* defaultValue, OptionType = STRING); Option(bool defaultValue, OptionType = CHECK); Option(int defaultValue, int minValue, int maxValue); - bool operator<(const Option& o) { return this->idx < o.idx; } + bool operator<(const Option& o) const { return this->idx < o.idx; } }; typedef std::map Options; @@ -125,7 +125,6 @@ namespace { o["Full Depth Moves (PV nodes)"] = Option(14, 1, 100); o["Full Depth Moves (non-PV nodes)"] = Option(3, 1, 100); o["Threat Depth"] = Option(5, 0, 100); - o["Selective Plies"] = Option(7, 0, 10); o["Futility Pruning (Main Search)"] = Option(true); o["Futility Pruning (Quiescence Search)"] = Option(true); o["Futility Margin (Quiescence Search)"] = Option(50, 0, 1000); @@ -342,7 +341,7 @@ namespace { Option::Option() {} // To allow insertion in a std::map - Option::Option(const std::string& def, OptionType t) + Option::Option(const char* def, OptionType t) : defaultValue(def), currentValue(def), type(t), idx(options.size()), minValue(0), maxValue(0) {} Option::Option(bool def, OptionType t)