Changeset 6651 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Evaluators

Timestamp:

08/11/11 06:41:19 (13 years ago)

Author:

abeham

Message:

#1614

• syncing

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Evaluators/GQAPEvaluator.cs (modified) (2 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Evaluators/GQAPEvaluator.cs

@@ -94 +94 @@
       DoubleArray demands = DemandsParameter.ActualValue;
       DoubleArray capacities = (DoubleArray)CapacitiesParameter.ActualValue.Clone();
+      double penalty = PenaltyParameter.ActualValue.Value;
       double quality = 0;
       double infeasibility = 0;
@@ -109 +110 @@
 
       InfeasibilityParameter.ActualValue = new DoubleValue(infeasibility);
-      QualityParameter.ActualValue = new DoubleValue(quality);
+      QualityParameter.ActualValue = new DoubleValue(quality + penalty * infeasibility);
       return base.Apply();
     }