Changeset 201

Timestamp:

04/28/08 09:18:13 (16 years ago)

Author:

gkronber

Message:

created a branch for experiments with the functions plugin regarding performance and efficiency

Location:

branches/ExperimentalFunctionsBaking

Files:

• . (copied) (copied from trunk/sources/HeuristicLab.Functions)
• Constant.cs (modified) (1 diff)
• FunctionTree.cs (modified) (1 diff)
• HeuristicLab.Functions.csproj (modified) (1 diff)
• Variable.cs (modified) (1 diff)

branches/ExperimentalFunctionsBaking/Constant.cs

@@ -52 +52 @@
     }
 
-    public override IFunctionTree GetTreeNode() {
-      return new ConstantFunctionTree(this);
-    }
+    //public override IFunctionTree GetTreeNode() {
+    //  return new ConstantFunctionTree(this);
+    //}
 
     // can't apply a constant

branches/ExperimentalFunctionsBaking/FunctionTree.cs

@@ -94 +94 @@
 
     double[] evaluationResults;
+    BakedFunctionTree bakedTree = null;
     public virtual double Evaluate(Dataset dataset, int sampleIndex) {
-      // lazy creation of evaluationResults to unburden the GC
-      if(evaluationResults == null) {
-        evaluationResults = new double[SubTrees.Count];
-      }
-      for(int i = 0; i < evaluationResults.Length; i++) {
-        evaluationResults[i] = SubTrees[i].Evaluate(dataset, sampleIndex);
-      }
-      return function.Apply(dataset, sampleIndex, evaluationResults);
+      //// lazy creation of evaluationResults to unburden the GC
+      //if(evaluationResults == null) {
+      //  evaluationResults = new double[SubTrees.Count];
+      //}
+      //for(int i = 0; i < evaluationResults.Length; i++) {
+      //  evaluationResults[i] = SubTrees[i].Evaluate(dataset, sampleIndex);
+      //}
+      //return function.Apply(dataset, sampleIndex, evaluationResults);
+      if(bakedTree==null) 
+        bakedTree = new BakedFunctionTree(this);
+      return bakedTree.Evaluate(dataset, sampleIndex);
     }
     #endregion

branches/ExperimentalFunctionsBaking/HeuristicLab.Functions.csproj

@@ -52 +52 @@
     <Compile Include="Average.cs" />
     <Compile Include="Constant.cs" />
+    <Compile Include="BakedFunctionTree.cs" />
     <Compile Include="GreaterThan.cs" />
     <Compile Include="FunctionTree.cs" />

branches/ExperimentalFunctionsBaking/Variable.cs

@@ -68 +68 @@
     }
 
-    public override IFunctionTree GetTreeNode() {
-      return new VariableFunctionTree(this);
-    }
+    //public override IFunctionTree GetTreeNode() {
+    //  return new VariableFunctionTree(this);
+    //}
 
     // can't apply a variable