Changeset 16516

Timestamp:

01/08/19 12:06:01 (6 years ago)

Author:

pfleck

Message:

#2972 Updated UI for PDP variable values selection.

Location:

branches/2972_PDPRowSelect/HeuristicLab.Problems.DataAnalysis.Views/3.4

Files:

• Controls/PartialDependencePlot.cs (modified) (1 diff)
• Regression/RegressionSolutionPartialDependencePlotView.Designer.cs (modified) (8 diffs)
• Regression/RegressionSolutionPartialDependencePlotView.cs (modified) (5 diffs)

branches/2972_PDPRowSelect/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/PartialDependencePlot.cs

@@ -668 +668 @@
     private void UpdateCursor() {
       var x = VerticalLineAnnotation.X;
-      sharedFixedVariables.SetVariableValue(x, FreeVariable, 0);
+
+      if (!sharedFixedVariables.GetDoubleValue(FreeVariable, 0).IsAlmost(x))
+        sharedFixedVariables.SetVariableValue(x, FreeVariable, 0);
 
       if (ShowCursor) {

branches/2972_PDPRowSelect/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionPartialDependencePlotView.Designer.cs

@@ -38 +38 @@
       this.variableGroupBox = new System.Windows.Forms.GroupBox();
       this.rowSelectGroupBox = new System.Windows.Forms.GroupBox();
-      this.comboBox1 = new System.Windows.Forms.ComboBox();
-      this.label2 = new System.Windows.Forms.Label();
+      this.variableValuesModeComboBox = new System.Windows.Forms.ComboBox();
+      this.rowLabel = new System.Windows.Forms.Label();
       this.rowNrNumericUpDown = new System.Windows.Forms.NumericUpDown();
       this.scrollPanel = new System.Windows.Forms.Panel();
@@ -71 +71 @@
       // partialDependencePlotTableLayout
       // 
-      this.partialDependencePlotTableLayout.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+      this.partialDependencePlotTableLayout.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.partialDependencePlotTableLayout.AutoSize = true;
@@ -98 +98 @@
       // limitView
       // 
-      this.limitView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+      this.limitView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.limitView.Caption = "DoubleLimit View";
@@ -135 +135 @@
       // columnsNumericUpDown
       // 
-      this.columnsNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+      this.columnsNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.columnsNumericUpDown.Location = new System.Drawing.Point(66, 46);
@@ -164 +164 @@
       // densityComboBox
       // 
-      this.densityComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+      this.densityComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.densityComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -214 +214 @@
       this.variableGroupBox.Controls.Add(this.variableListView);
       this.variableGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.variableGroupBox.Location = new System.Drawing.Point(0, 151);
+      this.variableGroupBox.Location = new System.Drawing.Point(0, 225);
       this.variableGroupBox.Name = "variableGroupBox";
       this.variableGroupBox.Size = new System.Drawing.Size(169, 423);
@@ -223 +223 @@
       // rowSelectGroupBox
       // 
-      this.rowSelectGroupBox.Controls.Add(this.comboBox1);
-      this.rowSelectGroupBox.Controls.Add(this.label2);
+      this.rowSelectGroupBox.Controls.Add(this.variableValuesModeComboBox);
+      this.rowSelectGroupBox.Controls.Add(this.rowLabel);
       this.rowSelectGroupBox.Controls.Add(this.rowNrNumericUpDown);
-      this.rowSelectGroupBox.Dock = System.Windows.Forms.DockStyle.Bottom;
-      this.rowSelectGroupBox.Location = new System.Drawing.Point(0, 574);
+      this.rowSelectGroupBox.Dock = System.Windows.Forms.DockStyle.Top;
+      this.rowSelectGroupBox.Location = new System.Drawing.Point(0, 151);
       this.rowSelectGroupBox.Name = "rowSelectGroupBox";
       this.rowSelectGroupBox.Size = new System.Drawing.Size(169, 74);
       this.rowSelectGroupBox.TabIndex = 1;
       this.rowSelectGroupBox.TabStop = false;
-      this.rowSelectGroupBox.Text = "Set Fixed Variable Values";
-      // 
-      // comboBox1
-      // 
-      this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-      this.comboBox1.FormattingEnabled = true;
-      this.comboBox1.Items.AddRange(new object[] {
+      this.rowSelectGroupBox.Text = "Variable Values";
+      // 
+      // variableValuesModeComboBox
+      // 
+      this.variableValuesModeComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.variableValuesModeComboBox.FormattingEnabled = true;
+      this.variableValuesModeComboBox.Items.AddRange(new object[] {
+            "Row",
             "Mean",
             "Median",
             "Most Common"});
-      this.comboBox1.Location = new System.Drawing.Point(10, 45);
-      this.comboBox1.Name = "comboBox1";
-      this.comboBox1.Size = new System.Drawing.Size(150, 21);
-      this.comboBox1.TabIndex = 3;
-      // 
-      // label2
-      // 
-      this.label2.AutoSize = true;
-      this.label2.Location = new System.Drawing.Point(7, 21);
-      this.label2.Name = "label2";
-      this.label2.Size = new System.Drawing.Size(46, 13);
-      this.label2.TabIndex = 2;
-      this.label2.Text = "Row Nr.";
+      this.variableValuesModeComboBox.Location = new System.Drawing.Point(10, 19);
+      this.variableValuesModeComboBox.Name = "variableValuesModeComboBox";
+      this.variableValuesModeComboBox.Size = new System.Drawing.Size(150, 21);
+      this.variableValuesModeComboBox.TabIndex = 3;
+      this.variableValuesModeComboBox.SelectedValueChanged += new System.EventHandler(this.variableValuesComboBox_SelectedValueChanged);
+      // 
+      // rowLabel
+      // 
+      this.rowLabel.AutoSize = true;
+      this.rowLabel.Location = new System.Drawing.Point(7, 48);
+      this.rowLabel.Name = "rowLabel";
+      this.rowLabel.Size = new System.Drawing.Size(44, 13);
+      this.rowLabel.TabIndex = 2;
+      this.rowLabel.Text = "Row nr.";
       // 
       // rowNrNumericUpDown
       // 
-      this.rowNrNumericUpDown.Location = new System.Drawing.Point(66, 19);
+      this.rowNrNumericUpDown.Location = new System.Drawing.Point(66, 46);
       this.rowNrNumericUpDown.Name = "rowNrNumericUpDown";
       this.rowNrNumericUpDown.Size = new System.Drawing.Size(94, 20);
@@ -322 +324 @@
     private System.Windows.Forms.NumericUpDown columnsNumericUpDown;
     private System.Windows.Forms.GroupBox rowSelectGroupBox;
-    private System.Windows.Forms.ComboBox comboBox1;
-    private System.Windows.Forms.Label label2;
+    private System.Windows.Forms.ComboBox variableValuesModeComboBox;
+    private System.Windows.Forms.Label rowLabel;
     private System.Windows.Forms.NumericUpDown rowNrNumericUpDown;
   }

branches/2972_PDPRowSelect/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionPartialDependencePlotView.cs

@@ -120 +120 @@
         Content.ProblemData.Dataset.VariableNames.Where(v => inputvariables.Contains(v)).ToList();
 
-
+      // ToDo: set default values with the variableValuesMode
       var doubleVariables = allowedInputVariables.Where(problemData.Dataset.VariableHasType<double>);
-      var doubleVariableValues = (IEnumerable<IList>)doubleVariables.Select(x => new List<double> { problemData.Dataset.GetDoubleValues(x, problemData.TrainingIndices).Median() });
+      var doubleVariableValues = (IEnumerable<IList>)doubleVariables.Select(x => new List<double> {
+        problemData.Dataset.GetDoubleValues(x, problemData.TrainingIndices).Median()
+      });
 
       var factorVariables = allowedInputVariables.Where(problemData.Dataset.VariableHasType<string>);
       var factorVariableValues = (IEnumerable<IList>)factorVariables.Select(x => new List<string> {
-        problemData.Dataset.GetStringValues(x, problemData.TrainingIndices)
-        .GroupBy(val => val).OrderByDescending(g => g.Count()).First().Key // most frequent value
+        MostCommon(problemData.Dataset.GetStringValues(x, problemData.TrainingIndices))
       });
 
-      if (sharedFixedVariables != null)
+      if (sharedFixedVariables != null) {
         sharedFixedVariables.ItemChanged -= SharedFixedVariables_ItemChanged;
+        sharedFixedVariables.Reset -= SharedFixedVariables_Reset;
+      }
 
       sharedFixedVariables = new ModifiableDataset(doubleVariables.Concat(factorVariables), doubleVariableValues.Concat(factorVariableValues));
@@ -230 +233 @@
 
       sharedFixedVariables.ItemChanged += SharedFixedVariables_ItemChanged;
+      sharedFixedVariables.Reset += SharedFixedVariables_Reset;
 
       rowNrNumericUpDown.Maximum = Content.ProblemData.Dataset.Rows - 1;
@@ -237 +241 @@
 
     private void SharedFixedVariables_ItemChanged(object sender, EventArgs<int, int> e) {
+      SharedFixedVariablesChanged();
+    }
+    private void SharedFixedVariables_Reset(object sender, EventArgs e) {
+      SharedFixedVariablesChanged();
+    }
+    private void SharedFixedVariablesChanged() {
+      if (!setVariableValues) // set mode to "nothing" if change was not initiated from a "mode change"
+        variableValuesModeComboBox.SelectedIndex = -1;
+
       double yValue = Content.Model.GetEstimatedValues(sharedFixedVariables, new[] { 0 }).Single();
       string title = Content.ProblemData.TargetVariable + ": " + yValue.ToString("G5", CultureInfo.CurrentCulture);
@@ -245 +258 @@
       }
     }
-
 
     private void OnPartialDependencePlotPostPaint(object o, EventArgs e) {
@@ -567 +579 @@
     }
 
+    // flag that the current change is not triggered by a manual change from within a single plot
+    private bool setVariableValues = false;
+    private void variableValuesComboBox_SelectedValueChanged(object sender, EventArgs e) {
+      if (variableValuesModeComboBox.SelectedIndex == -1)
+        return; // changed to "manual" due to manual change of a variable
+      setVariableValues = true;
+      UpdateVariableValues();
+      setVariableValues = false;
+    }
     private void rowNrNumericUpDown_ValueChanged(object sender, EventArgs e) {
-      int rowNumber = (int)rowNrNumericUpDown.Value;
+      if ((string)variableValuesModeComboBox.SelectedItem != "Row") {
+        variableValuesModeComboBox.SelectedItem = "Row"; // triggers UpdateVariableValues
+      } else {
+        setVariableValues = true;
+        UpdateVariableValues();
+        setVariableValues = false;
+      }
+    }
+    private void UpdateVariableValues() {
+      string mode = (string)variableValuesModeComboBox.SelectedItem;
+
       var dataset = Content.ProblemData.Dataset;
-
-      object[] newRow = sharedFixedVariables.VariableNames
-        .Select<string, object>(variableName => {
-          if (dataset.DoubleVariables.Contains(variableName)) {
-            return dataset.GetDoubleValue(variableName, rowNumber);
-          } else if (dataset.StringVariables.Contains(variableName)) {
-            return dataset.GetStringValue(variableName, rowNumber);
-          } else {
-            throw new NotSupportedException("Only double and string(factor) columns are currently supported.");
-          }
-        }).ToArray();
+      object[] newRow;
+
+      if (mode == "Row") {
+        int rowNumber = (int)rowNrNumericUpDown.Value;
+        newRow = sharedFixedVariables.VariableNames
+          .Select<string, object>(variableName => {
+            if (dataset.DoubleVariables.Contains(variableName)) {
+              return dataset.GetDoubleValue(variableName, rowNumber);
+            } else if (dataset.StringVariables.Contains(variableName)) {
+              return dataset.GetStringValue(variableName, rowNumber);
+            } else {
+              throw new NotSupportedException("Only double and string(factor) columns are currently supported.");
+            }
+          }).ToArray();
+      } else {
+        //int si = densityComboBox.SelectedIndex;
+        newRow = sharedFixedVariables.VariableNames
+          .Select<string, object>(variableName => {
+            if (dataset.DoubleVariables.Contains(variableName)) {
+              var values = dataset.GetDoubleValues(variableName/*, GetDensityIndices(si)*/);
+              return
+                mode == "Mean" ? values.Average() :
+                mode == "Median" ? values.Median() :
+                mode == "Most Common" ? MostCommon(values) :
+                throw new NotSupportedException();
+            } else if (dataset.StringVariables.Contains(variableName)) {
+              var values = dataset.GetStringValues(variableName/*, GetDensityIndices(si)*/);
+              return
+                mode == "Mean" ? MostCommon(values) :
+                mode == "Median" ? MostCommon(values) :
+                mode == "Most Common" ? MostCommon(values) :
+                throw new NotSupportedException();
+            } else {
+              throw new NotSupportedException("Only double and string(factor) columns are currently supported.");
+            }
+          }).ToArray();
+      }
 
       sharedFixedVariables.ReplaceRow(0, newRow);
+    }
+
+    private static T MostCommon<T>(IEnumerable<T> values) {
+      return values.GroupBy(x => x).OrderByDescending(g => g.Count()).Select(g => g.Key).First();
     }
   }