Changeset 7970 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/SlackMinimizationSolutionCreator.cs

Timestamp:

06/06/12 04:29:56 (12 years ago)

Author:

abeham

Message:

#1614: restructured architecture to allow for different evaluator with different penalty strategies

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/SlackMinimizationSolutionCreator.cs (modified) (6 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/SlackMinimizationSolutionCreator.cs

@@ -35 +35 @@
   [Item("SlackMinimizationSolutionCreator", "A heuristic that creates a solution to the Generalized Quadratic Assignment Problem by minimizing the amount of slack.")]
   [StorableClass]
-  public class SlackMinimizationSolutionCreator : GQAPStochasticSolutionCreator {
+  public class SlackMinimizationSolutionCreator : GQAPStochasticSolutionCreator,
+    IEvaluatorAwareGQAPOperator {
 
     public IValueLookupParameter<IntValue> MaximumTriesParameter {
@@ -49 +50 @@
       get { return (IValueLookupParameter<IntValue>)Parameters["RandomWalkLength"]; }
     }
+    public IValueLookupParameter<IGQAPEvaluator> EvaluatorParameter {
+      get { return (IValueLookupParameter<IGQAPEvaluator>)Parameters["Evaluator"]; }
+    }
 
     [StorableConstructor]
@@ -59 +63 @@
       Parameters.Add(new ValueLookupParameter<IntValue>("Depth", "How deep the algorithm should look forward.", new IntValue(3)));
       Parameters.Add(new ValueLookupParameter<IntValue>("RandomWalkLength", "The length of the random walk in the feasible region that is used to diversify the found assignments.", new IntValue(10)));
+      Parameters.Add(new ValueLookupParameter<IGQAPEvaluator>("Evaluator", "The evaluator that is used to evaluate GQAP solutions."));
     }
 
@@ -75 +80 @@
     }
 
-    public static IntegerVector CreateSolution(IRandom random, DoubleArray demands, DoubleArray capacities, int depth, int maximumTries, bool createMostFeasibleSolution, int randomWalkLength, CancellationToken cancel) {
+    public static IntegerVector CreateSolution(IRandom random, DoubleArray demands,
+      DoubleArray capacities, IGQAPEvaluator evaluator,
+      int depth, int maximumTries, bool createMostFeasibleSolution, int randomWalkLength, CancellationToken cancel) {
       IntegerVector result = null;
       bool isFeasible = false;
@@ -118 +125 @@
           }
         } else RandomFeasibleWalk(random, assignment, demands, slack, randomWalkLength);
-        double violation = GQAPEvaluator.EvaluateOverbooking(slack, capacities);
+        double violation = evaluator.EvaluateOverbooking(slack, capacities);
         isFeasible = violation == 0;
         if (isFeasible || violation < minViolation) {
@@ -177 +184 @@
     protected override IntegerVector CreateRandomSolution(IRandom random, DoubleArray demands, DoubleArray capacities) {
       return CreateSolution(random, demands, capacities,
+        EvaluatorParameter.ActualValue,
         DepthParameter.ActualValue.Value,
         MaximumTriesParameter.ActualValue.Value,