Changeset 9739 for branches/HeuristicLab.DataAnalysis.Symbolic.LinearInterpreter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeLinearInterpreter.cs

Timestamp:

07/24/13 09:56:56 (11 years ago)

Author:

bburlacu

Message:

#2021: Added separate SymbolicExpressionTreeLinearCompiler. Updated the SymbolicDataAnalysisExpressionTreeLinearInterpreter:

• moved constants evaluation outside of loop
• simplified code
• renamed EvaluateFast method to Evaluate and made it static.

File:

• branches/HeuristicLab.DataAnalysis.Symbolic.LinearInterpreter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeLinearInterpreter.cs (modified) (5 diffs)

branches/HeuristicLab.DataAnalysis.Symbolic.LinearInterpreter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeLinearInterpreter.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -121 +122 @@
       }
 
-      var root = tree.Root.GetSubtree(0).GetSubtree(0);
-      var nodes = new List<ISymbolicExpressionTreeNode> { root };
-      var code = new List<LinearInstruction>{ 
-          new LinearInstruction { dynamicNode = root,
-          nArguments = (byte) root.SubtreeCount, 
-          opCode = OpCodes.MapSymbolToOpCode(root)
-        }
-      };
-
-      // iterate breadth-wise over tree nodes and produce an array of instructions
-      int i = 0;
-      while (i != nodes.Count) {
-        if (nodes[i].SubtreeCount > 0) {
-          // save index of the first child in the instructions array
-          code[i].childIndex = code.Count;
-          for (int j = 0; j != nodes[i].SubtreeCount; ++j) {
-            var s = nodes[i].GetSubtree(j);
-            nodes.Add(s);
-            code.Add(new LinearInstruction {
-              dynamicNode = s,
-              nArguments = (byte)s.SubtreeCount,
-              opCode = OpCodes.MapSymbolToOpCode(s)
-            });
-          }
-        }
-        ++i;
-      }
-      // fill in iArg0 value for terminal nodes
-      foreach (var instr in code) {
+      var code = SymbolicExpressionTreeLinearCompiler.Compile(tree, OpCodes.MapSymbolToOpCode);
+      PrepareInterpreterState(code, dataset);
+      return rows.Select(row => Evaluate(dataset, ref row, code));
+    }
+
+    private static void PrepareInterpreterState(LinearInstruction[] code, Dataset dataset) {
+      for (int i = code.Length - 1; i >= 0; --i) {
+        var instr = code[i];
+        #region opcode switch
         switch (instr.opCode) {
+          case OpCodes.Constant: {
+              var constTreeNode = (ConstantTreeNode)instr.dynamicNode;
+              instr.value = constTreeNode.Value;
+            }
+            break;
           case OpCodes.Variable: {
               var variableTreeNode = (VariableTreeNode)instr.dynamicNode;
@@ -167 +153 @@
             break;
         }
+        #endregion
       }
-
-      var array = code.ToArray();
-
-      foreach (var rowEnum in rows) {
-        int row = rowEnum;
-        EvaluateFast(dataset, ref row, array);
-        yield return code[0].value;
-      }
-    }
-
-    private void EvaluateFast(Dataset dataset, ref int row, LinearInstruction[] code) {
+    }
+
+    private static double Evaluate(Dataset dataset, ref int row, LinearInstruction[] code) {
       for (int i = code.Length - 1; i >= 0; --i) {
         var instr = code[i];
-
+        if (instr.opCode == OpCodes.Constant) continue;
+        #region opcode switch
         switch (instr.opCode) {
           case OpCodes.Variable: {
@@ -194 +174 @@
               if (actualRow < 0 || actualRow >= dataset.Rows) instr.value = double.NaN;
               instr.value = ((IList<double>)instr.iArg0)[actualRow] * laggedVariableTreeNode.Weight;
-            }
-            break;
-          case OpCodes.Constant: {
-              var constTreeNode = (ConstantTreeNode)instr.dynamicNode;
-              instr.value = constTreeNode.Value;
             }
             break;
@@ -462 +437 @@
             throw new NotSupportedException();
         }
+        #endregion
       }
+      return code[0].value;
     }
   }