Changeset 4346 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/LambdaInterchange/AlbaLambdaInterchangeMove.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/AlbaLambdaInterchangeMove.cs (moved) (moved from branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/LambdaInterchange/LambdaInterchangeMove.cs) (6 diffs)

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

@@ -29 +29 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
-  [Item("InversionMove", "Item that describes a lambda move on a VRP representation.")]
+  [Item("InversionMove", "Item that describes a lambda move on a VRP representation.  It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
   [StorableClass]
-  public class LambdaInterchangeMove: Item, IVRPMove {
+  public class AlbaLambdaInterchangeMove: Item, IVRPMove {
     [Storable]
     public IVRPEncoding Individual { get; protected set; }
@@ -53 +53 @@
     public int Length2 { get; protected set; }
     
-    public LambdaInterchangeMove(): base() {
+    public AlbaLambdaInterchangeMove(): base() {
       Tour1 = -1;
       Position1 = -1;
@@ -65 +65 @@
     }
 
-    public LambdaInterchangeMove(int tour1, int position1, int length1, 
+    public AlbaLambdaInterchangeMove(int tour1, int position1, int length1, 
       int tour2, int position2, int length2, AlbaEncoding permutation) {
         Tour1 = tour1;
@@ -79 +79 @@
 
     public override IDeepCloneable Clone(HeuristicLab.Common.Cloner cloner) {
-      LambdaInterchangeMove clone = new LambdaInterchangeMove();
+      AlbaLambdaInterchangeMove clone = new AlbaLambdaInterchangeMove();
 
       clone.Tour1 = Tour1;
@@ -105 +105 @@
       DoubleValue overloadPenalty, DoubleValue tardinessPenalty,
       ILookupParameter<DoubleMatrix> distanceMatrix, Data.BoolValue useDistanceMatrix) {
-        return LambdaInterchangeMoveEvaluator.GetMoveQuality(Individual as AlbaEncoding, this, vehicles,
+        return AlbaLambdaInterchangeMoveEvaluator.GetMoveQuality(Individual as AlbaEncoding, this, vehicles,
           dueTimeArray, serviceTimeArray, readyTimeArray, demandArray, capacity,
           coordinates, fleetUsageFactor, timeFactor, distanceFactor,
@@ -112 +112 @@
 
     public IVRPEncoding MakeMove() {
-      LambdaInterchangeMoveMaker.Apply(Individual as AlbaEncoding, this);
+      AlbaLambdaInterchangeMoveMaker.Apply(Individual as AlbaEncoding, this);
 
       return Individual;