Rename Option in UCIOPtion

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index a8b34c7021c27e05d4545bd22e5e3fb648320e18..8031ff15d855bf233ec3f54055268a6f9ffad440 100644 (file)
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -68,39 +68,39 @@ OptionsMap::OptionsMap() {
 
   OptionsMap& o = *this;
 
-  o["Use Search Log"] = Option(false);
-  o["Search Log Filename"] = Option("SearchLog.txt");
-  o["Book File"] = Option("book.bin");
-  o["Best Book Move"] = Option(false);
-  o["Mobility (Middle Game)"] = Option(100, 0, 200);
-  o["Mobility (Endgame)"] = Option(100, 0, 200);
-  o["Pawn Structure (Middle Game)"] = Option(100, 0, 200);
-  o["Pawn Structure (Endgame)"] = Option(100, 0, 200);
-  o["Passed Pawns (Middle Game)"] = Option(100, 0, 200);
-  o["Passed Pawns (Endgame)"] = Option(100, 0, 200);
-  o["Space"] = Option(100, 0, 200);
-  o["Aggressiveness"] = Option(100, 0, 200);
-  o["Cowardice"] = Option(100, 0, 200);
-  o["Minimum Split Depth"] = Option(4, 4, 7);
-  o["Maximum Number of Threads per Split Point"] = Option(5, 4, 8);
-  o["Threads"] = Option(1, 1, MAX_THREADS);
-  o["Use Sleeping Threads"] = Option(true);
-  o["Hash"] = Option(32, 4, 8192);
-  o["Clear Hash"] = Option(false, "button");
-  o["Ponder"] = Option(true);
-  o["OwnBook"] = Option(true);
-  o["MultiPV"] = Option(1, 1, 500);
-  o["Skill level"] = Option(20, 0, 20);
-  o["Emergency Move Horizon"] = Option(40, 0, 50);
-  o["Emergency Base Time"] = Option(200, 0, 30000);
-  o["Emergency Move Time"] = Option(70, 0, 5000);
-  o["Minimum Thinking Time"] = Option(20, 0, 5000);
-  o["UCI_Chess960"] = Option(false);
-  o["UCI_AnalyseMode"] = Option(false);
+  o["Use Search Log"] = UCIOption(false);
+  o["Search Log Filename"] = UCIOption("SearchLog.txt");
+  o["Book File"] = UCIOption("book.bin");
+  o["Best Book Move"] = UCIOption(false);
+  o["Mobility (Middle Game)"] = UCIOption(100, 0, 200);
+  o["Mobility (Endgame)"] = UCIOption(100, 0, 200);
+  o["Pawn Structure (Middle Game)"] = UCIOption(100, 0, 200);
+  o["Pawn Structure (Endgame)"] = UCIOption(100, 0, 200);
+  o["Passed Pawns (Middle Game)"] = UCIOption(100, 0, 200);
+  o["Passed Pawns (Endgame)"] = UCIOption(100, 0, 200);
+  o["Space"] = UCIOption(100, 0, 200);
+  o["Aggressiveness"] = UCIOption(100, 0, 200);
+  o["Cowardice"] = UCIOption(100, 0, 200);
+  o["Minimum Split Depth"] = UCIOption(4, 4, 7);
+  o["Maximum Number of Threads per Split Point"] = UCIOption(5, 4, 8);
+  o["Threads"] = UCIOption(1, 1, MAX_THREADS);
+  o["Use Sleeping Threads"] = UCIOption(true);
+  o["Hash"] = UCIOption(32, 4, 8192);
+  o["Clear Hash"] = UCIOption(false, "button");
+  o["Ponder"] = UCIOption(true);
+  o["OwnBook"] = UCIOption(true);
+  o["MultiPV"] = UCIOption(1, 1, 500);
+  o["Skill level"] = UCIOption(20, 0, 20);
+  o["Emergency Move Horizon"] = UCIOption(40, 0, 50);
+  o["Emergency Base Time"] = UCIOption(200, 0, 30000);
+  o["Emergency Move Time"] = UCIOption(70, 0, 5000);
+  o["Minimum Thinking Time"] = UCIOption(20, 0, 5000);
+  o["UCI_Chess960"] = UCIOption(false);
+  o["UCI_AnalyseMode"] = UCIOption(false);
 
   // Set some SMP parameters accordingly to the detected CPU count
-  Option& thr = o["Threads"];
-  Option& msd = o["Minimum Split Depth"];
+  UCIOption& thr = o["Threads"];
+  UCIOption& msd = o["Minimum Split Depth"];
 
   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)
           if (it->second.idx == i)
           {
-              const Option& o = it->second;
+              const UCIOption& o = it->second;
               s << "\noption name " << it->first << " type " << o.type;
 
               if (o.type != "button")
@@ -137,13 +137,13 @@ string OptionsMap::print_all() const {
 
 /// 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; }
 
-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"); }
 
-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); }
 
 
@@ -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
 /// 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());
 

diff --git a/src/ucioption.h b/src/ucioption.h
index a5da2e440b768e50f3fa11f50700e11983f3b2e0..b6ad959cc353a9e5a3579d2973410fc2d88d2b10 100644 (file)
--- a/src/ucioption.h
+++ b/src/ucioption.h
@@ -25,12 +25,12 @@
 #include <map>
 #include <string>
 
-class Option {
+class UCIOption {
 public:
-  Option() {} // To be used in a std::map
-  Option(const char* defaultValue);
-  Option(bool defaultValue, std::string type = "check");
-  Option(int defaultValue, int minValue, int maxValue);
+  UCIOption() {} // To be used in a std::map
+  UCIOption(const char* defaultValue);
+  UCIOption(bool defaultValue, std::string type = "check");
+  UCIOption(int defaultValue, int minValue, int maxValue);
 
   void set_value(const std::string& v);
   template<typename T> T value() const;
@@ -51,7 +51,7 @@ struct CaseInsensitiveLess {
 
 
 /// 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:
   OptionsMap();
   std::string print_all() const;
@@ -62,21 +62,21 @@ extern OptionsMap Options;
 
 /// Option::value() definition and specializations
 template<typename T>
-T Option::value() const {
+T UCIOption::value() const {
 
   assert(type == "spin");
   return T(atoi(currentValue.c_str()));
 }
 
 template<>
-inline std::string Option::value<std::string>() const {
+inline std::string UCIOption::value<std::string>() const {
 
   assert(type == "string");
   return currentValue;
 }
 
 template<>
-inline bool Option::value<bool>() const {
+inline bool UCIOption::value<bool>() const {
 
   assert(type == "check" || type == "button");
   return currentValue == "true";