Changeset 7420 for branches/GeneralizedQAP

Timestamp:

01/27/12 13:35:11 (13 years ago)

Author:

abeham

Message:

#1614

• fixed parameterizing of local improvement operators

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASPWithPathRelinking.cs (modified) (4 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASPWithPathRelinking.cs

@@ -190 +190 @@
       base.Problem_OperatorsChanged(sender, e);
     }
+
+    private void LocalImprovementParameter_ValueChanged(object sender, EventArgs e) {
+      Parameterize();
+    }
     #endregion
 
@@ -201 +205 @@
 
     private void RegisterEventHandlers() {
-
+      LocalImprovementParameter.ValueChanged += new EventHandler(LocalImprovementParameter_ValueChanged);
     }
 
@@ -231 +235 @@
 
         analyzer.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
+
+        if (LocalImprovementParameter.Value != null)
+          LocalImprovementParameter.Value.Problem = Problem;
       }
       foreach (var localImprovement in LocalImprovementParameter.ValidValues) {
@@ -236 +243 @@
         localImprovement.EvaluatedSolutionsParameter.ActualName = "EvaluatedSolutions";
         localImprovement.ResultsParameter.ActualName = "Results";
-        if (Problem != null && localImprovement.ProblemType.IsAssignableFrom(Problem.GetType()))
-          localImprovement.Problem = Problem;
       }
       foreach (var merger in EliteSetMergerParameter.ValidValues) {