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

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.Knapsack/3.3

Files:

• HeuristicLab.Problems.Knapsack-3.3.csproj (modified) (4 diffs)
• Improvers (added)
• Improvers/KnapsackImprovementOperator.cs (added)
• KnapsackProblem.cs (modified) (3 diffs)
• PathRelinkers (added)
• PathRelinkers/KnapsackMultipleGuidesPathRelinker.cs (added)
• PathRelinkers/KnapsackPathRelinker.cs (added)
• PathRelinkers/KnapsackSimultaneousPathRelinker.cs (added)
• SimilarityCalculators (added)
• SimilarityCalculators/KnapsackSimilarityCalculator.cs (added)

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

@@ -109 +109 @@
   <ItemGroup>
     <Compile Include="Evaluators\KnapsackEvaluator.cs" />
+    <Compile Include="Improvers\KnapsackImprovementOperator.cs" />
     <Compile Include="Interfaces\IKnapsackEvaluator.cs" />
     <Compile Include="Interfaces\IKnapsackMoveEvaluator.cs" />
@@ -115 +116 @@
     <Compile Include="MoveEvaluators\KnapsackMoveEvaluator.cs" />
     <Compile Include="MoveEvaluators\KnapsackOneBitflipMoveEvaluator.cs" />
+    <Compile Include="PathRelinkers\KnapsackMultipleGuidesPathRelinker.cs" />
+    <Compile Include="PathRelinkers\KnapsackPathRelinker.cs" />
+    <Compile Include="PathRelinkers\KnapsackSimultaneousPathRelinker.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Analyzers\BestKnapsackSolutionAnalyzer.cs" />
+    <Compile Include="SimilarityCalculators\KnapsackSimilarityCalculator.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -159 +164 @@
       <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">
@@ -198 +207 @@
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

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

@@ -28 +28 @@
 using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Optimization;
+using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -244 +245 @@
     }
     private void InitializeOperators() {
+      Operators.Add(new KnapsackImprovementOperator());
+      Operators.Add(new KnapsackMultipleGuidesPathRelinker());
+      Operators.Add(new KnapsackPathRelinker());
+      Operators.Add(new KnapsackSimultaneousPathRelinker());
+      Operators.Add(new KnapsackSimilarityCalculator());
+
       Operators.Add(new BestKnapsackSolutionAnalyzer());
       ParameterizeAnalyzer();
@@ -290 +297 @@
         op.BinaryVectorParameter.Hidden = true;
       }
+      foreach (IImprovementOperator op in Operators.OfType<IImprovementOperator>()) {
+        op.TargetParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName;
+        op.TargetParameter.Hidden = true;
+      }
+      foreach (IPathRelinker op in Operators.OfType<IPathRelinker>()) {
+        op.ParentsParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName;
+        op.ParentsParameter.Hidden = true;
+      }
+      foreach (ISimilarityCalculator op in Operators.OfType<ISimilarityCalculator>()) {
+        op.TargetParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName;
+        op.TargetParameter.Hidden = true;
+      }
     }
     #endregion