Changeset 11505 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASPWithPathRelinking.cs

Timestamp:

10/27/14 17:03:27 (9 years ago)

Author:

abeham

Message:

#1614: updated to trunk changes

File:

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

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

@@ -228 +228 @@
           Analyzer.Operators.SetItemCheckedState(a, a.EnabledByDefault);
         }
-        InitializeFromInstallation(LocalImprovementParameter, x => x.ProblemType.IsAssignableFrom(Problem.GetType()));
+        InitializeFromInstallation(LocalImprovementParameter, x => x is ILocalImprovementAlgorithmOperator
+          && ((ILocalImprovementAlgorithmOperator)x).ProblemType.IsInstanceOfType(Problem));
         InitializeFromProblem(PathRelinkingParameter);
         InitializeFromProblem(EliteSetReducerParameter);
@@ -251 +252 @@
         analyzer.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
 
-        if (LocalImprovementParameter.Value != null)
-          LocalImprovementParameter.Value.Problem = Problem;
+        if (LocalImprovementParameter.Value != null) {
+          if (LocalImprovementParameter.Value is ILocalImprovementAlgorithmOperator)
+            ((ILocalImprovementAlgorithmOperator)LocalImprovementParameter.Value).Problem = Problem;
+        }
       }
       foreach (var localImprovement in LocalImprovementParameter.ValidValues) {