Changeset 12151 for trunk/sources/HeuristicLab.Analysis.Statistics.Views/3.3/CorrelationView.cs

Timestamp:

03/06/15 13:26:30 (9 years ago)

Author:

mkommend

Message:

#2352: Reverse merged r12137 and implemented a format pattern for the EnhancedStringConvertibleMatrixView.

File:

• trunk/sources/HeuristicLab.Analysis.Statistics.Views/3.3/CorrelationView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Analysis.Statistics.Views/3.3/CorrelationView.cs

@@ -56 +56 @@
       stringConvertibleMatrixView.Minimum = -1.0;
       stringConvertibleMatrixView.Maximum = 1.0;
+      stringConvertibleMatrixView.FormatPattern = "0.000";
 
       methodComboBox.Items.Add(PearsonName);
@@ -216 +217 @@
           if (!rowValues.Any() || !columnValues.Any() || rowValues.Count() != columnValues.Count()) {
             dt[i, j] = double.NaN;
-          } else if (i == j) {
-            dt[i, j] = 1.0;
           } else {
             if (methodName == PearsonName) {
-              dt[i, j] = Math.Round(alglib.pearsoncorr2(rowValues.ToArray(), columnValues.ToArray()), 3); // for correlations it is usually sufficient to show only 3 digits
+              dt[i, j] = alglib.pearsoncorr2(rowValues.ToArray(), columnValues.ToArray());
             } else {
-              dt[i, j] = Math.Round(alglib.spearmancorr2(rowValues.ToArray(), columnValues.ToArray()), 3); // for correlations it is usually sufficient to show only 3 digits
+              dt[i, j] = alglib.spearmancorr2(rowValues.ToArray(), columnValues.ToArray());
             }
           }