X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.cpp;h=bc35865540aa151b734b306b483d8e26a4110633;hp=9bcd960b6a157f535d44dfaa030f64d1519849ef;hb=2142be7d7f2747a3e980a77102ecb29c989fe1ac;hpb=6a6facc058e5f08ccd07815a6e619eb0d2451000

diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index 9bcd960b..bc358655 100644
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -116,14 +116,12 @@ namespace {
     o["Passed Pawn Extension (non-PV nodes)"] = Option(0, 0, 2);
     o["Pawn Endgame Extension (PV nodes)"] = Option(2, 0, 2);
     o["Pawn Endgame Extension (non-PV nodes)"] = Option(2, 0, 2);
-    o["Full Depth Moves (PV nodes)"] = Option(10, 1, 100);
-    o["Full Depth Moves (non-PV nodes)"] = Option(3, 1, 100);
     o["Threat Depth"] = Option(5, 0, 100);
     o["Randomness"] = Option(0, 0, 10);
     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, THREAD_MAX);
-    o["Hash"] = Option(32, 4, 2048);
+    o["Threads"] = Option(1, 1, MAX_THREADS);
+    o["Hash"] = Option(32, 4, 8192);
     o["Clear Hash"] = Option(false, BUTTON);
     o["New Game"] = Option(false, BUTTON);
     o["Ponder"] = Option(true);
@@ -198,10 +196,14 @@ void init_uci_options() {
 
   // Set optimal value for parameter "Minimum Split Depth"
   // according to number of available cores.
+  assert(options.find("Threads") != options.end());
   assert(options.find("Minimum Split Depth") != options.end());
 
+  Option& thr = options["Threads"];
   Option& msd = options["Minimum Split Depth"];
 
+  thr.defaultValue = thr.currentValue = stringify(cpu_count());
+
   if (cpu_count() >= 8)
       msd.defaultValue = msd.currentValue = stringify(7);
 }
@@ -291,10 +293,28 @@ void set_option_value(const string& name, const string& value) {
   else if (v == "false")
       v = "0";
 
-  if (options.find(name) != options.end())
-      options[name].currentValue = v;
-  else
+  if (options.find(name) == options.end())
+  {
       std::cout << "No such option: " << name << std::endl;
+      return;
+  }
+
+  // Normally it's up to 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.
+  Option& opt = options[name];
+
+  if (opt.type == CHECK && v != "0" && v != "1")
+      return;
+
+  else if (opt.type == SPIN)
+  {
+      int val = atoi(v.c_str());
+      if (val < opt.minValue || val > opt.maxValue)
+          return;
+  }
+
+  opt.currentValue = v;
 }