Changeset 9380

Timestamp:

04/18/13 16:06:51 (12 years ago)

Author:

ascheibe

Message:

#2031 use EnhancedStringConvertibleMatrixView instead of StringConvertibleMatrixView in ResultCorrelationView

Location:

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3

Files:

• ResultCorrelationView.cs (modified) (3 diffs)
• ResultCorrelationView.designer.cs (modified) (2 diffs)

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/ResultCorrelationView.cs

@@ -35 +35 @@
     public ResultCorrelationView() {
       InitializeComponent();
+      stringConvertibleMatrixView.Minimum = -1.0;
+      stringConvertibleMatrixView.Maximum = 1.0;
     }
 
@@ -153 +155 @@
       var runs = Content.Where(x => x.Results.ContainsKey(resultName) && x.Visible);
 
-      StringMatrix dt = new StringMatrix(rowNames.Count(), columnNames.Count());
+      DoubleMatrix dt = new DoubleMatrix(rowNames.Count(), columnNames.Count());
       dt.RowNames = rowNames;
       dt.ColumnNames = columnNames;
@@ -168 +170 @@
           || resultRowVals.Contains(double.NegativeInfinity)
           || resultRowVals.Contains(double.PositiveInfinity)) {
-          dt[j, 0] = "X";
-          dt[j++, 1] = "X";
+          dt[j, 0] = double.NaN;
+          dt[j++, 1] = double.NaN;
         } else {
-          dt[j, 0] = alglib.pearsoncorr2(resultVals.ToArray(), resultRowVals.ToArray()).ToString();
-          dt[j++, 1] = alglib.spearmancorr2(resultVals.ToArray(), resultRowVals.ToArray()).ToString();
+          dt[j, 0] = alglib.pearsoncorr2(resultVals.ToArray(), resultRowVals.ToArray());
+          dt[j++, 1] = alglib.spearmancorr2(resultVals.ToArray(), resultRowVals.ToArray());
         }
       }

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/ResultCorrelationView.designer.cs

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.stringConvertibleMatrixView = new HeuristicLab.Data.Views.StringConvertibleMatrixView();
+      this.stringConvertibleMatrixView = new HeuristicLab.Data.Views.EnhancedStringConvertibleMatrixView();
       this.label1 = new System.Windows.Forms.Label();
       this.resultComboBox = new System.Windows.Forms.ComboBox();
@@ -111 +111 @@
     #endregion
 
-    private HeuristicLab.Data.Views.StringConvertibleMatrixView stringConvertibleMatrixView;
+    private HeuristicLab.Data.Views.EnhancedStringConvertibleMatrixView stringConvertibleMatrixView;
     private System.Windows.Forms.Label label1;
     private System.Windows.Forms.ComboBox resultComboBox;