Changeset 13396 for branches/ProblemRefactoring/HeuristicLab.Problems.QuadraticAssignment/3.3/LocalImprovement/QAPStochasticScrambleLocalImprovement.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.Problems.QuadraticAssignment/3.3/LocalImprovement/QAPStochasticScrambleLocalImprovement.cs (modified) (4 diffs)

branches/ProblemRefactoring/HeuristicLab.Problems.QuadraticAssignment/3.3/LocalImprovement/QAPStochasticScrambleLocalImprovement.cs

@@ -34 +34 @@
   [Item("QAPStochasticScrambleLocalImprovement", "Takes a solution and finds the local optimum with respect to the scramble neighborhood by decending along the steepest gradient.")]
   [StorableClass]
-  public class QAPStochasticScrambleLocalImprovement : SingleSuccessorOperator, ILocalImprovementOperator, IStochasticOperator, ISingleObjectiveOperator {
+  public class QAPStochasticScrambleLocalImprovement : SingleSuccessorOperator, IQAPLocalImprovementOperator, IStochasticOperator, ISingleObjectiveOperator {
 
     public ILookupParameter<IntValue> LocalIterationsParameter {
@@ -56 +56 @@
     }
 
-    public ILookupParameter<Permutation> AssignmentParameter {
-      get { return (ILookupParameter<Permutation>)Parameters["Assignment"]; }
+    public ILookupParameter<Permutation> PermutationParameter {
+      get { return (ILookupParameter<Permutation>)Parameters["Permutation"]; }
     }
 
@@ -92 +92 @@
       Parameters.Add(new LookupParameter<IntValue>("EvaluatedSolutions", "The amount of evaluated solutions (here a move is counted only as 4/n evaluated solutions with n being the length of the permutation)."));
       Parameters.Add(new LookupParameter<ResultCollection>("Results", "The collection where to store results."));
-      Parameters.Add(new LookupParameter<Permutation>("Assignment", "The permutation that is to be locally optimized."));
+      Parameters.Add(new LookupParameter<Permutation>("Permutation", "The permutation that is to be locally optimized."));
       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality value of the assignment."));
       Parameters.Add(new LookupParameter<BoolValue>("Maximization", "True if the problem should be maximized or minimized."));
@@ -132 +132 @@
       var maxIterations = MaximumIterationsParameter.ActualValue.Value;
       var neighborhoodSize = NeighborhoodSizeParameter.ActualValue.Value;
-      var assignment = AssignmentParameter.ActualValue;
+      var assignment = PermutationParameter.ActualValue;
       var maximization = MaximizationParameter.ActualValue.Value;
       var weights = WeightsParameter.ActualValue;