Changeset 3618 for trunk/sources/HeuristicLab.Analysis

Timestamp:

05/05/10 02:02:51 (14 years ago)

Author:

swagner

Message:

Worked on refactoring of algorithm analysis and tracing (#999)

• added interfaces to specify on which scope level an analyzer can be applied
• adapted MultiAnalyzer

Location:

trunk/sources/HeuristicLab.Analysis/3.3

Files:

• HeuristicLab.Analysis-3.3.csproj (modified) (1 diff)
• MultiAnalyzer.cs (modified) (2 diffs)
• PopulationBestAverageWorstQualityAnalyzer.cs (moved) (moved from trunk/sources/HeuristicLab.Analysis/3.3/BestAverageWorstQualityAnalyzer.cs) (2 diffs)

trunk/sources/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

@@ -85 +85 @@
   <ItemGroup>
     <None Include="HeuristicLabAnalysisPlugin.cs.frame" />
-    <Compile Include="BestAverageWorstQualityAnalyzer.cs" />
     <Compile Include="BestAverageWorstQualityCalculator.cs" />
     <Compile Include="BestQualityMemorizer.cs" />
     <Compile Include="MultiAnalyzer.cs" />
+    <Compile Include="PopulationBestAverageWorstQualityAnalyzer.cs" />
     <Compile Include="QualityDifferenceCalculator.cs" />
     <Compile Include="DataRow.cs" />

trunk/sources/HeuristicLab.Analysis/3.3/MultiAnalyzer.cs

@@ -32 +32 @@
   /// An analyzer which applies arbitrary many other analyzers.
   /// </summary>
-  [Item("MultiAnalyzer", "An analyzer which applies arbitrary many other analyzers.")]
+  [Item("MultiAnalyzer<T>", "An analyzer which applies arbitrary many other analyzers.")]
   [StorableClass]
-  public class MultiAnalyzer : CheckedMultiOperator<IAnalyzer>, IAnalyzer {
+  public class MultiAnalyzer<T> : CheckedMultiOperator<T>, IAnalyzer where T : class, IAnalyzer {
     public override bool CanChangeName {
       get { return false; }
@@ -69 +69 @@
         counter.Value = 0;
         OperationCollection next = new OperationCollection();
-        foreach (IndexedItem<IAnalyzer> item in Operators.CheckedItems)
+        foreach (IndexedItem<T> item in Operators.CheckedItems)
           next.Add(ExecutionContext.CreateOperation(item.Value));
         next.Add(base.Apply());

trunk/sources/HeuristicLab.Analysis/3.3/PopulationBestAverageWorstQualityAnalyzer.cs

@@ -32 +32 @@
   /// An operator which analyzes the best, average and worst solution quality in the current population.
   /// </summary>
-  [Item("BestAverageWorstQualityAnalyzer", "An operator which analyzes the best, average and worst solution quality in the current population.")]
+  [Item("PopulationBestAverageWorstQualityAnalyzer", "An operator which analyzes the best, average and worst solution quality in the current population.")]
   [StorableClass]
-  public sealed class BestAverageWorstQualityAnalyzer : AlgorithmOperator, IAnalyzer {
+  public sealed class PopulationBestAverageWorstQualityAnalyzer : AlgorithmOperator, IPopulationAnalyzer {
     #region Parameter properties
     public ValueLookupParameter<BoolValue> MaximizationParameter {
@@ -69 +69 @@
 
     [StorableConstructor]
-    private BestAverageWorstQualityAnalyzer(bool deserializing) : base() { }
-    public BestAverageWorstQualityAnalyzer()
+    private PopulationBestAverageWorstQualityAnalyzer(bool deserializing) : base() { }
+    public PopulationBestAverageWorstQualityAnalyzer()
       : base() {
       Initialize();