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

trunk/sources/HeuristicLab.Functions/ProgrammableFunction.cs

@@ -36 +36 @@
 
 namespace HeuristicLab.Functions {
-  public class ProgrammableFunction : ProgrammableOperator, IFunction {
+  public sealed class ProgrammableFunction : ProgrammableOperator, IFunction {
     private MethodInfo applyMethod;
     public ProgrammableFunction()
@@ -120 +120 @@
 
     public IFunctionTree GetTreeNode() {
-      return new ProgrammableFunctionTree(this);
+      return new BakedFunctionTree(this);
     }
 
@@ -187 +187 @@
   }
 
-  class ProgrammableFunctionTree : FunctionTree {
-    private ProgrammableFunction progFun;
-    public ProgrammableFunctionTree() : base() { }
-    public ProgrammableFunctionTree(ProgrammableFunction progFun) : base(progFun) {
-      this.progFun = progFun;
-    }
-    public override double Evaluate(Dataset dataset, int sampleIndex) {
-      // evaluate sub-trees
-      double[] evaluationResults = new double[SubTrees.Count];
-      for(int subTree = 0; subTree < SubTrees.Count; subTree++) {
-        evaluationResults[subTree] = SubTrees[subTree].Evaluate(dataset, sampleIndex);
-      }
-
-      // collect parameters
-      object[] parameters = new object[LocalVariables.Count + 3];
-      parameters[0] = dataset;
-      parameters[1] = sampleIndex;
-      int i = 2;
-      // all local variables are available in the custom function
-      foreach(IVariable variable in LocalVariables) {
-        parameters[i] = variable;
-        i++;
-      }
-      parameters[i] = evaluationResults;
-      return progFun.Call(parameters);
-    }
-  }
+  //class ProgrammableFunctionTree : FunctionTree {
+  //  private ProgrammableFunction progFun;
+  //  public ProgrammableFunctionTree() : base() { }
+  //  public ProgrammableFunctionTree(ProgrammableFunction progFun) : base(progFun) {
+  //    this.progFun = progFun;
+  //  }
+  //  public override double Evaluate(Dataset dataset, int sampleIndex) {
+  //    // evaluate sub-trees
+  //    double[] evaluationResults = new double[SubTrees.Count];
+  //    for(int subTree = 0; subTree < SubTrees.Count; subTree++) {
+  //      evaluationResults[subTree] = SubTrees[subTree].Evaluate(dataset, sampleIndex);
+  //    }
+
+  //    // collect parameters
+  //    object[] parameters = new object[LocalVariables.Count + 3];
+  //    parameters[0] = dataset;
+  //    parameters[1] = sampleIndex;
+  //    int i = 2;
+  //    // all local variables are available in the custom function
+  //    foreach(IVariable variable in LocalVariables) {
+  //      parameters[i] = variable;
+  //      i++;
+  //    }
+  //    parameters[i] = evaluationResults;
+  //    return progFun.Call(parameters);
+  //  }
+  //}
 }