Changeset 4376 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP

Timestamp:

09/09/10 16:24:09 (14 years ago)

Author:

svonolfe

Message:

Added Potvin encoding (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP

Files:

• CVRPEvaluator.cs (modified) (2 diffs)
• CVRPProblemInstance.cs (modified) (2 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPEvaluator.cs

@@ -49 +49 @@
       base.EvaluateTour(eval, instance, tour);
 
-      ICapacitatedProblemInstance cvrpInstance = instance as ICapacitatedProblemInstance;
+      IHomogenousCapacitatedProblemInstance cvrpInstance = instance as IHomogenousCapacitatedProblemInstance;
 
       double delivered = 0.0;
@@ -55 +55 @@
 
       for (int i = 0; i < tour.Stops.Count; i++) {
-        delivered += instance.Demand[i];
+        delivered += instance.Demand[tour.Stops[i]];
       }
 
-      double capacity = (instance as ICapacitatedProblemInstance).Capacity.Value;
+      double capacity = cvrpInstance.Capacity.Value;
       if (delivered > capacity) {
         overweight = delivered - capacity;

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPProblemInstance.cs

@@ -36 +36 @@
   [Item("CVRPProblemInstance", "Represents a single depot CVRP instance.")]
   [StorableClass]
-  public class CVRPProblemInstance: SingleDepotVRPProblemInstance, ICapacitatedProblemInstance {
+  public class CVRPProblemInstance: SingleDepotVRPProblemInstance, IHomogenousCapacitatedProblemInstance {
     protected IValueParameter<DoubleValue> CapacityParameter {
       get { return (IValueParameter<DoubleValue>)Parameters["Capacity"]; }
@@ -55 +55 @@
     protected override IEnumerable<IOperator> GetOperators() {
         return base.GetOperators()
-          .Where(o => o is ICapacitatedOperator).Cast<IOperator>();
+          .Where(o => o is IHomogenousCapacitatedOperator).Cast<IOperator>();
     }