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

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

@@ -28 +28 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
-  [Item("InversionMove", "Item that describes an intra route inversion move on a VRP representation.")]
+  [Item("InversionMove", "Item that describes an intra route inversion 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 IntraRouteInversionMove : TwoIndexMove, IVRPMove {
+  public class AlbaIntraRouteInversionMove : TwoIndexMove, IVRPMove {
     public IVRPEncoding Individual { get { return Permutation as AlbaEncoding; } }
     
-    public IntraRouteInversionMove()
+    public AlbaIntraRouteInversionMove()
       : base() {
     }
 
-    public IntraRouteInversionMove(int index1, int index2)
+    public AlbaIntraRouteInversionMove(int index1, int index2)
       : base(index1, index2, null) {
     }
 
-    public IntraRouteInversionMove(int index1, int index2, AlbaEncoding permutation)
+    public AlbaIntraRouteInversionMove(int index1, int index2, AlbaEncoding permutation)
       : base(index1, index2, permutation) {
         this.Permutation = permutation.Clone() as AlbaEncoding;
@@ -47 +47 @@
 
     public override IDeepCloneable Clone(HeuristicLab.Common.Cloner cloner) {
-      IntraRouteInversionMove clone = new IntraRouteInversionMove(
+      AlbaIntraRouteInversionMove clone = new AlbaIntraRouteInversionMove(
         Index1, Index2);
 
@@ -66 +66 @@
       DoubleValue overloadPenalty, DoubleValue tardinessPenalty,
       ILookupParameter<DoubleMatrix> distanceMatrix, Data.BoolValue useDistanceMatrix) {
-        return IntraRouteInversionMoveEvaluator.GetMoveQuality(Permutation as AlbaEncoding, this, vehicles,
+        return AlbaIntraRouteInversionMoveEvaluator.GetMoveQuality(Permutation as AlbaEncoding, this, vehicles,
           dueTimeArray, serviceTimeArray, readyTimeArray, demandArray, capacity,
           coordinates, fleetUsageFactor, timeFactor, distanceFactor,
@@ -73 +73 @@
 
     public IVRPEncoding MakeMove() {
-      IntraRouteInversionMoveMaker.Apply(Individual as AlbaEncoding, this);
+      AlbaIntraRouteInversionMoveMaker.Apply(Individual as AlbaEncoding, this);
 
       return Individual;