Changeset 17698 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Crossovers

Timestamp:

07/24/20 00:58:42 (4 years ago)

Author:

abeham

Message:

#2521: working on VRP (WIP)

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Crossovers/GVRCrossover.cs (modified) (4 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Crossovers/GVRCrossover.cs

@@ -52 +52 @@
     }
 
-    private GVREncoding Crossover(IRandom random, GVREncoding parent1, GVREncoding parent2) {
-      GVREncoding child = parent1.Clone() as GVREncoding;
+    private GVREncodedSolution Crossover(IRandom random, GVREncodedSolution parent1, GVREncodedSolution parent2) {
+      GVREncodedSolution child = parent1.Clone() as GVREncodedSolution;
 
       Tour tour = parent2.Tours[random.Next(parent2.Tours.Count)];
@@ -97 +97 @@
       } else {
         //special case -> only one tour, whole tour has been chosen as subroute
-        child = parent1.Clone() as GVREncoding;
+        child = parent1.Clone() as GVREncodedSolution;
       }
 
@@ -104 +104 @@
 
     public override IOperation InstrumentedApply() {
-      ItemArray<IVRPEncoding> parents = new ItemArray<IVRPEncoding>(ParentsParameter.ActualValue.Length);
+      ItemArray<IVRPEncodedSolution> parents = new ItemArray<IVRPEncodedSolution>(ParentsParameter.ActualValue.Length);
       for (int i = 0; i < ParentsParameter.ActualValue.Length; i++) {
-        IVRPEncoding solution = ParentsParameter.ActualValue[i];
-        if (!(solution is GVREncoding)) {
-          parents[i] = GVREncoding.ConvertFrom(solution, ProblemInstance);
+        IVRPEncodedSolution solution = ParentsParameter.ActualValue[i];
+        if (!(solution is GVREncodedSolution)) {
+          parents[i] = GVREncodedSolution.ConvertFrom(solution, ProblemInstance);
         } else {
           parents[i] = solution;
@@ -115 +115 @@
       ParentsParameter.ActualValue = parents;
 
-      ChildParameter.ActualValue = Crossover(RandomParameter.ActualValue, parents[0] as GVREncoding, parents[1] as GVREncoding);
+      ChildParameter.ActualValue = Crossover(RandomParameter.ActualValue, parents[0] as GVREncodedSolution, parents[1] as GVREncodedSolution);
 
       return base.InstrumentedApply();