Changeset 6838 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Creators/IterativeInsertionCreator.cs

Timestamp:

09/27/11 13:29:56 (13 years ago)

Author:

svonolfe

Message:

Updated interface of evaluator - added individual (#1177)

File:

• branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Creators/IterativeInsertionCreator.cs (modified) (3 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Creators/IterativeInsertionCreator.cs

@@ -101 +101 @@
 
       Tour currentTour = new Tour();
+      result.Tours.Add(currentTour);
 
       int j = random.Next(customers.Count);
@@ -114 +115 @@
         }
 
-        CVRPEvaluation evaluation = instance.Evaluate(currentTour) as CVRPEvaluation;
+        CVRPEvaluation evaluation = instance.EvaluateTour(currentTour, result) as CVRPEvaluation;
         if (result.Tours.Count < instance.Vehicles.Value && 
           ((adhereTimeWindows && !instance.Feasible(evaluation)) || ((!adhereTimeWindows) && evaluation.Overload > double.Epsilon))) {
@@ -132 +133 @@
       }
 
-      if (currentTour.Stops.Count > 0)
-        result.Tours.Add(currentTour);
+      if (currentTour.Stops.Count == 0)
+        result.Tours.Remove(currentTour);
 
       return result;