Changeset 4346 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/IntraRouteInversion/AlbaStochasticIntraRouteInversionSingleMoveGenerator.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/IntraRouteInversion/AlbaStochasticIntraRouteInversionSingleMoveGenerator.cs (moved) (moved from branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/IntraRouteInversion/StochasticIntraRouteInversionSingleMoveGenerator.cs) (3 diffs)

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

@@ -30 +30 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
-  [Item("StochasticIntraRouteInversionSingleMoveGenerator", "Generates one random intra route inversion move from a given VRP encoding.")]
+  [Item("AlbaStochasticIntraRouteInversionSingleMoveGenerator", "Generates one random intra route inversion move 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 StochasticIntraRouteInversionSingleMoveGenerator : IntraRouteInversionMoveGenerator,
+  public sealed class AlbaStochasticIntraRouteInversionSingleMoveGenerator : AlbaIntraRouteInversionMoveGenerator,
     IStochasticOperator, ISingleMoveGenerator, IAlbaIntraRouteInversionMoveOperator, IMultiVRPMoveGenerator {
     #region IMultiVRPMoveOperator Members
 
     public ILookupParameter VRPMoveParameter {
-      get { return (ILookupParameter)Parameters["IntraRouteInversionMove"]; }
+      get { return (ILookupParameter)Parameters["AlbaIntraRouteInversionMove"]; }
     }
 
@@ -47 +47 @@
     
     [StorableConstructor]
-    private StochasticIntraRouteInversionSingleMoveGenerator(bool deserializing) : base(deserializing) { }
+    private AlbaStochasticIntraRouteInversionSingleMoveGenerator(bool deserializing) : base(deserializing) { }
 
-    public StochasticIntraRouteInversionSingleMoveGenerator()
+    public AlbaStochasticIntraRouteInversionSingleMoveGenerator()
       : base() {
         Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator."));
     }
 
-    public static IntraRouteInversionMove Apply(AlbaEncoding individual, int cities, IRandom rand) {
+    public static AlbaIntraRouteInversionMove Apply(AlbaEncoding individual, int cities, IRandom rand) {
       int index1 = -1;
       int index2 = -1;
@@ -86 +86 @@
       }
 
-      return new IntraRouteInversionMove(index1, index2, individual);
+      return new AlbaIntraRouteInversionMove(index1, index2, individual);
     }
 
-    protected override IntraRouteInversionMove[] GenerateMoves(AlbaEncoding individual) {
-      List<IntraRouteInversionMove> moves = new List<IntraRouteInversionMove>();
+    protected override AlbaIntraRouteInversionMove[] GenerateMoves(AlbaEncoding individual) {
+      List<AlbaIntraRouteInversionMove> moves = new List<AlbaIntraRouteInversionMove>();
 
-      IntraRouteInversionMove move = Apply(individual, Cities, RandomParameter.ActualValue);
+      AlbaIntraRouteInversionMove move = Apply(individual, Cities, RandomParameter.ActualValue);
       if(move != null)
         moves.Add(move);