Changeset 4318


Ignore:
Timestamp:
08/25/10 17:03:08 (12 years ago)
Author:
svonolfe
Message:

Improved VRP analyzers (#1039)

Location:
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Analyzers
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Analyzers/BestAverageWorstVRPToursAnalyzer.cs

    r4301 r4318  
    213213
    214214      resultsCollector.CollectedValues.Add(new LookupParameter<DataTable>(OverloadsParameter.Name));
    215       resultsCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("BestOverload", null, BestOverloadParameter.Name));
    216215
    217216      //tardiness
     
    234233
    235234      resultsCollector.CollectedValues.Add(new LookupParameter<DataTable>(TardinessValuesParameter.Name));
    236       resultsCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("BestTardiness", null, BestTardinessParameter.Name));
    237235
    238236      //Distance
     
    255253
    256254      resultsCollector.CollectedValues.Add(new LookupParameter<DataTable>(DistancesParameter.Name));
    257       resultsCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("BestDistance", null, BestDistanceParameter.Name));
    258255
    259256      //Travel Time
     
    276273
    277274      resultsCollector.CollectedValues.Add(new LookupParameter<DataTable>(TravelTimesParameter.Name));
    278       resultsCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("BestTravelTime", null, BestTravelTimeParameter.Name));
    279275
    280276      //Vehicles Utlized
     
    297293
    298294      resultsCollector.CollectedValues.Add(new LookupParameter<DataTable>(VehiclesUtilizedValuesParameter.Name));
    299       resultsCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("BestVehiclesUtilized", null, BestVehiclesUtilizedParameter.Name));
    300295      #endregion
    301296
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Analyzers/BestVRPSolutionAnalyzer.cs

    r4301 r4318  
    127127        BestSolutionParameter.ActualValue = solution;
    128128        results.Add(new Result("Best VRP Solution", solution));
     129
     130        results.Add(new Result("Best VRP Solution TravelTime", new DoubleValue(travelTimes[i].Value)));
     131        results.Add(new Result("Best VRP Solution Distance", new DoubleValue(distances[i].Value)));
     132        results.Add(new Result("Best VRP Solution VehicleUtilization", new DoubleValue(vehiclesUtilizations[i].Value)));
     133        results.Add(new Result("Best VRP Solution Overload", new DoubleValue(overloads[i].Value)));
     134        results.Add(new Result("Best VRP Solution Tardiness", new DoubleValue(tardinesses[i].Value)));
     135
    129136      } else {
    130137        if (qualities[i].Value <= solution.Quality.Value) {
     
    132139          solution.Solution = best.Clone() as IVRPEncoding;
    133140          solution.Quality.Value = qualities[i].Value;
    134           solution.Distance.Value = distances[i].Value;
    135           solution.Overload.Value = overloads[i].Value;
    136           solution.Tardiness.Value = tardinesses[i].Value;
    137           solution.TravelTime.Value = travelTimes[i].Value;
    138           solution.VehicleUtilization.Value = vehiclesUtilizations[i].Value;
     141          solution.Distance.Value = (results["Best VRP Solution Distance"].Value as DoubleValue).Value = distances[i].Value;
     142          solution.Overload.Value = (results["Best VRP Solution Overload"].Value as DoubleValue).Value = overloads[i].Value;
     143          solution.Tardiness.Value = (results["Best VRP Solution Tardiness"].Value as DoubleValue).Value = tardinesses[i].Value;
     144          solution.TravelTime.Value = (results["Best VRP Solution TravelTime"].Value as DoubleValue).Value = travelTimes[i].Value;
     145          solution.VehicleUtilization.Value = (results["Best VRP Solution VehicleUtilization"].Value as DoubleValue).Value = vehiclesUtilizations[i].Value;
    139146          solution.DistanceMatrix = DistanceMatrixParameter.ActualValue;
    140147          solution.UseDistanceMatrix = UseDistanceMatrixParameter.ActualValue;
Note: See TracChangeset for help on using the changeset viewer.