Changeset 15504 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/CordeauCrossover.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/Operators/Crossovers/CordeauCrossover.cs (modified) (10 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/CordeauCrossover.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.
@@ -34 +34 @@
   [StorableClass]
   public class CordeauCrossover : GQAPCrossover,
-    IQualitiesAwareGQAPOperator, IWeightsAwareGQAPOperator, IDistancesAwareGQAPOperator, IInstallationCostsAwareGQAPOperator,
-    IDemandsAwareGQAPOperator, ICapacitiesAwareGQAPOperator, ITransportationCostsAwareGQAPOperator,
-    IExpectedRandomQualityAwareGQAPOperator {
+    IQualitiesAwareGQAPOperator, IProblemInstanceAwareGQAPOperator {
 
     public ILookupParameter<BoolValue> MaximizationParameter {
@@ -44 +42 @@
       get { return (IScopeTreeLookupParameter<DoubleValue>)Parameters["Quality"]; }
     }
-    public IScopeTreeLookupParameter<DoubleValue> FlowDistanceQualityParameter {
-      get { return (IScopeTreeLookupParameter<DoubleValue>)Parameters["FlowDistanceQuality"]; }
-    }
-    public IScopeTreeLookupParameter<DoubleValue> InstallationQualityParameter {
-      get { return (IScopeTreeLookupParameter<DoubleValue>)Parameters["InstallationQuality"]; }
-    }
-    public IScopeTreeLookupParameter<DoubleValue> OverbookedCapacityParameter {
-      get { return (IScopeTreeLookupParameter<DoubleValue>)Parameters["OverbookedCapacity"]; }
-    }
-    public ILookupParameter<DoubleMatrix> WeightsParameter {
-      get { return (ILookupParameter<DoubleMatrix>)Parameters["Weights"]; }
-    }
-    public ILookupParameter<DoubleMatrix> DistancesParameter {
-      get { return (ILookupParameter<DoubleMatrix>)Parameters["Distances"]; }
-    }
-    public ILookupParameter<DoubleMatrix> InstallationCostsParameter {
-      get { return (ILookupParameter<DoubleMatrix>)Parameters["InstallationCosts"]; }
-    }
-    public ILookupParameter<DoubleArray> DemandsParameter {
-      get { return (ILookupParameter<DoubleArray>)Parameters["Demands"]; }
-    }
-    public ILookupParameter<DoubleArray> CapacitiesParameter {
-      get { return (ILookupParameter<DoubleArray>)Parameters["Capacities"]; }
-    }
-    public IValueLookupParameter<DoubleValue> TransportationCostsParameter {
-      get { return (IValueLookupParameter<DoubleValue>)Parameters["TransportationCosts"]; }
-    }
-    public IValueLookupParameter<DoubleValue> ExpectedRandomQualityParameter {
-      get { return (IValueLookupParameter<DoubleValue>)Parameters["ExpectedRandomQuality"]; }
-    }
-    public IValueLookupParameter<IGQAPEvaluator> EvaluatorParameter {
-      get { return (IValueLookupParameter<IGQAPEvaluator>)Parameters["Evaluator"]; }
+    public IScopeTreeLookupParameter<Evaluation> EvaluationParameter {
+      get { return (IScopeTreeLookupParameter<Evaluation>)Parameters["Evaluation"]; }
     }
     public ILookupParameter<IntValue> EvaluatedSolutionsParameter {
@@ -88 +56 @@
     public CordeauCrossover()
       : base() {
-      Parameters.Add(new LookupParameter<BoolValue>("Maximization", GeneralizedQuadraticAssignmentProblem.MaximizationDescription));
-      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", GQAPEvaluator.QualityDescription, 1));
-      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("FlowDistanceQuality", GQAPEvaluator.FlowDistanceQualityDescription, 1));
-      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("InstallationQuality", GQAPEvaluator.InstallationQualityDescription, 1));
-      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("OverbookedCapacity", GQAPEvaluator.OverbookedCapacityDescription, 1));
-      Parameters.Add(new LookupParameter<DoubleMatrix>("Weights", GeneralizedQuadraticAssignmentProblem.WeightsDescription));
-      Parameters.Add(new LookupParameter<DoubleMatrix>("Distances", GeneralizedQuadraticAssignmentProblem.DistancesDescription));
-      Parameters.Add(new LookupParameter<DoubleMatrix>("InstallationCosts", GeneralizedQuadraticAssignmentProblem.InstallationCostsDescription));
-      Parameters.Add(new LookupParameter<DoubleArray>("Demands", GeneralizedQuadraticAssignmentProblem.DemandsDescription));
-      Parameters.Add(new LookupParameter<DoubleArray>("Capacities", GeneralizedQuadraticAssignmentProblem.CapacitiesDescription));
-      Parameters.Add(new ValueLookupParameter<DoubleValue>("TransportationCosts", GeneralizedQuadraticAssignmentProblem.TransportationCostsDescription));
-      Parameters.Add(new ValueLookupParameter<DoubleValue>("ExpectedRandomQuality", GeneralizedQuadraticAssignmentProblem.ExpectedRandomQualityDescription));
-      Parameters.Add(new ValueLookupParameter<IGQAPEvaluator>("Evaluator", "The evaluator used to evaluate solutions."));
+      Parameters.Add(new LookupParameter<BoolValue>("Maximization", ""));
+      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The quality of the parents", 1));
+      Parameters.Add(new ScopeTreeLookupParameter<Evaluation>("Evaluation", GQAP.EvaluationDescription, 1));
       Parameters.Add(new LookupParameter<IntValue>("EvaluatedSolutions", "The number of evaluated solutions."));
     }
@@ -108 +66 @@
     }
 
-    public static IntegerVector Apply(IRandom random, BoolValue maximization,
+    public static IntegerVector Apply(IRandom random, bool maximization,
       IntegerVector parent1, DoubleValue quality1,
       IntegerVector parent2, DoubleValue quality2,
-      DoubleMatrix weights, DoubleMatrix distances, DoubleMatrix installationCosts,
-      DoubleArray demands, DoubleArray capacities,
-      double transportationCosts, double expectedRandomQuality, IGQAPEvaluator evaluator, IntValue evaluatedSolutions) {
+      GQAPInstance problemInstance, IntValue evaluatedSolutions) {
+      var distances = problemInstance.Distances;
+      var capacities = problemInstance.Capacities;
+      var demands = problemInstance.Demands;
+
       var medianDistances = Enumerable.Range(0, distances.Rows).Select(x => distances.GetRow(x).Median()).ToArray();
 
@@ -120 +80 @@
       
       bool onefound = false;
-      double fbest, fbestAttempt = maximization.Value ? double.MinValue : double.MaxValue;
+      double fbest, fbestAttempt = maximization ? double.MinValue : double.MaxValue;
       IntegerVector bestAttempt = null;
       IntegerVector result = null;
 
       fbest = quality1.Value;
-      if (maximization.Value && quality1.Value < quality2.Value
-        || !maximization.Value && quality1.Value > quality2.Value) {
+      if (maximization && quality1.Value < quality2.Value
+        || !maximization && quality1.Value > quality2.Value) {
         var temp = parent1;
         parent1 = parent2;
@@ -140 +100 @@
           TryRandomAssignment(random, demands, capacities, m, n, cap, child, ref unassigned);
         if (unassigned == 0) {
-          var childFit = evaluator.Evaluate(child, weights, distances, installationCosts, demands, capacities, transportationCosts, expectedRandomQuality);
+          var childFit = problemInstance.ToSingleObjective(problemInstance.Evaluate(child));
           evaluatedSolutions.Value++;
-          if (maximization.Value && childFit >= fbest
-            || !maximization.Value && childFit <= fbest) {
+          if (maximization && childFit >= fbest
+            || !maximization && childFit <= fbest) {
             fbest = childFit;
             result = child;
             onefound = true;
           }
-          if (!onefound && (maximization.Value && fbestAttempt < childFit || !maximization.Value && fbestAttempt > childFit)) {
+          if (!onefound && (maximization && fbestAttempt < childFit || !maximization && fbestAttempt > childFit)) {
             bestAttempt = child;
             fbestAttempt = childFit;
@@ -162 +122 @@
         RandomAssignment(random, demands, capacities, m, n, cap, child, ref unassigned);
 
-        var childFit = evaluator.Evaluate(child, weights, distances, installationCosts, demands, capacities, transportationCosts, expectedRandomQuality);
+        var childFit = problemInstance.ToSingleObjective(problemInstance.Evaluate(child));
         evaluatedSolutions.Value++;
         if (childFit < fbest) {
@@ -170 +130 @@
         }
 
-        if (!onefound && (maximization.Value && fbestAttempt < childFit || !maximization.Value && fbestAttempt > childFit)) {
+        if (!onefound && (maximization && fbestAttempt < childFit || !maximization && fbestAttempt > childFit)) {
           bestAttempt = child;
           fbestAttempt = childFit;
@@ -237 +197 @@
     }
 
-    protected override IntegerVector Cross(IRandom random, ItemArray<IntegerVector> parents) {
+    protected override IntegerVector Cross(IRandom random, ItemArray<IntegerVector> parents,
+      GQAPInstance problemInstance) {
       if (parents == null) throw new ArgumentNullException("parents");
       if (parents.Length != 2) throw new ArgumentException(Name + " works only with exactly two parents.");
 
       var qualities = QualityParameter.ActualValue;
-      return Apply(random, MaximizationParameter.ActualValue,
+      return Apply(random, MaximizationParameter.ActualValue.Value,
         parents[0], qualities[0],
         parents[1], qualities[1],
-        WeightsParameter.ActualValue, DistancesParameter.ActualValue, InstallationCostsParameter.ActualValue,
-        DemandsParameter.ActualValue, CapacitiesParameter.ActualValue,
-        TransportationCostsParameter.ActualValue.Value, ExpectedRandomQualityParameter.ActualValue.Value,
-        EvaluatorParameter.ActualValue, EvaluatedSolutionsParameter.ActualValue);
+        problemInstance,
+        EvaluatedSolutionsParameter.ActualValue);
     }
   }