Changeset 9240 for branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Optimization.Views/3.3/RunCollectionViews

Timestamp:

02/21/13 16:20:52 (12 years ago)

Author:

bburlacu

Message:

#1772: Merged trunk changes for HeuristicLab.Optimization.Views. Modified RunCollectionDataTableView to calculate rows mean and put the results into the clipboard.

Location:

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Optimization.Views

Files:

• . (copied) (copied from trunk/sources/HeuristicLab.Optimization.Views) (1 prop)
• 3.3/RunCollectionViews/RunCollectionBubbleChartView.Designer.cs (modified) (6 diffs)
• 3.3/RunCollectionViews/RunCollectionBubbleChartView.cs (modified) (4 diffs)
• 3.3/RunCollectionViews/RunCollectionDataTableView.Designer.cs (modified) (4 diffs)
• 3.3/RunCollectionViews/RunCollectionDataTableView.cs (modified) (2 diffs)

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBubbleChartView.Designer.cs

@@ -46 +46 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
-      System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
-      System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series();
+      System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
+      System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RunCollectionBubbleChartView));
       this.yJitterLabel = new System.Windows.Forms.Label();
@@ -72 +72 @@
       this.noRunsLabel = new System.Windows.Forms.Label();
       this.sizeTrackBar = new System.Windows.Forms.TrackBar();
+      this.getDataAsMatrixToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       ((System.ComponentModel.ISupportInitialize)(this.xTrackBar)).BeginInit();
       ((System.ComponentModel.ISupportInitialize)(this.yTrackBar)).BeginInit();
@@ -188 +189 @@
       // 
       this.chart.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)));
-      chartArea2.Name = "ChartArea1";
-      this.chart.ChartAreas.Add(chartArea2);
+            | System.Windows.Forms.AnchorStyles.Left)
+            | System.Windows.Forms.AnchorStyles.Right)));
+      chartArea1.Name = "ChartArea1";
+      this.chart.ChartAreas.Add(chartArea1);
       this.chart.Location = new System.Drawing.Point(6, 30);
       this.chart.Name = "chart";
-      series2.ChartArea = "ChartArea1";
-      series2.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Point;
-      series2.IsVisibleInLegend = false;
-      series2.MarkerStyle = System.Windows.Forms.DataVisualization.Charting.MarkerStyle.Circle;
-      series2.Name = "Bubbles";
-      series2.YValuesPerPoint = 2;
-      this.chart.Series.Add(series2);
+      series1.ChartArea = "ChartArea1";
+      series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Point;
+      series1.IsVisibleInLegend = false;
+      series1.MarkerStyle = System.Windows.Forms.DataVisualization.Charting.MarkerStyle.Circle;
+      series1.Name = "Bubbles";
+      series1.YValuesPerPoint = 2;
+      this.chart.Series.Add(series1);
       this.chart.Size = new System.Drawing.Size(843, 425);
       this.chart.TabIndex = 16;
@@ -215 +216 @@
       this.openBoxPlotViewToolStripMenuItem.Text = "Open BoxPlot View";
       this.openBoxPlotViewToolStripMenuItem.Click += new System.EventHandler(this.openBoxPlotViewToolStripMenuItem_Click);
-      //
+      // 
       // hideRunToolStripMenuItem
-      //
+      // 
       this.hideRunToolStripMenuItem.Name = "hideRunToolStripMenuItem";
       this.hideRunToolStripMenuItem.Size = new System.Drawing.Size(256, 22);
       this.hideRunToolStripMenuItem.Text = "Hide Run";
-      this.hideRunToolStripMenuItem.Click += new System.EventHandler(hideRunToolStripMenuItem_Click);
+      this.hideRunToolStripMenuItem.Click += new System.EventHandler(this.hideRunToolStripMenuItem_Click);
       // 
       // zoomButton
@@ -325 +326 @@
       this.sizeTrackBar.Value = 10;
       this.sizeTrackBar.ValueChanged += new System.EventHandler(this.sizeTrackBar_ValueChanged);
+      // 
+      // ToolStripMenuItem
+      // 
+      this.getDataAsMatrixToolStripMenuItem.Name = "getDataAsMatrixToolStripMenuItem";
+      this.getDataAsMatrixToolStripMenuItem.Size = new System.Drawing.Size(256, 22);
+      this.getDataAsMatrixToolStripMenuItem.Text = "Get Data as Matrix";
+      this.getDataAsMatrixToolStripMenuItem.Click += new System.EventHandler(this.getDataAsMatrixToolStripMenuItem_Click);
       // 
       // RunCollectionBubbleChartView
@@ -386 +394 @@
     private System.Windows.Forms.Button colorYAxisButton;
     private System.Windows.Forms.TrackBar sizeTrackBar;
+    private System.Windows.Forms.ToolStripMenuItem getDataAsMatrixToolStripMenuItem;
   }
 }

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBubbleChartView.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
+using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.MainForm;
+using HeuristicLab.MainForm.WindowsForms;
 using System;
 using System.Collections.Generic;
@@ -26 +31 @@
 using System.Windows.Forms;
 using System.Windows.Forms.DataVisualization.Charting;
-using HeuristicLab.Common;
-using HeuristicLab.Core;
-using HeuristicLab.Data;
-using HeuristicLab.MainForm;
-using HeuristicLab.MainForm.WindowsForms;
 
 namespace HeuristicLab.Optimization.Views {
@@ -58 +58 @@
       chart.ContextMenuStrip.Items.Insert(0, hideRunToolStripMenuItem);
       chart.ContextMenuStrip.Items.Insert(1, openBoxPlotViewToolStripMenuItem);
+      chart.ContextMenuStrip.Items.Add(getDataAsMatrixToolStripMenuItem);
       chart.ContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(ContextMenuStrip_Opening);
 
@@ -688 +689 @@
       boxplotView.Show();
     }
+
+    private void getDataAsMatrixToolStripMenuItem_Click(object sender, EventArgs e) {
+      int xCol = Matrix.ColumnNames.ToList().IndexOf(xAxisValue);
+      var grouped = new Dictionary<string, List<string>>();
+      Dictionary<double, string> reverseMapping = null;
+      if (categoricalMapping.ContainsKey(xCol))
+        reverseMapping = categoricalMapping[xCol].ToDictionary(x => x.Value, y => y.Key.ToString());
+      foreach (var run in Content.Where(r => r.Visible)) {
+        var x = GetValue(run, xAxisValue);
+        var y = GetValue(run, yAxisValue);
+        if (!(x.HasValue && y.HasValue)) continue;
+
+        var category = reverseMapping == null ? x.Value.ToString() : reverseMapping[x.Value];
+        if (!grouped.ContainsKey(category)) grouped[category] = new List<string>();
+        grouped[category].Add(y.Value.ToString());
+      }
+
+      if (!grouped.Any()) return;
+      var matrix = new StringMatrix(grouped.Values.Max(x => x.Count), grouped.Count) {
+        ColumnNames = grouped.Keys.ToArray()
+      };
+      int i = 0;
+      foreach (var col in matrix.ColumnNames) {
+        int j = 0;
+        foreach (var y in grouped[col])
+          matrix[j++, i] = y;
+        i++;
+      }
+
+      MainFormManager.MainForm.ShowContent(matrix);
+    }
     #endregion
 

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionDataTableView.Designer.cs

@@ -49 +49 @@
       this.label2 = new System.Windows.Forms.Label();
       this.dataRowComboBox = new System.Windows.Forms.ComboBox();
+      this.meanButton = new System.Windows.Forms.Button();
       this.SuspendLayout();
       // 
       // dataTableComboBox
       // 
-      this.dataTableComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-            | System.Windows.Forms.AnchorStyles.Right)));
       this.dataTableComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
       this.dataTableComboBox.FormattingEnabled = true;
       this.dataTableComboBox.Location = new System.Drawing.Point(69, 3);
       this.dataTableComboBox.Name = "dataTableComboBox";
-      this.dataTableComboBox.Size = new System.Drawing.Size(455, 21);
+      this.dataTableComboBox.Size = new System.Drawing.Size(360, 21);
       this.dataTableComboBox.TabIndex = 0;
       this.dataTableComboBox.SelectedIndexChanged += new System.EventHandler(this.dataTableComboBox_SelectedIndexChanged);
@@ -74 +73 @@
       // viewHost
       // 
-      this.viewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-            | System.Windows.Forms.AnchorStyles.Left)
+      this.viewHost.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.viewHost.Caption = "View";
@@ -99 +98 @@
       // dataRowComboBox
       // 
-      this.dataRowComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-            | System.Windows.Forms.AnchorStyles.Right)));
       this.dataRowComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
       this.dataRowComboBox.FormattingEnabled = true;
       this.dataRowComboBox.Location = new System.Drawing.Point(69, 30);
       this.dataRowComboBox.Name = "dataRowComboBox";
-      this.dataRowComboBox.Size = new System.Drawing.Size(455, 21);
+      this.dataRowComboBox.Size = new System.Drawing.Size(360, 21);
       this.dataRowComboBox.TabIndex = 4;
       this.dataRowComboBox.SelectedIndexChanged += new System.EventHandler(this.dataRowComboBox_SelectedIndexChanged);
       // 
+      // meanButton
+      // 
+      this.meanButton.Location = new System.Drawing.Point(436, 3);
+      this.meanButton.Name = "meanButton";
+      this.meanButton.Size = new System.Drawing.Size(88, 48);
+      this.meanButton.TabIndex = 5;
+      this.meanButton.Text = "Compute Mean";
+      this.meanButton.UseVisualStyleBackColor = true;
+      this.meanButton.Click += new System.EventHandler(this.meanButton_Click);
+      // 
       // RunCollectionDataTableView
       // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
+      this.Controls.Add(this.meanButton);
       this.Controls.Add(this.dataRowComboBox);
       this.Controls.Add(this.label2);
@@ -132 +139 @@
     private System.Windows.Forms.Label label2;
     private System.Windows.Forms.ComboBox dataRowComboBox;
+    private System.Windows.Forms.Button meanButton;
   }
 }

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionDataTableView.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using System.Windows.Forms;
 using HeuristicLab.Analysis;
@@ -226 +227 @@
     }
     private void dataRowComboBox_SelectedIndexChanged(object sender, System.EventArgs e) {
+      CombinedDataTable.Rows.Clear(); // to also clear the mean values row
       RebuildCombinedDataTable();
+    }
+
+    private void meanButton_Click(object sender, EventArgs e) {
+      var caption = (string)dataRowComboBox.SelectedItem + " Mean Values";
+
+      var rows = combinedDataTable.Rows.ToList();
+
+      if (combinedDataTable.Rows.ContainsKey(caption))
+        combinedDataTable.Rows.Remove(caption);
+
+      // add an additional data row with the mean values
+      int maxCount = combinedDataTable.Rows.Max(row => row.Values.Count);
+      int rowCount = combinedDataTable.Rows.Count;
+      var meanValues = new List<double>();
+
+      for (int i = 0; i != maxCount; ++i) {
+        double mean = 0;
+        for (int j = 0; j != rowCount; ++j) {
+          mean += i < rows[j].Values.Count ? rows[j].Values[i] : 0;
+        }
+        meanValues.Add(mean / rowCount);
+      }
+
+      combinedDataTable.Rows.Add(new DataRow(caption));
+      combinedDataTable.Rows[caption].Values.AddRange(meanValues);
+      var sb = new StringBuilder();
+      foreach (var val in meanValues)
+        sb.AppendLine(val.ToString());
+      Clipboard.SetText(sb.ToString());
     }
   }