Changeset 229 for trunk/sources/HeuristicLab.Functions/Variable.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/Variable.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Functions/Variable.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Functions {
-  public class Variable : FunctionBase {
+  public sealed class Variable : FunctionBase {
 
     public const string WEIGHT = "Weight";
@@ -37 +37 @@
 
     public override string Description {
-      get { return @"Variable reads a value from a dataset, multiplies that value with a given factor and returns the result.
+      get {
+        return @"Variable reads a value from a dataset, multiplies that value with a given factor and returns the result.
 The variable 'SampleOffset' can be used to read a value from previous or following rows.
-The index of the row that is actually read is SampleIndex+SampleOffset)."; }
+The index of the row that is actually read is SampleIndex+SampleOffset).";
+      }
     }
 
@@ -68 +70 @@
     }
 
-    public override IFunctionTree GetTreeNode() {
-      return new VariableFunctionTree(this);
-    }
-
-    // can't apply a variable
-    public override double Apply(Dataset dataset, int sampleIndex, double[] args) {
-      throw new NotSupportedException();
-    }
-
     public override void Accept(IFunctionVisitor visitor) {
       visitor.Visit(this);
     }
   }
-  class VariableFunctionTree : FunctionTree {
-    private ConstrainedDoubleData weight;
-    private ConstrainedIntData index;
-    private ConstrainedIntData offset;
-
-    public VariableFunctionTree() : base() { }
-    public VariableFunctionTree(Variable variable) : base(variable) {
-      UpdateCachedValues();
-    }
-
-    protected void UpdateCachedValues() {
-      weight = (ConstrainedDoubleData)GetLocalVariable(Variable.WEIGHT).Value;
-      index = (ConstrainedIntData)GetLocalVariable(Variable.INDEX).Value;
-      offset = (ConstrainedIntData)GetLocalVariable(Variable.OFFSET).Value;
-    }
-
-    public override double Evaluate(Dataset dataset, int sampleIndex) {
-      if(sampleIndex + offset.Data < 0 || sampleIndex + offset.Data >= dataset.Rows) return double.NaN;
-      return weight.Data * dataset.GetValue(sampleIndex + offset.Data, index.Data);
-    }
-
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      VariableFunctionTree clone = new VariableFunctionTree();
-      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();
-    }
-  }
 }