Changeset 7970 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces

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

Location:

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

Files:

• IEvaluatorAwareGQAPOperator.cs (added)
• IExpectedRandomQualityAwareGQAPOperator.cs (added)
• IGQAPEvaluator.cs (modified) (2 diffs)
• IOverbookedCapacityPenaltyAwareGQAPOperator.cs (deleted)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/IGQAPEvaluator.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Optimization;
 
@@ -30 +31 @@
     ILookupParameter<DoubleValue> InstallationQualityParameter { get; }
     ILookupParameter<DoubleValue> OverbookedCapacityParameter { get; }
+
+    double Evaluate(IntegerVector assignment, DoubleMatrix weights, DoubleMatrix distances,
+                    DoubleMatrix installCosts, DoubleArray demands, DoubleArray capacities,
+                    double transportationCosts, double expectedRandomQuality);
+
+    void Evaluate(IntegerVector assignment, DoubleMatrix weights, DoubleMatrix distances,
+                  DoubleMatrix installCosts, DoubleArray demands, DoubleArray capacities,
+                  out double flowDistanceQuality, out double installationQuality,
+                  out double overbookedCapacity);
+
+    double EvaluateOverbooking(DoubleArray slack, DoubleArray capacities);
+
+    double GetFitness(double flowDistanceQuality, double installationQuality,
+                      double overbookedCapacity, double transportationCosts,
+                      double expectedRandomQuality);
   }
 }