Changeset 8880 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/AbstractFeatureCorrelationView.cs

Timestamp:

11/08/12 12:10:38 (11 years ago)

Author:

sforsten

Message:

#1292: implemented changes suggested by mkommend in comment:49:ticket:1292

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/AbstractFeatureCorrelationView.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/AbstractFeatureCorrelationView.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
@@ -32 +33 @@
   [Content(typeof(DataAnalysisProblemData), false)]
   public abstract partial class AbstractFeatureCorrelationView : AsynchronousContentView {
+    public const string ALLSAMPLES = "All Samples";
+    public const string TRAININGSAMPLES = "Training Samples";
+    public const string TESTSAMPLES = "Test Samples";
+
+    public static readonly IList<string> Partitions = new List<string>() { ALLSAMPLES, TRAININGSAMPLES, TESTSAMPLES };
+
     protected FeatureCorrelationCalculator fcc;
 
@@ -44 +51 @@
       var calculators = ApplicationManager.Manager.GetInstances<IDependencyCalculator>();
       var calcList = calculators.OrderBy(c => c.Name).Select(c => new { Name = c.Name, Calculator = c }).ToList();
-      CorrelationCalcComboBox.ValueMember = "Calculator";
-      CorrelationCalcComboBox.DisplayMember = "Name";
-      CorrelationCalcComboBox.DataSource = calcList;
-      CorrelationCalcComboBox.SelectedItem = calcList.First(c => c.Calculator.GetType().Equals(typeof(PearsonsRDependenceCalculator)));
-      PartitionComboBox.DataSource = FeatureCorrelationPartitions.Partitions;
-      PartitionComboBox.SelectedItem = FeatureCorrelationPartitions.TRAININGSAMPLES;
+      correlationCalcComboBox.ValueMember = "Calculator";
+      correlationCalcComboBox.DisplayMember = "Name";
+      correlationCalcComboBox.DataSource = calcList;
+      correlationCalcComboBox.SelectedItem = calcList.First(c => c.Calculator.GetType().Equals(typeof(PearsonsRDependenceCalculator)));
+      partitionComboBox.DataSource = Partitions;
+      partitionComboBox.SelectedItem = TRAININGSAMPLES;
     }
 
@@ -59 +66 @@
 
     protected override void DeregisterContentEvents() {
-      fcc.CorrelationCalculationFinished += new FeatureCorrelationCalculator.CorrelationCalculationFinishedHandler(Content_CorrelationCalculationFinished);
-      fcc.ProgressCalculation += new FeatureCorrelationCalculator.ProgressCalculationHandler(Content_ProgressCalculation);
+      fcc.CorrelationCalculationFinished -= new FeatureCorrelationCalculator.CorrelationCalculationFinishedHandler(Content_CorrelationCalculationFinished);
+      fcc.ProgressCalculation -= new FeatureCorrelationCalculator.ProgressCalculationHandler(Content_ProgressCalculation);
       base.DeregisterContentEvents();
     }
@@ -99 +106 @@
 
     protected void UpdateDataView(DoubleMatrix correlation) {
-      IDependencyCalculator calc = (IDependencyCalculator)CorrelationCalcComboBox.SelectedValue;
+      IDependencyCalculator calc = (IDependencyCalculator)correlationCalcComboBox.SelectedValue;
       maximumLabel.Text = calc.Maximum.ToString();
       minimumLabel.Text = calc.Minimum.ToString();
@@ -111 +118 @@
 
     protected void Content_ProgressCalculation(object sender, ProgressChangedEventArgs e) {
-      if (!CalculatingPanel.Visible && e.ProgressPercentage != HeatMapProgressBar.Maximum) {
-        CalculatingPanel.Show();
-      } else if (e.ProgressPercentage == HeatMapProgressBar.Maximum) {
-        CalculatingPanel.Hide();
+      if (!calculatingPanel.Visible && e.ProgressPercentage != heatMapProgressBar.Maximum) {
+        calculatingPanel.Show();
+      } else if (e.ProgressPercentage == heatMapProgressBar.Maximum) {
+        calculatingPanel.Hide();
       }
-      HeatMapProgressBar.Value = e.ProgressPercentage;
+      heatMapProgressBar.Value = e.ProgressPercentage;
     }
   }