Changeset 3667 for trunk/sources/HeuristicLab.Problems.OneMax/3.3/OnemaxProblem.cs

Timestamp:

05/06/10 12:49:05 (14 years ago)

Author:

svonolfe

Message:

• Updated OneMax analyzer
• Updated Knapsack analyzer
• Fixed bug in OneMax and TF analyzer views

(#999)

File:

• trunk/sources/HeuristicLab.Problems.OneMax/3.3/OnemaxProblem.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Problems.OneMax/3.3/OnemaxProblem.cs

@@ -102 +102 @@
       get { return operators.Cast<IOperator>(); }
     }
-    private IEnumerable<IBestOneMaxSolutionAnalyzer> BestOneMaxSolutionAnalyzers {
-      get { return operators.OfType<IBestOneMaxSolutionAnalyzer>(); }
+    private BestOneMaxSolutionAnalyzer BestOneMaxSolutionAnalyzer {
+      get { return operators.OfType<BestOneMaxSolutionAnalyzer>().FirstOrDefault(); }
     }
     #endregion
@@ -157 +157 @@
       ParameterizeSolutionCreator();
       ParameterizeEvaluator();
-      ParameterizeAnalyzers();
+      ParameterizeAnalyzer();
       ParameterizeOperators();
       OnSolutionCreatorChanged();
@@ -163 +163 @@
     private void SolutionCreator_BinaryVectorParameter_ActualNameChanged(object sender, EventArgs e) {
       ParameterizeEvaluator();
-      ParameterizeAnalyzers();
+      ParameterizeAnalyzer();
       ParameterizeOperators();
     }
     private void EvaluatorParameter_ValueChanged(object sender, EventArgs e) {
       ParameterizeEvaluator();
-      ParameterizeAnalyzers();
+      ParameterizeAnalyzer();
       OnEvaluatorChanged();
     }
@@ -209 +209 @@
         ((OneMaxEvaluator)Evaluator).BinaryVectorParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName;
     }
-    private void ParameterizeAnalyzers() {
-      foreach (IBestOneMaxSolutionAnalyzer analyzer in BestOneMaxSolutionAnalyzers) {
-        analyzer.BinaryVectorParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName;
-        analyzer.ResultsParameter.ActualName = "Results";
-      }
+    private void ParameterizeAnalyzer() {
+      BestOneMaxSolutionAnalyzer.BinaryVectorParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName;
+      BestOneMaxSolutionAnalyzer.ResultsParameter.ActualName = "Results";
     }
     private void InitializeOperators() {
       operators = new List<IOperator>();
       operators.Add(new BestOneMaxSolutionAnalyzer());
-      operators.Add(new PopulationBestOneMaxSolutionAnalyzer());
-      operators.Add(new MultiPopulationBestOneMaxSolutionAnalyzer());
-      ParameterizeAnalyzers();
+      ParameterizeAnalyzer();
       foreach(IBinaryVectorOperator op in ApplicationManager.Manager.GetInstances<IBinaryVectorOperator>()) {
         if (!(op is ISingleObjectiveMoveEvaluator) || (op is IOneMaxMoveEvaluator)) {