Changeset 6448 for trunk/sources/HeuristicLab.Problems.VehicleRouting

Timestamp:

06/20/11 13:33:29 (14 years ago)

Author:

svonolfe

Message:

Included additional operators (#1561)

Location:

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

Files:

• Alba/LocalImprovement (added)
• Alba/LocalImprovement/AlbaLambdaInterchangeLocalImprovementOperator.cs (added)
• Alba/Moves/LambdaInterchange/AlbaExhaustiveLambdaInterchangeMoveGenerator.cs (modified) (2 diffs)
• Alba/Moves/LambdaInterchange/AlbaStochasticLambdaInterchangeMutliMoveGenerator.cs (modified) (1 diff)
• General/Creators/IterativeInsertionCreator.cs (added)
• Potvin/Crossovers/PotvinInsertionBasedCrossover.cs (added)

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

@@ -39 +39 @@
     }
 
-    protected override AlbaLambdaInterchangeMove[] GenerateMoves(AlbaEncoding individual, int lambda) {
+    public static AlbaLambdaInterchangeMove[] GenerateAllMoves(AlbaEncoding individual, int lambda) {
       List<AlbaLambdaInterchangeMove> moves = new List<AlbaLambdaInterchangeMove>();
 
@@ -66 +66 @@
       return moves.ToArray();
     }
+
+    protected override AlbaLambdaInterchangeMove[] GenerateMoves(AlbaEncoding individual, int lambda) {
+      return GenerateAllMoves(individual, lambda);
+    }
   }
 }

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

@@ -50 +50 @@
       return new AlbaStochasticLambdaInterchangeMultiMoveGenerator(this, cloner);
     }
-    protected override AlbaLambdaInterchangeMove[] GenerateMoves(AlbaEncoding individual, int lambda) {
-      int sampleSize = SampleSizeParameter.ActualValue.Value;
 
+    public static AlbaLambdaInterchangeMove[] GenerateAllMoves(AlbaEncoding individual, int lambda, int sampleSize, IRandom random) {
       AlbaLambdaInterchangeMove[] moves = new AlbaLambdaInterchangeMove[sampleSize];
       for (int i = 0; i < sampleSize; i++) {
         moves[i] = AlbaStochasticLambdaInterchangeSingleMoveGenerator.Apply(
-          individual, Cities, lambda, RandomParameter.ActualValue);
+          individual, individual.Cities, lambda, random);
       }
 
       return moves;
     }
+
+    protected override AlbaLambdaInterchangeMove[] GenerateMoves(AlbaEncoding individual, int lambda) {
+      int sampleSize = SampleSizeParameter.ActualValue.Value;
+
+      return GenerateAllMoves(individual, lambda, sampleSize, RandomParameter.ActualValue);
+    }
   }
 }