Changeset 6569 for branches/QAPAlgorithms/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.cs

Timestamp:

07/17/11 22:51:11 (13 years ago)

Author:

abeham

Message:

#1541

• updated to latest trunk version

Location:

branches/QAPAlgorithms

Files:

• . (modified) (2 props)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.cs (modified) (3 diffs)

branches/QAPAlgorithms

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

branches/QAPAlgorithms/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);
       }

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates