Changeset 11323 for branches

Timestamp:

09/01/14 13:36:29 (10 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:

• HeuristicLab.Problems.Instances.Orienteering/3.3/SchildeInstanceProvider.cs (modified) (1 diff)
• HeuristicLab.Problems.Orienteering/3.3/Improvers/OrienteeringLocalImprovementOperator.cs (modified) (2 diffs)

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Instances.Orienteering/3.3/SchildeInstanceProvider.cs

@@ -38 +38 @@
     }
     public override string ReferencePublication {
-      get { return "Metaheuristics for the bi-objective orienteering problem (Michael Schilde, Karl F. Doerner, Richard F. Hartl, Guenter Kiechle)"; }
+      get {
+        return @"Michael Schilde, Karl F. Doerner, Richard F. Hartl, Guenter Kiechle. 2009.
+Metaheuristics for the bi-objective orienteering problem.
+Swarm Intelligence, Volume 3, Issue 3, pp 179-201.";
+      }
     }
     public override Uri WebLink {

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3/Improvers/OrienteeringLocalImprovementOperator.cs

@@ -129 +129 @@
       var tour = IntegerVectorParameter.ActualValue.ToList();
 
-      double tourLength = distances.CalculateTourLength(tour, pointVisitingCosts);
+      double tourLength = 0;
       double tourScore = tour.Sum(point => scores[point]);
 
@@ -139 +139 @@
       while (optimizationDone && localIterations.Value < maxIterations) {
         optimizationDone = false;
+
+        if (localIterations.Value == 0)
+          tourLength = distances.CalculateTourLength(tour, pointVisitingCosts);
 
         // Try to shorten the path