Changeset 11898

Timestamp:

02/05/15 09:27:24 (9 years ago)

Author:

jkarder

Message:

#2250: merged r11404 and r11839 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs (modified) (4 diffs)

stable/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs

@@ -62 +62 @@
     }
     public IValueParameter<BoolValue> ExecutePathRelinkingParameter {
-      get { return (IValueLookupParameter<BoolValue>)Parameters["ExecutePathRelinking"]; }
+      get { return (IValueParameter<BoolValue>)Parameters["ExecutePathRelinking"]; }
     }
     public IConstrainedValueParameter<IImprovementOperator> ImproverParameter {
@@ -175 +175 @@
       Parameters.Add(new ValueParameter<MultiAnalyzer>("Analyzer", "The analyzer used to analyze each iteration.", new MultiAnalyzer()));
       Parameters.Add(new ConstrainedValueParameter<ICrossover>("Crossover", "The operator used to cross solutions."));
-      Parameters.Add(new ValueParameter<BoolValue>("ExecutePathRelinking", "True if path relinking should be executed instead of crossover, otherwise false.", new BoolValue(true)));
+      Parameters.Add(new ValueParameter<BoolValue>("ExecutePathRelinking", "True if path relinking should be executed instead of crossover, otherwise false.", new BoolValue(false)));
       Parameters.Add(new ConstrainedValueParameter<IImprovementOperator>("Improver", "The operator used to improve solutions."));
       Parameters.Add(new ValueParameter<IntValue>("MaximumIterations", "The maximum number of iterations which should be processed.", new IntValue(100)));
@@ -309 +309 @@
       base.Problem_OperatorsChanged(sender, e);
     }
+    private void PathRelinkerParameter_ValueChanged(object sender, EventArgs e) {
+      ExecutePathRelinking.Value = PathRelinkerParameter.Value != null;
+    }
     private void SimilarityCalculatorParameter_ValueChanged(object sender, EventArgs e) {
       ParameterizeMainLoop();
@@ -322 +325 @@
     #region Helpers
     private void Initialize() {
+      PathRelinkerParameter.ValueChanged += new EventHandler(PathRelinkerParameter_ValueChanged);
       SimilarityCalculatorParameter.ValueChanged += new EventHandler(SimilarityCalculatorParameter_ValueChanged);
       if (Problem != null)