Changeset 5513 for branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.cs

Timestamp:

02/18/11 10:55:20 (14 years ago)

Author:

mkommend

Message:

#1418: Adapted views to new symbolic expression tree encoding.

File:

• branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.cs (modified) (9 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.cs

@@ -24 +24 @@
 using System.Drawing;
 using System.Drawing.Imaging;
+using System.Linq;
 using System.Windows.Forms;
 
@@ -30 +31 @@
     private Image image;
     private StringFormat stringFormat;
-    private Dictionary<SymbolicExpressionTreeNode, VisualSymbolicExpressionTreeNode> visualTreeNodes;
+    private Dictionary<ISymbolicExpressionTreeNode, VisualSymbolicExpressionTreeNode> visualTreeNodes;
 
     public SymbolicExpressionTreeChart() {
@@ -44 +45 @@
     }
 
-    public SymbolicExpressionTreeChart(SymbolicExpressionTree tree)
+    public SymbolicExpressionTreeChart(ISymbolicExpressionTree tree)
       : this() {
       this.Tree = tree;
@@ -85 +86 @@
     }
 
-    private SymbolicExpressionTree tree;
-    public SymbolicExpressionTree Tree {
+    private ISymbolicExpressionTree tree;
+    public ISymbolicExpressionTree Tree {
       get { return this.tree; }
       set {
         tree = value;
-        visualTreeNodes = new Dictionary<SymbolicExpressionTreeNode, VisualSymbolicExpressionTreeNode>();
+        visualTreeNodes = new Dictionary<ISymbolicExpressionTreeNode, VisualSymbolicExpressionTreeNode>();
         if (tree != null) {
           foreach (SymbolicExpressionTreeNode node in tree.IterateNodesPrefix())
@@ -129 +130 @@
     }
 
-    public VisualSymbolicExpressionTreeNode GetVisualSymbolicExpressionTreeNode(SymbolicExpressionTreeNode symbolicExpressionTreeNode) {
+    public VisualSymbolicExpressionTreeNode GetVisualSymbolicExpressionTreeNode(ISymbolicExpressionTreeNode symbolicExpressionTreeNode) {
       if (visualTreeNodes.ContainsKey(symbolicExpressionTreeNode))
         return visualTreeNodes[symbolicExpressionTreeNode];
@@ -207 +208 @@
 
     #region methods for painting the symbolic expression tree
-    private void DrawFunctionTree(SymbolicExpressionTree tree, Graphics graphics, int x, int y, int width, int height) {
+    private void DrawFunctionTree(ISymbolicExpressionTree tree, Graphics graphics, int x, int y, int width, int height) {
       DrawFunctionTree(tree.Root, graphics, x, y, width, height, Point.Empty);
     }
@@ -220 +221 @@
     /// <param name="width">width of drawing area</param>
     /// <param name="height">height of drawing area</param>
-    private void DrawFunctionTree(SymbolicExpressionTreeNode node, Graphics graphics, int x, int y, int width, int height, Point connectionPoint) {
+    private void DrawFunctionTree(ISymbolicExpressionTreeNode node, Graphics graphics, int x, int y, int width, int height, Point connectionPoint) {
       VisualSymbolicExpressionTreeNode visualTreeNode = visualTreeNodes[node];
       float center_x = x + width / 2;
@@ -262 +263 @@
 
       //draw terminal node
-      if (node.SubTrees.Count == 0) {
+      if (node.SubTrees.Count() == 0) {
         graphics.FillRectangle(nodeFillBrush, visualTreeNode.X, visualTreeNode.Y, visualTreeNode.Width, visualTreeNode.Height);
         graphics.DrawRectangle(nodeLinePen, visualTreeNode.X, visualTreeNode.Y, visualTreeNode.Width, visualTreeNode.Height);
@@ -280 +281 @@
       //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.SubTrees.Count() + 1];
       xBoundaries[0] = x;
-      for (int i = 0; i < node.SubTrees.Count; i++) {
-        xBoundaries[i + 1] = (int)(xBoundaries[i] + (width * (double)node.SubTrees[i].GetSize()) / (node.GetSize() - 1));
-        DrawFunctionTree(node.SubTrees[i], graphics, xBoundaries[i], y + height,
+      for (int i = 0; i < node.SubTrees.Count(); i++) {
+        xBoundaries[i + 1] = (int)(xBoundaries[i] + (width * (double)node.SubTrees.ElementAt(i).GetSize()) / (node.GetSize() - 1));
+        DrawFunctionTree(node.SubTrees.ElementAt(i), graphics, xBoundaries[i], y + height,
           xBoundaries[i + 1] - xBoundaries[i], height, connectFrom);
       }