Changeset 8334 for trunk/sources/HeuristicLab.Problems.TestFunctions/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.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj
r6866 r8334 108 108 </ItemGroup> 109 109 <ItemGroup> 110 <Compile Include="Improvers\SingleObjectiveTestFunctionImprovementOperator.cs" /> 111 <Compile Include="PathRelinkers\SingleObjectiveTestFunctionPathRelinker.cs" /> 110 112 <Compile Include="Plugin.cs" /> 111 113 <Compile Include="Properties\AssemblyInfo.cs" /> … … 152 154 <Compile Include="MoveEvaluators\RealVectorAdditiveMoveWrapper.cs" /> 153 155 <Compile Include="RealVectorToRealVectorEncoder.cs" /> 156 <Compile Include="SimilarityCalculators\SingleObjectiveTestFunctionSimilarityCalculator.cs" /> 154 157 <Compile Include="SingleObjectiveTestFunctionSolution.cs" /> 155 158 <Compile Include="SingleObjectiveTestFunctionProblem.cs" /> … … 193 196 <Name>HeuristicLab.Operators-3.3</Name> 194 197 <Private>False</Private> 198 </ProjectReference> 199 <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj"> 200 <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project> 201 <Name>HeuristicLab.Optimization.Operators-3.3</Name> 195 202 </ProjectReference> 196 203 <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj"> … … 232 239 </BootstrapperPackage> 233 240 </ItemGroup> 241 <ItemGroup /> 234 242 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 235 243 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. -
trunk/sources/HeuristicLab.Problems.TestFunctions/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")] -
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs
r7442 r8334 257 257 } 258 258 private void InitializeOperators() { 259 Operators.Add(new SingleObjectiveTestFunctionImprovementOperator()); 260 Operators.Add(new SingleObjectiveTestFunctionPathRelinker()); 261 Operators.Add(new SingleObjectiveTestFunctionSimilarityCalculator()); 262 259 263 Operators.Add(new BestSingleObjectiveTestFunctionSolutionAnalyzer()); 260 264 ParameterizeAnalyzers(); … … 359 363 op.MaximizationParameter.Hidden = true; 360 364 } 361 foreach (var op in Operators.OfType<IRealVectorMultiNeighborhoodShakingOperator>()) { 362 op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 363 op.RealVectorParameter.Hidden = true; 365 foreach (IRealVectorMultiNeighborhoodShakingOperator op in Operators.OfType<IRealVectorMultiNeighborhoodShakingOperator>()) { 366 op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 367 op.RealVectorParameter.Hidden = true; 368 } 369 foreach (ISingleObjectiveImprovementOperator op in Operators.OfType<ISingleObjectiveImprovementOperator>()) { 370 op.SolutionParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 371 op.SolutionParameter.Hidden = true; 372 } 373 foreach (ISingleObjectivePathRelinker op in Operators.OfType<ISingleObjectivePathRelinker>()) { 374 op.ParentsParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 375 op.ParentsParameter.Hidden = true; 376 } 377 foreach (SingleObjectiveTestFunctionSimilarityCalculator op in Operators.OfType<SingleObjectiveTestFunctionSimilarityCalculator>()) { 378 op.SolutionVariableName = SolutionCreator.RealVectorParameter.ActualName; 379 op.QualityVariableName = Evaluator.QualityParameter.ActualName; 380 op.Bounds = Bounds; 364 381 } 365 382 }
Note: See TracChangeset
for help on using the changeset viewer.