Changeset 5987 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

04/08/11 16:02:47 (14 years ago)

Author:

gkronber

Message:

#1418 improved memory usage of symbolic data analysis expression tree interpreter.

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeInterpreter.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeInterpreter.cs

@@ -36 +36 @@
     #region private classes
     private class InterpreterState {
-      private const int ARGUMENT_STACK_SIZE = 1024;
       private double[] argumentStack;
       private int argumentStackPointer;
@@ -45 +44 @@
         set { pc = value; }
       }
-      internal InterpreterState(Instruction[] code) {
+      internal InterpreterState(Instruction[] code, int argumentStackSize) {
         this.code = code;
         this.pc = 0;
-        this.argumentStack = new double[ARGUMENT_STACK_SIZE];
+        if (argumentStackSize > 0) {
+          this.argumentStack = new double[argumentStackSize];
+        }
         this.argumentStackPointer = 0;
       }
@@ -202 +203 @@
       var compiler = new SymbolicExpressionTreeCompiler();
       Instruction[] code = compiler.Compile(tree, MapSymbolToOpCode);
-
+      int necessaryArgStackSize = 0;
       for (int i = 0; i < code.Length; i++) {
         Instruction instr = code[i];
@@ -216 +217 @@
           var variableConditionTreeNode = instr.dynamicNode as VariableConditionTreeNode;
           instr.iArg0 = (ushort)dataset.GetVariableIndex(variableConditionTreeNode.VariableName);
+        } else if (instr.opCode == OpCodes.Call) {
+          necessaryArgStackSize += instr.nArguments + 1;
         }
       }
-      var state = new InterpreterState(code);
+      var state = new InterpreterState(code, necessaryArgStackSize);
 
       foreach (var rowEnum in rows) {
@@ -370 +373 @@
             double f_3 = Evaluate(dataset, ref row, state); row--;
             state.ProgramCounter = savedPc;
-            double f_4 = Evaluate(dataset, ref row, state); 
+            double f_4 = Evaluate(dataset, ref row, state);
             row += 4;