Changeset 15504 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators

Timestamp:

12/10/17 22:11:10 (7 years ago)

Author:

abeham

Message:

#1614: refactored code

• change problem to derive from basic problem
• using a combined instance class instead of individual parameters

Location:

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

Files:

• GQAPSolutionCreator.cs (modified) (4 diffs)
• GQAPStochasticSolutionCreator.cs (modified) (3 diffs)
• GreedyRandomizedSolutionCreator.cs (modified) (7 diffs)
• RandomButFeasibleSolutionCreator.cs (modified) (7 diffs)
• RandomSolutionCreator.cs (deleted)
• SlackMinimizationSolutionCreator.cs (modified) (7 diffs)

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -31 +31 @@
   [Item("GQAPSolutionCreator", "Base class for solution creators of the Generalized Quadratic Assignment Problem.")]
   [StorableClass]
-  public abstract class GQAPSolutionCreator : SingleSuccessorOperator, IDemandsAwareGQAPOperator, ICapacitiesAwareGQAPOperator, IGQAPSolutionCreator {
+  public abstract class GQAPSolutionCreator : SingleSuccessorOperator, IProblemInstanceAwareGQAPOperator, IGQAPSolutionCreator {
 
     #region Parameter Descriptions
@@ -37 +37 @@
     #endregion
 
-    public ILookupParameter<IntegerVector> AssignmentParameter {
-      get { return (ILookupParameter<IntegerVector>)Parameters["Assignment"]; }
+    public ILookupParameter<IntegerVector> IntegerVectorParameter {
+      get { return (ILookupParameter<IntegerVector>)Parameters["IntegerVector"]; }
     }
-    public ILookupParameter<DoubleArray> DemandsParameter {
-      get { return (ILookupParameter<DoubleArray>)Parameters["Demands"]; }
+    public ILookupParameter<GQAPInstance> ProblemInstanceParameter {
+      get { return (ILookupParameter<GQAPInstance>)Parameters["ProblemInstance"]; }
     }
-    public ILookupParameter<DoubleArray> CapacitiesParameter {
-      get { return (ILookupParameter<DoubleArray>)Parameters["Capacities"]; }
+    public IValueLookupParameter<IntValue> LengthParameter {
+      get { return (IValueLookupParameter<IntValue>)Parameters["Length"]; }
+    }
+    public IValueLookupParameter<IntMatrix> BoundsParameter {
+      get { return (IValueLookupParameter<IntMatrix>)Parameters["Bounds"]; }
     }
 
@@ -53 +56 @@
     public GQAPSolutionCreator()
       : base() {
-      Parameters.Add(new LookupParameter<IntegerVector>("Assignment", AssignmentDescription));
-      Parameters.Add(new LookupParameter<DoubleArray>("Demands", GeneralizedQuadraticAssignmentProblem.DemandsDescription));
-      Parameters.Add(new LookupParameter<DoubleArray>("Capacities", GeneralizedQuadraticAssignmentProblem.CapacitiesDescription));
+      Parameters.Add(new LookupParameter<IntegerVector>("IntegerVector", AssignmentDescription));
+      Parameters.Add(new LookupParameter<GQAPInstance>("ProblemInstance", GQAP.ProblemInstanceDescription));
+      Parameters.Add(new ValueLookupParameter<IntValue>("Length", "The length of the vector.") { Hidden = true });
+      Parameters.Add(new ValueLookupParameter<IntMatrix>("Bounds", "") { Hidden = true });
     }
 
     public override IOperation Apply() {
-      AssignmentParameter.ActualValue = CreateSolution(DemandsParameter.ActualValue, CapacitiesParameter.ActualValue);
+      IntegerVectorParameter.ActualValue = CreateSolution(ProblemInstanceParameter.ActualValue);
       return base.Apply();
     }
 
-    protected abstract IntegerVector CreateSolution(DoubleArray demands, DoubleArray capacities);
+    protected abstract IntegerVector CreateSolution(GQAPInstance problemInstance);
   }
 }

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Optimization;
@@ -46 +45 @@
     }
 
-    protected sealed override IntegerVector CreateSolution(DoubleArray demands, DoubleArray capacities) {
-      return CreateRandomSolution(RandomParameter.ActualValue, demands, capacities);
+    protected sealed override IntegerVector CreateSolution(GQAPInstance problemInstance) {
+      return CreateRandomSolution(RandomParameter.ActualValue, problemInstance);
     }
 
-    protected abstract IntegerVector CreateRandomSolution(IRandom random, DoubleArray demands, DoubleArray capacities);
+    protected abstract IntegerVector CreateRandomSolution(IRandom random, GQAPInstance problemInstance);
   }
 }

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -35 +35 @@
   [Item("GreedyRandomizedSolutionCreator", "Creates a solution according to the procedure described in Mateus, G., Resende, M., and Silva, R. 2011. GRASP with path-relinking for the generalized quadratic assignment problem. Journal of Heuristics 17, Springer Netherlands, pp. 527-565.")]
   [StorableClass]
-  public class GreedyRandomizedSolutionCreator : GQAPStochasticSolutionCreator,
-    IEvaluatorAwareGQAPOperator {
+  public class GreedyRandomizedSolutionCreator : GQAPStochasticSolutionCreator {
 
     public IValueLookupParameter<IntValue> MaximumTriesParameter {
@@ -43 +42 @@
     public IValueLookupParameter<BoolValue> CreateMostFeasibleSolutionParameter {
       get { return (IValueLookupParameter<BoolValue>)Parameters["CreateMostFeasibleSolution"]; }
-    }
-    public IValueLookupParameter<IGQAPEvaluator> EvaluatorParameter {
-      get { return (IValueLookupParameter<IGQAPEvaluator>)Parameters["Evaluator"]; }
     }
 
@@ -56 +52 @@
       Parameters.Add(new ValueLookupParameter<IntValue>("MaximumTries", "The maximum number of tries to create a feasible solution after which an exception is thrown. If it is set to 0 or a negative value there will be an infinite number of attempts.", new IntValue(100000)));
       Parameters.Add(new ValueLookupParameter<BoolValue>("CreateMostFeasibleSolution", "If this is set to true the operator will always succeed, and outputs the solution with the least violation instead of throwing an exception.", new BoolValue(false)));
-      Parameters.Add(new ValueLookupParameter<IGQAPEvaluator>("Evaluator", "The evaluator that is used to evaluate GQAP solutions."));
     }
 
@@ -63 +58 @@
     }
 
-    public static IntegerVector CreateSolution(IRandom random, DoubleArray demands, DoubleArray capacities,
-      IGQAPEvaluator evaluator,
+    public static IntegerVector CreateSolution(IRandom random, GQAPInstance problemInstance,
       int maximumTries, bool createMostFeasibleSolution, CancellationToken cancelToken) {
+      var demands = problemInstance.Demands;
+      var capacities = problemInstance.Capacities;
       int tries = 0;
       var assignment = new Dictionary<int, int>(demands.Length);
@@ -125 +121 @@
             slack[l] -= demands[f];
           }
-          double violation = evaluator.EvaluateOverbooking(slack, capacities);
+          double violation = slack.Select(x => x < 0 ? -x : 0).Sum();
           if (violation < minViolation) {
             bestAssignment = assignment;
@@ -139 +135 @@
     }
 
-    protected override IntegerVector CreateRandomSolution(IRandom random, DoubleArray demands, DoubleArray capacities) {
-      return CreateSolution(random, demands, capacities,
-        EvaluatorParameter.ActualValue,
+    protected override IntegerVector CreateRandomSolution(IRandom random, GQAPInstance problemInstance) {
+      return CreateSolution(random, problemInstance,
         MaximumTriesParameter.ActualValue.Value,
         CreateMostFeasibleSolutionParameter.ActualValue.Value,

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -35 +35 @@
   [Item("RandomButFeasibleSolutionCreator", "Creates a random, but feasible solution to the Generalized Quadratic Assignment Problem.")]
   [StorableClass]
-  public class RandomFeasibleSolutionCreator : GQAPStochasticSolutionCreator,
-    IEvaluatorAwareGQAPOperator {
+  public class RandomFeasibleSolutionCreator : GQAPStochasticSolutionCreator {
 
     public IValueLookupParameter<IntValue> MaximumTriesParameter {
@@ -43 +42 @@
     public IValueLookupParameter<BoolValue> CreateMostFeasibleSolutionParameter {
       get { return (IValueLookupParameter<BoolValue>)Parameters["CreateMostFeasibleSolution"]; }
-    }
-    public IValueLookupParameter<IGQAPEvaluator> EvaluatorParameter {
-      get { return (IValueLookupParameter<IGQAPEvaluator>)Parameters["Evaluator"]; }
     }
 
@@ -55 +51 @@
       Parameters.Add(new ValueLookupParameter<IntValue>("MaximumTries", "The maximum number of tries to create a feasible solution after which an exception is thrown. If it is set to 0 or a negative value there will be an infinite number of attempts.", new IntValue(100000)));
       Parameters.Add(new ValueLookupParameter<BoolValue>("CreateMostFeasibleSolution", "If this is set to true the operator will always succeed, and outputs the solution with the least violation instead of throwing an exception.", new BoolValue(false)));
-      Parameters.Add(new ValueLookupParameter<IGQAPEvaluator>("Evaluator", "The evaluator that is used to evaluate GQAP solutions."));
     }
 
@@ -62 +57 @@
     }
 
-    public static IntegerVector CreateSolution(IRandom random, DoubleArray demands,
-      DoubleArray capacities, IGQAPEvaluator evaluator,
+    public static IntegerVector CreateSolution(IRandom random, GQAPInstance problemInstance,
       int maximumTries, bool createMostFeasibleSolution, CancellationToken cancel) {
+      var capacities = problemInstance.Capacities;
+      var demands = problemInstance.Demands;
       IntegerVector result = null;
       bool isFeasible = false;
@@ -87 +83 @@
           slack[assignment[equipment]] -= demands[equipment];
         }
-        double violation = evaluator.EvaluateOverbooking(slack, capacities);
+        double violation = slack.Select(x => x < 0 ? -x : 0).Sum();
         isFeasible = violation == 0;
         if (isFeasible || violation < minViolation) {
@@ -97 +93 @@
     }
 
-    protected override IntegerVector CreateRandomSolution(IRandom random, DoubleArray demands, DoubleArray capacities) {
-      return CreateSolution(random, demands, capacities,
-        EvaluatorParameter.ActualValue,
+    protected override IntegerVector CreateRandomSolution(IRandom random, GQAPInstance problemInstance) {
+      return CreateSolution(random, problemInstance,
         MaximumTriesParameter.ActualValue.Value,
         CreateMostFeasibleSolutionParameter.ActualValue.Value,

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -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,
-    IEvaluatorAwareGQAPOperator {
+  public class SlackMinimizationSolutionCreator : GQAPStochasticSolutionCreator {
 
     public IValueLookupParameter<IntValue> MaximumTriesParameter {
@@ -50 +49 @@
       get { return (IValueLookupParameter<IntValue>)Parameters["RandomWalkLength"]; }
     }
-    public IValueLookupParameter<IGQAPEvaluator> EvaluatorParameter {
-      get { return (IValueLookupParameter<IGQAPEvaluator>)Parameters["Evaluator"]; }
-    }
 
     [StorableConstructor]
@@ -63 +59 @@
       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."));
     }
 
@@ -70 +65 @@
     }
 
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      if (!Parameters.ContainsKey("Depth")) {
-        Parameters.Add(new ValueLookupParameter<IntValue>("Depth", "How deep the algorithm should look forward.", new IntValue(3)));
-      }
-      if (!Parameters.ContainsKey("RandomWalkLength")) {
-        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)));
-      }
-    }
+    public static IntegerVector CreateSolution(IRandom random, GQAPInstance problemInstance,
+      int depth, int maximumTries, bool createMostFeasibleSolution, int randomWalkLength, CancellationToken cancel) {
+      var capacities = problemInstance.Capacities;
+      var demands = problemInstance.Demands;
 
-    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;
@@ -125 +112 @@
           }
         } else RandomFeasibleWalk(random, assignment, demands, slack, randomWalkLength);
-        double violation = evaluator.EvaluateOverbooking(slack, capacities);
+        double violation = slack.Select(x => x < 0 ? -x : 0).Sum();
         isFeasible = violation == 0;
         if (isFeasible || violation < minViolation) {
@@ -182 +169 @@
     }
 
-    protected override IntegerVector CreateRandomSolution(IRandom random, DoubleArray demands, DoubleArray capacities) {
-      return CreateSolution(random, demands, capacities,
-        EvaluatorParameter.ActualValue,
+    protected override IntegerVector CreateRandomSolution(IRandom random, GQAPInstance problemInstance) {
+      return CreateSolution(random, problemInstance,
         DepthParameter.ActualValue.Value,
         MaximumTriesParameter.ActualValue.Value,