Changeset 10216

Timestamp:

12/11/13 13:24:04 (11 years ago)

Author:

rstoll

Message:

Exchanged own median, standard deviation implementation with the one in the common lib
Added GetVariance (using common as well)

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• Implementations/StatisticInfo.cs (modified) (3 diffs)
• Interfaces/IStatisticInfo.cs (modified) (1 diff)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/StatisticInfo.cs

@@ -1 +1 @@
 using System;
 using System.Linq;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.DataPreprocessing {
@@ -57 +58 @@
       double median = double.NaN;
       if (preprocessingData.IsType<double>(variableName)) {
-        median = preprocessingData.GetValues<double>(variableName).OrderBy(x => x).ElementAt(preprocessingData.Rows / 2);
+        median = preprocessingData.GetValues<double>(variableName).Median();
       }
       return median;
@@ -82 +83 @@
       double stdDev = double.NaN;
       if (preprocessingData.IsType<double>(variableName)) {
-        double avg = GetAverage(variableName);
-        stdDev = Math.Sqrt(preprocessingData.GetValues<double>(variableName).Sum(x => (x - avg) * (x - avg)) / (preprocessingData.Rows - 1));
+        stdDev = preprocessingData.GetValues<double>(variableName).StandardDeviation();
+      }
+      return stdDev;
+    }
+
+    public double GetVariance(string variableName) {
+      double stdDev = double.NaN;
+      if (preprocessingData.IsType<double>(variableName)) {
+        stdDev = preprocessingData.GetValues<double>(variableName).Variance();
       }
       return stdDev;

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IStatisticInfo.cs

@@ -17 +17 @@
     T GetMostCommonValue<T>(string variableName);
     double GetStandardDeviation(string variableName);
+    double GetVariance(string variableName);
     int GetDifferentValuesCount<T>(string variableName);
   }