Changeset 13396 for branches/ProblemRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/PermutationEncoding.cs

Timestamp:

11/25/15 16:22:37 (8 years ago)

Author:

abeham

Message:

#2521:

• Refactored QuadraticAssignmentProblem to use new SingleObjectiveProblem
  • Removed QAPEvaluator
  • Adapted RobustTabooSearch
• Introduced several interfaces in PermutationEncoding necessary for wiring
• Changed all Encodings to use IItem instead of IOperator in ConfigureOperators (name still unchanged)
• Added a protected MaximizationParameter property in SingleObjectiveProblem (necessary for wiring)
• Changed AlleleFrequnencyAnalyzer to use ISolution interface instead of IItem
• Added a comment to ISolutionCreator<TSolution> of some changes that would be welcomed

File:

• branches/ProblemRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/PermutationEncoding.cs (modified) (6 diffs)

branches/ProblemRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/PermutationEncoding.cs

@@ -145 +145 @@
           typeof (IPermutationScrambleMoveOperator),
           typeof (IPermutationSwap2MoveOperator),                    
-          typeof (IPermutationTranslocationMoveOperator)
+          typeof (IPermutationTranslocationMoveOperator),
+          typeof (IPermutationLocalImprovementOperator),
+          typeof (IPermutationSolutionOperator),
+          typeof (IPermutationSolutionsOperator),
       };
     }
@@ -160 +163 @@
     #endregion
 
-    public override void ConfigureOperators(IEnumerable<IOperator> operators) {
+    public override void ConfigureOperators(IEnumerable<IItem> operators) {
       ConfigureCreators(operators.OfType<IPermutationCreator>());
       ConfigureCrossovers(operators.OfType<IPermutationCrossover>());
@@ -170 +173 @@
       ConfigureSwap2MoveOperators(operators.OfType<IPermutationSwap2MoveOperator>());
       ConfigureTranslocationMoveOperators(operators.OfType<IPermutationTranslocationMoveOperator>());
+      ConfigureLocalImprovementOperators(operators.OfType<IPermutationLocalImprovementOperator>());
+      ConfigureSolutionOperators(operators.OfType<IPermutationSolutionOperator>());
+      ConfigureSolutionsOperators(operators.OfType<IPermutationSolutionsOperator>());
     }
 
@@ -176 +182 @@
       foreach (var creator in creators) {
         creator.LengthParameter.ActualName = LengthParameter.Name;
-        creator.PermutationParameter.ActualName = Name;
         creator.PermutationTypeParameter.Value.Value = Type;
       }
@@ -187 +192 @@
     }
     private void ConfigureManipulators(IEnumerable<IPermutationManipulator> manipulators) {
-      foreach (var manipulator in manipulators) {
-        manipulator.PermutationParameter.ActualName = Name;
-      }
+      // IPermutationManipulator does not contain additional parameters (already contained in IPermutationSolutionOperator)
     }
     private void ConfigureShakingOperators(IEnumerable<IPermutationMultiNeighborhoodShakingOperator> shakingOperators) {
@@ -221 +224 @@
       }
     }
-
+    private void ConfigureLocalImprovementOperators(IEnumerable<IPermutationLocalImprovementOperator> localImprovementOperators) {
+      // IPermutationLocalImprovementOperator does not contain additional parameters (already contained in IPermutationSolutionOperator)
+    }
+    private void ConfigureSolutionOperators(IEnumerable<IPermutationSolutionOperator> solutionOperators) {
+      foreach (var solutionOperator in solutionOperators) {
+        solutionOperator.PermutationParameter.ActualName = Name;
+      }
+    }
+    private void ConfigureSolutionsOperators(IEnumerable<IPermutationSolutionsOperator> solutionsOperators) {
+      foreach (var solutionsOperator in solutionsOperators) {
+        solutionsOperator.PermutationsParameter.ActualName = Name;
+      }
+    }
     #endregion
   }