Changeset 7793

Timestamp:

05/10/12 18:05:40 (13 years ago)

Author:

jkarder

Message:

#1331:

• added operators for the VehicleRouting problem
• minor code improvements

Location:

branches/ScatterSearch (trunk integration)

Files:

• HeuristicLab.Optimization.Operators/3.3/SimilarityCalculator.cs (modified) (1 diff)
• HeuristicLab.Problems.Knapsack/3.3/SimilarityCalculators/KnapsackSimilarityCalculator.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/SimilarityCalculators/SingleObjectiveTestFunctionSimilarityCalculator.cs (modified) (1 diff)
• HeuristicLab.Problems.TravelingSalesman/3.3/SimilarityCalculators/TSPSimilarityCalculator.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting/3.3/HeuristicLab.Problems.VehicleRouting-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting/3.3/Improvers (added)
• HeuristicLab.Problems.VehicleRouting/3.3/Improvers/VRPImprovementOperator.cs (added)
• HeuristicLab.Problems.VehicleRouting/3.3/PathRelinkers (added)
• HeuristicLab.Problems.VehicleRouting/3.3/PathRelinkers/VRPPathRelinker.cs (added)
• HeuristicLab.Problems.VehicleRouting/3.3/SimilarityCalculators (added)
• HeuristicLab.Problems.VehicleRouting/3.3/SimilarityCalculators/VRPSimilarityCalculator.cs (added)
• HeuristicLab.Problems.VehicleRouting/3.3/VehicleRoutingProblem.cs (modified) (3 diffs)

branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Operators/3.3/SimilarityCalculator.cs

@@ -65 +65 @@
 
       if (left == right) return 0;
-      else return CalculateDiversity(left, right);
+      else return CalculateSimilarity(left, right);
     }
 
-    protected abstract double CalculateDiversity(IScope left, IScope right);
+    protected abstract double CalculateSimilarity(IScope left, IScope right);
   }
 }

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.Knapsack/3.3/SimilarityCalculators/KnapsackSimilarityCalculator.cs

@@ -42 +42 @@
     }
 
-    protected override double CalculateDiversity(IScope left, IScope right) {
+    protected override double CalculateSimilarity(IScope left, IScope right) {
       BinaryVector sol1 = left.Variables[TargetParameter.ActualName].Value as BinaryVector;
       BinaryVector sol2 = right.Variables[TargetParameter.ActualName].Value as BinaryVector;

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TestFunctions/3.3/SimilarityCalculators/SingleObjectiveTestFunctionSimilarityCalculator.cs

@@ -63 +63 @@
     }
 
-    protected override double CalculateDiversity(IScope left, IScope right) {
+    protected override double CalculateSimilarity(IScope left, IScope right) {
       RealVector sol1 = left.Variables["Point"].Value as RealVector;
       RealVector sol2 = right.Variables["Point"].Value as RealVector;

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TravelingSalesman/3.3/SimilarityCalculators/TSPSimilarityCalculator.cs

@@ -42 +42 @@
     }
 
-    protected override double CalculateDiversity(IScope left, IScope right) {
+    protected override double CalculateSimilarity(IScope left, IScope right) {
       Permutation v1 = left.Variables[TargetParameter.ActualName].Value as Permutation;
       Permutation v2 = right.Variables[TargetParameter.ActualName].Value as Permutation;

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.VehicleRouting/3.3/HeuristicLab.Problems.VehicleRouting-3.3.csproj

@@ -119 +119 @@
     <Compile Include="Encodings\Potvin\Crossovers\PotvinInsertionBasedCrossover.cs" />
     <Compile Include="Encodings\Potvin\Manipulators\PotvinLocalSearchManipulator.cs" />
+    <Compile Include="Improvers\VRPImprovementOperator.cs" />
     <Compile Include="Interfaces\IVRPMultiNeighborhoodShakingOperator.cs" />
+    <Compile Include="PathRelinkers\VRPPathRelinker.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="ShakingOperators\VehicleRoutingShakingOperator.cs" />
+    <Compile Include="SimilarityCalculators\VRPSimilarityCalculator.cs" />
     <Compile Include="SolutionParser.cs" />
     <Compile Include="Encodings\Alba\Crossovers\AlbaPermutationCrossover.cs" />

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.VehicleRouting/3.3/VehicleRoutingProblem.cs

@@ -27 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
+using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -411 +412 @@
 
     private void InitializeOperators() {
+      Operators.Add(new VRPImprovementOperator());
+      Operators.Add(new VRPPathRelinker());
+      Operators.Add(new VRPSimilarityCalculator());
+
       Operators.Add(new BestVRPSolutionAnalyzer());
       Operators.Add(new BestAverageWorstVRPToursAnalyzer());
@@ -518 +523 @@
         op.VRPToursParameter.ActualName = SolutionCreator.VRPToursParameter.ActualName;
       }
+      foreach (IImprovementOperator op in Operators.OfType<IImprovementOperator>()) {
+        op.TargetParameter.ActualName = SolutionCreator.VRPToursParameter.ActualName;
+        op.TargetParameter.Hidden = true;
+      }
+      foreach (IPathRelinker op in Operators.OfType<IPathRelinker>()) {
+        op.ParentsParameter.ActualName = SolutionCreator.VRPToursParameter.ActualName;
+        op.ParentsParameter.Hidden = true;
+      }
+      foreach (ISimilarityCalculator op in Operators.OfType<ISimilarityCalculator>()) {
+        op.TargetParameter.ActualName = SolutionCreator.VRPToursParameter.ActualName;
+        op.TargetParameter.Hidden = true;
+      }
     }
     private void ClearDistanceMatrix() {