Restore development versioning and LSN filtering

[stockfish] / src / ucioption.cpp

diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index c31a49e78ae9b62e4cbfb7872baf0edf8db31c1a..442ca924e10761a030213f8a32533ad943509963 100644 (file)
--- 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<std::string, Option> Options;
@@ -125,13 +125,8 @@ 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);
-    o["Futility Margin Scale Factor (Main Search)"] = Option(100, 0, 1000);
-    o["Maximum Razoring Depth"] = Option(3, 0, 4);
-    o["Razoring Margin"] = Option(300, 150, 600);
     o["LSN filtering"] = Option(true);
     o["LSN Time Margin (sec)"] = Option(4, 1, 10);
     o["LSN Value Margin"] = Option(200, 100, 600);
@@ -342,7 +337,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)