Changeset 4287 for branches

Timestamp:

08/23/10 14:06:43 (14 years ago)

Author:

svonolfe

Message:

Made intra route inversion and lamda interchange moves work with the SA algorithm (#1039)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings

Files:

• Alba/Moves/IntraRouteInversion/IntraRouteInversionMove.cs (modified) (5 diffs)
• Alba/Moves/LambdaInterchange/ExhaustiveLambdaInterchangeMoveGenerator.cs (modified) (1 diff)
• Alba/Moves/LambdaInterchange/LambdaInterchangeMove.cs (modified) (7 diffs)
• Alba/Moves/LambdaInterchange/StochasticLambdaInterchangeSingleMoveGenerator.cs (modified) (1 diff)
• General/Moves/Interfaces/IVRPMove.cs (modified) (2 diffs)
• General/Moves/MultiVRPMoveOperator/MultiVRPMoveEvaluator.cs (modified) (1 diff)
• General/Moves/MultiVRPMoveOperator/MultiVRPMoveMaker.cs (modified) (1 diff)

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

@@ -31 +31 @@
   [StorableClass]
   public class IntraRouteInversionMove : TwoIndexMove, IVRPMove {
+    public IVRPEncoding Individual { get { return Permutation as AlbaEncoding; } }
+    
     public IntraRouteInversionMove()
       : base() {
@@ -41 +43 @@
     public IntraRouteInversionMove(int index1, int index2, AlbaEncoding permutation)
       : base(index1, index2, permutation) {
+        this.Permutation = permutation.Clone() as AlbaEncoding;
     }
 
@@ -57 +60 @@
 
     public TourEvaluation GetMoveQuality(
-      IVRPEncoding individual, IntValue vehicles,
+      IntValue vehicles,
       DoubleArray dueTimeArray, DoubleArray serviceTimeArray, DoubleArray readyTimeArray, 
       DoubleArray demandArray, DoubleValue capacity, DoubleMatrix coordinates,
@@ -63 +66 @@
       DoubleValue overloadPenalty, DoubleValue tardinessPenalty,
       ILookupParameter<DoubleMatrix> distanceMatrix, Data.BoolValue useDistanceMatrix) {
-        return IntraRouteInversionMoveEvaluator.GetMoveQuality(individual as AlbaEncoding, this, vehicles,
+        return IntraRouteInversionMoveEvaluator.GetMoveQuality(Permutation as AlbaEncoding, this, vehicles,
           dueTimeArray, serviceTimeArray, readyTimeArray, demandArray, capacity,
           coordinates, fleetUsageFactor, timeFactor, distanceFactor,
@@ -69 +72 @@
     }
 
-    public void MakeMove(IRandom random, IVRPEncoding individual) {
-      IntraRouteInversionMoveMaker.Apply(individual as AlbaEncoding, this);
+    public IVRPEncoding MakeMove(IRandom random) {
+      IntraRouteInversionMoveMaker.Apply(Individual as AlbaEncoding, this);
+
+      return Individual;
     }
 

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

@@ -55 +55 @@
                   for(int index2 = 0; index2 < tour2.Cities.Count - length2 + 1; index2++) {
                     moves.Add(new LambdaInterchangeMove(tour1Index, index1, length1, 
-                      tour2Index, index2, length2));
+                      tour2Index, index2, length2, individual));
                   }
                 }

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

@@ -33 +33 @@
   public class LambdaInterchangeMove: Item, IVRPMove {
     [Storable]
+    public IVRPEncoding Individual { get; protected set; }
+    
+    [Storable]
     public int Tour1 { get; protected set; }
 
@@ -58 +61 @@
       Position2 = -1;
       Length2 = -1;
+
+      Individual = null;
     }
 
     public LambdaInterchangeMove(int tour1, int position1, int length1, 
-      int tour2, int position2, int length2) {
+      int tour2, int position2, int length2, AlbaEncoding permutation) {
         Tour1 = tour1;
         Position1 = position1;
@@ -69 +74 @@
         Position2 = position2;
         Length2 = length2;
+
+        this.Individual = permutation.Clone() as AlbaEncoding;
     }
 
@@ -82 +89 @@
       clone.Length2 = Length2;
 
+      if (Individual != null)
+        clone.Individual = (AlbaEncoding)cloner.Clone(Individual);
+
       cloner.RegisterClonedObject(this, clone);
       return clone;
@@ -89 +99 @@
 
     public TourEvaluation GetMoveQuality(
-      IVRPEncoding individual, IntValue vehicles,
+      IntValue vehicles,
       DoubleArray dueTimeArray, DoubleArray serviceTimeArray, DoubleArray readyTimeArray, 
       DoubleArray demandArray, DoubleValue capacity, DoubleMatrix coordinates,
@@ -95 +105 @@
       DoubleValue overloadPenalty, DoubleValue tardinessPenalty,
       ILookupParameter<DoubleMatrix> distanceMatrix, Data.BoolValue useDistanceMatrix) {
-        return LambdaInterchangeMoveEvaluator.GetMoveQuality(individual as AlbaEncoding, this,  vehicles,
+        return LambdaInterchangeMoveEvaluator.GetMoveQuality(Individual as AlbaEncoding, this, vehicles,
           dueTimeArray, serviceTimeArray, readyTimeArray, demandArray, capacity,
           coordinates, fleetUsageFactor, timeFactor, distanceFactor,
@@ -101 +111 @@
     }
 
-    public void MakeMove(IRandom random, IVRPEncoding individual) {
-      LambdaInterchangeMoveMaker.Apply(individual as AlbaEncoding, this);
+    public IVRPEncoding MakeMove(IRandom random) {
+      LambdaInterchangeMoveMaker.Apply(Individual as AlbaEncoding, this);
+
+      return Individual;
     }
 

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

@@ -74 +74 @@
       int index2 = rand.Next(route2.Cities.Count - length2 + 1);
 
-      return new LambdaInterchangeMove(route1Index, index1, length1, route2Index, index2, length2);
+      return new LambdaInterchangeMove(route1Index, index1, length1, route2Index, index2, length2, individual);
     }
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/Moves/Interfaces/IVRPMove.cs

@@ -27 +27 @@
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
   public interface IVRPMove : IItem {
-    TourEvaluation GetMoveQuality(IVRPEncoding individual,  IntValue vehicles,
+    TourEvaluation GetMoveQuality(IntValue vehicles,
         DoubleArray dueTimeArray, DoubleArray serviceTimeArray, DoubleArray readyTimeArray, DoubleArray demandArray, 
         DoubleValue capacity,DoubleMatrix coordinates,
@@ -34 +34 @@
       ILookupParameter<DoubleMatrix> distanceMatrix, BoolValue useDistanceMatrix);
 
-    void MakeMove(IRandom random, IVRPEncoding individual);
+    IVRPEncoding MakeMove(IRandom random);
   }
 }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveEvaluator.cs

@@ -46 +46 @@
 
       return move.GetMoveQuality(
-        VRPToursParameter.ActualValue,
         VehiclesParameter.ActualValue,
         DueTimeParameter.ActualValue,

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveMaker.cs

@@ -114 +114 @@
      
       //perform move
-      move.MakeMove(RandomParameter.ActualValue, VRPToursParameter.ActualValue);
+      VRPToursParameter.ActualValue = move.MakeMove(RandomParameter.ActualValue);
 
       quality.Value = moveQuality.Value;