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

Timestamp:

02/02/15 17:23:33 (10 years ago)

Author:

bburlacu

Message:

#1772: Improved functionality of the SymbolicDataAnalysisGenealogyGraphView in terms of graph navigation and display of useful information. Fixed save of tree image to file in the SymbolicExpressionTreeChart.

Location:

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

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj (modified) (2 diffs)
• Properties/Resources.Designer.cs (added)
• Properties/Resources.resx (added)
• Resources (added)
• Resources/LargeLeftDiagonal_235.png (added)
• Resources/LargeRightDiagonal_238.png (added)
• Tracking/SymbolicDataAnalysisGenealogyGraphView.Designer.cs (modified) (2 diffs)
• Tracking/SymbolicDataAnalysisGenealogyGraphView.cs (modified) (3 diffs)
• Tracking/SymbolicDataAnalysisGenealogyGraphView.resx (added)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj

@@ -219 +219 @@
     <Compile Include="MenuItems\OptimizeDataAnalysisRunsMenuItem.cs" />
     <Compile Include="Plugin.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="SlidingWindowDataView.cs">
       <SubType>UserControl</SubType>
@@ -371 +376 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <None Include="Resources\LargeLeftDiagonal_235.png" />
+    <None Include="Resources\LargeRightDiagonal_238.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Tracking\SymbolicDataAnalysisGenealogyGraphView.resx">
+      <DependentUpon>SymbolicDataAnalysisGenealogyGraphView.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

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

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.components = new System.ComponentModel.Container();
+      this.groupBox1 = new System.Windows.Forms.GroupBox();
+      this.navigateRightButton = new System.Windows.Forms.Button();
+      this.navigateLeftButton = new System.Windows.Forms.Button();
+      this.nodeDegreeLabel = new System.Windows.Forms.Label();
+      this.nodeDegreeLabelLabel = new System.Windows.Forms.Label();
+      this.nodeRankLabel = new System.Windows.Forms.Label();
+      this.nodeRankLabelLabel = new System.Windows.Forms.Label();
+      this.nodeQualityLabel = new System.Windows.Forms.Label();
+      this.nodeQualityLabelLabel = new System.Windows.Forms.Label();
+      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
+      this.splitContainer.Panel1.SuspendLayout();
+      this.splitContainer.Panel2.SuspendLayout();
+      this.splitContainer.SuspendLayout();
+      this.groupBox1.SuspendLayout();
       this.SuspendLayout();
+      // 
+      // splitContainer
+      // 
+      // 
+      // genealogyGraphChart
+      // 
+      this.genealogyGraphChart.Size = new System.Drawing.Size(692, 697);
+      // 
+      // groupBox1
+      // 
+      this.groupBox1.Controls.Add(this.navigateRightButton);
+      this.groupBox1.Controls.Add(this.navigateLeftButton);
+      this.groupBox1.Controls.Add(this.nodeDegreeLabel);
+      this.groupBox1.Controls.Add(this.nodeDegreeLabelLabel);
+      this.groupBox1.Controls.Add(this.nodeRankLabel);
+      this.groupBox1.Controls.Add(this.nodeRankLabelLabel);
+      this.groupBox1.Controls.Add(this.nodeQualityLabel);
+      this.groupBox1.Controls.Add(this.nodeQualityLabelLabel);
+      this.groupBox1.Location = new System.Drawing.Point(420, 4);
+      this.groupBox1.Name = "groupBox1";
+      this.groupBox1.Size = new System.Drawing.Size(624, 44);
+      this.groupBox1.TabIndex = 2;
+      this.groupBox1.TabStop = false;
+      this.groupBox1.Text = "Current Node";
+      // 
+      // navigateRightButton
+      // 
+      this.navigateRightButton.Image = global::HeuristicLab.Problems.DataAnalysis.Symbolic.Views.Properties.Resources.LargeLeftDiagonal_235;
+      this.navigateRightButton.Location = new System.Drawing.Point(309, 15);
+      this.navigateRightButton.Name = "navigateRightButton";
+      this.navigateRightButton.Size = new System.Drawing.Size(22, 22);
+      this.navigateRightButton.TabIndex = 6;
+      this.navigateRightButton.UseVisualStyleBackColor = true;
+      this.navigateRightButton.Click += new System.EventHandler(this.navigateRightButton_Click);
+      // 
+      // navigateLeftButton
+      // 
+      this.navigateLeftButton.Image = global::HeuristicLab.Problems.DataAnalysis.Symbolic.Views.Properties.Resources.LargeRightDiagonal_238;
+      this.navigateLeftButton.Location = new System.Drawing.Point(281, 15);
+      this.navigateLeftButton.Name = "navigateLeftButton";
+      this.navigateLeftButton.Size = new System.Drawing.Size(22, 22);
+      this.navigateLeftButton.TabIndex = 6;
+      this.navigateLeftButton.UseVisualStyleBackColor = true;
+      this.navigateLeftButton.Click += new System.EventHandler(this.navigateLeftButton_Click);
+      // 
+      // nodeDegreeLabel
+      // 
+      this.nodeDegreeLabel.AutoSize = true;
+      this.nodeDegreeLabel.Location = new System.Drawing.Point(235, 20);
+      this.nodeDegreeLabel.Name = "nodeDegreeLabel";
+      this.nodeDegreeLabel.Size = new System.Drawing.Size(0, 13);
+      this.nodeDegreeLabel.TabIndex = 5;
+      // 
+      // nodeDegreeLabelLabel
+      // 
+      this.nodeDegreeLabelLabel.AutoSize = true;
+      this.nodeDegreeLabelLabel.Location = new System.Drawing.Point(192, 20);
+      this.nodeDegreeLabelLabel.Name = "nodeDegreeLabelLabel";
+      this.nodeDegreeLabelLabel.Size = new System.Drawing.Size(45, 13);
+      this.nodeDegreeLabelLabel.TabIndex = 4;
+      this.nodeDegreeLabelLabel.Text = "Degree:";
+      // 
+      // nodeRankLabel
+      // 
+      this.nodeRankLabel.AutoSize = true;
+      this.nodeRankLabel.Location = new System.Drawing.Point(138, 20);
+      this.nodeRankLabel.Name = "nodeRankLabel";
+      this.nodeRankLabel.Size = new System.Drawing.Size(0, 13);
+      this.nodeRankLabel.TabIndex = 3;
+      // 
+      // nodeRankLabelLabel
+      // 
+      this.nodeRankLabelLabel.AutoSize = true;
+      this.nodeRankLabelLabel.Location = new System.Drawing.Point(96, 20);
+      this.nodeRankLabelLabel.Name = "nodeRankLabelLabel";
+      this.nodeRankLabelLabel.Size = new System.Drawing.Size(36, 13);
+      this.nodeRankLabelLabel.TabIndex = 2;
+      this.nodeRankLabelLabel.Text = "Rank:";
+      // 
+      // nodeQualityLabel
+      // 
+      this.nodeQualityLabel.AutoSize = true;
+      this.nodeQualityLabel.Location = new System.Drawing.Point(54, 20);
+      this.nodeQualityLabel.Name = "nodeQualityLabel";
+      this.nodeQualityLabel.Size = new System.Drawing.Size(0, 13);
+      this.nodeQualityLabel.TabIndex = 1;
+      // 
+      // nodeQualityLabelLabel
+      // 
+      this.nodeQualityLabelLabel.AutoSize = true;
+      this.nodeQualityLabelLabel.Location = new System.Drawing.Point(6, 20);
+      this.nodeQualityLabelLabel.Name = "nodeQualityLabelLabel";
+      this.nodeQualityLabelLabel.Size = new System.Drawing.Size(42, 13);
+      this.nodeQualityLabelLabel.TabIndex = 0;
+      this.nodeQualityLabelLabel.Text = "Quality:";
       // 
       // SymbolicDataAnalysisGenealogyGraphView
@@ -52 +160 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.groupBox1);
       this.Name = "SymbolicDataAnalysisGenealogyGraphView";
       this.Size = new System.Drawing.Size(1247, 755);
+      this.Controls.SetChildIndex(this.splitContainer, 0);
+      this.Controls.SetChildIndex(this.groupBox1, 0);
+      this.splitContainer.Panel1.ResumeLayout(false);
+      this.splitContainer.Panel2.ResumeLayout(false);
+      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
+      this.splitContainer.ResumeLayout(false);
+      this.groupBox1.ResumeLayout(false);
+      this.groupBox1.PerformLayout();
       this.ResumeLayout(false);
+
     }
 
     #endregion
+
+    private System.Windows.Forms.GroupBox groupBox1;
+    private System.Windows.Forms.Label nodeQualityLabelLabel;
+    private System.Windows.Forms.Label nodeQualityLabel;
+    private System.Windows.Forms.Label nodeRankLabelLabel;
+    private System.Windows.Forms.Label nodeRankLabel;
+    private System.Windows.Forms.Label nodeDegreeLabel;
+    private System.Windows.Forms.Label nodeDegreeLabelLabel;
+    private System.Windows.Forms.Button navigateRightButton;
+    private System.Windows.Forms.Button navigateLeftButton;
   }
 }

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

@@ -73 +73 @@
       var visualNode = (VisualGenealogyGraphNode)sender;
       var graphNode = (IGenealogyGraphNode<ISymbolicExpressionTree>)visualNode.Data;
+
+      nodeQualityLabel.Text = String.Format("{0:0.000}", graphNode.Quality);
+      nodeRankLabel.Text = String.Format("{0:0.0}", graphNode.Rank);
+      nodeDegreeLabel.Text = String.Format("{0} / {1}", graphNode.InDegree, graphNode.OutDegree);
 
       if (openNew_CheckBox.Checked) {
@@ -169 +173 @@
         var visualNode = SymbolicExpressionTreeChart.GetVisualSymbolicExpressionTreeNode(s);
         visualNode.LineColor = myColor;
-        //        visualNode.FillColor = myColor;
 
         foreach (var c in s.Subtrees) {
@@ -178 +181 @@
       SymbolicExpressionTreeChart.RepaintNodes();
     }
+
+    private void navigateLeftButton_Click(object sender, EventArgs e) {
+      var graphNode = (IGenealogyGraphNode<ISymbolicExpressionTree>)genealogyGraphChart.SelectedGraphNode;
+      if (graphNode.Parents.Any()) {
+        genealogyGraphChart.SelectedGraphNode = graphNode.Parents.First();
+      }
+    }
+
+    private void navigateRightButton_Click(object sender, EventArgs e) {
+      var graphNode = (IGenealogyGraphNode<ISymbolicExpressionTree>)genealogyGraphChart.SelectedGraphNode;
+      if (graphNode.Parents.Any()) {
+        genealogyGraphChart.SelectedGraphNode = graphNode.Parents.Last(); // this will only work for genealogy graphs (not trace graphs)
+      }
+    }
   }