Changeset 15673 for trunk

Timestamp:

01/30/18 13:53:04 (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) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionVariableImpactsView.cs (modified) (7 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 {

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

@@ -32 +32 @@
   [Content(typeof(IRegressionSolution))]
   public partial class RegressionSolutionVariableImpactsView : DataAnalysisSolutionEvaluationView {
+    private enum SortingCriteria {
+      ImpactValue,
+      Occurrence,
+      VariableName
+    }
+
     private Dictionary<string, double> rawVariableImpacts = new Dictionary<string, double>();
 
@@ -46 +52 @@
 
       //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.sortByComboBox.Items.AddRange(Enum.GetValues(typeof(SortingCriteria)).Cast<object>().ToArray());
+      this.sortByComboBox.SelectedItem = SortingCriteria.ImpactValue;
 
       this.dataPartitionComboBox.SelectedIndex = 0;
@@ -96 +102 @@
       //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:
+      switch ((SortingCriteria)sortByComboBox.SelectedItem) {
+        case SortingCriteria.ImpactValue:
           ascendingCheckBox.Checked = false;
           break;
-        case RegressionSolutionVariableImpactsCalculator.SortingCriteria.Occurrence:
+        case SortingCriteria.Occurrence:
           ascendingCheckBox.Checked = true;
           break;
-        case RegressionSolutionVariableImpactsCalculator.SortingCriteria.VariableName:
+        case SortingCriteria.VariableName:
           ascendingCheckBox.Checked = true;
           break;
         default:
-          throw new Exception("Cannot interpret SortingCriteria");
+          throw new NotImplementedException("Ordering for selected SortingCriteria not implemented");
       }
       ascendingCheckBox.CheckedChanged += ascendingCheckBox_CheckedChanged;
@@ -121 +127 @@
     #region Helper Methods         
     private void UpdateVariableImpacts() {
-      if (Content == null || replacementComboBox.SelectedIndex < 0
-        || factorVarReplComboBox.SelectedIndex < 0
-        || dataPartitionComboBox.SelectedIndex < 0) return;
+      if (Content == null) { return; }
+      if (replacementComboBox.SelectedIndex < 0) { return; }
+      if (dataPartitionComboBox.SelectedIndex < 0) { return; }
+      if (factorVarReplComboBox.SelectedIndex < 0) { return; }
+
+      variableImactsArrayView.Caption = Content.Name + " Variable Impacts";
+
       var mainForm = (MainForm.WindowsForms.MainForm)MainFormManager.MainForm;
-      variableImactsArrayView.Caption = Content.Name + " Variable Impacts";
-      var replMethod =
-         (RegressionSolutionVariableImpactsCalculator.ReplacementMethodEnum)
-           replacementComboBox.Items[replacementComboBox.SelectedIndex];
-      var factorReplMethod =
-        (RegressionSolutionVariableImpactsCalculator.FactorReplacementMethodEnum)
-          factorVarReplComboBox.Items[factorVarReplComboBox.SelectedIndex];
-      var dataPartition =
-        (RegressionSolutionVariableImpactsCalculator.DataPartitionEnum)dataPartitionComboBox.SelectedItem;
+      var replMethod = (RegressionSolutionVariableImpactsCalculator.ReplacementMethodEnum)replacementComboBox.Items[replacementComboBox.SelectedIndex];
+      var factorReplMethod = (RegressionSolutionVariableImpactsCalculator.FactorReplacementMethodEnum)factorVarReplComboBox.Items[factorVarReplComboBox.SelectedIndex];
+      var dataPartition = (RegressionSolutionVariableImpactsCalculator.DataPartitionEnum)dataPartitionComboBox.SelectedItem;
 
       Task.Factory.StartNew(() => {
@@ -146 +150 @@
           rawVariableImpacts.Clear();
           originalVariableOrdering.ForEach(v => rawVariableImpacts.Add(v, impacts.First(vv => vv.Item1 == v).Item2));
+          UpdateDataOrdering();
         } finally {
           mainForm.RemoveOperationProgressFromView(this);
-          UpdateDataOrdering();
         }
       });
@@ -159 +163 @@
     private void UpdateDataOrdering() {
       //Check if valid sortingCriteria is selected and data exists
-      if (sortByComboBox.SelectedIndex == -1 || rawVariableImpacts == null || !rawVariableImpacts.Any()) { return; }
+      if (sortByComboBox.SelectedIndex == -1) { return; }
+      if (rawVariableImpacts == null) { return; }
+      if (!rawVariableImpacts.Any()) { return; }
 
-      var selectedItem = (RegressionSolutionVariableImpactsCalculator.SortingCriteria)sortByComboBox.SelectedItem;
+      var selectedItem = (SortingCriteria)sortByComboBox.SelectedItem;
       bool ascending = ascendingCheckBox.Checked;
 
@@ -168 +174 @@
       //Sort accordingly
       switch (selectedItem) {
-        case RegressionSolutionVariableImpactsCalculator.SortingCriteria.ImpactValue:
-          orderedEntries = ascending ? rawVariableImpacts.OrderBy(v => v.Value) : rawVariableImpacts.OrderByDescending(v => v.Value);
+        case SortingCriteria.ImpactValue:
+          orderedEntries = rawVariableImpacts.OrderBy(v => v.Value);
           break;
-        case RegressionSolutionVariableImpactsCalculator.SortingCriteria.Occurrence:
-          orderedEntries = ascending ? rawVariableImpacts : rawVariableImpacts.Reverse();
+        case SortingCriteria.Occurrence:
+          orderedEntries = rawVariableImpacts;
           break;
-        case RegressionSolutionVariableImpactsCalculator.SortingCriteria.VariableName:
-          orderedEntries = ascending ? rawVariableImpacts.OrderBy(v => v.Key, new NaturalStringComparer()) : rawVariableImpacts.OrderByDescending(v => v.Key, new NaturalStringComparer());
+        case SortingCriteria.VariableName:
+          orderedEntries = rawVariableImpacts.OrderBy(v => v.Key, new NaturalStringComparer());
           break;
         default:
-          throw new Exception("Cannot interpret SortingCriteria");
+          throw new NotImplementedException("Ordering for selected SortingCriteria not implemented");
       }
+
+      if (!ascending) { orderedEntries = orderedEntries.Reverse(); }
 
       //Write the data back

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

@@ -52 +52 @@
       All
     }
-    public enum SortingCriteria {
-      ImpactValue,
-      Occurrence,
-      VariableName
-    }
-
+   
     private const string ReplacementParameterName = "Replacement Method";
     private const string DataPartitionParameterName = "DataPartition";