Changeset 15665

Timestamp:

01/29/18 17:19:06 (7 years ago)

Author:

fholzing

Message:

#2871: Implemented review-issues

Location:

trunk/sources

Files:

• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionVariableImpactsView.Designer.cs (modified) (5 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionVariableImpactsView.cs (modified) (8 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolutionVariableImpactsCalculator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionVariableImpactsView.Designer.cs

@@ -19 +19 @@
  */
 #endregion
+using System;
+using System.Linq;
+
 namespace HeuristicLab.Problems.DataAnalysis.Views {
   partial class RegressionSolutionVariableImpactsView {
@@ -80 +83 @@
       this.sortByComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
       this.sortByComboBox.FormattingEnabled = true;
-      this.sortByComboBox.Items.AddRange(new object[] {
-            "Impact Value",
-            "Occurrence",
-            "Variable Name"});
       this.sortByComboBox.Location = new System.Drawing.Point(407, 3);
       this.sortByComboBox.Name = "sortByComboBox";
@@ -92 +91 @@
       // factorVarReplComboBox
       // 
+      this.factorVarReplComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
       this.factorVarReplComboBox.FormattingEnabled = true;
       this.factorVarReplComboBox.Items.AddRange(new object[] {
@@ -114 +114 @@
       // replacementComboBox
       // 
+      this.replacementComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
       this.replacementComboBox.FormattingEnabled = true;
       this.replacementComboBox.Items.AddRange(new object[] {
@@ -146 +147 @@
       // dataPartitionComboBox
       // 
+      this.dataPartitionComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
       this.dataPartitionComboBox.FormattingEnabled = true;
       this.dataPartitionComboBox.Items.AddRange(new object[] {

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionVariableImpactsView.cs

@@ -19 +19 @@
  */
 #endregion
+
 using System;
 using System.Collections.Generic;
@@ -26 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.MainForm;
-using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
@@ -32 +32 @@
   [Content(typeof(IRegressionSolution))]
   public partial class RegressionSolutionVariableImpactsView : DataAnalysisSolutionEvaluationView {
-
-    private const int ORDER_BY_IMPACT = 0;
-    private const int ORDER_BY_OCCURRENCE = 1;
-    private const int ORDER_BY_NAME = 2;
-
     private Dictionary<string, double> rawVariableImpacts = new Dictionary<string, double>();
 
@@ -49 +44 @@
       : base() {
       InitializeComponent();
+
+      //Little workaround. If you fill the ComboBox-Items in the other partial class, the UI-Designer will moan.
+      this.sortByComboBox.Items.AddRange(Enum.GetValues(typeof(RegressionSolutionVariableImpactsCalculator.SortingCriteria)).Cast<object>().ToArray());
+      this.sortByComboBox.SelectedItem = RegressionSolutionVariableImpactsCalculator.SortingCriteria.ImpactValue;
+
       this.dataPartitionComboBox.SelectedIndex = 0;
       this.replacementComboBox.SelectedIndex = 0;
@@ -84 +84 @@
     }
 
+
+    private void dataPartitionComboBox_SelectedIndexChanged(object sender, EventArgs e) {
+      UpdateVariableImpacts();
+    }
+
+    private void replacementComboBox_SelectedIndexChanged(object sender, EventArgs e) {
+      UpdateVariableImpacts();
+    }
+
+    private void sortByComboBox_SelectedIndexChanged(object sender, EventArgs e) {
+      //Update the default ordering (asc,desc), but remove the eventHandler beforehand (otherwise the data would be ordered twice)
+      ascendingCheckBox.CheckedChanged -= ascendingCheckBox_CheckedChanged;
+      switch ((RegressionSolutionVariableImpactsCalculator.SortingCriteria)sortByComboBox.SelectedItem) {
+        case RegressionSolutionVariableImpactsCalculator.SortingCriteria.ImpactValue:
+          ascendingCheckBox.Checked = false;
+          break;
+        case RegressionSolutionVariableImpactsCalculator.SortingCriteria.Occurrence:
+          ascendingCheckBox.Checked = true;
+          break;
+        case RegressionSolutionVariableImpactsCalculator.SortingCriteria.VariableName:
+          ascendingCheckBox.Checked = true;
+          break;
+        default:
+          throw new Exception("Cannot interpret SortingCriteria");
+      }
+      ascendingCheckBox.CheckedChanged += ascendingCheckBox_CheckedChanged;
+
+      UpdateDataOrdering();
+    }
+
+    private void ascendingCheckBox_CheckedChanged(object sender, EventArgs e) {
+      UpdateDataOrdering();
+    }
+    #endregion
+
+    #region Helper Methods         
     private void UpdateVariableImpacts() {
       if (Content == null || replacementComboBox.SelectedIndex < 0
@@ -103 +139 @@
           mainForm.AddOperationProgressToView(this, "Calculating variable impacts for " + Content.Name);
 
+          //Remember the original ordering of the variables
           var impacts = RegressionSolutionVariableImpactsCalculator.CalculateImpacts(Content, dataPartition, replMethod, factorReplMethod);
-          var impactArray = new DoubleArray(impacts.Select(i => i.Item2).ToArray());
-          impactArray.ElementNames = impacts.Select(i => i.Item1);
-          variableImactsArrayView.Content = (DoubleArray)impactArray.AsReadOnly();
-
-          //Remember the original ordering of the variables
           var problemData = Content.ProblemData;
           var inputvariables = new HashSet<string>(problemData.AllowedInputVariables.Union(Content.Model.VariablesUsedForPrediction));
@@ -114 +146 @@
           rawVariableImpacts.Clear();
           originalVariableOrdering.ForEach(v => rawVariableImpacts.Add(v, impacts.First(vv => vv.Item1 == v).Item2));
-
         } finally {
           mainForm.RemoveOperationProgressFromView(this);
+          UpdateDataOrdering();
         }
       });
     }
 
-    private void dataPartitionComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-      ResetOrdering();
-      UpdateVariableImpacts();
-    }
-
-    private void replacementComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-      ResetOrdering();
-      UpdateVariableImpacts();
-    }
-
-    private void sortByComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-      //Update the default ordering (asc,desc), but remove the eventHandler beforehand (otherwise the data would be ordered twice)
-      ascendingCheckBox.CheckedChanged -= ascendingCheckBox_CheckedChanged;
-      switch (sortByComboBox.SelectedIndex) {
-        case ORDER_BY_IMPACT: {
-            ascendingCheckBox.Checked = false;
-            break;
-          }
-        case ORDER_BY_OCCURRENCE: {
-            ascendingCheckBox.Checked = true;
-            break;
-          }
-        case ORDER_BY_NAME: {
-            ascendingCheckBox.Checked = true;
-            break;
-          }
-      }
-      ascendingCheckBox.CheckedChanged += ascendingCheckBox_CheckedChanged;
-
-      UpdateDataOrdering();
-    }
-
-    private void ascendingCheckBox_CheckedChanged(object sender, EventArgs e) {
-      UpdateDataOrdering();
-    }
-    #endregion
-
-    #region Helper Methods
     /// <summary>
     /// Updates the <see cref="variableImactsArrayView"/> according to the selected ordering <see cref="ascendingCheckBox"/> of the selected Column <see cref="sortByComboBox"/>
@@ -164 +158 @@
     /// </summary>
     private void UpdateDataOrdering() {
-      int orderIdx = sortByComboBox.SelectedIndex;
+      //Check if valid sortingCriteria is selected and data exists
+      if (sortByComboBox.SelectedIndex == -1 || rawVariableImpacts == null || !rawVariableImpacts.Any()) { return; }
+
+      var selectedItem = (RegressionSolutionVariableImpactsCalculator.SortingCriteria)sortByComboBox.SelectedItem;
       bool ascending = ascendingCheckBox.Checked;
 
-      //Check if valid ordering is selected AND at if any VariableImpact exists
-      if (orderIdx > -1 && rawVariableImpacts != null && rawVariableImpacts.Any()) {
-        IEnumerable<KeyValuePair<string, double>> orderedEntries = null;
+      IEnumerable<KeyValuePair<string, double>> orderedEntries = null;
 
-        //Sort accordingly
-        switch (orderIdx) {
-          case ORDER_BY_IMPACT: {
-              orderedEntries = ascending ? rawVariableImpacts.OrderBy(v => v.Value) : rawVariableImpacts.OrderByDescending(v => v.Value);
-              break;
-            }
-          case ORDER_BY_OCCURRENCE: {
-              orderedEntries = ascending ? rawVariableImpacts : rawVariableImpacts.Reverse();
-              break;
-            }
-          case ORDER_BY_NAME: {
-              orderedEntries = ascending ? rawVariableImpacts.OrderBy(v => v.Key, new NaturalStringComparer()) : rawVariableImpacts.OrderByDescending(v => v.Key, new NaturalStringComparer());
-              break;
-            }
-        }
+      //Sort accordingly
+      switch (selectedItem) {
+        case RegressionSolutionVariableImpactsCalculator.SortingCriteria.ImpactValue:
+          orderedEntries = ascending ? rawVariableImpacts.OrderBy(v => v.Value) : rawVariableImpacts.OrderByDescending(v => v.Value);
+          break;
+        case RegressionSolutionVariableImpactsCalculator.SortingCriteria.Occurrence:
+          orderedEntries = ascending ? rawVariableImpacts : rawVariableImpacts.Reverse();
+          break;
+        case RegressionSolutionVariableImpactsCalculator.SortingCriteria.VariableName:
+          orderedEntries = ascending ? rawVariableImpacts.OrderBy(v => v.Key, new NaturalStringComparer()) : rawVariableImpacts.OrderByDescending(v => v.Key, new NaturalStringComparer());
+          break;
+        default:
+          throw new Exception("Cannot interpret SortingCriteria");
+      }
 
-        //Write the data back
-        var impactArray = new DoubleArray(orderedEntries.Select(i => i.Value).ToArray()) {
-          ElementNames = orderedEntries.Select(i => i.Key)
-        };
-        variableImactsArrayView.Content = (DoubleArray)impactArray.AsReadOnly();
-      }
-    }
-
-    /// <summary>
-    /// Resets the ordering to the default behaviour (descending by variableImpact), meaning <see cref="ascendingCheckBox"/> and <see cref="sortByComboBox"/> will be updated
-    /// Note: this will NOT update the UI
-    /// </summary>
-    private void ResetOrdering() {
-      //The events shouldn't fire everytime we reset the data
-      ascendingCheckBox.CheckedChanged -= ascendingCheckBox_CheckedChanged;
-      sortByComboBox.SelectedIndexChanged -= sortByComboBox_SelectedIndexChanged;
-
-      ascendingCheckBox.Checked = false;
-      sortByComboBox.SelectedIndex = ORDER_BY_IMPACT;
-
-      ascendingCheckBox.CheckedChanged += ascendingCheckBox_CheckedChanged;
-      sortByComboBox.SelectedIndexChanged += sortByComboBox_SelectedIndexChanged;
+      //Write the data back
+      var impactArray = new DoubleArray(orderedEntries.Select(i => i.Value).ToArray()) {
+        ElementNames = orderedEntries.Select(i => i.Key)
+      };
+      variableImactsArrayView.Content = (DoubleArray)impactArray.AsReadOnly();
     }
     #endregion

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolutionVariableImpactsCalculator.cs

@@ -51 +51 @@
       Test,
       All
+    }
+    public enum SortingCriteria {
+      ImpactValue,
+      Occurrence,
+      VariableName
     }