Changeset 229 for trunk/sources/HeuristicLab.Functions/Constant.cs

Timestamp:

05/11/08 08:55:19 (16 years ago)

Author:

gkronber

Message:

merged changes (r201 r203 r206 r208 r220 r223 r224 r225 r226 r227) from branch ExperimentalFunctionsBaking into the trunk. (ticket #139)

File:

• trunk/sources/HeuristicLab.Functions/Constant.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Functions/Constant.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Functions {
-  public class Constant : FunctionBase {
+  public sealed class Constant : FunctionBase {
     public const string VALUE = "Value";
 
@@ -51 +51 @@
       AddConstraint(new NumberOfSubOperatorsConstraint(0, 0));
     }
-
-    public override IFunctionTree GetTreeNode() {
-      return new ConstantFunctionTree(this);
-    }
-
-    // can't apply a constant
-    public override double Apply(Dataset dataset, int sampleIndex, double[] args) {
-      throw new NotSupportedException();
-    }
-
     public override void Accept(IFunctionVisitor visitor) {
       visitor.Visit(this);
     }
   }
-
-  class ConstantFunctionTree : FunctionTree {
-    private ConstrainedDoubleData value;
-    public ConstantFunctionTree() : base() { }
-    public ConstantFunctionTree(Constant constant) : base(constant) {
-      UpdateCachedValues();
-    }
-
-    private void UpdateCachedValues() {
-      value = (ConstrainedDoubleData)GetLocalVariable(Constant.VALUE).Value;
-    }
-
-    public override double Evaluate(Dataset dataset, int sampleIndex) {
-      return value.Data;
-    }
-
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      ConstantFunctionTree clone = new ConstantFunctionTree();
-      clonedObjects.Add(clone.Guid, clone);
-      FillClone(clone, clonedObjects);
-      clone.UpdateCachedValues();
-      return clone;
-    }
-
-    public override void Populate(System.Xml.XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
-      UpdateCachedValues();
-    }
-  }
 }