Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/19/10 11:12:40 (14 years ago)
Author:
svonolfe
Message:

Implemented review comments (#1236)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Evaluators/VRPEvaluator.cs

    r4722 r4847  
    116116      DoubleArray serviceTimeArray, DoubleArray readyTimeArray, DoubleArray demandArray, DoubleValue capacity,
    117117      DoubleValue fleetUsageFactor, DoubleValue timeFactor, DoubleValue distanceFactor, DoubleValue overloadPenalty, DoubleValue tardinessPenalty,
    118       DoubleMatrix coordinates, ILookupParameter<DoubleMatrix> distanceMatrix, BoolValue useDistanceMatrix) {
     118      DoubleMatrix coordinates, IParameter distanceMatrix, BoolValue useDistanceMatrix) {
    119119      TourEvaluation eval = new TourEvaluation();
    120120
     
    190190      DoubleArray serviceTimeArray, DoubleArray readyTimeArray, DoubleArray demandArray, DoubleValue capacity,
    191191      DoubleValue fleetUsageFactor, DoubleValue timeFactor, DoubleValue distanceFactor, DoubleValue overloadPenalty, DoubleValue tardinessPenalty,
    192       DoubleMatrix coordinates, ILookupParameter<DoubleMatrix> distanceMatrix, BoolValue useDistanceMatrix) {
     192      DoubleMatrix coordinates, IParameter distanceMatrix, BoolValue useDistanceMatrix) {
    193193      TourEvaluation sumEval = new TourEvaluation();
    194194      sumEval.Distance = 0;
     
    199199      sumEval.Tardiness = 0;
    200200
    201       foreach (Tour tour in solution.GetTours(distanceMatrix)) {
     201      foreach (Tour tour in solution.GetTours(distanceMatrix as ILookupParameter<DoubleMatrix>)) {
    202202        TourEvaluation eval = EvaluateTour(tour, dueTimeArray, serviceTimeArray, readyTimeArray, demandArray, capacity,
    203203          fleetUsageFactor, timeFactor, distanceFactor, overloadPenalty, tardinessPenalty,
Note: See TracChangeset for help on using the changeset viewer.