Changeset 12488 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/ConstraintRelaxation/Capacitated

Timestamp:

06/22/15 16:56:47 (10 years ago)

Author:

pfleck

Message:

#2400

• Interfaces for Capaciated-, PickupAndDelivery- and TimeWindowed-ProblemInstances now specify an additional penalty parameter to set the current penalty factor for the constraint relaxation.
• The setter of the penalty-property in the ProblemInstances is removed.
• A CurrentPenalty property is added for setting the adapted penalty value from the relaxation analyzers. These properties are explicitly implemented to "hide" the setter from the API, so that it wont be used unaware of the relaxation mechanics.
• Hide the CurrentPenaltyParameters for same reasons to avoid setting it unwarily.
• Added additional infos in the error message off the VRPInstances unit-test.

File:

• trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/ConstraintRelaxation/Capacitated/CapacityRelaxationVRPAnalyzer.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/ConstraintRelaxation/Capacitated/CapacityRelaxationVRPAnalyzer.cs

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