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

Timestamp:

06/22/20 03:45:41 (5 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

Location:

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

Files:

• HeuristicLab.Encodings.IntegerVectorEncoding-3.3.csproj (modified) (1 diff)
• IntegerVectorEncoding.cs (modified) (3 diffs)
• IntegerVectorMultiObjectiveProblem.cs (modified) (1 diff)
• IntegerVectorProblem.cs (modified) (2 diffs)
• Interfaces/IIntegerVectorLocalImprovementOperator.cs (added)
• Interfaces/IIntegerVectorMultiNeighborhoodShakingOperator.cs (modified) (1 diff)
• Interfaces/IIntegerVectorSolutionOperator.cs (added)
• Interfaces/IIntegerVectorSolutionsOperator.cs (added)

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/HeuristicLab.Encodings.IntegerVectorEncoding-3.3.csproj

@@ -146 +146 @@
     <Compile Include="Interfaces\IIntegerVectorStdDevStrategyParameterManipulator.cs" />
     <Compile Include="Interfaces\IIntegerVectorStdDevStrategyParameterOperator.cs" />
+    <Compile Include="Interfaces\IIntegerVectorLocalImprovementOperator.cs" />
+    <Compile Include="Interfaces\IIntegerVectorSolutionOperator.cs" />
+    <Compile Include="Interfaces\IIntegerVectorSolutionsOperator.cs" />
     <Compile Include="Manipulators\UniformSomePositionsManipulator.cs" />
     <Compile Include="Manipulators\RoundedNormalAllPositionsManipulator.cs" />

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
 

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

@@ -86 +86 @@
     }
 
-    protected override void OnEncodingChanged() {
-      base.OnEncodingChanged();
+    protected override void ParameterizeOperators() {
+      base.ParameterizeOperators();
       Parameterize();
     }

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

@@ -72 +72 @@
 
       Operators.Add(new HammingSimilarityCalculator());
+      // TODO: These should be added in the SingleObjectiveProblem base class (if they were accessible from there)
       Operators.Add(new QualitySimilarityCalculator());
       Operators.Add(new PopulationSimilarityAnalyzer(Operators.OfType<ISolutionSimilarityCalculator>()));
@@ -86 +87 @@
     }
 
-    protected override void OnEncodingChanged() {
-      base.OnEncodingChanged();
+    protected override void ParameterizeOperators() {
+      base.ParameterizeOperators();
       Parameterize();
     }
 
     private void Parameterize() {
+      // TODO: this is done in base class as well (but operators are added at this level of the hierarchy)
       foreach (var similarityCalculator in Operators.OfType<ISolutionSimilarityCalculator>()) {
         similarityCalculator.SolutionVariableName = Encoding.Name;

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

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Core;
-using HEAL.Attic;
+using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Encodings.IntegerVectorEncoding {
   [StorableType("2b21442c-735f-4df3-a163-4e3147cd11a5")]
-  public interface IIntegerVectorMultiNeighborhoodShakingOperator : IIntegerVectorOperator {
+  public interface IIntegerVectorMultiNeighborhoodShakingOperator : IIntegerVectorOperator, IMultiNeighborhoodShakingOperator {
     ILookupParameter<IntegerVector> IntegerVectorParameter { get; }
   }