Changeset 4154 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba

Timestamp:

08/04/10 17:34:02 (14 years ago)

Author:

svonolfe

Message:

Further improved the VRP design (#1039)

Location:

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba

Files:

• Creators/AlbaPushForwardInsertionCreator.cs (modified) (1 diff)
• Crossovers/AlbaCrossover.cs (modified) (1 diff)
• Crossovers/AlbaPermutationCrossover.cs (modified) (2 diffs)
• Manipulators/AlbaManipulator.cs (modified) (1 diff)
• Moves/AlbaMoveOperator.cs (modified) (1 diff)
• Moves/ThreeOpt/AlbaTranslocationMoveGenerator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Creators/AlbaPushForwardInsertionCreator.cs

@@ -28 +28 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.VehicleRouting.Encodings.General;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Crossovers/AlbaCrossover.cs

@@ -28 +28 @@
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
   [StorableClass]
-  public abstract class AlbaCrossover : VRPCrossover {
-    public ILookupParameter<IntValue> VehiclesParameter {
-      get { return (ILookupParameter<IntValue>)Parameters["Vehicles"]; }
-    }
-
-    public AlbaCrossover()
-      : base() {
-        Parameters.Add(new LookupParameter<IntValue>("Vehicles", "The vehicles count."));
-    }
-    
+  public abstract class AlbaCrossover : VRPCrossover {    
     protected virtual void Crossover() {
     }
 
     public override IOperation Apply() {
-      int cities = 0;
-
       ItemArray<IVRPEncoding> parents = new ItemArray<IVRPEncoding>(ParentsParameter.ActualValue.Length);
       for (int i = 0; i < ParentsParameter.ActualValue.Length; i++) {
         IVRPEncoding solution = ParentsParameter.ActualValue[i];
-        cities = solution.Cities;
+
         if (!(solution is AlbaEncoding)) {
           parents[i] = AlbaEncoding.ConvertFrom(solution, VehiclesParameter.ActualValue.Value);

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Crossovers/AlbaPermutationCrossover.cs

@@ -39 +39 @@
 
     protected override void Crossover() {
-      int cities = ParentsParameter.ActualValue[0].Cities;
-
       PermutationCrossoverParameter.ActualValue.ParentsParameter.ActualName = ParentsParameter.ActualName;
       IAtomicOperation op = this.ExecutionContext.CreateOperation(
@@ -51 +49 @@
         ExecutionContext.Scope.Variables.Remove(childName);
 
-        ChildParameter.ActualValue = new AlbaEncoding(permutation, cities);
+        ChildParameter.ActualValue = new AlbaEncoding(permutation, Cities);
       } else
         ChildParameter.ActualValue = null;

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Manipulators/AlbaManipulator.cs

@@ -28 +28 @@
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
   [StorableClass]
-  public abstract class AlbaManipulator : VRPManipulator {
-    public ILookupParameter<IntValue> VehiclesParameter {
-      get { return (ILookupParameter<IntValue>)Parameters["Vehicles"]; }
-    }
-
-    public AlbaManipulator()
-      : base() {
-        Parameters.Add(new LookupParameter<IntValue>("Vehicles", "The vehicles count."));
-    }
-    
+  public abstract class AlbaManipulator : VRPManipulator {    
     protected virtual void Manipulate() {
     }

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/AlbaMoveOperator.cs

@@ -29 +29 @@
   [Item("AlbaMoveOperator", "A move operator for an alba VRP representation.")]
   [StorableClass]
-  public abstract class AlbaMoveOperator : VRPMoveOperator {
-    public ILookupParameter<IntValue> VehiclesParameter {
-      get { return (ILookupParameter<IntValue>)Parameters["Vehicles"]; }
-    }
-
-    public AlbaMoveOperator()
-      : base() {
-      Parameters.Add(new LookupParameter<IntValue>("Vehicles", "The vehicles count."));
-    }
-    
+  public abstract class AlbaMoveOperator : VRPMoveOperator {    
     [Storable]
     protected abstract IPermutationMoveOperator PermutationMoveOperatorParameter { get; set; }

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveGenerator.cs

@@ -82 +82 @@
       Permutation permutation = VRPSolutionParameter.ActualValue as Permutation;
       string moveName = TranslocationMoveGeneratorParameter.ActualValue.TranslocationMoveParameter.Name;
-      int cities = VRPSolutionParameter.ActualValue.Cities;
 
       List<Scope> toBeDeleted = new List<Scope>();
@@ -93 +92 @@
             if (move.Index1 - 1 >= 0 &&
               move.Index3 - 1 >= 0)
-              criteria1 = (permutation[move.Index1] >= cities &&
-                permutation[move.Index1 - 1] >= cities &&
-                permutation[move.Index3 - 1] >= cities);
+              criteria1 = (permutation[move.Index1] >= Cities &&
+                permutation[move.Index1 - 1] >= Cities &&
+                permutation[move.Index3 - 1] >= Cities);
 
             int index3 = move.Index3 + (move.Index2 - move.Index1) + 1;
@@ -101 +100 @@
             if (move.Index2 + 1 < permutation.Length &&
               index3 < permutation.Length)
-              criteria2 = (permutation[move.Index2] >= cities &&
-                permutation[move.Index2 + 1] >= cities &&
-                permutation[index3] >= cities);
+              criteria2 = (permutation[move.Index2] >= Cities &&
+                permutation[move.Index2 + 1] >= Cities &&
+                permutation[index3] >= Cities);
 
             if (criteria1 && criteria2)