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

Timestamp:

01/26/12 00:36:45 (12 years ago)

Author:

abeham

Message:

#1614

• renamed AssemblyInfo frame files to proper name
• fixed discovery of move operators
• fixed a bug in the move evaluator
• fixed a bug in the DiscreteLocationCrossover

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Evaluators/GQAPNMoveEvaluator.cs (modified) (1 diff)

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

@@ -180 +180 @@
       MoveFlowDistanceQualityParameter.ActualValue = new DoubleValue(flowDistanceQuality + moveFlowDistanceQuality);
       MoveInstallationQualityParameter.ActualValue = new DoubleValue(installationQuality + moveInstallationQuality);
-      MoveOverbookedCapacityParameter.ActualValue = new DoubleValue(moveOverbookedCapacity);
+      MoveOverbookedCapacityParameter.ActualValue = new DoubleValue(overbookedCapacity + moveOverbookedCapacity);
 
       MoveQualityParameter.ActualValue = new DoubleValue(GQAPEvaluator.GetCombinedQuality(
         flowDistanceQuality + moveFlowDistanceQuality,
         installationQuality + moveInstallationQuality,
-        moveOverbookedCapacity,
+        overbookedCapacity + moveOverbookedCapacity,
         transportationCosts,
         overbookedCapacityPenalty));