Changeset 5127 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances

Timestamp:

12/17/10 13:42:53 (14 years ago)

Author:

svonolfe

Message:

Implemented unified tabu search (WIP) (#1177)

Location:

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

Files:

• SingleDepotVRP/CVRP/CVRPProblemInstance.cs (modified) (1 diff)
• SingleDepotVRP/CVRP/CVRPTW/CVRPTWProblemInstance.cs (modified) (1 diff)
• VRPEvaluator.cs (modified) (4 diffs)
• VRPProblemInstance.cs (modified) (1 diff)

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

@@ -76 +76 @@
     public CVRPProblemInstance() {
       Parameters.Add(new ValueParameter<DoubleValue>("Capacity", "The capacity of each vehicle.", new DoubleValue(0)));
-      Parameters.Add(new ValueParameter<DoubleValue>("EvalOverloadPenalty", "The overload penalty considered in the evaluation.", new DoubleValue(100)));
+      Parameters.Add(new ValueParameter<DoubleValue>("EvalOverloadPenalty", "The overload penalty considered in the evaluation.", new DoubleValue(1)));
 
       AttachEventHandlers();

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

@@ -102 +102 @@
 
       Parameters.Add(new ValueParameter<DoubleValue>("EvalTimeFactor", "The time factor considered in the evaluation.", new DoubleValue(0)));
-      Parameters.Add(new ValueParameter<DoubleValue>("EvalTardinessPenalty", "The tardiness penalty considered in the evaluation.", new DoubleValue(100)));
+      Parameters.Add(new ValueParameter<DoubleValue>("EvalTardinessPenalty", "The tardiness penalty considered in the evaluation.", new DoubleValue(1)));
 
       AttachEventHandlers();

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPEvaluator.cs

@@ -55 +55 @@
       get { return (ILookupParameter<DoubleValue>)Parameters["VehiclesUtilized"]; }
     }
+
+    public ILookupParameter<DoubleValue> PenaltyParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["Penalty"]; }
+    }
     
     [StorableConstructor]
@@ -65 +69 @@
       Parameters.Add(new LookupParameter<DoubleValue>("Distance", "The distance."));
       Parameters.Add(new LookupParameter<DoubleValue>("VehiclesUtilized", "The number of vehicles utilized."));
+
+      Parameters.Add(new LookupParameter<DoubleValue>("Penalty", "The applied penalty."));
     }
 
@@ -81 +87 @@
       VehcilesUtilizedParameter.ActualValue = new DoubleValue(0);
       DistanceParameter.ActualValue = new DoubleValue(0);
+      PenaltyParameter.ActualValue = new DoubleValue(0);
     }
 
@@ -87 +94 @@
       VehcilesUtilizedParameter.ActualValue.Value = tourEvaluation.VehicleUtilization;
       DistanceParameter.ActualValue.Value = tourEvaluation.Distance;
+      PenaltyParameter.ActualValue.Value = tourEvaluation.Penalty;
     }
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs

@@ -221 +221 @@
       Parameters.Add(new ValueParameter<DoubleArray>("Demand", "The demand of each customer.", new DoubleArray()));
 
-      Parameters.Add(new ValueParameter<DoubleValue>("EvalFleetUsageFactor", "The fleet usage factor considered in the evaluation.", new DoubleValue(100)));
+      Parameters.Add(new ValueParameter<DoubleValue>("EvalFleetUsageFactor", "The fleet usage factor considered in the evaluation.", new DoubleValue(0)));
       Parameters.Add(new ValueParameter<DoubleValue>("EvalDistanceFactor", "The distance factor considered in the evaluation.", new DoubleValue(1)));