X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.cpp;h=51987d03c9d01c5ee05b4332d156de47fecf830a;hp=2f4d6f46ed13efeb08184274e95e48a86cdc809f;hb=9934b8ec31483ceb98c19dfe4fface14fe384b32;hpb=2ef5b4066e649c6ce3b10aa5f1bff7525246646d

diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index 2f4d6f46..51987d03 100644
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -20,6 +20,7 @@
 #include <algorithm>
 #include <sstream>
 
+#include "evaluate.h"
 #include "misc.h"
 #include "thread.h"
 #include "tt.h"
@@ -29,15 +30,18 @@ using std::string;
 
 OptionsMap Options; // Global object
 
+namespace {
 
-/// 'On change' actions, triggered by an option's change event
-static void on_threads(UCIOption&) { Threads.read_uci_options(); }
-static void on_hash_size(UCIOption& o) { TT.set_size(o); }
-static void on_clear_hash(UCIOption& o) { TT.clear(); o = false; } // UCI button
-
+/// 'On change' actions, triggered by an option's value change
+void on_eval(UCIOption&) { Eval::init(); }
+void on_threads(UCIOption&) { Threads.read_uci_options(); }
+void on_hash_size(UCIOption& o) { TT.set_size(o); }
+void on_clear_hash(UCIOption& o) { TT.clear(); o = false; } // UCI button
 
 /// Our case insensitive less() function as required by UCI protocol
-static bool ci_less(char c1, char c2) { return tolower(c1) < tolower(c2); }
+bool ci_less(char c1, char c2) { return tolower(c1) < tolower(c2); }
+
+}
 
 bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
   return lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less);
@@ -58,13 +62,13 @@ OptionsMap::OptionsMap() {
   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["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["Mobility (Middle Game)"]      = UCIOption(100, 0, 200, on_eval);
+  o["Mobility (Endgame)"]          = UCIOption(100, 0, 200, on_eval);
+  o["Passed Pawns (Middle Game)"]  = UCIOption(100, 0, 200, on_eval);
+  o["Passed Pawns (Endgame)"]      = UCIOption(100, 0, 200, on_eval);
+  o["Space"]                       = UCIOption(100, 0, 200, on_eval);
+  o["Aggressiveness"]              = UCIOption(100, 0, 200, on_eval);
+  o["Cowardice"]                   = UCIOption(100, 0, 200, on_eval);
   o["Min Split Depth"]             = UCIOption(msd, 4, 7, on_threads);
   o["Max Threads per Split Point"] = UCIOption(5, 4, 8, on_threads);
   o["Threads"]                     = UCIOption(cpus, 1, MAX_THREADS);
@@ -81,12 +85,13 @@ OptionsMap::OptionsMap() {
   o["Minimum Thinking Time"]       = UCIOption(20, 0, 5000);
   o["Slow Mover"]                  = UCIOption(100, 10, 1000);
   o["UCI_Chess960"]                = UCIOption(false);
-  o["UCI_AnalyseMode"]             = UCIOption(false);
+  o["UCI_AnalyseMode"]             = UCIOption(false, on_eval);
 }
 
 
 /// operator<<() is used to output all the UCI options in chronological insertion
 /// order (the idx field) and in the format defined by the UCI protocol.
+
 std::ostream& operator<<(std::ostream& os, const OptionsMap& om) {
 
   for (size_t idx = 0; idx < om.size(); idx++)
@@ -110,19 +115,19 @@ std::ostream& operator<<(std::ostream& os, const OptionsMap& om) {
 
 /// UCIOption class c'tors
 
-UCIOption::UCIOption(const char* v, Fn* f) : type("string"), min(0), max(0), idx(Options.size()), on_change_action(f)
+UCIOption::UCIOption(const char* v, Fn* f) : type("string"), min(0), max(0), idx(Options.size()), on_change(f)
 { defaultValue = currentValue = v; }
 
-UCIOption::UCIOption(bool v, Fn* f) : type("check"), min(0), max(0), idx(Options.size()), on_change_action(f)
+UCIOption::UCIOption(bool v, Fn* f) : type("check"), min(0), max(0), idx(Options.size()), on_change(f)
 { defaultValue = currentValue = (v ? "true" : "false"); }
 
-UCIOption::UCIOption(int v, int minv, int maxv, Fn* f) : type("spin"), min(minv), max(maxv), idx(Options.size()), on_change_action(f)
+UCIOption::UCIOption(int v, int minv, int maxv, Fn* f) : type("spin"), min(minv), max(maxv), idx(Options.size()), on_change(f)
 { std::ostringstream ss; ss << v; defaultValue = currentValue = ss.str(); }
 
 
 /// UCIOption::operator=() updates currentValue. 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.
+/// the user by console window, so let's check the bounds anyway.
 
 void UCIOption::operator=(const string& v) {
 
@@ -134,7 +139,7 @@ void UCIOption::operator=(const string& v) {
   {
       currentValue = v;
 
-      if (on_change_action)
-          (*on_change_action)(*this);
+      if (on_change)
+          (*on_change)(*this);
   }
 }