Changeset 8925 for trunk/sources/HeuristicLab.Optimization.Views

Timestamp:

11/20/12 12:13:24 (11 years ago)

Author:

bburlacu

Message:

#1890: Reverted erroneous commit for RunCollectionDataTableView.cs and RunCollectionDataTableView.Designer.cs.

Location:

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionViews

Files:

• RunCollectionDataTableView.Designer.cs (modified) (5 diffs)
• RunCollectionDataTableView.cs (modified) (2 diffs)

trunk/sources/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.label3 = new System.Windows.Forms.Label();
-      this.groupByComboBox = new System.Windows.Forms.ComboBox();
       this.SuspendLayout();
       // 
       // dataTableComboBox
       // 
-      this.dataTableComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+      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;
@@ -76 +74 @@
       // 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";
@@ -101 +99 @@
       // dataRowComboBox
       // 
-      this.dataRowComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+      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;
@@ -111 +109 @@
       this.dataRowComboBox.SelectedIndexChanged += new System.EventHandler(this.dataRowComboBox_SelectedIndexChanged);
       // 
-      // label3
-      // 
-      this.label3.AutoSize = true;
-      this.label3.Location = new System.Drawing.Point(3, 61);
-      this.label3.Name = "label3";
-      this.label3.Size = new System.Drawing.Size(53, 13);
-      this.label3.TabIndex = 5;
-      this.label3.Text = "Grouping:";
-      // 
-      // groupByComboBox
-      // 
-      this.groupByComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-      this.groupByComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-      this.groupByComboBox.FormattingEnabled = true;
-      this.groupByComboBox.Items.AddRange(new object[] {
-            "None",
-            "Same runs",
-            "All"});
-      this.groupByComboBox.Location = new System.Drawing.Point(69, 58);
-      this.groupByComboBox.Name = "groupByComboBox";
-      this.groupByComboBox.Size = new System.Drawing.Size(455, 21);
-      this.groupByComboBox.TabIndex = 6;
-      this.groupByComboBox.SelectedIndexChanged += new System.EventHandler(this.groupByComboBox_SelectedIndexChanged);
-      // 
       // RunCollectionDataTableView
       // 
+      this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
-      this.Controls.Add(this.groupByComboBox);
-      this.Controls.Add(this.label3);
       this.Controls.Add(this.dataRowComboBox);
       this.Controls.Add(this.label2);
@@ -160 +132 @@
     private System.Windows.Forms.Label label2;
     private System.Windows.Forms.ComboBox dataRowComboBox;
-    private System.Windows.Forms.Label label3;
-    private System.Windows.Forms.ComboBox groupByComboBox;
   }
 }

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionDataTableView.cs

@@ -220 +220 @@
       dataRowComboBox.Items.Add(AllDataRows);
       if (dataRowComboBox.Items.Count > 0) dataRowComboBox.SelectedItem = dataRowComboBox.Items[0];
-      groupByComboBox.SelectedItem = groupByComboBox.Items[0];
     }
 
@@ -227 +226 @@
     }
     private void dataRowComboBox_SelectedIndexChanged(object sender, System.EventArgs e) {
-      //      RebuildCombinedDataTable();
-      groupByComboBox_SelectedIndexChanged(sender, e);
-    }
-    private void groupByComboBox_SelectedIndexChanged(object sender, System.EventArgs e) {
-      var resultName = (string)dataTableComboBox.SelectedItem;
-      var groupByCriteriaName = (string)groupByComboBox.SelectedItem;
-      switch (groupByCriteriaName) {
-        case ("None"): {
-            combinedDataTable.Rows.Clear();
-            RebuildCombinedDataTable();
-            break;
-          }
-        case ("Same runs"): {
-            var rowName = (string)dataRowComboBox.SelectedItem;
-            var runGroups = Content.GroupBy(r => r.Algorithm);
-            combinedDataTable.Rows.Clear();
-            foreach (var g in runGroups) {
-              var dataTable = g.Select(r => r.Results[resultName] as DataTable);
-              var rows = dataTable.SelectMany(d => d.Rows.Where(row => row.Name == rowName)).ToList();
-              var avgRow = new DataRow { VisualProperties = { StartIndexZero = true }, Name = resultName + "." + rowName };
-              var min = rows.Min(r => r.Values.Count);
-              for (int i = 0; i != min; ++i) {
-                avgRow.Values.Add(rows.Average(r => r.Values[i]));
-              }
-              combinedDataTable.Rows.Add(avgRow);
-            }
-            break;
-          }
-        case ("All"): {
-            var rowName = (string)dataRowComboBox.SelectedItem;
-            RebuildCombinedDataTable();
-            var rows = combinedDataTable.Rows;
-            var avgRow = new DataRow { VisualProperties = { StartIndexZero = true }, Name = resultName + "." + rowName };
-            var min = rows.Min(r => r.Values.Count);
-            for (int i = 0; i != min; ++i) {
-              avgRow.Values.Add(rows.Average(r => r.Values[i]));
-            }
-            combinedDataTable.Rows.Clear();
-            combinedDataTable.Rows.Add(avgRow);
-            break;
-          }
-      }
+      RebuildCombinedDataTable();
     }
   }