Changeset 239 for trunk

Timestamp:

05/13/08 15:10:57 (16 years ago)

Author:

gkronber

Message:

fixed #148

Location:

trunk/sources/HeuristicLab.Functions

Files:

• BakedFunctionTree.cs (modified) (1 diff)
• BakedTreeEvaluator.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Functions/BakedFunctionTree.cs

@@ -220 +220 @@
     }
 
+    private BakedTreeEvaluator evaluator;
     public double Evaluate(Dataset dataset, int sampleIndex) {
       FlattenVariables();
       FlattenTrees();
-      return BakedTreeEvaluator.Evaluate(dataset, sampleIndex, code, data);
+      if(evaluator == null) evaluator = new BakedTreeEvaluator(code, data);
+      return evaluator.Evaluate(dataset, sampleIndex);
     }
 

trunk/sources/HeuristicLab.Functions/BakedTreeEvaluator.cs

@@ -6 +6 @@
 
 namespace HeuristicLab.Functions {
-  static class BakedTreeEvaluator {
+  internal class BakedTreeEvaluator {
     private const int ADDITION = 10010;
     private const int AND = 10020;
@@ -35 +35 @@
     private static Dictionary<IFunction, int> reverseSymbolTable;
     private static Dictionary<Type, int> staticTypes;
+    private static int MAX_CODE_LENGTH = 4096;
+    private static int MAX_DATA_LENGTH = 4096;
+    private static int[] codeArr = new int[MAX_CODE_LENGTH];
+    private static double[] dataArr = new double[MAX_DATA_LENGTH];
 
     static BakedTreeEvaluator() {
@@ -65 +69 @@
     }
 
+    internal BakedTreeEvaluator(List<int> code, List<double> data) {
+      code.CopyTo(codeArr);
+      data.CopyTo(dataArr);
+    }
+
     internal static int MapFunction(IFunction function) {
       if(!reverseSymbolTable.ContainsKey(function)) {
@@ -84 +93 @@
 
 
-    private static int PC;
-    private static int DP;
-    private static int MAX_CODE_LENGTH = 4096;
-    private static int MAX_DATA_LENGTH = 4096;
-    private static int[] codeArr = new int[MAX_CODE_LENGTH];
-    private static double[] dataArr = new double[MAX_DATA_LENGTH];
-    private static Dataset dataset;
-    private static int sampleIndex;
-
-    internal static double Evaluate(Dataset _dataset, int _sampleIndex, List<int> code, List<double> data) {
+    private int PC;
+    private int DP;
+    private Dataset dataset;
+    private int sampleIndex;
+
+    internal double Evaluate(Dataset _dataset, int _sampleIndex) {
       PC = 0;
       DP = 0;
-      code.CopyTo(codeArr);
-      data.CopyTo(dataArr);
       sampleIndex = _sampleIndex;
       dataset = _dataset;
@@ -103 +106 @@
     }
 
-    private static double EvaluateBakedCode() {
+    private double EvaluateBakedCode() {
       int arity = codeArr[PC];
       int functionSymbol = codeArr[PC+1];