Changeset 17698 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Manipulators

Timestamp:

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

Author:

abeham

Message:

#2521: working on VRP (WIP)

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Manipulators

Files:

• AlbaCustomerInsertionManipulator.cs (modified) (1 diff)
• AlbaCustomerInversionManipulator.cs (modified) (1 diff)
• AlbaCustomerSwapManipulator.cs (modified) (1 diff)
• AlbaIntraRouteInversionManipulator.cs (modified) (2 diffs)
• AlbaLambdaInterchangeManipulator.cs (modified) (3 diffs)
• AlbaManipulator.cs (modified) (2 diffs)
• AlbaPermutationManipulator.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Manipulators/AlbaCustomerInsertionManipulator.cs

@@ -43 +43 @@
     }
 
-    protected override void Manipulate(IRandom random, AlbaEncoding individual) {
-      AlbaEncoding original = (AlbaEncoding)individual.Clone();
+    protected override void Manipulate(IRandom random, AlbaEncodedSolution individual) {
+      AlbaEncodedSolution original = (AlbaEncodedSolution)individual.Clone();
       int cutIndex, insertIndex, number;
 

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Manipulators/AlbaCustomerInversionManipulator.cs

@@ -44 +44 @@
     }
 
-    protected override void Manipulate(IRandom random, AlbaEncoding individual) {
+    protected override void Manipulate(IRandom random, AlbaEncodedSolution individual) {
       int breakPoint1, breakPoint2;
 

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Manipulators/AlbaCustomerSwapManipulator.cs

@@ -43 +43 @@
     }
 
-    protected override void Manipulate(IRandom random, AlbaEncoding individual) {
+    protected override void Manipulate(IRandom random, AlbaEncodedSolution individual) {
       int index1, index2, temp;
 

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Manipulators/AlbaIntraRouteInversionManipulator.cs

@@ -44 +44 @@
     }
 
-    public static void Apply(AlbaEncoding individual, int index1, int index2) {
+    public static void Apply(AlbaEncodedSolution individual, int index1, int index2) {
       if (index1 != -1 && index2 != -1) {
         int breakPoint1 = index1 + 1;
@@ -56 +56 @@
     }
 
-    protected override void Manipulate(IRandom rand, AlbaEncoding individual) {
+    protected override void Manipulate(IRandom rand, AlbaEncodedSolution individual) {
       int index1 = -1;
       int index2 = -1;

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Manipulators/AlbaLambdaInterchangeManipulator.cs

@@ -52 +52 @@
     }
 
-    public static void Apply(AlbaEncoding individual, int tour1Index, int position1, int length1,
+    public static void Apply(AlbaEncodedSolution individual, int tour1Index, int position1, int length1,
       int tour2Index, int position2, int length2) {
       List<Tour> tours = individual.GetTours();
@@ -74 +74 @@
       }
 
-      AlbaEncoding original = individual.Clone() as AlbaEncoding;
+      AlbaEncodedSolution original = individual.Clone() as AlbaEncodedSolution;
       int index = 0;
 
@@ -106 +106 @@
     }
 
-    protected override void Manipulate(IRandom rand, AlbaEncoding individual) {
+    protected override void Manipulate(IRandom rand, AlbaEncodedSolution individual) {
       List<Tour> tours = individual.GetTours();
       if (tours.Count > 1) {

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Manipulators/AlbaManipulator.cs

@@ -48 +48 @@
     }
 
-    protected abstract void Manipulate(IRandom random, AlbaEncoding individual);
+    protected abstract void Manipulate(IRandom random, AlbaEncodedSolution individual);
 
-    protected int FindCustomerLocation(int customer, AlbaEncoding individual) {
+    protected int FindCustomerLocation(int customer, AlbaEncodedSolution individual) {
       int pos = -1;
       for (int i = 0; i < individual.Length; i++) {
@@ -63 +63 @@
 
     public override IOperation InstrumentedApply() {
-      IVRPEncoding solution = VRPToursParameter.ActualValue;
-      if (!(solution is AlbaEncoding)) {
-        VRPToursParameter.ActualValue = AlbaEncoding.ConvertFrom(solution, ProblemInstance);
+      IVRPEncodedSolution solution = VRPToursParameter.ActualValue;
+      if (!(solution is AlbaEncodedSolution)) {
+        VRPToursParameter.ActualValue = AlbaEncodedSolution.ConvertFrom(solution, ProblemInstance);
       }
 
-      Manipulate(RandomParameter.ActualValue, VRPToursParameter.ActualValue as AlbaEncoding);
-      (VRPToursParameter.ActualValue as AlbaEncoding).Repair();
+      Manipulate(RandomParameter.ActualValue, VRPToursParameter.ActualValue as AlbaEncodedSolution);
+      (VRPToursParameter.ActualValue as AlbaEncodedSolution).Repair();
 
       return base.InstrumentedApply();

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Manipulators/AlbaPermutationManipulator.cs

@@ -50 +50 @@
     }
 
-    protected override void Manipulate(IRandom random, AlbaEncoding individual) {
+    protected override void Manipulate(IRandom random, AlbaEncodedSolution individual) {
       InnerManipulatorParameter.ActualValue.PermutationParameter.ActualName = VRPToursParameter.ActualName;