Changeset 6772 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General

Timestamp:

09/15/11 16:32:43 (13 years ago)

Author:

svonolfe

Message:

Added support for multiple moves in tabu search (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves

Files:

• Interfaces/IVRPMove.cs (modified) (1 diff)
• MultiVRPMoveOperator/MultiVRPMoveEvaluator.cs (modified) (1 diff)
• MultiVRPMoveOperator/MultiVRPMoveGenerator.cs (modified) (3 diffs)
• MultiVRPMoveOperator/MultiVRPMoveTabuChecker.cs (added)
• MultiVRPMoveOperator/MultiVRPMoveTabuMaker.cs (added)

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

@@ -30 +30 @@
     VRPMoveEvaluator GetMoveEvaluator();
     VRPMoveMaker GetMoveMaker();
+    ITabuMaker GetTabuMaker();
+    ITabuChecker GetTabuChecker();
+    ITabuChecker GetSoftTabuChecker();
   }
 }

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

@@ -52 +52 @@
     }
 
-    protected override void EvaluateMove() {
+    protected override void EvaluateMove() { }
+
+    public override IOperation Apply() {
       IVRPMove move = VRPMoveParameter.ActualValue as IVRPMove;
 
       VRPMoveEvaluator moveEvaluator = move.GetMoveEvaluator();
       moveEvaluator.VRPMoveParameter.ActualName = VRPMoveParameter.Name;
-      IAtomicOperation op = this.ExecutionContext.CreateOperation(moveEvaluator);
-      op.Operator.Execute((IExecutionContext)op, CancellationToken);
+
+      OperationCollection next = new OperationCollection(base.Apply());
+      next.Insert(0, ExecutionContext.CreateOperation(moveEvaluator));
+
+      return next;
     }
   }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveGenerator.cs

@@ -39 +39 @@
   [StorableClass]
   public class MultiVRPMoveGenerator : CheckedMultiOperator<IMultiVRPMoveGenerator>, IMultiVRPMoveOperator,
-    IStochasticOperator, IMultiMoveGenerator, IGeneralVRPOperator, IMultiVRPOperator  {
+    IStochasticOperator, IMoveGenerator, IGeneralVRPOperator, IMultiVRPOperator {
     public override bool CanChangeName {
       get { return false; }
     }
 
-    public IValueLookupParameter<IntValue> SampleSizeParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["SampleSize"]; }
+    public IValueLookupParameter<IntValue> SelectedOperatorsParameter {
+      get { return (IValueLookupParameter<IntValue>)Parameters["SelectedOperators"]; }
     }
 
@@ -80 +80 @@
     public MultiVRPMoveGenerator()
       : base() {
-      Parameters.Add(new ValueLookupParameter<IntValue>("SampleSize", "The number of moves to generate."));
+      Parameters.Add(new ValueLookupParameter<IntValue>("SelectedOperators", "The number of selected operators.", new IntValue(1)));
       Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator which should be used for stochastic manipulation operators."));
       Parameters.Add(new ValueLookupParameter<DoubleArray>("Probabilities", "The array of relative probabilities for each operator.", new DoubleArray()));
@@ -158 +158 @@
       OperationCollection next = new OperationCollection(base.Apply());
 
-      for (int i = 0; i < SampleSizeParameter.ActualValue.Value; i++) {
+      for (int i = 0; i < SelectedOperatorsParameter.ActualValue.Value; i++) {
         IRandom random = RandomParameter.ActualValue;
         DoubleArray probabilities = ProbabilitiesParameter.ActualValue;