Changeset 9320

Timestamp:

03/18/13 19:29:07 (11 years ago)

Author:

ascheibe

Message:

#1886 some more improvements for the statistical testing view

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views/3.3

Files:

• StatisticalTestingView.cs (modified) (5 diffs)
• StatisticalTestingView.designer.cs (modified) (2 diffs)
• StatisticalTestingView.resx (modified) (1 diff)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views/3.3/StatisticalTestingView.cs

@@ -75 +75 @@
 
       var parameters = (from run in Content
+                        where run.Visible
                         from param in run.Parameters
                         select param.Key).Distinct().ToArray();
@@ -80 +81 @@
       foreach (var p in parameters) {
         var variations = (from run in Content
-                          where run.Parameters.ContainsKey(p) &&
+                          where run.Visible && run.Parameters.ContainsKey(p) &&
                           (run.Parameters[p] is IntValue || run.Parameters[p] is DoubleValue ||
                           run.Parameters[p] is StringValue || run.Parameters[p] is BoolValue)
@@ -89 +90 @@
         }
       }
-      if (groupComboBox.Items.Count > 0) groupComboBox.SelectedItem = groupComboBox.Items[0];
+
+      if (groupComboBox.Items.Count > 0) {
+        //try to select something different than "Seed" or "Algorithm Name" as this makes no sense
+        //and takes a long time to group
+        List<int> possibleIndizes = new List<int>();
+        for (int i = 0; i < groupComboBox.Items.Count; i++) {
+          if (groupComboBox.Items[i].ToString() != "Seed"
+            && groupComboBox.Items[i].ToString() != "Algorithm Name") {
+            possibleIndizes.Add(i);
+          }
+        }
+
+        if (possibleIndizes.Count > 0) {
+          groupComboBox.SelectedItem = groupComboBox.Items[possibleIndizes.First()];
+        } else {
+          groupComboBox.SelectedItem = groupComboBox.Items[0];
+        }
+      }
     }
 
@@ -101 +119 @@
       resultComboBox.Items.Clear();
       var results = (from run in Content
+                     where run.Visible
                      from result in run.Results
                      where result.Value is IntValue || result.Value is DoubleValue
@@ -139 +158 @@
     }
 
-    private List<RunCollection> GetGroups(string[] columnNames, IEnumerable<IRun> runs) {
-      List<RunCollection> runCols = new List<RunCollection>();
+    private List<IEnumerable<IRun>> GetGroups(string[] columnNames, IEnumerable<IRun> runs) {
+      List<IEnumerable<IRun>> runCols = new List<IEnumerable<IRun>>();
       string parameterName = (string)groupComboBox.SelectedItem;
 
       foreach (string cn in columnNames) {
         var tmpRuns = runs.Where(x => ((string)((dynamic)x.Parameters[parameterName]).Value.ToString()) == cn);
-        runCols.Add(new RunCollection(tmpRuns));
+        runCols.Add(tmpRuns);
       }
 

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views/3.3/StatisticalTestingView.designer.cs

@@ -131 +131 @@
       this.normalDistButton.Location = new System.Drawing.Point(3, 3);
       this.normalDistButton.Name = "normalDistButton";
-      this.normalDistButton.Size = new System.Drawing.Size(155, 23);
+      this.normalDistButton.Size = new System.Drawing.Size(166, 23);
       this.normalDistButton.TabIndex = 11;
       this.normalDistButton.Text = "Check for Normal Distribution";
@@ -170 +170 @@
       // normalityDetails
       // 
-      this.normalityDetails.Location = new System.Drawing.Point(164, 3);
+      this.normalityDetails.Location = new System.Drawing.Point(175, 3);
       this.normalityDetails.Name = "normalityDetails";
       this.normalityDetails.Size = new System.Drawing.Size(181, 23);

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views/3.3/StatisticalTestingView.resx

@@ -166 +166 @@
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEAAACxABrSO9dQAAABl0RVh0U29mdHdhcmUA
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDwAACw8BkvkDpQAAABl0RVh0U29mdHdhcmUA
         UGFpbnQuTkVUIHYzLjUuODc7gF0AAAK0SURBVDhPrZBrSNNRAMWNvkVEEBT0oY+BUAgSRBhIQmUqKYb4
         KgudU1MTlj2WZUlMykdu+VhatmWKWaaITF35qCmzWoaGj81kms72dm5/3cM9TtvdX9Sob/0+XC6Hcw73