Changeset 3642 for trunk

Timestamp:

05/05/10 16:37:12 (15 years ago)

Author:

svonolfe

Message:

Added anaylzers for the onemax problem (#999)

Location:

trunk/sources/HeuristicLab.Problems.OneMax/3.3

Files:

• Analyzers (added)
• Analyzers/BestOneMaxSolutionAnalyzer.cs (added)
• Analyzers/MultiPopulationBestOneMaxSolutionAnalyzer.cs (added)
• Analyzers/PopulationBestOneMaxSolutionAnalyzer.cs (added)
• HeuristicLab.Problems.OneMax-3.3.csproj (modified) (1 diff)
• Interfaces/IBestOneMaxSolutionAnalyzer.cs (added)
• OneMaxSolution.cs (added)
• OnemaxProblem.cs (modified) (5 diffs)

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

@@ -86 +86 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Analyzers\BestOneMaxSolutionAnalyzer.cs" />
+    <Compile Include="Analyzers\MultiPopulationBestOneMaxSolutionAnalyzer.cs" />
+    <Compile Include="Analyzers\PopulationBestOneMaxSolutionAnalyzer.cs" />
+    <Compile Include="Interfaces\IBestOneMaxSolutionAnalyzer.cs" />
     <Compile Include="Interfaces\IOneMaxSolutionsVisualizer.cs" />
     <Compile Include="Interfaces\IOneMaxMoveEvaluator.cs" />
+    <Compile Include="OneMaxSolution.cs" />
     <Compile Include="MoveEvaluators\OneMaxMoveEvaluator.cs" />
     <Compile Include="MoveEvaluators\OneMaxOneBitflipMoveEvaluator.cs" />

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

@@ -32 +32 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Problems.OneMax.Analyzers;
 
 namespace HeuristicLab.Problems.OneMax {
@@ -97 +98 @@
       get { return BestKnownQualityParameter.Value; }
     }
-    private List<IBinaryVectorOperator> operators;
+    private List<IOperator> operators;
     public IEnumerable<IOperator> Operators {
       get { return operators.Cast<IOperator>(); }
+    }
+    private IEnumerable<IBestOneMaxSolutionAnalyzer> BestOneMaxSolutionAnalyzers {
+      get { return operators.OfType<IBestOneMaxSolutionAnalyzer>(); }
     }
     #endregion
@@ -150 +154 @@
 
     private void SolutionCreatorParameter_ValueChanged(object sender, EventArgs e) {
-      SolutionCreator.BinaryVectorParameter.ActualNameChanged += new EventHandler(SolutionCreator_PermutationParameter_ActualNameChanged);
+      SolutionCreator.BinaryVectorParameter.ActualNameChanged += new EventHandler(SolutionCreator_BinaryVectorParameter_ActualNameChanged);
       ParameterizeSolutionCreator();
       ParameterizeEvaluator();
+      ParameterizeAnalyzers();
       ParameterizeOperators();
       OnSolutionCreatorChanged();
     }
-    private void SolutionCreator_PermutationParameter_ActualNameChanged(object sender, EventArgs e) {
-      ParameterizeEvaluator();
+    private void SolutionCreator_BinaryVectorParameter_ActualNameChanged(object sender, EventArgs e) {
+      ParameterizeEvaluator();
+      ParameterizeAnalyzers();
       ParameterizeOperators();
     }
     private void EvaluatorParameter_ValueChanged(object sender, EventArgs e) {
       ParameterizeEvaluator();
+      ParameterizeAnalyzers();
       OnEvaluatorChanged();
     }
@@ -188 +195 @@
       InitializeOperators();
       SolutionCreatorParameter.ValueChanged += new EventHandler(SolutionCreatorParameter_ValueChanged);
-      SolutionCreator.BinaryVectorParameter.ActualNameChanged += new EventHandler(SolutionCreator_PermutationParameter_ActualNameChanged);
+      SolutionCreator.BinaryVectorParameter.ActualNameChanged += new EventHandler(SolutionCreator_BinaryVectorParameter_ActualNameChanged);
       EvaluatorParameter.ValueChanged += new EventHandler(EvaluatorParameter_ValueChanged);
       LengthParameter.ValueChanged += new EventHandler(LengthParameter_ValueChanged);
@@ -202 +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 InitializeOperators() {
-      operators = new List<IBinaryVectorOperator>();
+      operators = new List<IOperator>();
+      operators.Add(new BestOneMaxSolutionAnalyzer());
+      operators.Add(new PopulationBestOneMaxSolutionAnalyzer());
+      operators.Add(new MultiPopulationBestOneMaxSolutionAnalyzer());
+      ParameterizeAnalyzers();
       foreach(IBinaryVectorOperator op in ApplicationManager.Manager.GetInstances<IBinaryVectorOperator>()) {
         if (!(op is ISingleObjectiveMoveEvaluator) || (op is IOneMaxMoveEvaluator)) {