Changeset 3991

Timestamp:

06/30/10 15:54:47 (14 years ago)

Author:

svonolfe

Message:

Fixed small issues in the VRP implementation (#1039)

Location:

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

Files:

• Creators/AlbaPermutationCreator.cs (modified) (3 diffs)
• Moves/ThreeOpt/AlbaTranslocationMoveGenerator.cs (modified) (3 diffs)

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

@@ -52 +52 @@
       Parameters.Add(new ValueLookupParameter<IPermutationCreator>("PermutationCreatorParameter", "The permutation creator.", new RandomPermutationCreator()));
 
+      Initialize();
       ParameterizeSolutionCreator();
-
-      Initialize();
     }
 
@@ -75 +74 @@
     void CitiesParameter_ValueChanged(object sender, EventArgs e) {
       CitiesParameter.Value.ValueChanged += new EventHandler(CitiesValue_ValueChanged);
-      
       ParameterizeSolutionCreator();
     }
@@ -84 +82 @@
 
     private void ParameterizeSolutionCreator() {
-      PermutationCreatorParameter.Value.LengthParameter.Value = CitiesParameter.Value;
       PermutationCreatorParameter.Value.PermutationTypeParameter.Value = new PermutationType(PermutationTypes.RelativeUndirected);
     }

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

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