Changeset 12199 for stable/HeuristicLab.Analysis.Statistics.Views/3.3

Timestamp:

03/13/15 19:51:32 (10 years ago)

Author:

gkronber

Message:

#2352: merged r12137, r12151:12152 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Analysis.Statistics.Views/3.3/CorrelationView.cs (modified) (2 diffs)

stable/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);
@@ -212 +213 @@
                 .Where(x => !double.IsNaN(x) && !double.IsNegativeInfinity(x) && !double.IsPositiveInfinity(x));
 
-          if (!rowValues.Any() || !columnValues.Any() || i == j || rowValues.Count() != columnValues.Count()) {
+          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) {