Changeset 7789 for branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TravelingSalesman/3.3

Timestamp:

05/10/12 10:42:06 (13 years ago)

Author:

jkarder

Message:

#1331:

• added Scatter Search algorithm
• added problem specific operators for improvement, path relinking and similarity calculation
• adjusted event handling

Location:

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

Files:

• HeuristicLab.Problems.TravelingSalesman-3.3.csproj (modified) (3 diffs)
• Improvers (added)
• Improvers/TSPImprovementOperator.cs (added)
• PathRelinkers (added)
• PathRelinkers/TSPMultipleGuidesPathRelinker.cs (added)
• PathRelinkers/TSPPathRelinker.cs (added)
• PathRelinkers/TSPSimultaneousPathRelinker.cs (added)
• SimilarityCalculators (added)
• SimilarityCalculators/TSPSimilarityCalculator.cs (added)
• TravelingSalesmanProblem.cs (modified) (3 diffs)

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

@@ -118 +118 @@
     <Compile Include="Evaluators\TSPEuclideanPathEvaluator.cs" />
     <Compile Include="Evaluators\TSPGeoPathEvaluator.cs" />
+    <Compile Include="Improvers\TSPImprovementOperator.cs" />
     <Compile Include="Interfaces\ITSPDistanceMatrixEvaluator.cs" />
     <Compile Include="MoveEvaluators\ThreeOpt\TSPTranslocationMoveEuclideanPathEvaluator.cs" />
@@ -127 +128 @@
     <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMovePathEvaluator.cs" />
     <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMoveRoundedEuclideanPathEvaluator.cs" />
+    <Compile Include="PathRelinkers\TSPMultipleGuidesPathRelinker.cs" />
+    <Compile Include="PathRelinkers\TSPPathRelinker.cs" />
+    <Compile Include="PathRelinkers\TSPSimultaneousPathRelinker.cs" />
     <Compile Include="Plugin.cs" />
+    <Compile Include="SimilarityCalculators\TSPSimilarityCalculator.cs" />
     <Compile Include="TravelingSalesmanProblem.cs" />
     <Compile Include="PathTSPTour.cs" />
@@ -182 +187 @@
       <Name>HeuristicLab.Operators-3.3</Name>
       <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
+      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
+      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">

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

@@ -29 +29 @@
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Optimization;
+using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -222 +223 @@
 
     private void InitializeOperators() {
+      Operators.Add(new TSPImprovementOperator());
+      Operators.Add(new TSPMultipleGuidesPathRelinker());
+      Operators.Add(new TSPPathRelinker());
+      Operators.Add(new TSPSimultaneousPathRelinker());
+      Operators.Add(new TSPSimilarityCalculator());
+
       Operators.Add(new BestTSPSolutionAnalyzer());
       Operators.Add(new TSPAlleleFrequencyAnalyzer());
@@ -335 +342 @@
         op.PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
         op.PermutationParameter.Hidden = true;
+      }
+      foreach (IImprovementOperator op in Operators.OfType<IImprovementOperator>()) {
+        op.TargetParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
+        op.TargetParameter.Hidden = true;
+      }
+      foreach (IPathRelinker op in Operators.OfType<IPathRelinker>()) {
+        op.ParentsParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
+        op.ParentsParameter.Hidden = true;
+      }
+      foreach (ISimilarityCalculator op in Operators.OfType<ISimilarityCalculator>()) {
+        op.TargetParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
+        op.TargetParameter.Hidden = true;
       }
     }