Changeset 3681 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Timestamp:

05/06/10 19:02:45 (15 years ago)

Author:

gkronber

Message:

Adapted analyzers to use ScopeTreeLookupParameter and wire the depth setting correctly for

• SymbolicExpressionTreeEncoding
• ArtificialAntProblem
• SymbolicRegression

#999

Location:

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3

Files:

• Analyzers/MinAvgMaxSymbolicExpressionTreeSizeAnalyzer.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Analyzers/PopulationMinAvgMaxTreeSizeAnalyzer.cs) (4 diffs)
• Analyzers/SymbolicExpressionTreeSizeAnalyzer.cs (deleted)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj (modified) (2 diffs)
• Interfaces/ISymbolicExpressionTreeAnalyzer.cs (modified) (1 diff)
• Interfaces/ISymbolicExpressionTreeMultiPopulationAnalyzer.cs (deleted)
• Interfaces/ISymbolicExpressionTreePopulationAnalyzer.cs (deleted)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Analyzers/MinAvgMaxSymbolicExpressionTreeSizeAnalyzer.cs

@@ -32 +32 @@
 using HeuristicLab.Analysis;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Interfaces;
+using System;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Analyzers {
   /// <summary>
-  /// An operator that tracks the min avgerage and max tree size in the population.
+  /// An operator that tracks the min avgerage and max tree size.
   /// </summary>
-  [Item("PopulationMinAvgMaxTreeSizeAnalyzer", "An operator that tracks the min avgerage and max tree size in the population.")]
+  [Item("MinAvgMaxSymbolicExpressionTreeSizeAnalyzer", "An operator that tracks the min avgerage and max tree size.")]
   [StorableClass]
-  public sealed class PopulationMinAvgMaxTreeSizeAnalyzer : AlgorithmOperator, ISymbolicExpressionTreePopulationAnalyzer {
+  public sealed class MinAvgMaxSymbolicExpressionTreeSizeAnalyzer : AlgorithmOperator, ISymbolicExpressionTreeAnalyzer {
     private const string SymbolicExpressionTreeParameterName = "SymbolicExpressionTree";
     private const string SymbolicExpressionTreeSizeParameterName = "SymbolicExpressionTreeSize";
@@ -45 +46 @@
     private const string ResultsParameterName = "Results";
 
-
     #region parameter properties
-    public ILookupParameter<ItemArray<SymbolicExpressionTree>> SymbolicExpressionTreeParameter {
-      get { return (ILookupParameter<ItemArray<SymbolicExpressionTree>>)Parameters[SymbolicExpressionTreeParameterName]; }
+    public ScopeTreeLookupParameter<SymbolicExpressionTree> SymbolicExpressionTreeParameter {
+      get { return (ScopeTreeLookupParameter<SymbolicExpressionTree>)Parameters[SymbolicExpressionTreeParameterName]; }
     }
-    public ILookupParameter<ItemArray<DoubleValue>> SymbolicExpressionTreeSizeParameter {
-      get { return (ILookupParameter<ItemArray<DoubleValue>>)Parameters[SymbolicExpressionTreeSizeParameterName]; }
+    public ScopeTreeLookupParameter<DoubleValue> SymbolicExpressionTreeSizeParameter {
+      get { return (ScopeTreeLookupParameter<DoubleValue>)Parameters[SymbolicExpressionTreeSizeParameterName]; }
     }
     public ValueLookupParameter<DataTable> SymbolicExpressionTreeSizesParameter {
@@ -59 +59 @@
       get { return (ValueLookupParameter<VariableCollection>)Parameters[ResultsParameterName]; }
     }
+    
+    [Storable]
+    private MinAverageMaxValueAnalyzer valueAnalyzer;
+
     #endregion
-    public PopulationMinAvgMaxTreeSizeAnalyzer()
+    public MinAvgMaxSymbolicExpressionTreeSizeAnalyzer()
       : base() {
       Parameters.Add(new ScopeTreeLookupParameter<SymbolicExpressionTree>(SymbolicExpressionTreeParameterName, "The symbolic expression tree whose size should be calculated."));
@@ -69 +73 @@
       UniformSubScopesProcessor subScopesProcessor = new UniformSubScopesProcessor();
       SymbolicExpressionTreeSizeCalculator sizeCalculator = new SymbolicExpressionTreeSizeCalculator();
-      MinAverageMaxValueAnalyzer valuesAnalyzer = new MinAverageMaxValueAnalyzer();
+      valueAnalyzer = new MinAverageMaxValueAnalyzer();
       sizeCalculator.SymbolicExpressionTreeParameter.ActualName = SymbolicExpressionTreeParameter.Name;
       sizeCalculator.SymbolicExpressionTreeSizeParameter.ActualName = SymbolicExpressionTreeSizeParameter.Name;
-      valuesAnalyzer.ValueParameter.ActualName = sizeCalculator.SymbolicExpressionTreeSizeParameter.Name;
-      valuesAnalyzer.ValuesParameter.ActualName = SymbolicExpressionTreeSizesParameter.Name;
-      valuesAnalyzer.ResultsParameter.ActualName = ResultsParameter.Name;
-      valuesAnalyzer.AverageValueParameter.ActualName = "Avg. Tree Size";
-      valuesAnalyzer.MaxValueParameter.ActualName = "Max Tree Size";
-      valuesAnalyzer.MinValueParameter.ActualName = "Min Tree Size";
+      valueAnalyzer.ValueParameter.ActualName = sizeCalculator.SymbolicExpressionTreeSizeParameter.Name;
+      valueAnalyzer.ValueParameter.Depth = SymbolicExpressionTreeSizeParameter.Depth;
+      valueAnalyzer.ValuesParameter.ActualName = SymbolicExpressionTreeSizesParameter.Name;
+      valueAnalyzer.ResultsParameter.ActualName = ResultsParameter.Name;
+      valueAnalyzer.AverageValueParameter.ActualName = "Avg. Tree Size";
+      valueAnalyzer.MaxValueParameter.ActualName = "Max Tree Size";
+      valueAnalyzer.MinValueParameter.ActualName = "Min Tree Size";
 
       OperatorGraph.InitialOperator = subScopesProcessor;
       subScopesProcessor.Operator = sizeCalculator;
-      subScopesProcessor.Successor = valuesAnalyzer;
-      valuesAnalyzer.Successor = null;
+      subScopesProcessor.Successor = valueAnalyzer;
+      valueAnalyzer.Successor = null;
+
+      Initialize();
+    }
+
+    [StorableConstructor]
+    private MinAvgMaxSymbolicExpressionTreeSizeAnalyzer(bool deserializing) : base() { }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void Initialize() {
+      SymbolicExpressionTreeParameter.DepthChanged += new EventHandler(SymbolicExpressionTreeParameter_DepthChanged);
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      MinAvgMaxSymbolicExpressionTreeSizeAnalyzer clone = (MinAvgMaxSymbolicExpressionTreeSizeAnalyzer)base.Clone(cloner);
+      clone.Initialize();
+      return clone;
+    }
+
+    private void SymbolicExpressionTreeParameter_DepthChanged(object sender, EventArgs e) {
+      valueAnalyzer.ValueParameter.Depth = SymbolicExpressionTreeParameter.Depth;
     }
   }

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj

@@ -83 +83 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Analyzers\PopulationMinAvgMaxTreeSizeAnalyzer.cs" />
-    <Compile Include="Analyzers\SymbolicExpressionTreeSizeAnalyzer.cs" />
+    <Compile Include="Analyzers\MinAvgMaxSymbolicExpressionTreeSizeAnalyzer.cs" />
     <Compile Include="Analyzers\SymbolicExpressionTreeSizeCalculator.cs" />
     <Compile Include="ArchitectureManipulators\ArgumentCreater.cs" />
@@ -103 +102 @@
     <Compile Include="Interfaces\ISymbolicExpressionTreeCreator.cs" />
     <Compile Include="Interfaces\ISymbolicExpressionTreeCrossover.cs" />
-    <Compile Include="Interfaces\ISymbolicExpressionTreeMultiPopulationAnalyzer.cs" />
-    <Compile Include="Interfaces\ISymbolicExpressionTreePopulationAnalyzer.cs" />
     <Compile Include="Manipulators\ChangeNodeTypeManipulation.cs" />
     <Compile Include="Interfaces\ISymbolicExpressionTreeManipulator.cs" />

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Interfaces/ISymbolicExpressionTreeAnalyzer.cs

@@ -35 +35 @@
   /// </summary>
   public interface ISymbolicExpressionTreeAnalyzer : IAnalyzer {
-    ILookupParameter<SymbolicExpressionTree> SymbolicExpressionTreeParameter { get; }
+    ScopeTreeLookupParameter<SymbolicExpressionTree> SymbolicExpressionTreeParameter { get; }
   }
 }