Changeset 11506 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views

Timestamp:

10/27/14 20:47:37 (10 years ago)

Author:

bburlacu

Message:

#1772: Updated views (fixed position and anchors).

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking

Files:

• SymboldDataAnalysisGenealogyView.Designer.cs (modified) (6 diffs)
• SymboldDataAnalysisGenealogyView.cs (modified) (3 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking/SymboldDataAnalysisGenealogyView.Designer.cs

@@ -49 +49 @@
       this.components = new System.ComponentModel.Container();
       this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-      this.genealogyGraphChart = new HeuristicLab.Problems.DataAnalysis.Symbolic.Views.SymbolicDataAnalysisExpressionGenealogyGraphChart();
       this.symbolicExpressionTreeChart = new HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.SymbolicExpressionTreeChart();
       this.groupBox1 = new System.Windows.Forms.GroupBox();
+      this.hotPaths_button = new System.Windows.Forms.Button();
       this.simpleLineages_checkBox = new System.Windows.Forms.CheckBox();
       this.lockGraph_checkBox = new System.Windows.Forms.CheckBox();
       this.trace_checkBox = new System.Windows.Forms.CheckBox();
-      this.hotPaths_button = new System.Windows.Forms.Button();
+      this.genealogyGraphChart = new HeuristicLab.Problems.DataAnalysis.Symbolic.Views.SymbolicDataAnalysisExpressionGenealogyGraphChart();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
       this.splitContainer1.Panel1.SuspendLayout();
@@ -65 +65 @@
       // splitContainer1
       // 
+      this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.splitContainer1.Location = new System.Drawing.Point(0, 57);
       this.splitContainer1.Name = "splitContainer1";
@@ -75 +78 @@
       // 
       this.splitContainer1.Panel2.Controls.Add(this.symbolicExpressionTreeChart);
-      this.splitContainer1.Size = new System.Drawing.Size(1247, 698);
-      this.splitContainer1.SplitterDistance = 607;
+      this.splitContainer1.Size = new System.Drawing.Size(1244, 695);
+      this.splitContainer1.SplitterDistance = 605;
       this.splitContainer1.TabIndex = 0;
       // 
-      // genealogyGraphChart
-      // 
-      this.genealogyGraphChart.BackColor = System.Drawing.SystemColors.Control;
-      this.genealogyGraphChart.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.genealogyGraphChart.GenealogyGraph = null;
-      this.genealogyGraphChart.Location = new System.Drawing.Point(0, 0);
-      this.genealogyGraphChart.LockGenealogy = false;
-      this.genealogyGraphChart.Name = "genealogyGraphChart";
-      this.genealogyGraphChart.ScaleOnResize = true;
-      this.genealogyGraphChart.SimpleLineages = false;
-      this.genealogyGraphChart.Size = new System.Drawing.Size(607, 698);
-      this.genealogyGraphChart.TabIndex = 0;
-      this.genealogyGraphChart.TraceFragments = false;
-      // 
       // symbolicExpressionTreeChart
       // 
+      this.symbolicExpressionTreeChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.symbolicExpressionTreeChart.BackgroundColor = System.Drawing.Color.White;
-      this.symbolicExpressionTreeChart.Dock = System.Windows.Forms.DockStyle.Fill;
       this.symbolicExpressionTreeChart.LineColor = System.Drawing.Color.Black;
       this.symbolicExpressionTreeChart.Location = new System.Drawing.Point(0, 0);
       this.symbolicExpressionTreeChart.Name = "symbolicExpressionTreeChart";
-      this.symbolicExpressionTreeChart.Size = new System.Drawing.Size(636, 698);
+      this.symbolicExpressionTreeChart.Size = new System.Drawing.Size(635, 692);
       this.symbolicExpressionTreeChart.Spacing = 5;
       this.symbolicExpressionTreeChart.SuspendRepaint = false;
@@ -109 +100 @@
       // groupBox1
       // 
+      this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.groupBox1.Controls.Add(this.hotPaths_button);
       this.groupBox1.Controls.Add(this.simpleLineages_checkBox);
@@ -115 +108 @@
       this.groupBox1.Location = new System.Drawing.Point(3, 3);
       this.groupBox1.Name = "groupBox1";
-      this.groupBox1.Size = new System.Drawing.Size(1195, 48);
+      this.groupBox1.Size = new System.Drawing.Size(1241, 48);
       this.groupBox1.TabIndex = 4;
       this.groupBox1.TabStop = false;
       this.groupBox1.Text = "Controls";
+      // 
+      // hotPaths_button
+      // 
+      this.hotPaths_button.Location = new System.Drawing.Point(263, 15);
+      this.hotPaths_button.Name = "hotPaths_button";
+      this.hotPaths_button.Size = new System.Drawing.Size(75, 23);
+      this.hotPaths_button.TabIndex = 7;
+      this.hotPaths_button.Text = "Hot paths";
+      this.hotPaths_button.UseVisualStyleBackColor = true;
+      this.hotPaths_button.Click += new System.EventHandler(this.hotPaths_button_Click);
       // 
       // simpleLineages_checkBox
@@ -153 +156 @@
       this.trace_checkBox.CheckedChanged += new System.EventHandler(this.trace_checkBox_CheckedChanged);
       // 
-      // hotPaths_button
-      // 
-      this.hotPaths_button.Location = new System.Drawing.Point(263, 15);
-      this.hotPaths_button.Name = "hotPaths_button";
-      this.hotPaths_button.Size = new System.Drawing.Size(75, 23);
-      this.hotPaths_button.TabIndex = 7;
-      this.hotPaths_button.Text = "Hot paths";
-      this.hotPaths_button.UseVisualStyleBackColor = true;
-      this.hotPaths_button.Click += new System.EventHandler(this.hotPaths_button_Click);
+      // genealogyGraphChart
+      // 
+      this.genealogyGraphChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.genealogyGraphChart.BackColor = System.Drawing.SystemColors.Control;
+      this.genealogyGraphChart.GenealogyGraph = null;
+      this.genealogyGraphChart.Location = new System.Drawing.Point(-5, 0);
+      this.genealogyGraphChart.LockGenealogy = false;
+      this.genealogyGraphChart.Name = "genealogyGraphChart";
+      this.genealogyGraphChart.ScaleOnResize = true;
+      this.genealogyGraphChart.SimpleLineages = false;
+      this.genealogyGraphChart.Size = new System.Drawing.Size(607, 692);
+      this.genealogyGraphChart.TabIndex = 0;
+      this.genealogyGraphChart.TraceFragments = false;
       // 
       // SymboldDataAnalysisGenealogyView

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking/SymboldDataAnalysisGenealogyView.cs

@@ -78 +78 @@
       var tree = graphNode.Data;
       symbolicExpressionTreeChart.Tree = tree;
-
       if (graphNode.InArcs.Any()) {
         var fragment = graphNode.InArcs.Last().Data as IFragment<ISymbolicExpressionTreeNode>;
         if (fragment != null) {
           treeChart_HighlightSubtree(graphNode.Data.NodeAt(fragment.Index1));
-        } else {
-          var td = graphNode.InArcs.Last().Data as Tuple<int, int, int, int>;
-          if (td != null) {
-            var s = graphNode.Data.NodeAt(td.Item1);
-            var f = graphNode.Data.NodeAt(td.Item2);
-            treeChart_HighlightSubtree(s, Color.Orange);
-            treeChart_HighlightSubtree(f, Color.RoyalBlue);
-          }
+        }
+      }
+      if (graphNode.OutArcs.Any()) {
+        var td = graphNode.OutArcs.Last().Data as Tuple<int, int, int, int>;
+        if (td != null) {
+          var s = graphNode.Data.NodeAt(td.Item3); // subtree index
+          var f = graphNode.Data.NodeAt(td.Item4); // fragment index 
+          treeChart_HighlightSubtree(s, Color.Orange);
+          treeChart_HighlightSubtree(f, Color.RoyalBlue);
         }
       }
@@ -98 +98 @@
       var visualNode = (VisualGenealogyGraphNode)sender;
       var graphNode = (IGenealogyGraphNode<ISymbolicExpressionTree>)visualNode.Data;
-      var tree = graphNode.Data;
-      MainFormManager.MainForm.ShowContent(tree);
+      //      var tree = graphNode.Data;
+      //      var model = new RegressionModel();
+      //      var solution = new RegressionSolution()
+      //      MainFormManager.MainForm.ShowContent(tree);
     }
 
@@ -117 +119 @@
         var subtreeIndex = graphNode.Data.IterateNodesPrefix().ToList().IndexOf(subtree);
         var fragmentGraph = SymbolicDataAnalysisExpressionTracing.TraceSubtree(graphNode, subtreeIndex);
+
         if (fragmentGraph.Vertices.Any()) {
+          var genealogyNodes = fragmentGraph.Vertices.Select(v => Content.GetByContent(v.Data));
+          genealogyGraphChart.HighlightNodes(genealogyNodes);
+          foreach (var a in fragmentGraph.Arcs) {
+            genealogyGraphChart.HighlightArc(Content.GetByContent(a.Target.Data), Content.GetByContent(a.Source.Data));
+          }
           MainFormManager.MainForm.ShowContent(fragmentGraph); // display the fragment graph on the screen
         }