Changeset 8689 for trunk/sources/HeuristicLab.Problems.DataAnalysis

Timestamp:

09/24/12 18:48:16 (12 years ago)

Author:

sforsten

Message:

#1292:

• NaN values are used, if the calculation is invalid (e.g. missing values, infinity etc.)
• Variables can now be filtered. Initially allowed input variables and target variable are shown, but with a right click a dialog can be opened to select variables, which shall be shown

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4

Files:

• Implementation/FeatureCorrelation/FeatureCorrelationCalculator.cs (modified) (5 diffs)
• OnlineCalculators/SpearmansRankCorrelationCoefficientCalculator.cs (modified) (2 diffs)

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

@@ -111 +111 @@
 
       IList<string> doubleVariableNames = dataset.DoubleVariables.ToList();
-      OnlineCalculatorError error;
+      OnlineCalculatorError error = OnlineCalculatorError.None;
       int length = doubleVariableNames.Count;
       double[,] elements = new double[length, length];
@@ -124 +124 @@
             return;
           }
-
           IEnumerable<double> var1 = GetRelevantValues(problemData, partition, doubleVariableNames[i]);
           IEnumerable<double> var2 = GetRelevantValues(problemData, partition, doubleVariableNames[j]);
@@ -130 +129 @@
           elements[i, j] = CalculateElementWithCalculator(calc, var1, var2, out error);
 
+          if (!error.Equals(OnlineCalculatorError.None)) {
+            elements[i, j] = double.NaN;
+          }
           elements[j, i] = elements[i, j];
-          if (!error.Equals(OnlineCalculatorError.None)) {
-            worker.ReportProgress(100);
-            throw new ArgumentException("Calculator returned " + error + Environment.NewLine + "Maybe try another calculator.");
-          }
           worker.ReportProgress((int)Math.Round((((Math.Pow(i, 2) + i) / 2 + j + 1.0) / calculations) * 100));
         }
@@ -153 +151 @@
 
       IList<string> doubleVariableNames = dataset.DoubleVariables.ToList();
-      OnlineCalculatorError error;
+      OnlineCalculatorError error = OnlineCalculatorError.None;
       int length = doubleVariableNames.Count;
       double[,] elements = new double[length, frames + 1];
@@ -186 +184 @@
 
           if (!error.Equals(OnlineCalculatorError.None)) {
-            worker.ReportProgress(100);
-            throw new ArgumentException("Calculator returned " + error + Environment.NewLine + "Maybe try another calculator.");
+            elements[i, j] = double.NaN;
           }
           worker.ReportProgress((int)((100.0 / calculations) * (i * (frames + 1) + j + 1)));

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/SpearmansRankCorrelationCoefficientCalculator.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -27 +28 @@
 
     public static double Calculate(IEnumerable<double> originalValues, IEnumerable<double> estimatedValues, out OnlineCalculatorError errorState) {
-      double rs = alglib.basestat.spearmancorr2(originalValues.ToArray(), estimatedValues.ToArray(), originalValues.Count());
-      errorState = OnlineCalculatorError.None;
+      double rs = double.NaN;
+      try {
+        rs = alglib.basestat.spearmancorr2(originalValues.ToArray(), estimatedValues.ToArray(), originalValues.Count());
+        errorState = OnlineCalculatorError.None;
+      }
+      catch (Exception ex) {
+        errorState = OnlineCalculatorError.InvalidValueAdded;
+      }
+
       return rs;
     }