Changeset 8874 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4

Timestamp:

11/07/12 13:44:33 (12 years ago)

Author:

mkommend

Message:

#1292: Minor code cleanup in feature correlation classes.

Location:

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

Files:

• AbstractFeatureCorrelationView.cs (modified) (2 diffs)
• EnhancedStringConvertibleMatrixView.cs (modified) (3 diffs)
• FeatureCorrelationCalculator.cs (modified) (3 diffs)
• FeatureCorrelationView.cs (modified) (2 diffs)
• TimeframeFeatureCorrelationView.cs (modified) (4 diffs)

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

@@ -33 +33 @@
   public abstract partial class AbstractFeatureCorrelationView : AsynchronousContentView {
     protected FeatureCorrelationCalculator fcc;
-    protected DoubleMatrix currentCorrelation;
 
     public new DataAnalysisProblemData Content {
@@ -99 +98 @@
     protected abstract void Content_CorrelationCalculationFinished(object sender, FeatureCorrelationCalculator.CorrelationCalculationFinishedArgs e);
 
-    protected void UpdateDataView() {
+    protected void UpdateDataView(DoubleMatrix correlation) {
       IDependencyCalculator calc = (IDependencyCalculator)CorrelationCalcComboBox.SelectedValue;
       maximumLabel.Text = calc.Maximum.ToString();
       minimumLabel.Text = calc.Minimum.ToString();
 
-      currentCorrelation.SortableView = true;
+      correlation.SortableView = true;
       dataView.Maximum = calc.Maximum;
       dataView.Minimum = calc.Minimum;
-      dataView.Content = currentCorrelation;
+      dataView.Content = correlation;
       dataView.Enabled = true;
     }

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

@@ -31 +31 @@
 namespace HeuristicLab.Problems.DataAnalysis.Views {
   public partial class EnhancedStringConvertibleMatrixView : StringConvertibleMatrixView {
-
-    protected IEnumerable<bool> columnVisibility, rowVisibility;
+    private bool[] columnVisibility, rowVisibility;
 
     // sets the visibility of its columns for the next time it is updated
-    public IEnumerable<bool> ColumnVisibility { set { columnVisibility = value; } }
+    public IEnumerable<bool> ColumnVisibility {
+      get { return columnVisibility; }
+      set { columnVisibility = value.ToArray(); }
+    }
     // sets the visibility of its rows for the next time it is updated
-    public IEnumerable<bool> RowVisibility { set { rowVisibility = value; } }
+    public IEnumerable<bool> RowVisibility {
+      get { return rowVisibility; }
+      set { rowVisibility = value.ToArray(); }
+    }
 
     public double Maximum { get; set; }
@@ -82 +87 @@
       var dialog = new StringConvertibleMatrixRowVisibilityDialog(this.dataGridView.Rows.Cast<DataGridViewRow>());
       dialog.ShowDialog();
-      rowVisibility = dialog.Visibility;
+      RowVisibility = dialog.Visibility;
     }
 
@@ -88 +93 @@
       var dialog = new StringConvertibleMatrixColumnVisibilityDialog(this.dataGridView.Columns.Cast<DataGridViewColumn>());
       dialog.ShowDialog();
-      columnVisibility = dialog.Visibility;
+      ColumnVisibility = dialog.Visibility;
     }
 

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

@@ -70 +70 @@
         bw.CancelAsync();
       }
-    }
-
-    private double[,] GetElementsOfCorrelation(double[,] corr, int frames) {
-      double[,] elements = new double[corr.GetLength(0), frames + 1];
-      for (int i = 0; i < corr.GetLength(0); i++) {
-        for (int j = 0; j <= frames; j++) {
-          elements[i, j] = corr[i, j];
-        }
-      }
-      return elements;
     }
 
@@ -204 +194 @@
 
     private IEnumerable<double> GetRelevantValues(IDataAnalysisProblemData problemData, string partition, string variable) {
-      IEnumerable<double> var = problemData.Dataset.GetDoubleValues(variable);
-      if (partition.Equals(FeatureCorrelationPartitions.TRAININGSAMPLES)) {
-        var = var.Skip(problemData.TrainingPartition.Start).Take(problemData.TrainingPartition.End - problemData.TrainingPartition.Start);
-      } else if (partition.Equals(FeatureCorrelationPartitions.TESTSAMPLES)) {
-        var = var.Skip(problemData.TestPartition.Start).Take(problemData.TestPartition.End - problemData.TestPartition.Start);
-      }
+      IEnumerable<double> var;
+      if (partition.Equals(FeatureCorrelationPartitions.TRAININGSAMPLES))
+        var = problemData.Dataset.GetDoubleValues(variable, problemData.TrainingIndices);
+      else if (partition.Equals(FeatureCorrelationPartitions.TESTSAMPLES))
+        var = problemData.Dataset.GetDoubleValues(variable, problemData.TestIndices);
+      else var = problemData.Dataset.GetDoubleValues(variable);
       return var;
     }
@@ -216 +206 @@
       BackgroundWorker worker = sender as BackgroundWorker;
       if (!e.Cancelled && !worker.CancellationPending) {
-        if (!(e.Error == null)) {
+        if (e.Error != null) {
           ErrorHandling.ShowErrorDialog(e.Error);
         } else {

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

@@ -43 +43 @@
     protected override void OnContentChanged() {
       if (Content != null) {
-        dataView.RowVisibility = SetInitialVariableVisibility();
-        dataView.ColumnVisibility = SetInitialVariableVisibility();
+        dataView.ColumnVisibility = dataView.RowVisibility = SetInitialVariableVisibility();
       }
       correlationCache.Reset();
@@ -51 +50 @@
 
     protected override void CalculateCorrelation() {
-      if (CorrelationCalcComboBox.SelectedItem != null && PartitionComboBox.SelectedItem != null) {
-        IDependencyCalculator calc = (IDependencyCalculator)CorrelationCalcComboBox.SelectedValue;
-        string partition = (string)PartitionComboBox.SelectedValue;
-        dataView.Enabled = false;
-        double[,] corr = correlationCache.GetCorrelation(calc, partition);
-        if (corr == null) {
-          fcc.CalculateElements(calc, partition);
-        } else {
-          fcc.TryCancelCalculation();
-          SetNewCorrelation(corr);
-          UpdateDataView();
-        }
+      if (CorrelationCalcComboBox.SelectedItem == null) return;
+      if (PartitionComboBox.SelectedItem == null) return;
+
+      IDependencyCalculator calc = (IDependencyCalculator)CorrelationCalcComboBox.SelectedValue;
+      string partition = (string)PartitionComboBox.SelectedValue;
+      dataView.Enabled = false;
+      double[,] corr = correlationCache.GetCorrelation(calc, partition);
+      if (corr == null) {
+        fcc.CalculateElements(calc, partition);
+      } else {
+        fcc.TryCancelCalculation();
+        var correlation = new DoubleMatrix(corr, Content.Dataset.DoubleVariables, Content.Dataset.DoubleVariables);
+        UpdateDataView(correlation);
       }
     }
 
-    private void SetNewCorrelation(double[,] elements) {
-      currentCorrelation = new DoubleMatrix(elements,
-                                            Content.Dataset.DoubleVariables,
-                                            Content.Dataset.DoubleVariables);
-    }
+
 
     protected override void Content_CorrelationCalculationFinished(object sender, FeatureCorrelationCalculator.CorrelationCalculationFinishedArgs e) {
       if (InvokeRequired) {
         Invoke(new FeatureCorrelationCalculator.CorrelationCalculationFinishedHandler(Content_CorrelationCalculationFinished), sender, e);
-      } else {
-        correlationCache.SetCorrelation(e.Calculcator, e.Partition, e.Correlation);
-        SetNewCorrelation(e.Correlation);
-        UpdateDataView();
+        return;
       }
+      correlationCache.SetCorrelation(e.Calculcator, e.Partition, e.Correlation);
+      var correlation = new DoubleMatrix(e.Correlation, Content.Dataset.DoubleVariables, Content.Dataset.DoubleVariables);
+      UpdateDataView(correlation);
     }
 

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

@@ -49 +49 @@
     }
 
-    protected void VariableSelectionComboBox_SelectedChangeCommitted(object sender, EventArgs e) {
+    private void VariableSelectionComboBox_SelectedChangeCommitted(object sender, EventArgs e) {
       CalculateCorrelation();
     }
-    protected void TimeframeTextbox_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e) {
+
+    private void TimeframeTextbox_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e) {
       if (e.KeyCode == Keys.Enter) {
         CalculateCorrelation();
@@ -74 +75 @@
         } else {
           fcc.TryCancelCalculation();
-          SetNewCorrelation(corr, calc, frames);
-          UpdateDataView();
+          var columnNames = Enumerable.Range(0, corr.GetLength(1)).Select(x => x.ToString());
+          var correlation = new DoubleMatrix(corr, columnNames, Content.Dataset.DoubleVariables);
+          ((IStringConvertibleMatrix)correlation).Columns = frames + 1;
+          UpdateDataView(correlation);
         }
       }
     }
 
-    protected bool ValidateTimeframeTextbox() {
+    private bool ValidateTimeframeTextbox() {
       int help;
       if (!int.TryParse(TimeframeTextbox.Text, out help)) {
@@ -95 +98 @@
     }
 
-    private void SetNewCorrelation(double[,] elements, IDependencyCalculator calc, int frames) {
-      double[,] neededValues = new double[elements.GetLength(0), frames + 1];
-      for (int i = 0; i < elements.GetLength(0); i++) {
-        Array.Copy(elements, i * elements.GetLength(1), neededValues, i * neededValues.GetLength(1), frames + 1);
-      }
-      SetNewCorrelation(neededValues);
-    }
-
-    private void SetNewCorrelation(double[,] elements) {
-      currentCorrelation = new DoubleMatrix(elements,
-                                            Enumerable.Range(0, elements.GetLength(1)).Select(x => x.ToString()),
-                                            Content.Dataset.DoubleVariables);
-    }
 
     protected override void Content_CorrelationCalculationFinished(object sender, FeatureCorrelationCalculator.CorrelationCalculationFinishedArgs e) {
@@ -114 +104 @@
       } else {
         correlationTimeframCache.SetTimeframeCorrelation(e.Calculcator, e.Partition, e.Variable, e.Correlation);
-        SetNewCorrelation(e.Correlation);
-        UpdateDataView();
+        var columnNames = Enumerable.Range(0, e.Correlation.GetLength(1)).Select(x => x.ToString());
+        var correlation = new DoubleMatrix(e.Correlation, columnNames, Content.Dataset.DoubleVariables);
+        UpdateDataView(correlation);
       }
     }