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

Timestamp:

06/21/13 21:04:20 (11 years ago)

Author:

gkronber

Message:

#1270 fixed compile errors in Smalltalk and GraphViz formatters

Location:

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4

Files:

• Formatters/SymbolicExpressionTreeGraphvizFormatter.cs (modified) (4 diffs)
• Formatters/SymbolicExpressionTreeStringFormatter.cs (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj (modified) (1 diff)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Formatters/SymbolicExpressionTreeGraphvizFormatter.cs

@@ -51 +51 @@
     }
 
-    public string Format(SymbolicExpressionTree symbolicExpressionTree) {
+    public string Format(ISymbolicExpressionTree symbolicExpressionTree) {
       int nodeCounter = 1;
       StringBuilder strBuilder = new StringBuilder();
@@ -60 +60 @@
     }
 
-    private string FormatRecursively(SymbolicExpressionTreeNode node, int indentLength, ref int nodeId) {
+    private string FormatRecursively(ISymbolicExpressionTreeNode node, int indentLength, ref int nodeId) {
       // save id of current node
       int currentNodeId = nodeId;
@@ -77 +77 @@
       strBuilder.Append("node" + currentNodeId + "[label=\"" + nodeLabel + "\"");
       // leaf nodes should have box shape
-      if (node.SubTrees.Count == 0) {
+      if (node.SubtreeCount == 0) {
         strBuilder.AppendLine(", shape=\"box\"];");
       } else {
@@ -84 +84 @@
 
       // internal nodes or leaf nodes?
-      foreach (SymbolicExpressionTreeNode subTree in node.SubTrees) {
+      foreach (ISymbolicExpressionTreeNode subTree in node.Subtrees) {
         // add an edge 
         if (Indent) strBuilder.Append(' ', indentLength);

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Formatters/SymbolicExpressionTreeStringFormatter.cs

@@ -28 +28 @@
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
 
-  [Item("SymbolicExpressionTreeStringFormatter", "The default string formatter for symbolic expression trees.")]
+  [Item("Default String Formatter", "The default string formatter for symbolic expression trees.")]
   [StorableClass]
   public class SymbolicExpressionTreeStringFormatter : NamedItem, ISymbolicExpressionTreeStringFormatter {

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

@@ -132 +132 @@
     </Compile>
     <Compile Include="Creators\RampedHalfAndHalfTreeCreator.cs" />
+    <Compile Include="Formatters\SymbolicExpressionTreeGraphvizFormatter.cs" />
     <Compile Include="Interfaces\IReadOnlySymbol.cs" />
     <Compile Include="Interfaces\ISymbolicExpressionGrammar.cs" />