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

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentView.cs

@@ -315 +315 @@
     private void recalculateButton_Click(object sender, EventArgs e) {
       double fdq, iq, oc;
-      GQAPEvaluator.Evaluate(Content.Assignment, Content.Weights,
+      Content.Evaluator.Evaluate(Content.Assignment, Content.Weights,
         Content.Distances, Content.InstallationCosts, Content.Demands,
         Content.Capacities, out fdq, out iq, out oc);
@@ -322 +322 @@
       Content.OverbookedCapacity = new DoubleValue(oc);
       Content.Quality = new DoubleValue(
-        GQAPEvaluator.GetCombinedQuality(fdq, iq, oc,
-        Content.TransportationCosts.Value, Content.OverbookedCapacityPenalty.Value));
+        Content.Evaluator.GetFitness(fdq, iq, oc,
+        Content.TransportationCosts.Value, Content.ExpectedRandomQuality.Value));
     }
   }