Introduced the UCI_AnalyseMode option, and made the evaluation function

symmetrical in analyse mode.

No functional change when playing games.

diff --git a/src/Makefile b/src/Makefile
index 5e27f9e72788f8ab14f10cf79d8ccbb2f68c1d41..09e79563d2e3229b228294cd75bcdb15ac0adda3 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -44,7 +44,7 @@ clean:
 ### Compiler:
 ###
 
-CXX = g++
+CXX = g++-4.2
 # CXX = icpc
 
 
@@ -67,7 +67,7 @@ include .depend
 
 # Enable/disable debugging, disabled by default
 
-CXXFLAGS += -DNDEBUG
+# CXXFLAGS += -DNDEBUG
 
 
 # Compile with full warnings, and symbol names stripped, you can use

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index 486bb810cb995b6f0a356f95f85ca2a0a09a1abd..7a4176b78af7834a92eb2a90d0b5d2f2b1e42637 100644 (file)
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -532,6 +532,14 @@ void read_weights(Color us) {
 
   WeightKingSafety[us]   = weight_option("Cowardice", WeightKingSafetyInternal);
   WeightKingSafety[them] = weight_option("Aggressiveness", WeightKingOppSafetyInternal);
+  // If running in analysis mode, make sure we use symmetrical king safety.
+  // We do this by replacing both WeightKingSafety[us] and 
+  // WeightKingSafety[them] by their average.
+  if (get_option_value_bool("UCI_AnalyseMode")) {
+      WeightKingSafety[us] = (WeightKingSafety[us] + WeightKingSafety[them]) / 2;
+      WeightKingSafety[them] = WeightKingSafety[us];
+  }
+
   WeightSpace = weight_option("Space", WeightSpaceInternal);
 
   init_safety();

diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index 92729355c827cd0d5c3abcb41b0e910353bbef63..a0269464db99f7d5ee1b26f08a70140602d6aaea 100644 (file)
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -130,6 +130,7 @@ namespace {
     o["MultiPV"] = Option(1, 1, 500);
     o["UCI_ShowCurrLine"] = Option(false);
     o["UCI_Chess960"] = Option(false);
+    o["UCI_AnalyseMode"] = Option(false);
 
     // Any option should know its name so to be easily printed
     for (Options::iterator it = o.begin(); it != o.end(); ++it)