Changeset 4383 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/IntraRouteInversion

Timestamp:

09/13/10 13:54:30 (14 years ago)

Author:

svonolfe

Message:

Improved moves, fixed behavior for SA (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/IntraRouteInversion

Files:

• AlbaIntraRouteInversionEvaluator.cs (modified) (1 diff)
• AlbaIntraRouteInversionMove.cs (modified) (3 diffs)
• AlbaIntraRouteInversionMoveMaker.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/IntraRouteInversion/AlbaIntraRouteInversionEvaluator.cs

@@ -48 +48 @@
 
     protected override void EvaluateMove() {
-      AlbaEncoding newSolution = VRPToursParameter.ActualValue.Clone() as AlbaEncoding;
+      AlbaEncoding newSolution = IntraRouteInversionMoveParameter.ActualValue.Permutation.Clone() as AlbaEncoding;
       AlbaIntraRouteInversionMoveMaker.Apply(newSolution, IntraRouteInversionMoveParameter.ActualValue);
 

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

@@ -29 +29 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
-  [Item("IntraRouteInversionMove", "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.")]
+  [Item("AlbaIntraRouteInversionMove", "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 AlbaIntraRouteInversionMove : TwoIndexMove, IVRPMove {
@@ -43 +43 @@
 
     public AlbaIntraRouteInversionMove(int index1, int index2, AlbaEncoding permutation)
-      : base(index1, index2, permutation) {
-        this.Permutation = permutation.Clone() as AlbaEncoding;
-    }
+      : base(index1, index2, permutation.Clone() as AlbaEncoding) {
+     }
 
     public override IDeepCloneable Clone(HeuristicLab.Common.Cloner cloner) {
@@ -52 +51 @@
 
       if (Permutation != null)
-        clone.Permutation = (AlbaEncoding)cloner.Clone(Permutation);
+        clone.Permutation = Permutation.Clone() as AlbaEncoding;
 
       cloner.RegisterClonedObject(this, clone);

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/IntraRouteInversion/AlbaIntraRouteInversionMoveMaker.cs

@@ -54 +54 @@
       AlbaIntraRouteInversionMove move = IntraRouteInversionMoveParameter.ActualValue;
 
-      Apply(VRPToursParameter.ActualValue as AlbaEncoding, move);
+      Apply(move.Individual as AlbaEncoding, move);
+      VRPToursParameter.ActualValue = move.Individual as AlbaEncoding;
     }
   }