Changeset 4352 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Analyzers/BestVRPSolutionAnalyzer.cs

Timestamp:

09/01/10 11:13:46 (14 years ago)

Author:

svonolfe

Message:

Merged r4351 of the VRP feature branch into trunk (#1039)

Location:

trunk/sources/HeuristicLab.Problems.VehicleRouting

Files:

• . (modified) (1 prop)
• 3.3/Analyzers/BestVRPSolutionAnalyzer.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Analyzers/BestVRPSolutionAnalyzer.cs

@@ -128 +128 @@
         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)));
+        results.Add(new Result("Best VRP Solution TravelTime", new DoubleValue(travelTimes[i].Value)));
+        results.Add(new Result("Best VRP Solution Distance", new DoubleValue(distances[i].Value)));
+        results.Add(new Result("Best VRP Solution VehicleUtilization", new DoubleValue(vehiclesUtilizations[i].Value)));
+        results.Add(new Result("Best VRP Solution Overload", new DoubleValue(overloads[i].Value)));
+        results.Add(new Result("Best VRP Solution 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 = (results["Best VRP Solution Distance"].Value as DoubleValue).Value = distances[i].Value;
+          solution.Overload.Value = (results["Best VRP Solution Overload"].Value as DoubleValue).Value = overloads[i].Value;
+          solution.Tardiness.Value = (results["Best VRP Solution Tardiness"].Value as DoubleValue).Value = tardinesses[i].Value;
+          solution.TravelTime.Value = (results["Best VRP Solution TravelTime"].Value as DoubleValue).Value = travelTimes[i].Value;
+          solution.VehicleUtilization.Value = (results["Best VRP Solution VehicleUtilization"].Value as DoubleValue).Value = vehiclesUtilizations[i].Value;
           solution.DistanceMatrix = DistanceMatrixParameter.ActualValue;
           solution.UseDistanceMatrix = UseDistanceMatrixParameter.ActualValue;