Changeset 6772

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

Files:

• Encodings/Alba/Moves/IntraRouteInversion/AlbaIntraRouteInversionMove.cs (modified) (2 diffs)
• Encodings/Alba/Moves/LambdaInterchange/AlbaLambdaInterchangeMove.cs (modified) (2 diffs)
• Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMove.cs (modified) (2 diffs)
• Encodings/General/Moves/Interfaces/IVRPMove.cs (modified) (1 diff)
• Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveEvaluator.cs (modified) (1 diff)
• Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveGenerator.cs (modified) (3 diffs)
• Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveTabuChecker.cs (added)
• Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveTabuMaker.cs (added)
• Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMove.cs (modified) (2 diffs)
• Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMoveTabuCriterion.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting-3.4.csproj (modified) (1 diff)

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

@@ -27 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
+using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
@@ -68 +69 @@
     }
 
+    public ITabuMaker GetTabuMaker() {
+      return null;
+    }
+
+    public ITabuChecker GetTabuChecker() {
+      return null;
+    }
+
+    public ITabuChecker GetSoftTabuChecker() {
+      return null;
+    }
+
     #endregion
   }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/LambdaInterchange/AlbaLambdaInterchangeMove.cs

@@ -28 +28 @@
 using HeuristicLab.Data;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
+using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
@@ -106 +107 @@
     }
 
+    public ITabuMaker GetTabuMaker() {
+      return null;
+    }
+
+    public ITabuChecker GetTabuChecker() {
+      return null;
+    }
+
+    public ITabuChecker GetSoftTabuChecker() {
+      return null;
+    }
+
     #endregion
   }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMove.cs

@@ -28 +28 @@
 using HeuristicLab.Data;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
+using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
@@ -69 +70 @@
     }
 
+    public ITabuMaker GetTabuMaker() {
+      return new AlbaTranslocationMoveTabuMaker();
+    }
+
+    public ITabuChecker GetTabuChecker() {
+      return new AlbaTranslocationMoveHardTabuCriterion();
+    }
+
+    public ITabuChecker GetSoftTabuChecker() {
+      return new AlbaTranslocationMoveSoftTabuCriterion();
+    }
+
     #endregion
   }

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;

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMove.cs

@@ -28 +28 @@
 using HeuristicLab.Data;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
+using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
@@ -83 +84 @@
     }
 
+    public ITabuMaker GetTabuMaker() {
+      return new PotvinCustomerRelocationMoveTabuMaker();
+    }
+
+    public ITabuChecker GetTabuChecker() {
+      return new PotvinCustomerRelocationMoveTabuCriterion();
+    }
+
+    public ITabuChecker GetSoftTabuChecker() {
+      PotvinCustomerRelocationMoveTabuCriterion tabuChecker = new PotvinCustomerRelocationMoveTabuCriterion();
+      tabuChecker.UseAspirationCriterion.Value = true;
+
+      return tabuChecker;
+    }
+
     #endregion
   }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMoveTabuCriterion.cs

@@ -32 +32 @@
   [Item("PotvinCustomerRelocationTabuCriterion", @"Checks if a certain customer relocation move is tabu.")]
   [StorableClass]
-  public class PotvinCustomerRelocationMoveTabuCriterion : SingleSuccessorOperator, IPotvinCustomerRelocationMoveOperator, ITabuChecker, IPotvinOperator {
+  public class PotvinCustomerRelocationMoveTabuCriterion : SingleSuccessorOperator, IPotvinCustomerRelocationMoveOperator, ITabuChecker, IPotvinOperator, IVRPMoveOperator {
     public override bool CanChangeName {
       get { return false; }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/HeuristicLab.Problems.VehicleRouting-3.4.csproj

@@ -183 +183 @@
     <Compile Include="Encodings\General\Moves\Interfaces\IMultiVRPMoveOperator.cs" />
     <Compile Include="Encodings\General\Moves\Interfaces\IVRPMove.cs" />
+    <Compile Include="Encodings\General\Moves\MultiVRPMoveOperator\MultiVRPMoveTabuMaker.cs" />
+    <Compile Include="Encodings\General\Moves\MultiVRPMoveOperator\MultiVRPMoveTabuChecker.cs" />
     <Compile Include="Encodings\General\Moves\MultiVRPMoveOperator\MultiVRPMoveEvaluator.cs" />
     <Compile Include="Encodings\General\Moves\MultiVRPMoveOperator\MultiVRPMoveGenerator.cs" />