Changeset 8334 for trunk/sources/HeuristicLab.Problems.Knapsack/3.3
- Timestamp:
- 07/26/12 17:09:43 (12 years ago)
- Location:
- trunk/sources
- Files:
-
- 4 edited
- 3 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources
- Property svn:mergeinfo changed
/branches/ScatterSearch (trunk integration) (added) merged: 7787,7789,7793,7806,7815,7821-7822,7954,8086,8171,8299,8303-8307,8319-8320,8322,8327-8328,8331-8332
- Property svn:mergeinfo changed
-
trunk/sources/HeuristicLab.Problems.Knapsack/3.3/HeuristicLab.Problems.Knapsack-3.3.csproj
r6866 r8334 109 109 <ItemGroup> 110 110 <Compile Include="Evaluators\KnapsackEvaluator.cs" /> 111 <Compile Include="Improvers\KnapsackImprovementOperator.cs" /> 111 112 <Compile Include="Interfaces\IKnapsackEvaluator.cs" /> 112 113 <Compile Include="Interfaces\IKnapsackMoveEvaluator.cs" /> … … 115 116 <Compile Include="MoveEvaluators\KnapsackMoveEvaluator.cs" /> 116 117 <Compile Include="MoveEvaluators\KnapsackOneBitflipMoveEvaluator.cs" /> 118 <Compile Include="PathRelinkers\KnapsackPathRelinker.cs" /> 119 <Compile Include="PathRelinkers\KnapsackSimultaneousPathRelinker.cs" /> 117 120 <Compile Include="Plugin.cs" /> 118 121 <Compile Include="Properties\AssemblyInfo.cs" /> 119 122 <Compile Include="Analyzers\BestKnapsackSolutionAnalyzer.cs" /> 123 <Compile Include="SimilarityCalculators\KnapsackSimilarityCalculator.cs" /> 120 124 </ItemGroup> 121 125 <ItemGroup> … … 159 163 <Name>HeuristicLab.Operators-3.3</Name> 160 164 <Private>False</Private> 165 </ProjectReference> 166 <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj"> 167 <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project> 168 <Name>HeuristicLab.Optimization.Operators-3.3</Name> 161 169 </ProjectReference> 162 170 <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj"> … … 198 206 </BootstrapperPackage> 199 207 </ItemGroup> 208 <ItemGroup /> 200 209 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 201 210 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. -
trunk/sources/HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs
r7351 r8334 244 244 } 245 245 private void InitializeOperators() { 246 Operators.Add(new KnapsackImprovementOperator()); 247 Operators.Add(new KnapsackPathRelinker()); 248 Operators.Add(new KnapsackSimultaneousPathRelinker()); 249 Operators.Add(new KnapsackSimilarityCalculator()); 250 246 251 Operators.Add(new BestKnapsackSolutionAnalyzer()); 247 252 ParameterizeAnalyzer(); … … 286 291 op.ValuesParameter.Hidden = true; 287 292 } 288 foreach ( var op in Operators.OfType<IBinaryVectorMultiNeighborhoodShakingOperator>()) {293 foreach (IBinaryVectorMultiNeighborhoodShakingOperator op in Operators.OfType<IBinaryVectorMultiNeighborhoodShakingOperator>()) { 289 294 op.BinaryVectorParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName; 290 295 op.BinaryVectorParameter.Hidden = true; 296 } 297 foreach (ISingleObjectiveImprovementOperator op in Operators.OfType<ISingleObjectiveImprovementOperator>()) { 298 op.SolutionParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName; 299 op.SolutionParameter.Hidden = true; 300 } 301 foreach (ISingleObjectivePathRelinker op in Operators.OfType<ISingleObjectivePathRelinker>()) { 302 op.ParentsParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName; 303 op.ParentsParameter.Hidden = true; 304 } 305 foreach (KnapsackSimilarityCalculator op in Operators.OfType<KnapsackSimilarityCalculator>()) { 306 op.SolutionVariableName = SolutionCreator.BinaryVectorParameter.ActualName; 307 op.QualityVariableName = Evaluator.QualityParameter.ActualName; 291 308 } 292 309 } -
trunk/sources/HeuristicLab.Problems.Knapsack/3.3/Plugin.cs.frame
r8246 r8334 36 36 [PluginDependency("HeuristicLab.Operators", "3.3")] 37 37 [PluginDependency("HeuristicLab.Optimization", "3.3")] 38 [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")] 38 39 [PluginDependency("HeuristicLab.Parameters", "3.3")] 39 40 [PluginDependency("HeuristicLab.Persistence", "3.3")]
Note: See TracChangeset
for help on using the changeset viewer.