Changeset 3647 for trunk/sources/HeuristicLab.Problems.TestFunctions
- Timestamp:
- 05/05/10 18:13:06 (14 years ago)
- Location:
- trunk/sources/HeuristicLab.Problems.TestFunctions/3.3
- Files:
-
- 6 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj
r3384 r3647 84 84 </ItemGroup> 85 85 <ItemGroup> 86 <Compile Include="Analyzers\BestSingleObjectiveTestFunctionSolutionAnalyzer.cs" /> 87 <Compile Include="Analyzers\MultiPopulationBestSingleObjectiveTestFunctionSolutionAnalyzer.cs" /> 88 <Compile Include="Analyzers\PopulationBestSingleObjectiveTestFunctionSolutionAnalyzer.cs" /> 86 89 <Compile Include="Evaluators\AckleyEvaluator.cs" /> 87 90 <Compile Include="Evaluators\BealeEvaluator.cs" /> … … 98 101 <Compile Include="Evaluators\ZakharovEvaluator.cs" /> 99 102 <Compile Include="HeuristicLabProblemsTestFunctionsPlugin.cs" /> 103 <Compile Include="Interfaces\IBestSingleObjectiveTestFunctionSolutionAnalyzer.cs" /> 100 104 <Compile Include="Interfaces\IRastriginMoveEvaluator.cs" /> 101 105 <Compile Include="Interfaces\ISingleObjectiveTestFunctionAdditiveMoveEvaluator.cs" /> … … 118 122 <Compile Include="MoveEvaluators\AdditiveMoveEvaluator.cs" /> 119 123 <Compile Include="MoveEvaluators\RealVectorAdditiveMoveWrapper.cs" /> 124 <Compile Include="SingleObjectiveTestFunctionSolution.cs" /> 120 125 <Compile Include="SingleObjectiveTestFunctionProblem.cs" /> 121 126 <None Include="HeuristicLab.snk" /> -
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs
r3616 r3647 33 33 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 34 34 using HeuristicLab.PluginInfrastructure; 35 using HeuristicLab.Problems.TestFunctions.Analyzers; 35 36 36 37 namespace HeuristicLab.Problems.TestFunctions { … … 121 122 get { return operators; } 122 123 } 124 private IEnumerable<IBestSingleObjectiveTestFunctionSolutionAnalyzer> BestSingleObjectiveTestFunctionSolutionAnalyzers { 125 get { return operators.OfType<IBestSingleObjectiveTestFunctionSolutionAnalyzer>(); } 126 } 123 127 #endregion 124 128 … … 147 151 ParameterizeSolutionCreator(); 148 152 ParameterizeEvaluator(); 149 ParameterizeVisualizer();150 153 151 154 Initialize(); … … 186 189 private void SolutionCreatorParameter_ValueChanged(object sender, EventArgs e) { 187 190 ParameterizeSolutionCreator(); 191 ParameterizeAnalyzers(); 188 192 SolutionCreator_RealVectorParameter_ActualNameChanged(null, EventArgs.Empty); 189 193 } … … 191 195 ParameterizeEvaluator(); 192 196 ParameterizeOperators(); 193 Parameterize Visualizer();197 ParameterizeAnalyzers(); 194 198 } 195 199 private void EvaluatorParameter_ValueChanged(object sender, EventArgs e) { 196 200 ParameterizeEvaluator(); 197 201 UpdateMoveEvaluators(); 202 ParameterizeAnalyzers(); 198 203 Maximization.Value = Evaluator.Maximization; 199 204 BoundsParameter.Value = Evaluator.Bounds; … … 272 277 strategyVectorCreator.StrategyParameterParameter.ActualNameChanged += new EventHandler(strategyVectorCreator_StrategyParameterParameter_ActualNameChanged); 273 278 } 279 private void ParameterizeAnalyzers() { 280 foreach (IBestSingleObjectiveTestFunctionSolutionAnalyzer analyzer in BestSingleObjectiveTestFunctionSolutionAnalyzers) { 281 analyzer.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 282 analyzer.ResultsParameter.ActualName = "Results"; 283 } 284 } 274 285 private void InitializeOperators() { 275 286 operators = new List<IOperator>(); 287 operators.Add(new BestSingleObjectiveTestFunctionSolutionAnalyzer()); 288 operators.Add(new PopulationBestSingleObjectiveTestFunctionSolutionAnalyzer()); 289 operators.Add(new MultiPopulationBestSingleObjectiveTestFunctionSolutionAnalyzer()); 290 ParameterizeAnalyzers(); 276 291 operators.AddRange(ApplicationManager.Manager.GetInstances<IRealVectorOperator>().Cast<IOperator>()); 277 292 operators.Add(strategyVectorCreator); … … 320 335 Evaluator.PointParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 321 336 } 322 private void ParameterizeVisualizer() {323 //if (Visualizer != null) {324 // Visualizer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;325 // Visualizer.PointParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;326 //}327 }328 337 private void ParameterizeOperators() { 329 338 foreach (IRealVectorCrossover op in Operators.OfType<IRealVectorCrossover>()) {
Note: See TracChangeset
for help on using the changeset viewer.