Changeset 11460

Timestamp:

10/13/14 13:17:27 (10 years ago)

Author:

bburlacu

Message:

#1772: HeuristicLab.Encodings.SymbolicExpressionTreeEncoding:

• SymbolicExpressionTreeLinearCompiler: add public Compile method accepting an ISymbolicExpressionTreeNode
• SymbolicExpressionTreeStringFormatter: add public Format method accepting an ISymbolicExpressionTreeNode

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4

Files:

• Compiler/SymbolicExpressionTreeLinearCompiler.cs (modified) (1 diff)
• Formatters/SymbolicExpressionTreeStringFormatter.cs (modified) (2 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Compiler/SymbolicExpressionTreeLinearCompiler.cs

@@ -26 +26 @@
     public static LinearInstruction[] Compile(ISymbolicExpressionTree tree, Func<ISymbolicExpressionTreeNode, byte> opCodeMapper) {
       var root = tree.Root.GetSubtree(0).GetSubtree(0);
+      return Compile(root, opCodeMapper);
+    }
+
+    public static LinearInstruction[] Compile(ISymbolicExpressionTreeNode root, Func<ISymbolicExpressionTreeNode, byte> opCodeMapper) {
       var code = new LinearInstruction[root.GetLength()];
       code[0] = new LinearInstruction { dynamicNode = root, nArguments = (byte)root.SubtreeCount, opCode = opCodeMapper(root) };

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Formatters/SymbolicExpressionTreeStringFormatter.cs

@@ -20 +20 @@
 #endregion
 
+using System.Linq;
 using System.Text;
-using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -48 +48 @@
     public string Format(ISymbolicExpressionTree symbolicExpressionTree) {
       return FormatRecursively(symbolicExpressionTree.Root, 0);
+    }
+
+    public string Format(ISymbolicExpressionTreeNode symbolicExpressionTreeNode) {
+      return FormatRecursively(symbolicExpressionTreeNode, 0);
     }