Changeset 14650 for branches/PersistentDataStructures/HeuristicLab.Problems.VehicleRouting

Timestamp:

02/07/17 14:05:09 (7 years ago)

Author:

epitzer

Message:

#2727 completely replace basic array with array mapped trie in ValueTypeArray and descendants

Location:

branches/PersistentDataStructures/HeuristicLab.Problems.VehicleRouting/3.4/Encodings

Files:

• Alba/AlbaEncoding.cs (modified) (3 diffs)
• General/PermutationEncoding.cs (modified) (3 diffs)
• Prins/PrinsEncoding.cs (modified) (2 diffs)
• Zhu/ZhuEncoding.cs (modified) (2 diffs)

branches/PersistentDataStructures/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/AlbaEncoding.cs

@@ -40 +40 @@
 
       Tour tour = new Tour();
-      for (int i = 0; i < this.array.Length; i++) {
-        if (this.array[i] >= cities) {
+      for (int i = 0; i < this.historyArray.Length; i++) {
+        if (this.historyArray[i] >= cities) {
           if (tour.Stops.Count > 0) {
             result.Add(tour);
@@ -48 +48 @@
           }
         } else {
-          tour.Stops.Add(this.array[i] + 1);
+          tour.Stops.Add(this.historyArray[i] + 1);
         }
       }
@@ -72 +72 @@
 
         while (vehicleAssignment == -1) {
-          if (this.array[i] >= ProblemInstance.Cities.Value) {
-            vehicleAssignment = this.array[i] - ProblemInstance.Cities.Value;
+          if (this.historyArray[i] >= ProblemInstance.Cities.Value) {
+            vehicleAssignment = this.historyArray[i] - ProblemInstance.Cities.Value;
           }
 

branches/PersistentDataStructures/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/PermutationEncoding.cs

@@ -24 +24 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data.PersistentDataStructures.Adaptations;
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -69 +70 @@
     public PermutationEncoding(Permutation permutation, IVRPProblemInstance problemInstance)
       : base(PermutationTypes.RelativeUndirected) {
-      this.array = new int[permutation.Length];
-      for (int i = 0; i < array.Length; i++)
-        this.array[i] = permutation[i];
+      this.historyArray = new HistoryArray<int>(permutation.Length);
+      for (int i = 0; i < historyArray.Length; i++)
+        this.historyArray[i] = permutation[i];
 
       this.ProblemInstance = problemInstance;
@@ -82 +83 @@
 
     public int IndexOf(int city) {
-      return Array.IndexOf(this.array, city);
+      return historyArray.IndexOf(city);
     }
   }

branches/PersistentDataStructures/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/PrinsEncoding.cs

@@ -102 +102 @@
 
         //find predecessor / successor in permutation
-        int predecessorIndex = Array.IndexOf(this.array, tour.Stops[0] - 1) - 1;
+        int predecessorIndex = historyArray.IndexOf(tour.Stops[0] - 1) - 1;
         if (predecessorIndex >= 0) {
           int predecessor = this[predecessorIndex] + 1;
@@ -114 +114 @@
           }
         } else {
-          int successorIndex = Array.IndexOf(this.array,
+          int successorIndex = historyArray.IndexOf(
             tour.Stops[tour.Stops.Count - 1] - 1) + 1;
           int successor = this[successorIndex] + 1;

branches/PersistentDataStructures/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/ZhuEncoding.cs

@@ -63 +63 @@
 
         //find predecessor / successor in permutation
-        int predecessorIndex = Array.IndexOf(this.array, tour.Stops[0] - 1) - 1;
+        int predecessorIndex = historyArray.IndexOf(tour.Stops[0] - 1) - 1;
         if (predecessorIndex >= 0) {
           int predecessor = this[predecessorIndex] + 1;
@@ -75 +75 @@
           }
         } else {
-          int successorIndex = Array.IndexOf(this.array,
+          int successorIndex = historyArray.IndexOf(
             tour.Stops[tour.Stops.Count - 1] - 1) + 1;
           int successor = this[successorIndex] + 1;