Changeset 6838 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Crossovers

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/Crossovers/PotvinInsertionBasedCrossover.cs (modified) (6 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Crossovers/PotvinInsertionBasedCrossover.cs

@@ -149 +149 @@
 
     private bool FindRouteInsertionPlace(
+      PotvinEncoding individual,
       Tour tour,
       int city, bool allowInfeasible, out int place) {
@@ -162 +163 @@
 
       double minDetour = 0;
-      VRPEvaluation eval = ProblemInstance.Evaluate(tour);
+      VRPEvaluation eval = ProblemInstance.EvaluateTour(tour, individual);
       bool originalFeasible = ProblemInstance.Feasible(eval);
 
@@ -220 +221 @@
 
         Tour childTour = new Tour();
+        child.Tours.Add(childTour);
         childTour.Stops.AddRange(r1.Stops);
 
@@ -233 +235 @@
 
         while (count < maxCount && R2.Count != 0) {
-          PotvinEncoding newChild = child.Clone() as PotvinEncoding;
-          newChild.Tours.Add(childTour);
-
           int index = random.Next(R2.Count);
           int city = R2[index];
@@ -241 +240 @@
 
           int place = -1;
-          bool found = FindRouteInsertionPlace(childTour, city, allowInfeasible, out place); 
+          bool found = FindRouteInsertionPlace(child, childTour, city, allowInfeasible, out place); 
           if (found) {
             childTour.Stops.Insert(place, city);
@@ -253 +252 @@
         }
 
-        child.Tours.Add(childTour);
         Repair(random, child, childTour, ProblemInstance, allowInfeasible);
       }