Changeset 9944

Timestamp:

09/10/13 17:23:25 (11 years ago)

Author:

gkronber

Message:

#2021 made fix in the way how the breath-first linear representation of the tree is translated to the prefix representation.

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeLinearInterpreter.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeLinearInterpreter.cs

@@ -333 +333 @@
 
     private static LinearInstruction[] GetPrefixSequence(LinearInstruction[] code, int startIndex) {
+      var s = new Stack<int>();
       var list = new List<LinearInstruction>();
-      int i = startIndex;
-      while (i != code.Length) {
+      s.Push(startIndex);
+      while (s.Any()) {
+        int i = s.Pop();
         var instr = code[i];
+        // push instructions in reverse execution order
+        for (int j = instr.nArguments - 1; j >= 0; j--) s.Push(instr.childIndex + j);
         list.Add(instr);
-        i = instr.nArguments > 0 ? instr.childIndex : i + 1;
       }
       return list.ToArray();