Changeset 5499 for branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Compiler

Timestamp:

02/16/11 19:01:00 (14 years ago)

Author:

gkronber

Message:

#1418 changes in symbolic expression tree encoding.

Location:

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4

Files:

• . (modified) (1 prop)
• Compiler/Instruction.cs (modified) (1 diff)
• Compiler/SymbolicExpressionTreeCompiler.cs (modified) (2 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4

@@ -2 +2 @@
 obj
 HeuristicLabEncodingsSymbolicExpressionTreeEncodingPlugin.cs
+*.user

@@ -2 +2 @@
 obj
 HeuristicLabEncodingsSymbolicExpressionTreeEncodingPlugin.cs
+*.user

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Compiler/Instruction.cs

@@ -21 +21 @@
 
 
-namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Compiler {
-  // total size of this struct should be small to improve cache access while executing the code
-  // should be aligned to 8/16/32 byte
-  // size = 4(8) + 1 + 1 + 2 = 8 (12)
+namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
+  // total size of this class should be small to improve cache access while executing the code
   public class Instruction {
     // the tree node can hold additional data that is necessary for the execution of this instruction
-    public SymbolicExpressionTreeNode dynamicNode;
+    public ISymbolicExpressionTreeNode dynamicNode;
     // op code of the function that determines what operation should be executed
     public byte opCode;

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Compiler/SymbolicExpressionTreeCompiler.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
 
-namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Compiler {
+namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
   public class SymbolicExpressionTreeCompiler {
     private Dictionary<string, ushort> entryPoint = new Dictionary<string, ushort>();
     private List<Func<Instruction, Instruction>> postInstructionCompiledHooks = new List<Func<Instruction, Instruction>>();
 
-    public Instruction[] Compile(SymbolicExpressionTree tree, Func<SymbolicExpressionTreeNode, byte> opCodeMapper) {
+    public Instruction[] Compile(SymbolicExpressionTree tree, Func<ISymbolicExpressionTreeNode, byte> opCodeMapper) {
       List<Instruction> code = new List<Instruction>();
       entryPoint.Clear();
       // compile main body branches
-      foreach (var branch in tree.Root.SubTrees[0].SubTrees) {
+      foreach (var branch in tree.Root.GetSubTree(0).SubTrees) {
         code.AddRange(Compile(branch, opCodeMapper));
       }
@@ -60 +59 @@
     }
 
-    private IEnumerable<Instruction> Compile(SymbolicExpressionTreeNode branch, Func<SymbolicExpressionTreeNode, byte> opCodeMapper) {
+    private IEnumerable<Instruction> Compile(ISymbolicExpressionTreeNode branch, Func<ISymbolicExpressionTreeNode, byte> opCodeMapper) {
       foreach (var node in branch.IterateNodesPrefix()) {
         Instruction instr = new Instruction();
-        if (node.SubTrees.Count > 255) throw new ArgumentException("Number of subtrees is too big (>255)");
-        instr.nArguments = (byte)node.SubTrees.Count;
+        int subTreesCount = node.SubTrees.Count();
+        if (subTreesCount > 255) throw new ArgumentException("Number of subtrees is too big (>255)");
+        instr.nArguments = (byte)subTreesCount;
         instr.opCode = opCodeMapper(node);
         if (node.Symbol is Argument) {

@@ -2 +2 @@
 obj
 HeuristicLabEncodingsSymbolicExpressionTreeEncodingPlugin.cs
+*.user