Changeset 4346 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/LambdaInterchange/AlbaStochasticLambdaInterchangeMutliMoveGenerator.cs

Timestamp:

08/31/10 14:03:12 (14 years ago)

Author:

svonolfe

Message:

Renamed operators, added comments according to code review (#1039)

File:

• branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/LambdaInterchange/AlbaStochasticLambdaInterchangeMutliMoveGenerator.cs (moved) (moved from branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/LambdaInterchange/StochasticLambdaInterchangeMutliMoveGenerator.cs) (3 diffs)

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

@@ -30 +30 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
-  [Item("StochasticLambdaInterchangeMultiMoveGenerator", "Generates multiple random lambda interchange moves from a given VRP encoding.")]
+  [Item("AlbaStochasticLambdaInterchangeMultiMoveGenerator", "Generates multiple random lambda interchange moves from a given VRP encoding.  It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
   [StorableClass]
-  public sealed class StochasticLambdaInterchangeMultiMoveGenerator : LambdaInterchangeMoveGenerator, IStochasticOperator, IMultiMoveGenerator, IAlbaLambdaInterchangeMoveOperator {
+  public sealed class AlbaStochasticLambdaInterchangeMultiMoveGenerator : AlbaLambdaInterchangeMoveGenerator, IStochasticOperator, IMultiMoveGenerator, IAlbaLambdaInterchangeMoveOperator {
     public ILookupParameter<IRandom> RandomParameter {
       get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
@@ -42 +42 @@
     
     [StorableConstructor]
-    private StochasticLambdaInterchangeMultiMoveGenerator(bool deserializing) : base(deserializing) { }
+    private AlbaStochasticLambdaInterchangeMultiMoveGenerator(bool deserializing) : base(deserializing) { }
 
-    public StochasticLambdaInterchangeMultiMoveGenerator()
+    public AlbaStochasticLambdaInterchangeMultiMoveGenerator()
       : base() {
         Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator."));
@@ -50 +50 @@
     }
 
-    protected override LambdaInterchangeMove[] GenerateMoves(AlbaEncoding individual, int lambda) {
+    protected override AlbaLambdaInterchangeMove[] GenerateMoves(AlbaEncoding individual, int lambda) {
       int sampleSize = SampleSizeParameter.ActualValue.Value;
 
-      LambdaInterchangeMove[] moves = new LambdaInterchangeMove[sampleSize];
+      AlbaLambdaInterchangeMove[] moves = new AlbaLambdaInterchangeMove[sampleSize];
       for (int i = 0; i < sampleSize; i++) {
-        moves[i] = StochasticLambdaInterchangeSingleMoveGenerator.Apply(
+        moves[i] = AlbaStochasticLambdaInterchangeSingleMoveGenerator.Apply(
           individual, Cities, lambda, RandomParameter.ActualValue);
       }