Changeset 7970 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAPAssignmentArchive.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/GQAPAssignmentArchive.cs (modified) (4 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAPAssignmentArchive.cs

@@ -131 +131 @@
 
     [Storable]
-    private DoubleValue overbookedCapacityPenalty;
-    public DoubleValue OverbookedCapacityPenalty {
-      get { return overbookedCapacityPenalty; }
+    private DoubleValue expectedRandomQuality;
+    public DoubleValue ExpectedRandomQuality {
+      get { return expectedRandomQuality; }
       set {
-        bool changed = (overbookedCapacityPenalty != value);
-        overbookedCapacityPenalty = value;
-        if (changed) OnPropertyChanged("OverbookedCapacityPenalty");
+        bool changed = (expectedRandomQuality != value);
+        expectedRandomQuality = value;
+        if (changed) OnPropertyChanged("ExpectedRandomQuality");
+      }
+    }
+
+    [Storable]
+    private IGQAPEvaluator evaluator;
+    public IGQAPEvaluator Evaluator {
+      get { return evaluator; }
+      set {
+        bool changed = (evaluator != value);
+        evaluator = value;
+        if (changed) OnPropertyChanged("Evaluator");
       }
     }
@@ -154 +165 @@
       capacities = cloner.Clone(original.capacities);
       transportationCosts = cloner.Clone(original.transportationCosts);
-      overbookedCapacityPenalty = cloner.Clone(original.overbookedCapacityPenalty);
+      expectedRandomQuality = cloner.Clone(original.expectedRandomQuality);
+      evaluator = cloner.Clone(original.evaluator);
     }
     public GQAPAssignmentArchive()
@@ -160 +172 @@
       this.solutions = new ItemList<GQAPSolution>();
     }
-    public GQAPAssignmentArchive(StringArray equipmentNames, StringArray locationNames, DoubleMatrix distances, DoubleMatrix weights, DoubleMatrix installationCosts, DoubleArray demands, DoubleArray capacities, DoubleValue transportationCosts, DoubleValue overbookedCapacityPenalty)
+    public GQAPAssignmentArchive(StringArray equipmentNames, StringArray locationNames, DoubleMatrix distances, DoubleMatrix weights, DoubleMatrix installationCosts, DoubleArray demands, DoubleArray capacities, DoubleValue transportationCosts, DoubleValue expectedRandomQuality, IGQAPEvaluator evaluator)
       : this() {
       this.distances = distances;
@@ -168 +180 @@
       this.capacities = capacities;
       this.transportationCosts = transportationCosts;
-      this.overbookedCapacityPenalty = overbookedCapacityPenalty;
+      this.expectedRandomQuality = expectedRandomQuality;
+      this.evaluator = evaluator;
     }