Changeset 10721 for branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views

Timestamp:

04/03/14 16:21:07 (10 years ago)

Author:

bburlacu

Message:

#1837: Performance and usability improvements.

Location:

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4

Files:

• SlidingWindowBestSolutionsCollectionHeatMapView.Designer.cs (modified) (2 diffs)
• SlidingWindowBestSolutionsCollectionHeatMapView.cs (modified) (5 diffs)
• SlidingWindowBestSolutionsCollectionView.Designer.cs (modified) (2 diffs)
• SlidingWindowBestSolutionsCollectionView.cs (modified) (6 diffs)

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SlidingWindowBestSolutionsCollectionHeatMapView.Designer.cs

@@ -19 +19 @@
  */
 #endregion
+
+using System.Windows.Forms;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views {
@@ -76 +78 @@
       this.comboBox1.Text = "Pearson R2";
       this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
+      this.comboBox1.DropDownStyle = ComboBoxStyle.DropDownList;
       // 
       // label1

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SlidingWindowBestSolutionsCollectionHeatMapView.cs

@@ -42 +42 @@
       base.OnContentChanged();
       if (Content != null) {
+        // set the dropdown value to the correct value
+        switch (Content.QualityMeasure) {
+          case SlidingWindowBestSolutionsCollection.QualityMeasures.PEARSON:
+            comboBox1.SelectedIndex = comboBox1.Items.IndexOf("Pearson R2");
+            break;
+          case SlidingWindowBestSolutionsCollection.QualityMeasures.MSE:
+            comboBox1.SelectedIndex = comboBox1.Items.IndexOf("Mean Squared Error");
+            break;
+        }
         if (Content.SlidingWindowQualities != null) {
           SetHeatmapContent(Content.SlidingWindowQualities);
         } else if (!Content.QualitiesCalculationInProgress) {
-          progress.Start("Calculating best solution qualities...");
           Content.CalculateQualities();
         }
@@ -64 +72 @@
       Content.QualitiesCalculationProgress -= bestSolutionCollectionQualitiesCalculationProgress;
       Content.QualitiesUpdated -= bestSolutionCollectionQualitiesUpdated;
+      Content.QualitiesCalculationStarted -= bestSolutionsCollectionQualtiesCalculationStarted;
       base.DeregisterContentEvents();
     }
@@ -73 +82 @@
       Content.QualitiesCalculationProgress += bestSolutionCollectionQualitiesCalculationProgress;
       Content.QualitiesUpdated += bestSolutionCollectionQualitiesUpdated;
+      Content.QualitiesCalculationStarted += bestSolutionsCollectionQualtiesCalculationStarted;
     }
 
@@ -90 +100 @@
     private void SetHeatmapContent(double[,] values) {
       double min = 0, max = 0;
-      foreach (var q in values) {
-        if (min > q) min = q;
-        if (max < q) max = q;
+      if (Content.QualityMeasure == SlidingWindowBestSolutionsCollection.QualityMeasures.PEARSON) {
+        max = 1.0;
+      } else {
+        foreach (var q in values) {
+          if (min > q) min = q;
+          if (max < q) max = q;
+        }
       }
       int rows = values.GetLength(0);
@@ -103 +117 @@
       }
       heatMapView.Content = new HeatMap(flipped, "Best Sliding Window Solutions", min, max);
+    }
+
+    private void bestSolutionsCollectionQualtiesCalculationStarted(object sender, EventArgs e) {
+      progress.Start("Calculating best solutions qualities...");
     }
 

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SlidingWindowBestSolutionsCollectionView.Designer.cs

@@ -19 +19 @@
  */
 #endregion
+
+using System.Windows.Forms;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views {
@@ -80 +82 @@
       this.comboBox1.Text = "Pearson R2";
       this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
+      this.comboBox1.DropDownStyle = ComboBoxStyle.DropDownList;
       // 
       // label1

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SlidingWindowBestSolutionsCollectionView.cs

@@ -43 +43 @@
       base.OnContentChanged();
       if (Content != null) {
+        switch (Content.QualityMeasure) {
+          case SlidingWindowBestSolutionsCollection.QualityMeasures.PEARSON:
+            comboBox1.SelectedIndex = comboBox1.Items.IndexOf("Pearson R2");
+            break;
+          case SlidingWindowBestSolutionsCollection.QualityMeasures.MSE:
+            comboBox1.SelectedIndex = comboBox1.Items.IndexOf("Mean Squared Error");
+            break;
+        }
         if (Content.SlidingWindowQualities != null) {
           SetMatrixContent(Content.SlidingWindowQualities);
         } else if (!Content.QualitiesCalculationInProgress) {
-          progress.Start("Calculating best solution qualities...");
           Content.CalculateQualities();
         }
@@ -60 +67 @@
       Content.QualitiesCalculationProgress -= bestSolutionCollectionQualitiesCalculationProgress;
       Content.QualitiesUpdated -= bestSolutionCollectionQualitiesUpdated;
+      Content.QualitiesCalculationStarted -= bestSolutionsCollectionQualtiesCalculationStarted;
       base.DeregisterContentEvents();
     }
@@ -70 +78 @@
       Content.QualitiesCalculationProgress += bestSolutionCollectionQualitiesCalculationProgress;
       Content.QualitiesUpdated += bestSolutionCollectionQualitiesUpdated;
+      Content.QualitiesCalculationStarted += bestSolutionsCollectionQualtiesCalculationStarted;
     }
 
@@ -79 +88 @@
 
     #region Event Handlers (Content)
+    private void bestSolutionsCollectionQualtiesCalculationStarted(object sender, EventArgs e) {
+      progress.Start("Calculating best solutions qualities...");
+    }
+
     private void bestSolutionsCollectionQualitiesCalculated(object sender, RunWorkerCompletedEventArgs e) {
       if (e.Cancelled || e.Error != null) {
@@ -87 +100 @@
       SetMatrixContent(Content.SlidingWindowQualities);
       progress.Finish();
-    }
-
-    private void SetMatrixContent(double[,] values) {
-      var qualitiesMap = new DoubleMatrix(values); // add an extra columns for the training data
-      qualitiesMap.ColumnNames = Enumerable.Range(0, qualitiesMap.Columns - 1).Select(x => Content.SlidingWindowRanges[x].Start + " - " + Content.SlidingWindowRanges[x].End).Concat(new List<string> { "Training" });
-      qualitiesMap.RowNames = Enumerable.Range(1, qualitiesMap.Rows).Select(x => "M" + x);
-
-      double min = 0, max = 0;
-      foreach (var q in qualitiesMap) {
-        if (min > q) min = q;
-        if (max < q) max = q;
-      }
-
-      enhancedStringConvertibleMatrixView.Minimum = min;
-      enhancedStringConvertibleMatrixView.Maximum = max;
-      enhancedStringConvertibleMatrixView.Content = qualitiesMap;
     }
 
@@ -117 +114 @@
       base.SetEnabledStateOfControls();
       // TODO: Enable or disable controls based on whether the content is null or the view is set readonly
+    }
+
+    private void SetMatrixContent(double[,] values) {
+      var qualitiesMap = new DoubleMatrix(values); // add an extra columns for the training data
+      qualitiesMap.ColumnNames = Enumerable.Range(0, qualitiesMap.Columns - 1).Select(x => Content.SlidingWindowRanges[x].Start + " - " + Content.SlidingWindowRanges[x].End).Concat(new List<string> { "Training" });
+      qualitiesMap.RowNames = Enumerable.Range(1, qualitiesMap.Rows).Select(x => "M" + x);
+      double min = 0, max = 0;
+      if (Content.QualityMeasure == SlidingWindowBestSolutionsCollection.QualityMeasures.PEARSON) {
+        max = 1.0;
+      } else {
+        foreach (var q in qualitiesMap) {
+          if (min > q) min = q;
+          if (max < q) max = q;
+        }
+      }
+
+      enhancedStringConvertibleMatrixView.Minimum = min;
+      enhancedStringConvertibleMatrixView.Maximum = max;
+      enhancedStringConvertibleMatrixView.Content = qualitiesMap;
     }