Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/19/10 13:54:50 (13 years ago)
Author:
svonolfe
Message:

Implemented review comments (#1236)

Location:
trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.3
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.3/VRPImportDialog.cs

    r4847 r4851  
    5757        okButton.Enabled = true;
    5858
     59        tourFileTextBox.Text = string.Empty;
     60        tourFileName = string.Empty;
     61
    5962        format = (VRPFormat)(openVRPFileDialog.FilterIndex);
    6063      }

  • trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.3/VehicleRoutingProblemView.cs

    r4847 r4851  
    109109        vrpSolutionView.Content = new VRPSolution(Content.Coordinates);
    110110      else {
    111         //call evaluator
    112         IValueLookupParameter<DoubleMatrix> distMatrix = new ValueLookupParameter<DoubleMatrix>("DistMatrix",
    113           Content.DistanceMatrix);
    114 
    115         TourEvaluation eval = VRPEvaluator.Evaluate(
    116           Content.BestKnownSolution,
    117           Content.Vehicles,
    118           Content.DueTime,
    119           Content.ServiceTime,
    120           Content.ReadyTime,
    121           Content.Demand,
    122           Content.Capacity,
    123           Content.FleetUsageFactorParameter.Value,
    124           Content.TimeFactorParameter.Value,
    125           Content.DistanceFactorParameter.Value,
    126           Content.OverloadPenaltyParameter.Value,
    127           Content.TardinessPenaltyParameter.Value,
    128           Content.Coordinates,
    129           distMatrix,
    130           Content.UseDistanceMatrix);
    131 
    132         Content.DistanceMatrix = distMatrix.Value;
    133 
    134         vrpSolutionView.Content = new VRPSolution(Content.Coordinates,
    135           Content.BestKnownSolution,
    136           new DoubleValue(eval.Quality),
    137           new DoubleValue(eval.Distance),
    138           new DoubleValue(eval.Overload),
    139           new DoubleValue(eval.Tardiness),
    140           new DoubleValue(eval.TravelTime),
    141           new DoubleValue(eval.VehcilesUtilized),
    142           Content.DistanceMatrix,
    143           Content.UseDistanceMatrix,
    144           Content.ReadyTime,
    145           Content.DueTime,
    146           Content.ServiceTime);
     111        vrpSolutionView.Content = Content.BestKnownSolution;
    147112      }
    148113    }
Note: See TracChangeset for help on using the changeset viewer.