Changeset 3929 for trunk/sources

Timestamp:

06/17/10 17:51:36 (14 years ago)

Author:

abeham

Message:

#1041

• Added SymbolicExpressionTreeStringFormatter

Location:

trunk/sources

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3/SymbolicExpressionView.cs (modified) (4 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTreeStringFormatter.cs (added)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3/SymbolicExpressionView.cs

@@ -35 +35 @@
   [Content(typeof(SymbolicExpressionTree), false)]
   public partial class SymbolicExpressionView : AsynchronousContentView {
+    private SymbolicExpressionTreeStringFormatter treeFormatter;
+
     public new SymbolicExpressionTree Content {
       get { return (SymbolicExpressionTree)base.Content; }
@@ -42 +44 @@
     public SymbolicExpressionView() {
       InitializeComponent();
+      treeFormatter = new SymbolicExpressionTreeStringFormatter();
     }
 
@@ -49 +52 @@
         textBox.Text = string.Empty;
       else
-        textBox.Text = SymbolicExpression(Content.Root, 0);
+        textBox.Text = treeFormatter.Format(Content);
     }
 
@@ -57 +60 @@
       textBox.ReadOnly = ReadOnly;
     }
-
-    private static string SymbolicExpression(SymbolicExpressionTreeNode node, int indentLength) {
-      StringBuilder strBuilder = new StringBuilder();
-      strBuilder.Append(' ', indentLength); strBuilder.Append("(");
-      // internal nodes or leaf nodes?
-      if (node.SubTrees.Count > 0) {
-        // symbol on same line as '('
-        strBuilder.AppendLine(node.ToString());
-        // each subtree expression on a new line
-        // and closing ')' also on new line
-        foreach (var subtree in node.SubTrees) {
-          strBuilder.AppendLine(SymbolicExpression(subtree, indentLength + 2));
-        }
-        strBuilder.Append(' ', indentLength); strBuilder.Append(")");
-      } else {
-        // symbol in the same line with as '(' and ')'
-        strBuilder.Append(node.ToString());
-        strBuilder.Append(")");
-      }
-      return strBuilder.ToString();
-    }
   }
 }

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj

@@ -108 +108 @@
     <Compile Include="Manipulators\OnePointShaker.cs" />
     <Compile Include="Manipulators\SymbolicExpressionTreeManipulator.cs" />
+    <Compile Include="SymbolicExpressionTreeStringFormatter.cs" />
     <Compile Include="SymbolicExpressionTreeTopLevelNode.cs" />
     <Compile Include="Crossovers\SubtreeCrossover.cs">