Changeset 6710 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer

Timestamp:

09/06/11 13:00:12 (13 years ago)

Author:

svonolfe

Message:

Added support for pickups and deliveries (#1177)

Location:

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

Files:

• BestAverageWorstTours/PickupAndDelivery (added)
• BestAverageWorstTours/PickupAndDelivery/BestAverageWorstPickupAndDeliveryVRPToursAnalyzer.cs (added)
• BestAverageWorstTours/PickupAndDelivery/BestAverageWorstPickupAndDeliveryVRPToursCalculator.cs (added)
• BestAverageWorstTours/PickupAndDelivery/BestPickupAndDeliveryVRPToursMemorizer.cs (added)
• BestSolution/Capacitated/BestCapacitatedVRPSolutionAnalyzer.cs (modified) (2 diffs)
• BestSolution/PickupAndDelivery (added)
• BestSolution/PickupAndDelivery/BestPickupAndDeliveryVRPSolutionAnalyzer.cs (added)
• BestSolution/TimeWindowed/BestTimeWindowedVRPSolutionAnalyzer.cs (modified) (2 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestSolution/Capacitated/BestCapacitatedVRPSolutionAnalyzer.cs

@@ -70 +70 @@
         Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Overload", "The overloads of the VRP solutions which should be analyzed."));
 
-        Parameters.Add(new LookupParameter<VRPSolution>("BestSolution", "The best TSP solution."));
+        Parameters.Add(new LookupParameter<VRPSolution>("BestSolution", "The best VRP solution."));
         Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The result collection where the best VRP solution should be stored."));
     }
@@ -91 +91 @@
       int i = qualities.Select((x, index) => new { index, x.Value }).OrderBy(x => x.Value).First().index;
 
-      IVRPEncoding best = solutions[i] as IVRPEncoding;
       VRPSolution solution = BestSolutionParameter.ActualValue;
-      if (!results.ContainsKey("Best VRP Solution Overload")) {
-        results.Add(new Result("Best VRP Solution Overload", new DoubleValue(overloads[i].Value)));
-      } else {
-        if (qualities[i].Value <= solution.Quality.Value) {
-          (results["Best VRP Solution Overload"].Value as DoubleValue).Value = overloads[i].Value;
+      if (solution != null) {
+        if (!results.ContainsKey("Best VRP Solution Overload")) {
+          results.Add(new Result("Best VRP Solution Overload", new DoubleValue(overloads[i].Value)));
+        } else {
+          if (qualities[i].Value <= solution.Quality.Value) {
+            (results["Best VRP Solution Overload"].Value as DoubleValue).Value = overloads[i].Value;
+          }
         }
       }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestSolution/TimeWindowed/BestTimeWindowedVRPSolutionAnalyzer.cs

@@ -73 +73 @@
         Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Tardiness", "The tardiness of the VRP solutions which should be analyzed."));
         Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("TravelTime", "The travel times of the VRP solutions which should be analyzed."));
- 
-        Parameters.Add(new LookupParameter<VRPSolution>("BestSolution", "The best TSP solution."));
+
+        Parameters.Add(new LookupParameter<VRPSolution>("BestSolution", "The best VRP solution."));
         Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The result collection where the best VRP solution should be stored."));
     }
@@ -96 +96 @@
       int i = qualities.Select((x, index) => new { index, x.Value }).OrderBy(x => x.Value).First().index;
 
-      IVRPEncoding best = solutions[i] as IVRPEncoding;
       VRPSolution solution = BestSolutionParameter.ActualValue;
-      if (!results.ContainsKey("Best VRP Solution Tardiness")) {
-        results.Add(new Result("Best VRP Solution Tardiness", new DoubleValue(tardinesses[i].Value)));
-        results.Add(new Result("Best VRP Solution TravelTime", new DoubleValue(travelTimes[i].Value)));
-      } else {
-        if (qualities[i].Value <= solution.Quality.Value) {
-          (results["Best VRP Solution Tardiness"].Value as DoubleValue).Value = tardinesses[i].Value;
-          (results["Best VRP Solution TravelTime"].Value as DoubleValue).Value = travelTimes[i].Value;
+      if (solution != null) {
+        if (!results.ContainsKey("Best VRP Solution Tardiness")) {
+          results.Add(new Result("Best VRP Solution Tardiness", new DoubleValue(tardinesses[i].Value)));
+          results.Add(new Result("Best VRP Solution TravelTime", new DoubleValue(travelTimes[i].Value)));
+        } else {
+          if (qualities[i].Value <= solution.Quality.Value) {
+            (results["Best VRP Solution Tardiness"].Value as DoubleValue).Value = tardinesses[i].Value;
+            (results["Best VRP Solution TravelTime"].Value as DoubleValue).Value = travelTimes[i].Value;
+          }
         }
       }