Revert "Introduce "Zugzwang detection" temporary hack for 1.7.1"

This reverts commit f9d3b48ad0ed62732bb07d4811f4fd17cf088cfe.

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

diff --git a/src/search.cpp b/src/search.cpp
index 0e65d19ff3c9f5d8da2d9fd7887ceb2bb42ec3e5..dfe5efa922840b8cc398152495c292045b2e5993 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -257,7 +257,7 @@ namespace {
   int SearchStartTime, MaxNodes, MaxDepth, MaxSearchTime;
   int AbsoluteMaxSearchTime, ExtraSearchTime, ExactMaxTime;
   bool UseTimeManagement, InfiniteSearch, PonderSearch, StopOnPonderhit;
-  bool FirstRootMove, AbortSearch, Quit, AspirationFailLow, ZugDetection;
+  bool FirstRootMove, AbortSearch, Quit, AspirationFailLow;
 
   // Log file
   bool UseLogFile;
@@ -425,7 +425,6 @@ bool think(const Position& pos, bool infinite, bool ponder, int side_to_move,
   MultiPV                 = get_option_value_int("MultiPV");
   Chess960                = get_option_value_bool("UCI_Chess960");
   UseLogFile              = get_option_value_bool("Use Search Log");
-  ZugDetection            = get_option_value_bool("Zugzwang detection"); // To be removed after 1.7.1
 
   if (UseLogFile)
       LogFile.open(get_option_value_string("Search Log Filename").c_str(), std::ios::out | std::ios::app);
@@ -2316,7 +2315,7 @@ namespace {
 
     Value v = value_from_tt(tte->value(), ply);
 
-    return   (allowNullmove || !(tte->type() & VALUE_TYPE_NULL) || !ZugDetection)
+    return   (allowNullmove || !(tte->type() & VALUE_TYPE_NULL))
 
           && (   tte->depth() >= depth
               || v >= Max(value_mate_in(PLY_MAX), beta)

diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index 990c748c9012d649c3182f8186430b5c3a449b00..7d1af39413355f42555cbc13bc93a6e0b891ab8f 100644 (file)
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -114,9 +114,6 @@ namespace {
     o["UCI_Chess960"] = Option(false);
     o["UCI_AnalyseMode"] = Option(false);
 
-    // Temporary hack for 1.7.1 to be removed in next release
-    o["Zugzwang detection"] = Option(false);
-
     // Any option should know its name so to be easily printed
     for (Options::iterator it = o.begin(); it != o.end(); ++it)
         it->second.name = it->first;