Changeset 4352 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/Moves

Timestamp:

09/01/10 11:13:46 (15 years ago)

Author:

svonolfe

Message:

Merged r4351 of the VRP feature branch into trunk (#1039)

Location:

trunk/sources/HeuristicLab.Problems.VehicleRouting

Files:

• . (modified) (1 prop)
• 3.3/Encodings/General/Moves/Interfaces/IVRPMove.cs (modified) (2 diffs)
• 3.3/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveEvaluator.cs (modified) (1 diff)
• 3.3/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveGenerator.cs (modified) (1 diff)
• 3.3/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveMaker.cs (modified) (1 diff)

trunk/sources/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, 
+    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();
   }
 }

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveEvaluator.cs

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

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveGenerator.cs

@@ -118 +118 @@
       Parameters.Add(new LookupParameter<IVRPMove>("VRPMove", "The generated moves."));
 
-      foreach (Type type in ApplicationManager.Manager.GetTypes(typeof(IMultiVRPMoveGenerator))) {
+      foreach (Type type in ApplicationManager.Manager.GetTypes(typeof(IMultiVRPMoveGenerator)).OrderBy(op => op.Name)) {
         if (!typeof(MultiOperator<IMultiVRPMoveGenerator>).IsAssignableFrom(type))
           Operators.Add((IMultiVRPMoveGenerator)Activator.CreateInstance(type), true);

trunk/sources/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();
 
       quality.Value = moveQuality.Value;