Changeset 11323


Ignore:
Timestamp:
09/01/14 13:36:29 (7 years ago)
Author:
pfleck
Message:

#2208

  • Updated InstanceProvider reference
  • Avoid evaluation in OrienteeringLocalImprovementOperator when no local iterations are performed.
Location:
branches/HeuristicLab.Problems.Orienteering
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Instances.Orienteering/3.3/SchildeInstanceProvider.cs

    r11319 r11323  
    3838    }
    3939    public override string ReferencePublication {
    40       get { return "Metaheuristics for the bi-objective orienteering problem (Michael Schilde, Karl F. Doerner, Richard F. Hartl, Guenter Kiechle)"; }
     40      get {
     41        return @"Michael Schilde, Karl F. Doerner, Richard F. Hartl, Guenter Kiechle. 2009.
     42Metaheuristics for the bi-objective orienteering problem.
     43Swarm Intelligence, Volume 3, Issue 3, pp 179-201.";
     44      }
    4145    }
    4246    public override Uri WebLink {
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3/Improvers/OrienteeringLocalImprovementOperator.cs

    r11320 r11323  
    129129      var tour = IntegerVectorParameter.ActualValue.ToList();
    130130
    131       double tourLength = distances.CalculateTourLength(tour, pointVisitingCosts);
     131      double tourLength = 0;
    132132      double tourScore = tour.Sum(point => scores[point]);
    133133
     
    139139      while (optimizationDone && localIterations.Value < maxIterations) {
    140140        optimizationDone = false;
     141
     142        if (localIterations.Value == 0)
     143          tourLength = distances.CalculateTourLength(tour, pointVisitingCosts);
    141144
    142145        // Try to shorten the path
Note: See TracChangeset for help on using the changeset viewer.