Changeset 4230 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba

Timestamp:

08/16/10 15:20:29 (14 years ago)

Author:

svonolfe

Message:

Added GVR encoding (#1039)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba

Files:

• AlbaEncoding.cs (modified) (3 diffs)
• Manipulators/IntraRouteInversionManipulator.cs (modified) (1 diff)
• Manipulators/LambdaInterchangeManipulator.cs (modified) (4 diffs)
• Moves/IntraRouteInversion/StochasticIntraRouteInversionSingleMoveGenerator.cs (modified) (1 diff)
• Moves/LambdaInterchange/ExhaustiveLambdaInterchangeMoveGenerator.cs (modified) (1 diff)
• Moves/LambdaInterchange/StochasticLambdaInterchangeSingleMoveGenerator.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/AlbaEncoding.cs

@@ -26 +26 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using System.Collections.Generic;
+using HeuristicLab.Problems.VehicleRouting.Encodings.General;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
@@ -35 +36 @@
     
     #region IVRPEncoding Members
-    public ItemList<Tour> Tours {
-      get {
-        ItemList<Tour> result = new ItemList<Tour>();
-        
-        Tour tour = new Tour();
-        for (int i = 0; i < this.array.Length; i++) {
-          if (this.array[i] >= cities) {
-            if (tour.Cities.Count > 0) {
-              result.Add(tour);
+    public List<Tour> GetTours() {
+      List<Tour> result = new List<Tour>();
 
-              tour = new Tour();
-            }
-          } else {
-            tour.Cities.Add(this.array[i] + 1);
+      Tour tour = new Tour();
+      for (int i = 0; i < this.array.Length; i++) {
+        if (this.array[i] >= cities) {
+          if (tour.Cities.Count > 0) {
+            result.Add(tour);
+
+            tour = new Tour();
           }
+        } else {
+          tour.Cities.Add(this.array[i] + 1);
         }
+      }
 
-        if (tour.Cities.Count > 0) {
-          result.Add(tour);
-        }
+      if (tour.Cities.Count > 0) {
+        result.Add(tour);
+      }
 
-        return result;
-      }
+      return result;
     }
 
@@ -93 +92 @@
 
     public static AlbaEncoding ConvertFrom(IVRPEncoding encoding, int vehicles) {
-      ItemList<Tour> tours = encoding.Tours;
+      List<Tour> tours = encoding.GetTours();
 
       int cities = 0;

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Manipulators/IntraRouteInversionManipulator.cs

@@ -56 +56 @@
 
       List<Tour> validTours = new List<Tour>();
-      foreach (Tour tour in individual.Tours) {
+      foreach (Tour tour in individual.GetTours()) {
         if (tour.Cities.Count >= 4)
           validTours.Add(tour);

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Manipulators/LambdaInterchangeManipulator.cs

@@ -26 +26 @@
 using HeuristicLab.Data;
 using System;
+using System.Collections.Generic;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
@@ -45 +46 @@
     public static void Apply(AlbaEncoding individual, int tour1Index, int position1, int length1, 
       int tour2Index, int position2, int length2) {
-      Tour tour1 = individual.Tours[tour1Index];
+      List<Tour> tours = individual.GetTours();
+
+      Tour tour1 = tours[tour1Index];
       int tour1Start = -1;
       for (int i = 0; i < individual.Length; i++) {
@@ -54 +57 @@
       }
 
-      Tour tour2 = individual.Tours[tour2Index];
+      Tour tour2 = tours[tour2Index];
       int tour2Start = -1;
       for (int i = 0; i < individual.Length; i++) {
@@ -96 +99 @@
 
     protected override void Manipulate(IRandom rand, AlbaEncoding individual) {
+      List<Tour> tours = individual.GetTours();
       int lambda = LambdaParameter.Value.Value;
-      
-      int route1Index = rand.Next(individual.Tours.Count);
-      Tour route1 = individual.Tours[route1Index];
 
-      int route2Index = rand.Next(individual.Tours.Count - 1);
+      int route1Index = rand.Next(tours.Count);
+      Tour route1 = tours[route1Index];
+
+      int route2Index = rand.Next(tours.Count - 1);
       if (route2Index >= route1Index)
         route2Index += 1;
-      Tour route2 = individual.Tours[route2Index];
+      Tour route2 = tours[route2Index];
 
       int length1 = rand.Next(Math.Min(lambda + 1, route1.Cities.Count + 1));

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/IntraRouteInversion/StochasticIntraRouteInversionSingleMoveGenerator.cs

@@ -59 +59 @@
 
       List<Tour> validTours = new List<Tour>();
-      foreach (Tour tour in individual.Tours) {
+      foreach (Tour tour in individual.GetTours()) {
         if (tour.Cities.Count >= 4)
           validTours.Add(tour);

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/LambdaInterchange/ExhaustiveLambdaInterchangeMoveGenerator.cs

@@ -42 +42 @@
       List<LambdaInterchangeMove> moves = new List<LambdaInterchangeMove>();
 
-      for (int tour1Index = 0; tour1Index < individual.Tours.Count; tour1Index++) {
-        Tour tour1 = individual.Tours[tour1Index];
-        for (int tour2Index = tour1Index + 1; tour2Index < individual.Tours.Count; tour2Index++) {
-          Tour tour2 = individual.Tours[tour2Index];
+      List<Tour> tours = individual.GetTours();
+
+      for (int tour1Index = 0; tour1Index < tours.Count; tour1Index++) {
+        Tour tour1 = tours[tour1Index];
+        for (int tour2Index = tour1Index + 1; tour2Index < tours.Count; tour2Index++) {
+          Tour tour2 = tours[tour2Index];
 
           for (int length1 = 0; length1 <= Math.Min(lambda, tour1.Cities.Count); length1++) {

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/LambdaInterchange/StochasticLambdaInterchangeSingleMoveGenerator.cs

@@ -55 +55 @@
 
     public static LambdaInterchangeMove Apply(AlbaEncoding individual, int cities, int lambda, IRandom rand) {
-      int route1Index = rand.Next(individual.Tours.Count);
-      Tour route1 = individual.Tours[route1Index];
+      List<Tour> tours = individual.GetTours();
 
-      int route2Index = rand.Next(individual.Tours.Count - 1);
+      int route1Index = rand.Next(tours.Count);
+      Tour route1 = tours[route1Index];
+
+      int route2Index = rand.Next(tours.Count - 1);
       if (route2Index >= route1Index)
         route2Index += 1;
-      Tour route2 = individual.Tours[route2Index];
+      Tour route2 = tours[route2Index];
 
       int length1 = rand.Next(Math.Min(lambda + 1, route1.Cities.Count + 1));