Changeset 260 for trunk/sources/HeuristicLab.Functions/BakedFunctionTree.cs

Timestamp:

05/14/08 20:14:07 (17 years ago)

Author:

gkronber

Message:

fixed #146 (serialization of function-trees in linear form)

File:

• trunk/sources/HeuristicLab.Functions/BakedFunctionTree.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.Functions/BakedFunctionTree.cs

@@ -34 +34 @@
     private List<int> code;
     private List<double> data;
-    private static BakedTreeEvaluator evaluator = new BakedTreeEvaluator();
+    private static EvaluatorSymbolTable symbolTable = EvaluatorSymbolTable.SymbolTable;
     public BakedFunctionTree() {
       code = new List<int>();
@@ -43 +43 @@
       : this() {
       code.Add(0);
-      code.Add(evaluator.MapFunction(function));
+      code.Add(symbolTable.MapFunction(function));
       code.Add(0);
       treesExpanded = true;
@@ -59 +59 @@
       : this() {
       code.Add(0);
-      code.Add(evaluator.MapFunction(tree.Function));
+      code.Add(symbolTable.MapFunction(tree.Function));
       code.Add(tree.LocalVariables.Count);
       foreach(IVariable variable in tree.LocalVariables) {
@@ -159 +159 @@
         if(!variablesExpanded) {
           variables = new List<IVariable>();
-          IFunction function = evaluator.MapSymbol(code[1]);
+          IFunction function = symbolTable.MapSymbol(code[1]);
           int localVariableIndex = 0;
           foreach(IVariableInfo variableInfo in function.VariableInfos) {
@@ -187 +187 @@
 
     public IFunction Function {
-      get { return evaluator.MapSymbol(code[1]); }
+      get { return symbolTable.MapSymbol(code[1]); }
     }
 
@@ -221 +221 @@
     }
 
+    private BakedTreeEvaluator evaluator = null;
     public double Evaluate(Dataset dataset, int sampleIndex) {
       FlattenVariables();
       FlattenTrees();
-      evaluator.SetCode(code, data);
+      if(evaluator == null) evaluator = new BakedTreeEvaluator(code, data);
       return evaluator.Evaluate(dataset, sampleIndex);
     }
@@ -250 +251 @@
       XmlNode evaluatorNode = node.SelectSingleNode("Evaluator");
       if(evaluatorNode != null) {
-        BakedTreeEvaluator evaluator = (BakedTreeEvaluator)PersistenceManager.Restore(evaluatorNode, restoredObjects);
-        BakedFunctionTree.evaluator = evaluator;
+        this.evaluator = (BakedTreeEvaluator)PersistenceManager.Restore(evaluatorNode, restoredObjects);
       }
       code = GetList<int>(node.Attributes["Code"].Value, s => int.Parse(s, CultureInfo.InvariantCulture));
       data = GetList<double>(node.Attributes["Data"].Value, s => double.Parse(s, CultureInfo.InvariantCulture));
+      treesExpanded = false;
+      variablesExpanded = false;
     }