Changeset 5499 for branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Analyzers/SymbolicExpressionTreeLengthCalculator.cs

Timestamp:

02/16/11 19:01:00 (14 years ago)

Author:

gkronber

Message:

#1418 changes in symbolic expression tree encoding.

Location:

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4

Files:

• . (modified) (1 prop)
• Analyzers/SymbolicExpressionTreeLengthCalculator.cs (moved) (moved from branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Analyzers/SymbolicExpressionTreeSizeCalculator.cs) (3 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4

@@ -2 +2 @@
 obj
 HeuristicLabEncodingsSymbolicExpressionTreeEncodingPlugin.cs
+*.user

@@ -2 +2 @@
 obj
 HeuristicLabEncodingsSymbolicExpressionTreeEncodingPlugin.cs
+*.user

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Analyzers/SymbolicExpressionTreeLengthCalculator.cs

@@ -27 +27 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Analyzers {
+namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
   /// <summary>
-  /// An operator that outputs the tree size of a symbolic expression tree.
+  /// An operator that outputs the length of a symbolic expression tree.
   /// </summary>
-  [Item("SymbolicExpressionTreeSizeCalculator", "An operator that outputs the tree size of a symbolic expression tree.")]
+  [Item("SymbolicExpressionTreeLengthCalculator", "An operator that outputs the length of a symbolic expression tree.")]
   [StorableClass]
-  public sealed class SymbolicExpressionTreeSizeCalculator : SingleSuccessorOperator {
+  public sealed class SymbolicExpressionTreeLengthCalculator : SingleSuccessorOperator {
     private const string SymbolicExpressionTreeParameterName = "SymbolicExpressionTree";
-    private const string SymbolicExpressionTreeSizeParameterName = "SymbolicExpressionTreeSize";
+    private const string SymbolicExpressionTreeLengthParameterName = "SymbolicExpressionTreeLength";
 
     #region parameter properties
@@ -41 +41 @@
       get { return (ILookupParameter<SymbolicExpressionTree>)Parameters[SymbolicExpressionTreeParameterName]; }
     }
-    public ILookupParameter<DoubleValue> SymbolicExpressionTreeSizeParameter {
-      get { return (ILookupParameter<DoubleValue>)Parameters[SymbolicExpressionTreeSizeParameterName]; }
+    public ILookupParameter<DoubleValue> SymbolicExpressionTreeLengthParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters[SymbolicExpressionTreeLengthParameterName]; }
     }
     #endregion
@@ -50 +50 @@
       get { return SymbolicExpressionTreeParameter.ActualValue; }
     }
-    public DoubleValue SymbolicExpressionTreeSize {
-      get { return SymbolicExpressionTreeSizeParameter.ActualValue; }
-      set { SymbolicExpressionTreeSizeParameter.ActualValue = value; }
+    public DoubleValue SymbolicExpressionTreeLength {
+      get { return SymbolicExpressionTreeLengthParameter.ActualValue; }
+      set { SymbolicExpressionTreeLengthParameter.ActualValue = value; }
     }
     #endregion
 
     [StorableConstructor]
-    private SymbolicExpressionTreeSizeCalculator(bool deserializing) : base(deserializing) { }
-    private SymbolicExpressionTreeSizeCalculator(SymbolicExpressionTreeSizeCalculator original, Cloner cloner) : base(original, cloner) { }
-    public SymbolicExpressionTreeSizeCalculator()
+    private SymbolicExpressionTreeLengthCalculator(bool deserializing) : base(deserializing) { }
+    private SymbolicExpressionTreeLengthCalculator(SymbolicExpressionTreeLengthCalculator original, Cloner cloner) : base(original, cloner) { }
+    public SymbolicExpressionTreeLengthCalculator()
       : base() {
-      Parameters.Add(new LookupParameter<SymbolicExpressionTree>(SymbolicExpressionTreeParameterName, "The symbolic expression tree whose size should be calculated."));
-      Parameters.Add(new LookupParameter<DoubleValue>(SymbolicExpressionTreeSizeParameterName, "The tree size of the symbolic expression tree."));
+      Parameters.Add(new LookupParameter<SymbolicExpressionTree>(SymbolicExpressionTreeParameterName, "The symbolic expression tree whose length should be calculated."));
+      Parameters.Add(new LookupParameter<DoubleValue>(SymbolicExpressionTreeLengthParameterName, "The length of the symbolic expression tree."));
     }
 
     public override IOperation Apply() {
-      SymbolicExpressionTree tree = SymbolicExpressionTree;
-      SymbolicExpressionTreeSize = new DoubleValue(tree.Size);
+      SymbolicExpressionTreeLength = new DoubleValue(SymbolicExpressionTree.Size);
       return base.Apply();
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new SymbolicExpressionTreeSizeCalculator(this, cloner);
+      return new SymbolicExpressionTreeLengthCalculator(this, cloner);
     }
   }

@@ -2 +2 @@
 obj
 HeuristicLabEncodingsSymbolicExpressionTreeEncodingPlugin.cs
+*.user