Changeset 17620 for branches/2521_ProblemRefactoring/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorEncoding.cs

Timestamp:

06/22/20 03:45:41 (4 years ago)

Author:

abeham

Message:

#2521:

• Fixed orienteering problem
• Corrected ParameterizeOperators in all encoding-specific problem base classes
• Added new interfaces and wiring code to IntegerVectorEncoding

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorEncoding.cs (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorEncoding.cs

@@ -120 +120 @@
         typeof (IIntegerVectorStdDevStrategyParameterOperator),
         typeof (IIntegerVectorMultiNeighborhoodShakingOperator),
+        typeof (IIntegerVectorLocalImprovementOperator),
+        typeof (IIntegerVectorSolutionOperator),
+        typeof (IIntegerVectorSolutionsOperator)
       };
     }
@@ -142 +145 @@
       ConfigureShakingOperators(operators.OfType<IIntegerVectorMultiNeighborhoodShakingOperator>());
       ConfigureStrategyVectorOperator(operators.OfType<IIntegerVectorStdDevStrategyParameterOperator>());
+      ConfigureLocalImprovementOperators(operators.OfType<IIntegerVectorLocalImprovementOperator>());
+      ConfigureSolutionOperators(operators.OfType<IIntegerVectorSolutionOperator>());
+      ConfigureSolutionsOperators(operators.OfType<IIntegerVectorSolutionsOperator>());
     }
 
@@ -217 +223 @@
       }
     }
+    private void ConfigureLocalImprovementOperators(IEnumerable<IIntegerVectorLocalImprovementOperator> localImprovementOperators) {
+      // IIntegerVectorLocalImprovementOperator does not contain additional parameters (already contained in IIntegerVectorSolutionOperator)
+    }
+    private void ConfigureSolutionOperators(IEnumerable<IIntegerVectorSolutionOperator> solutionOperators) {
+      foreach (var solutionOperator in solutionOperators) {
+        solutionOperator.IntegerVectorParameter.ActualName = Name;
+      }
+    }
+    private void ConfigureSolutionsOperators(IEnumerable<IIntegerVectorSolutionsOperator> solutionsOperators) {
+      foreach (var solutionsOperator in solutionsOperators) {
+        solutionsOperator.IntegerVectorsParameter.ActualName = Name;
+      }
+    }
     #endregion