Changeset 4287 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General

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/General/Moves

Files:

• Interfaces/IVRPMove.cs (modified) (2 diffs)
• MultiVRPMoveOperator/MultiVRPMoveEvaluator.cs (modified) (1 diff)
• MultiVRPMoveOperator/MultiVRPMoveMaker.cs (modified) (1 diff)

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;