Changeset 8784


Ignore:
Timestamp:
10/11/12 09:10:00 (10 years ago)
Author:
svonolfe
Message:

modified dial-a-ride evaluation (#1955)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/DynamicVehicleRouting/HeuristicLab.PDPSimulation/3.3/Operators/DialARideEvaluator.cs

    r8782 r8784  
    181181                pickupReady = readyTime[location + depots - 1];
    182182              }
    183               leadTimes.Add(time - pickupReady);
     183              leadTimes.Add(time - currentServiceTime - pickupReady);
    184184            }
    185185          } else {
     
    207207      double leadTime = 0;
    208208      if (leadTimes.Count > 0)
    209         leadTime = leadTimes.Average();
     209        leadTime = leadTimes.Sum();
    210210      eval.Quality += leadTime * LeadTimeFactorParameter.Value.Value;
    211211
     
    217217      tourPenalty += penalty;
    218218
    219       (eval as CVRPTWEvaluation).Tardiness += tardiness;
     219      //(eval as CVRPTWEvaluation).Tardiness += tardiness;
    220220      (eval as CVRPTWEvaluation).TravelTime += time;
    221221
    222       penalty = tardiness;
    223       eval.Penalty += penalty;
    224       eval.Quality += penalty;
    225       tourPenalty += penalty;
     222      //penalty = tardiness;
     223      //eval.Penalty += penalty;
     224      eval.Quality += tardiness;
     225      //tourPenalty += penalty;
    226226
    227227      (eval as CVRPPDTWEvaluation).PickupViolations += pickupViolations;
Note: See TracChangeset for help on using the changeset viewer.