Changeset 4301 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Analyzers

Timestamp:

08/24/10 14:52:26 (14 years ago)

Author:

svonolfe

Message:

Added VRPTours analyzer (#1039)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Analyzers

Files:

• BestAverageWorstVRPToursAnalyzer.cs (added)
• BestAverageWorstVRPToursCalculator.cs (added)
• BestVRPSolutionAnalyzer.cs (modified) (1 diff)
• BestVRPToursMemorizer.cs (added)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Analyzers/BestVRPSolutionAnalyzer.cs

@@ -127 +127 @@
         BestSolutionParameter.ActualValue = solution;
         results.Add(new Result("Best VRP Solution", solution));
-
-        results.Add(new Result("Best TravelTime", new DoubleValue(travelTimes[i].Value)));
-        results.Add(new Result("Best Distance",  new DoubleValue(distances[i].Value)));
-        results.Add(new Result("Best VehicleUtilization", new DoubleValue(vehiclesUtilizations[i].Value)));
-        results.Add(new Result("Best Overload",  new DoubleValue(overloads[i].Value)));
-        results.Add(new Result("Best Tardiness",  new DoubleValue(tardinesses[i].Value)));
       } else {
-        if (solution.Quality.Value > qualities[i].Value) {
+        if (qualities[i].Value <= solution.Quality.Value) {
           solution.Coordinates = coordinates;
           solution.Solution = best.Clone() as IVRPEncoding;
           solution.Quality.Value = qualities[i].Value;
-          solution.Distance.Value = (results["Best Distance"].Value as DoubleValue).Value = distances[i].Value;
-          solution.Overload.Value = (results["Best Overload"].Value as DoubleValue).Value = overloads[i].Value;
-          solution.Tardiness.Value = (results["Best Tardiness"].Value as DoubleValue).Value = tardinesses[i].Value;
-          solution.TravelTime.Value = (results["Best TravelTime"].Value as DoubleValue).Value = travelTimes[i].Value;
-          solution.VehicleUtilization.Value = (results["Best VehicleUtilization"].Value as DoubleValue).Value = vehiclesUtilizations[i].Value;
+          solution.Distance.Value = distances[i].Value;
+          solution.Overload.Value = overloads[i].Value;
+          solution.Tardiness.Value = tardinesses[i].Value;
+          solution.TravelTime.Value = travelTimes[i].Value;
+          solution.VehicleUtilization.Value = vehiclesUtilizations[i].Value;
           solution.DistanceMatrix = DistanceMatrixParameter.ActualValue;
           solution.UseDistanceMatrix = UseDistanceMatrixParameter.ActualValue;