Changeset 11424 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3

Timestamp:

10/08/14 07:31:33 (10 years ago)

Author:

abeham

Message:

#2174: fixed a casting bug and bugs regarding the parameterization of move operators

File:

• branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs (modified) (2 diffs)

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs

@@ -280 +280 @@
         #endregion
         #region Wire BinaryVector ShakingOperators
-        Operators.RemoveAll(x => x is IBinaryVectorMultiNeighborhoodShakingOperator && ((IBinaryVectorManipulator)x).BinaryVectorParameter.ActualName != paramName);
+        Operators.RemoveAll(x => x is IBinaryVectorMultiNeighborhoodShakingOperator && ((IBinaryVectorMultiNeighborhoodShakingOperator)x).BinaryVectorParameter.ActualName != paramName);
         var shakingOperators = ApplicationManager.Manager.GetInstances<IBinaryVectorMultiNeighborhoodShakingOperator>().ToList();
         foreach (var so in shakingOperators) {
@@ -865 +865 @@
 
     protected virtual void UpdateMoveOperators() {
-      Operators.RemoveAll(x => x is IParameterVectorMoveOperator);
-      var generator = new ParameterVectorMoveGenerator();
-      generator.ConfigurationParameter.ActualName = ConfigurationParameter.Name;
-      generator.ProblemDefinitionParameter.ActualName = ProblemDefinitionParameter.Name;
-
-      var evaluator = new ParameterVectorMoveEvaluator();
-      evaluator.ConfigurationParameter.ActualName = ConfigurationParameter.Name;
-      evaluator.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
-      evaluator.ProblemDefinitionParameter.ActualName = ProblemDefinitionParameter.Name;
-
-      var maker = new ParameterVectorMoveMaker();
-      maker.ConfigurationParameter.ActualName = ConfigurationParameter.Name;
-      maker.MoveQualityParameter.ActualName = evaluator.MoveQualityParameter.ActualName;
-      maker.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
-
-      Operators.AddRange(new IItem[] { generator, evaluator, maker });
+      if (!Operators.Any(x => x is ParameterVectorMoveGenerator))
+        Operators.Add(new ParameterVectorMoveGenerator());
+      if (!Operators.Any(x => x is ParameterVectorMoveEvaluator))
+        Operators.Add(new ParameterVectorMoveEvaluator());
+      if (!Operators.Any(x => x is ParameterVectorMoveMaker))
+        Operators.Add(new ParameterVectorMoveMaker());
+
+      foreach (var generator in Operators.OfType<ParameterVectorMoveGenerator>()) {
+        generator.ConfigurationParameter.ActualName = ConfigurationParameter.Name;
+        generator.ProblemDefinitionParameter.ActualName = ProblemDefinitionParameter.Name;
+      }
+      foreach (var evaluator in Operators.OfType<ParameterVectorMoveEvaluator>()) {
+        evaluator.ConfigurationParameter.ActualName = ConfigurationParameter.Name;
+        evaluator.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
+        evaluator.ProblemDefinitionParameter.ActualName = ProblemDefinitionParameter.Name;
+      }
+      foreach (var maker in Operators.OfType<ParameterVectorMoveMaker>()) {
+        maker.ConfigurationParameter.ActualName = ConfigurationParameter.Name;
+        maker.MoveQualityParameter.ActualName = Operators.OfType<ParameterVectorMoveEvaluator>().First().MoveQualityParameter.ActualName;
+        maker.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
+      }
     }