Changeset 7213 for branches/HeuristicLab.TimeSeries/HeuristicLab.Algorithms.TabuSearch

Timestamp:

12/20/11 11:45:18 (13 years ago)

Author:

gkronber

Message:

#1081 merged r7103:7209 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.TabuSearch/3.3/TabuNeighborhoodAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearch.cs (modified) (1 diff)

branches/HeuristicLab.TimeSeries/HeuristicLab.Algorithms.TabuSearch/3.3/TabuNeighborhoodAnalyzer.cs

@@ -33 +33 @@
   [Item("TabuNeighborhoodAnalyzer", "Analyzes the tabu neighborhood")]
   public class TabuNeighborhoodAnalyzer : SingleSuccessorOperator, IAnalyzer {
+    public virtual bool EnabledByDefault {
+      get { return true; }
+    }
+
     public ScopeTreeLookupParameter<BoolValue> IsTabuParameter {
       get { return (ScopeTreeLookupParameter<BoolValue>)Parameters["IsTabu"]; }

branches/HeuristicLab.TimeSeries/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearch.cs

@@ -407 +407 @@
           foreach (IScopeTreeLookupParameter param in analyzer.Parameters.OfType<IScopeTreeLookupParameter>())
             param.Depth = 0;
-          Analyzer.Operators.Add(analyzer);
-        }
-      }
-      Analyzer.Operators.Add(moveQualityAnalyzer);
-      Analyzer.Operators.Add(tabuNeighborhoodAnalyzer);
+          Analyzer.Operators.Add(analyzer, analyzer.EnabledByDefault);
+        }
+      }
+      Analyzer.Operators.Add(moveQualityAnalyzer, moveQualityAnalyzer.EnabledByDefault);
+      Analyzer.Operators.Add(tabuNeighborhoodAnalyzer, tabuNeighborhoodAnalyzer.EnabledByDefault);
     }
     private void ClearMoveParameters() {