Changeset 3647 for trunk/sources/HeuristicLab.Problems.TestFunctions

Timestamp:

05/05/10 18:13:06 (15 years ago)

Author:

svonolfe

Message:

Added anaylzers for the SingleObjectiveTestFunction problem (#999)

Location:

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3

Files:

• Analyzers (added)
• Analyzers/BestSingleObjectiveTestFunctionSolutionAnalyzer.cs (added)
• Analyzers/MultiPopulationBestSingleObjectiveTestFunctionSolutionAnalyzer.cs (added)
• Analyzers/PopulationBestSingleObjectiveTestFunctionSolutionAnalyzer.cs (added)
• HeuristicLab.Problems.TestFunctions-3.3.csproj (modified) (3 diffs)
• Interfaces/IBestSingleObjectiveTestFunctionSolutionAnalyzer.cs (added)
• SingleObjectiveTestFunctionProblem.cs (modified) (7 diffs)
• SingleObjectiveTestFunctionSolution.cs (added)

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj

@@ -84 +84 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Analyzers\BestSingleObjectiveTestFunctionSolutionAnalyzer.cs" />
+    <Compile Include="Analyzers\MultiPopulationBestSingleObjectiveTestFunctionSolutionAnalyzer.cs" />
+    <Compile Include="Analyzers\PopulationBestSingleObjectiveTestFunctionSolutionAnalyzer.cs" />
     <Compile Include="Evaluators\AckleyEvaluator.cs" />
     <Compile Include="Evaluators\BealeEvaluator.cs" />
@@ -98 +101 @@
     <Compile Include="Evaluators\ZakharovEvaluator.cs" />
     <Compile Include="HeuristicLabProblemsTestFunctionsPlugin.cs" />
+    <Compile Include="Interfaces\IBestSingleObjectiveTestFunctionSolutionAnalyzer.cs" />
     <Compile Include="Interfaces\IRastriginMoveEvaluator.cs" />
     <Compile Include="Interfaces\ISingleObjectiveTestFunctionAdditiveMoveEvaluator.cs" />
@@ -118 +122 @@
     <Compile Include="MoveEvaluators\AdditiveMoveEvaluator.cs" />
     <Compile Include="MoveEvaluators\RealVectorAdditiveMoveWrapper.cs" />
+    <Compile Include="SingleObjectiveTestFunctionSolution.cs" />
     <Compile Include="SingleObjectiveTestFunctionProblem.cs" />
     <None Include="HeuristicLab.snk" />

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs

@@ -33 +33 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Problems.TestFunctions.Analyzers;
 
 namespace HeuristicLab.Problems.TestFunctions {
@@ -121 +122 @@
       get { return operators; }
     }
+    private IEnumerable<IBestSingleObjectiveTestFunctionSolutionAnalyzer> BestSingleObjectiveTestFunctionSolutionAnalyzers {
+      get { return operators.OfType<IBestSingleObjectiveTestFunctionSolutionAnalyzer>(); }
+    }
     #endregion
 
@@ -147 +151 @@
       ParameterizeSolutionCreator();
       ParameterizeEvaluator();
-      ParameterizeVisualizer();
 
       Initialize();
@@ -186 +189 @@
     private void SolutionCreatorParameter_ValueChanged(object sender, EventArgs e) {
       ParameterizeSolutionCreator();
+      ParameterizeAnalyzers();
       SolutionCreator_RealVectorParameter_ActualNameChanged(null, EventArgs.Empty);
     }
@@ -191 +195 @@
       ParameterizeEvaluator();
       ParameterizeOperators();
-      ParameterizeVisualizer();
+      ParameterizeAnalyzers();
     }
     private void EvaluatorParameter_ValueChanged(object sender, EventArgs e) {
       ParameterizeEvaluator();
       UpdateMoveEvaluators();
+      ParameterizeAnalyzers();
       Maximization.Value = Evaluator.Maximization;
       BoundsParameter.Value = Evaluator.Bounds;
@@ -272 +277 @@
       strategyVectorCreator.StrategyParameterParameter.ActualNameChanged += new EventHandler(strategyVectorCreator_StrategyParameterParameter_ActualNameChanged);
     }
+    private void ParameterizeAnalyzers() {
+      foreach (IBestSingleObjectiveTestFunctionSolutionAnalyzer analyzer in BestSingleObjectiveTestFunctionSolutionAnalyzers) {
+        analyzer.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
+        analyzer.ResultsParameter.ActualName = "Results";
+      }
+    }
     private void InitializeOperators() {
       operators = new List<IOperator>();
+      operators.Add(new BestSingleObjectiveTestFunctionSolutionAnalyzer());
+      operators.Add(new PopulationBestSingleObjectiveTestFunctionSolutionAnalyzer());
+      operators.Add(new MultiPopulationBestSingleObjectiveTestFunctionSolutionAnalyzer());
+      ParameterizeAnalyzers();
       operators.AddRange(ApplicationManager.Manager.GetInstances<IRealVectorOperator>().Cast<IOperator>());
       operators.Add(strategyVectorCreator);
@@ -320 +335 @@
       Evaluator.PointParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
     }
-    private void ParameterizeVisualizer() {
-      //if (Visualizer != null) {
-      //  Visualizer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
-      //  Visualizer.PointParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
-      //}
-    }
     private void ParameterizeOperators() {
       foreach (IRealVectorCrossover op in Operators.OfType<IRealVectorCrossover>()) {