Changeset 3409 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Timestamp:

04/19/10 10:18:15 (15 years ago)

Author:

gkronber

Message:

Worked on ADF aware evaluation for symbolic regression problems #938 (Data types and operators for regression problems)

Location:

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3

Files:

• Instruction.cs (modified) (1 diff)
• SymbolicExpressionTree.cs (modified) (1 diff)
• SymbolicExpressionTreeCompiler.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Instruction.cs

@@ -35 +35 @@
     Div,
     Call,
+    Arg,
     Values,
     Dynamic

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTree.cs

@@ -47 +47 @@
     }
 
-    public SymbolicExpressionTreeNode ResultProducingExpression {
-      get { return root.SubTrees[0].SubTrees[0]; }
-    }
-
     public int Size {
       get {

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

@@ -37 +37 @@
       {typeof(Division), CodeSymbol.Div},
       {typeof(InvokeFunction), CodeSymbol.Call},
+      {typeof(Argument), CodeSymbol.Arg},
       //{typeof(Values), CodeSymbol.Values}
     };
@@ -45 +46 @@
       entryPoint.Clear();
       // compile main body
-      code.AddRange(Compile(tree.ResultProducingExpression));
+      code.AddRange(Compile(tree.Root.SubTrees[0]));
       // compile branches
       var functionBranches = from node in tree.IterateNodesPrefix()
@@ -67 +68 @@
             var invokeNode = (InvokeFunctionTreeNode)node;
             instr.iArg0 = entryPoint[invokeNode.Symbol.FunctionName];
+          } else if (instr.symbol == CodeSymbol.Arg) {
+            var argNode = (ArgumentTreeNode)node;
+            instr.iArg0 = (short)argNode.Symbol.ArgumentIndex;
           }
         } else {