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

Timestamp:

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

Author:

abeham

Message:

#1614: refactored code

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

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/RandomButFeasibleSolutionCreator.cs (modified) (7 diffs)

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,