Changeset 9835 for branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.cs

Timestamp:

08/01/13 13:01:40 (11 years ago)

Author:

bburlacu

Message:

#1772: Merged remaining trunk changes into the EvolutionaryTracking branch.

Location:

branches/HeuristicLab.EvolutionaryTracking

Files:

• . (modified) (3 props)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views (copied) (copied from trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.cs (modified) (6 diffs)

branches/HeuristicLab.EvolutionaryTracking

@@ -1 @@
-*.suo
-_ReSharper.HeuristicLab.Tracking
+_ReSharper.Sliding Window GP
 bin

@@ -1 @@
-*.suo
-_ReSharper.HeuristicLab.Tracking
+_ReSharper.Sliding Window GP
 bin

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.cs

@@ -25 +25 @@
 using System.Drawing.Imaging;
 using System.Windows.Forms;
+using Point = System.Drawing.Point;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views {
@@ -48 +49 @@
     }
 
+    #region Public properties
     private int spacing;
     public int Spacing {
@@ -106 +108 @@
       set { suspendRepaint = value; }
     }
+    #endregion
 
     protected override void OnPaint(PaintEventArgs e) {
@@ -250 +253 @@
 
     #region methods for painting the symbolic expression tree
+
     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);
+      //      DrawFunctionTree(tree.Root, graphics, x, y, width, height, Point.Empty);
+      AlternateDraw(tree, graphics, 70, 46, 20, 50);
+    }
+
+    private void AlternateDraw(ISymbolicExpressionTree tree, Graphics graphics, int preferredWidth, int preferredHeight, int minDistance, int maxDistance) {
+      var tl = new TreeLayout();
+      tl.Distance = 5;
+      tl.SymbolicExpressionTree = tree;
+
+      var nodePositions = tl.GetNodeCoordinates();
+      var bounds = tl.Bounds();
+
+      double sx = Width / bounds.Width;
+      double sy = Height / bounds.Height;
+
+      double dx = tl.Distance * sx; // scaled horizontal distance
+      double dy = tl.Distance * sy; // scaled vertical distance
+
+      int maxWidth = (int)Math.Round(dx);
+      int maxHeight = (int)Math.Round(dy);
+
+      // instead of using the preferred with/height of each node inside the foreach loop below,
+      // we assume the same width/height for all nodes
+      int w = Math.Min(preferredWidth, maxWidth - minDistance / 2);
+      int h = Math.Min(preferredHeight, maxHeight - minDistance / 2);
+      // adjust scaling factor so that nodes will be at most maxDistance far from each other on the horizontal axis
+      double offset = 0;
+      if (maxDistance + w < maxWidth) {
+        sx *= (double)(maxDistance + w) / maxWidth;
+        offset = (Width - (sx * bounds.Width)) / 2;
+      }
+      foreach (var node in visualTreeNodes.Keys) {
+        var visualNode = visualTreeNodes[node];
+        var pos = nodePositions[node];
+        visualNode.Width = w;
+        visualNode.Height = h;
+        visualNode.X = (int)Math.Round(pos.X * sx + offset); ;
+        visualNode.Y = (int)Math.Round(pos.Y * sy);
+        DrawTreeNode(graphics, visualNode);
+      }
+      graphics.ResetClip(); // reset clip region
+      foreach (var visualNode in visualTreeNodes.Values) {
+        var node = visualNode.SymbolicExpressionTreeNode;
+        foreach (var subtree in node.Subtrees) {
+          var visualLine = GetVisualSymbolicExpressionTreeNodeConnection(node, subtree);
+          var visualSubtree = visualTreeNodes[subtree];
+          var origin = new Point(visualNode.X + visualNode.Width / 2, visualNode.Y + visualNode.Height);
+          var target = new Point(visualSubtree.X + visualSubtree.Width / 2, visualSubtree.Y);
+          using (var linePen = new Pen(visualLine.LineColor)) {
+            linePen.DashStyle = visualLine.DashStyle;
+            graphics.DrawLine(linePen, origin, target);
+          }
+        }
+      }
     }
 
@@ -257 +314 @@
     /// 
     /// </summary>
-    /// <param name="functionTree"> function tree to draw</param>
+    /// <param name="node">the root of the function tree to draw</param>
     /// <param name="graphics">graphics object to draw on</param>
     /// <param name="x">x coordinate of drawing area</param>
@@ -365 +422 @@
     }
     #endregion
-
     #region save image
     private void saveImageToolStripMenuItem_Click(object sender, EventArgs e) {

@@ -1 @@
-*.suo
-_ReSharper.HeuristicLab.Tracking
+_ReSharper.Sliding Window GP
 bin