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

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

@@ -29 +29 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
-  [Item("ExhaustiveIntraRouteInversionGenerator", "Generates all possible intra route inversion moves from a given VRP encoding.")]
+  [Item("AlbaExhaustiveIntraRouteInversionGenerator", "Generates all possible intra route inversion 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 ExhaustiveIntraRouteInversionGenerator : IntraRouteInversionMoveGenerator, IExhaustiveMoveGenerator, IAlbaIntraRouteInversionMoveOperator {
+  public sealed class AlbaExhaustiveIntraRouteInversionGenerator : AlbaIntraRouteInversionMoveGenerator, IExhaustiveMoveGenerator, IAlbaIntraRouteInversionMoveOperator {
     [StorableConstructor]
-    private ExhaustiveIntraRouteInversionGenerator(bool deserializing) : base(deserializing) { }
+    private AlbaExhaustiveIntraRouteInversionGenerator(bool deserializing) : base(deserializing) { }
 
-    public ExhaustiveIntraRouteInversionGenerator()
+    public AlbaExhaustiveIntraRouteInversionGenerator()
       : base() {
     }
 
-    protected override IntraRouteInversionMove[] GenerateMoves(AlbaEncoding individual) {
-      List<IntraRouteInversionMove> moves = new List<IntraRouteInversionMove>();
+    protected override AlbaIntraRouteInversionMove[] GenerateMoves(AlbaEncoding individual) {
+      List<AlbaIntraRouteInversionMove> moves = new List<AlbaIntraRouteInversionMove>();
 
       int currentTourStart = 0;
@@ -55 +55 @@
           for (int i = 0; i <= tourLength - 4; i++ ) {
             for (int j = i + 2; j <= tourLength - 2; j++) {
-              IntraRouteInversionMove move = new IntraRouteInversionMove(
+              AlbaIntraRouteInversionMove move = new AlbaIntraRouteInversionMove(
                 currentTourStart + i, 
                 currentTourStart + j,