Changeset 3747

Timestamp:

05/10/10 16:35:17 (14 years ago)

Author:

gkronber

Message:

Fixed bugs related to evaluation of ADFs in symbolic expressions. #791

Location:

trunk/sources

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Compiler/SymbolicExpressionTreeCompiler.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SimpleArithmeticExpressionInterpreter.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Compiler/SymbolicExpressionTreeCompiler.cs

@@ -68 +68 @@
         instr.nArguments = (byte)node.SubTrees.Count;
         instr.opCode = opCodeMapper(node);
-        if (branch.Symbol is Argument) {
+        if (node.Symbol is Argument) {
           var argNode = (ArgumentTreeNode)node;
           instr.iArg0 = (ushort)argNode.Symbol.ArgumentIndex;

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SimpleArithmeticExpressionInterpreter.cs

@@ -81 +81 @@
         var variableTreeNode = instr.dynamicNode as VariableTreeNode;
         instr.iArg0 = (ushort)dataset.GetVariableIndex(variableTreeNode.VariableName);
-      }
+      } 
       return instr;
     }
@@ -138 +138 @@
             for (int i = 0; i < currentInstr.nArguments; i++) {
               argumentStack[argStackPointer + currentInstr.nArguments - i] = Evaluate();
-              argStackPointer++;
             }
+            argStackPointer += currentInstr.nArguments;
 
             // save the pc