Changeset 8671 for branches/DynamicVehicleRouting

Timestamp:

09/19/12 14:14:20 (12 years ago)

Author:

svonolfe

Message:

Removed operators that will not be included in the first version of the addon (#1955)

Location:

branches/DynamicVehicleRouting/HeuristicLab.PDPSimulation/3.3

Files:

• DistanceMeasures/PathMeasure.cs (deleted)
• HeuristicLab.PDPSimulation-3.3.csproj (modified) (1 diff)
• Operators/Improvers (deleted)
• Operators/Manipulators (deleted)
• Operators/Moves (deleted)
• Optimizers/DynamicPDProblemInstance.cs (modified) (1 diff)
• Plugin.cs (modified) (1 diff)

branches/DynamicVehicleRouting/HeuristicLab.PDPSimulation/3.3/HeuristicLab.PDPSimulation-3.3.csproj

@@ -165 +165 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Operators\Improvers\IntraRouteImprovementOperator.cs" />
-    <Compile Include="Operators\Manipulators\PotvinCustomerRelocationManipulator.cs" />
     <Compile Include="DistanceMeasures\DistanceMatrixData.cs" />
     <Compile Include="DistanceMeasures\DistanceMatrixMeasure.cs" />
     <Compile Include="DistanceMeasures\DistanceMeasure.cs" />
     <Compile Include="DistanceMeasures\EuclideanDistanceMeasure.cs" />
-    <Compile Include="DistanceMeasures\PathMeasure.cs" />
     <Compile Include="DomainModel\SimulationObject.cs" />
     <Compile Include="Operators\DynPDPEvaluator.cs" />
     <Compile Include="Operators\DynPushForwardInsertionCreator.cs" />
     <Compile Include="Operators\DynPDPProblemInstance.cs" />
-    <Compile Include="Operators\Manipulators\DynPotvinPairwiseOneLevelExchangeManipulator.cs" />
-    <Compile Include="Operators\Manipulators\DynPotvinPairwiseTwoLevelExchangeManipulator.cs" />
-    <Compile Include="Operators\Moves\Exchange\IPotvinPDExchangeMoveOperator.cs" />
-    <Compile Include="Operators\Moves\Exchange\PotvinPDExchangeExhaustiveMoveGenerator.cs" />
-    <Compile Include="Operators\Moves\Exchange\PotvinPDExchangeMove.cs" />
-    <Compile Include="Operators\Moves\Exchange\PotvinPDExchangeMoveEvaluator.cs" />
-    <Compile Include="Operators\Moves\Exchange\PotvinPDExchangeMoveGenerator.cs" />
-    <Compile Include="Operators\Moves\Exchange\PotvinPDExchangeMoveMaker.cs" />
-    <Compile Include="Operators\Moves\Exchange\PotvinPDExchangeMoveTabuCriterion.cs" />
-    <Compile Include="Operators\Moves\Exchange\PotvinPDExchangeMoveTabuMaker.cs" />
-    <Compile Include="Operators\Moves\Exchange\PotvinPDExchangeMultiMoveGenerator.cs" />
-    <Compile Include="Operators\Moves\Exchange\PotvinPDExchangeSingleMoveGenerator.cs" />
-    <Compile Include="Operators\Moves\PotvinPDRelocateMoveAttribute.cs" />
-    <Compile Include="Operators\Moves\Rearrange\IPotvinPDRearrangeMoveOperator.cs" />
-    <Compile Include="Operators\Moves\Rearrange\PotvinPDRearrangeExhaustiveMoveGenerator.cs" />
-    <Compile Include="Operators\Moves\Rearrange\PotvinPDRearrangeMove.cs" />
-    <Compile Include="Operators\Moves\Rearrange\PotvinPDRearrangeMoveEvaluator.cs" />
-    <Compile Include="Operators\Moves\Rearrange\PotvinPDRearrangeMoveGenerator.cs" />
-    <Compile Include="Operators\Moves\Rearrange\PotvinPDRearrangeMoveMaker.cs" />
-    <Compile Include="Operators\Moves\Rearrange\PotvinPDRearrangeMoveTabuCriterion.cs" />
-    <Compile Include="Operators\Moves\Rearrange\PotvinPDRearrangeMoveTabuMaker.cs" />
-    <Compile Include="Operators\Moves\Rearrange\PotvinPDRearrangeMultiMoveGenerator.cs" />
-    <Compile Include="Operators\Moves\Rearrange\PotvinPDRearrangeSingleMoveGenerator.cs" />
-    <Compile Include="Operators\Moves\Shift\IPotvinPDShiftMoveOperator.cs" />
-    <Compile Include="Operators\Moves\Shift\PotvinPDShiftExhaustiveMoveGenerator.cs" />
-    <Compile Include="Operators\Moves\Shift\PotvinPDShiftMove.cs" />
-    <Compile Include="Operators\Moves\Shift\PotvinPDShiftMoveEvaluator.cs" />
-    <Compile Include="Operators\Moves\Shift\PotvinPDShiftMoveGenerator.cs" />
-    <Compile Include="Operators\Moves\Shift\PotvinPDShiftMoveMaker.cs" />
-    <Compile Include="Operators\Moves\Shift\PotvinPDShiftMoveTabuCriterion.cs" />
-    <Compile Include="Operators\Moves\Shift\PotvinPDShiftMoveTabuMaker.cs" />
-    <Compile Include="Operators\Moves\Shift\PotvinPDShiftMultiMoveGenerator.cs" />
-    <Compile Include="Operators\Moves\Shift\PotvinPDShiftSingleMoveGenerator.cs" />
     <Compile Include="Optimizers\DynamicPDProblemInstance.cs" />
     <Compile Include="Optimizers\DynamicPDPOptimization.cs" />

branches/DynamicVehicleRouting/HeuristicLab.PDPSimulation/3.3/Optimizers/DynamicPDProblemInstance.cs

@@ -361 +361 @@
       }
 
-      int j = 0;
-      while (j < tabuAttributes.Count) {
-        if (tabuAttributes[j] is DynPotvinPDRelocateMoveAttribute) {
-          DynPotvinPDRelocateMoveAttribute attr =
-            tabuAttributes[j] as DynPotvinPDRelocateMoveAttribute;
-
-          if (attr.City > (customer + 1)) {
-            attr.City = attr.City - 1;
-            j++;
-          } else if (attr.City < (customer + 1)) {
-            j++;
-          } else {
-            attr.City = -1;
-            j++;
-          }
-        } else {
-          j++;
-        }
-      }
-
       Dictionary<int, Guid> newOrderAssignment = new Dictionary<int, Guid>();
       foreach (int assigned in orderAssignment.Keys) {

branches/DynamicVehicleRouting/HeuristicLab.PDPSimulation/3.3/Plugin.cs

@@ -29 +29 @@
   /// Plugin class for HeuristicLab.PDPSimulation plugin.
   /// </summary>
-  [Plugin("HeuristicLab.PDPSimulation", "3.3.4.0")]
+  [Plugin("HeuristicLab.PDPSimulation", "3.3.4.8670")]
   [PluginFile("HeuristicLab.PDPSimulation-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Analysis", "3.3")]