Changeset 12505 for branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/ConstraintRelaxation/PickupAndDelivery

Timestamp:

06/25/15 11:26:25 (9 years ago)

Author:

mkommend

Message:

#2276: Merged trunk changes into dataset refactoring branch.

Location:

branches/HeuristicLab.DatasetRefactor/sources

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.VehicleRouting (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/ConstraintRelaxation/PickupAndDelivery/PickupViolationsRelaxationVRPAnalyzer.cs (modified) (1 diff)

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/ConstraintRelaxation/PickupAndDelivery/PickupViolationsRelaxationVRPAnalyzer.cs

@@ -136 +136 @@
       double max = pdp.PickupViolationPenalty.Value * (1 + phi);
 
-      pdp.PickupViolationPenalty = new DoubleValue(min + (max - min) * factor);
-      if (pdp.PickupViolationPenalty.Value < minPenalty)
-        pdp.PickupViolationPenalty.Value = minPenalty;
-      if (pdp.PickupViolationPenalty.Value > maxPenalty)
-        pdp.PickupViolationPenalty.Value = maxPenalty;
+      pdp.CurrentPickupViolationPenalty = new DoubleValue(min + (max - min) * factor);
+      if (pdp.CurrentPickupViolationPenalty.Value < minPenalty)
+        pdp.CurrentPickupViolationPenalty.Value = minPenalty;
+      if (pdp.CurrentPickupViolationPenalty.Value > maxPenalty)
+        pdp.CurrentPickupViolationPenalty.Value = maxPenalty;
 
       for (int j = 0; j < qualities.Length; j++) {
-        qualities[j].Value += pickupViolations[j].Value * pdp.PickupViolationPenalty.Value;
+        qualities[j].Value += pickupViolations[j].Value * pdp.CurrentPickupViolationPenalty.Value;
       }
 
       if (!results.ContainsKey("Current Pickup Violation Penalty")) {
-        results.Add(new Result("Current Pickup Violation Penalty", new DoubleValue(pdp.PickupViolationPenalty.Value)));
+        results.Add(new Result("Current Pickup Violation Penalty", new DoubleValue(pdp.CurrentPickupViolationPenalty.Value)));
       } else {
-        (results["Current Pickup Violation Penalty"].Value as DoubleValue).Value = pdp.PickupViolationPenalty.Value;
+        (results["Current Pickup Violation Penalty"].Value as DoubleValue).Value = pdp.CurrentPickupViolationPenalty.Value;
       }