Changeset 220 for branches/ExperimentalFunctionsBaking/IfThenElse.cs

Timestamp:

05/07/08 00:02:43 (16 years ago)

Author:

gkronber

Message:

worked on #139:

• fixed display of trees in the gui
• split list representation of tree into two lists code and data
• implemented static evaluation for all predefined functions (except ProgrammableFunction)

File:

• branches/ExperimentalFunctionsBaking/IfThenElse.cs (modified) (2 diffs)

branches/ExperimentalFunctionsBaking/IfThenElse.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Functions {
-  public class IfThenElse : FunctionBase {
+  public sealed class IfThenElse : FunctionBase {
     public override string Description {
       get {
@@ -41 +41 @@
     }
 
-    public override IFunctionTree GetTreeNode() {
-      return new IfThenElseFunctionTree(this);
-    }
-
-    // special form
-    public override double Apply(Dataset dataset, int sampleIndex, double[] args) {
-      throw new NotImplementedException();
-    }
-
     public override void Accept(IFunctionVisitor visitor) {
       visitor.Visit(this);
     }
   }
-
-  class IfThenElseFunctionTree : FunctionTree {
-    public IfThenElseFunctionTree() : base() { }
-    public IfThenElseFunctionTree(IfThenElse ifte) : base(ifte) { }
-
-    public override double Evaluate(Dataset dataset, int sampleIndex) {
-      double condition = Math.Round(SubTrees[0].Evaluate(dataset, sampleIndex));
-      if(condition < .5) return SubTrees[1].Evaluate(dataset, sampleIndex);
-      else if(condition >= .5) return SubTrees[2].Evaluate(dataset, sampleIndex);
-      else return double.NaN;
-    }
-
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      IfThenElseFunctionTree clone = new IfThenElseFunctionTree();
-      clonedObjects.Add(clone.Guid, clone);
-      FillClone(clone, clonedObjects);
-      return clone;
-    }
-  }
 }