Changeset 6375 for trunk

Timestamp:

06/07/11 09:55:49 (14 years ago)

Author:

mkommend

Message:

#1549: Minor changes in SymbolicExpressionTreeNode and the SymbolicExpressionTreeChart that are necessary for the debugger visualizer to work correctly.

Location:

trunk/sources

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.cs (modified) (3 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeNode.cs (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Tests/Grammars.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.cs

@@ -24 +24 @@
 using System.Drawing;
 using System.Drawing.Imaging;
-using System.Linq;
 using System.Windows.Forms;
 
@@ -263 +262 @@
 
       //draw terminal node
-      if (node.Subtrees.Count() == 0) {
+      if (node.SubtreesCount == 0) {
         graphics.FillRectangle(nodeFillBrush, visualTreeNode.X, visualTreeNode.Y, visualTreeNode.Width, visualTreeNode.Height);
         graphics.DrawRectangle(nodeLinePen, visualTreeNode.X, visualTreeNode.Y, visualTreeNode.Width, visualTreeNode.Height);
@@ -281 +280 @@
       //calculate areas for the subtrees according to their tree size and call drawFunctionTree
       Point connectFrom = new Point(visualTreeNode.X + visualTreeNode.Width / 2, visualTreeNode.Y + visualTreeNode.Height);
-      int[] xBoundaries = new int[node.Subtrees.Count() + 1];
+      int[] xBoundaries = new int[node.SubtreesCount + 1];
       xBoundaries[0] = x;
-      for (int i = 0; i < node.Subtrees.Count(); i++) {
-        xBoundaries[i + 1] = (int)(xBoundaries[i] + (width * (double)node.Subtrees.ElementAt(i).GetLength()) / (node.GetLength() - 1));
-        DrawFunctionTree(node.Subtrees.ElementAt(i), graphics, xBoundaries[i], y + height,
+      for (int i = 0; i < node.SubtreesCount; i++) {
+        xBoundaries[i + 1] = (int)(xBoundaries[i] + (width * (double)node.GetSubtree(i).GetLength()) / (node.GetLength() - 1));
+        DrawFunctionTree(node.GetSubtree(i), graphics, xBoundaries[i], y + height,
           xBoundaries[i + 1] - xBoundaries[i], height, connectFrom);
       }

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeNode.cs

@@ -186 +186 @@
 
     public override string ToString() {
-      return Symbol.Name;
+      if (Symbol != null) return Symbol.Name;
+      return "SymbolicExpressionTreeNode";
     }
 

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Tests/Grammars.cs

@@ -27 +27 @@
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding_3._4.Tests {
   public static class Grammars {
+
+    [StorableClass]
     private class Addition : Symbol {
+      [StorableConstructor]
+      protected Addition(bool deserializing) : base(deserializing) { }
       protected Addition(Addition original, Cloner cloner) : base(original, cloner) { }
       public Addition() : base("Addition", "") { }
@@ -34 +38 @@
       }
     }
+
+    [StorableClass]
     private class Subtraction : Symbol {
+      [StorableConstructor]
+      protected Subtraction(bool deserializing) : base(deserializing) { }
       protected Subtraction(Subtraction original, Cloner cloner) : base(original, cloner) { }
       public Subtraction() : base("Subtraction", "") { }
@@ -41 +49 @@
       }
     }
+
+    [StorableClass]
     private class Multiplication : Symbol {
+      [StorableConstructor]
+      protected Multiplication(bool deserializing) : base(deserializing) { }
       protected Multiplication(Multiplication original, Cloner cloner) : base(original, cloner) { }
       public Multiplication() : base("Multiplication", "") { }
@@ -48 +60 @@
       }
     }
+
+    [StorableClass]
     private class Division : Symbol {
+      [StorableConstructor]
+      protected Division(bool deserializing) : base(deserializing) { }
       protected Division(Division original, Cloner cloner) : base(original, cloner) { }
       public Division() : base("Division", "") { }
@@ -55 +71 @@
       }
     }
+
+    [StorableClass]
     private class Terminal : Symbol {
+      [StorableConstructor]
+      protected Terminal(bool deserializing) : base(deserializing) { }
       protected Terminal(Terminal original, Cloner cloner) : base(original, cloner) { }
       public Terminal() : base("Terminal", "") { }
@@ -67 +87 @@
     }
 
+    [StorableClass]
     private class TerminalNode : SymbolicExpressionTreeTerminalNode {
       public override bool HasLocalParameters { get { return true; } }
@@ -94 +115 @@
     }
 
+    [StorableClass]
     private class SimpleArithmeticGrammar : SymbolicExpressionGrammar {
+      [StorableConstructor]
+      protected SimpleArithmeticGrammar(bool deserializing) : base(deserializing) { }
       protected SimpleArithmeticGrammar(SimpleArithmeticGrammar original, Cloner cloner) : base(original, cloner) { }
       public SimpleArithmeticGrammar()