Changeset 11156 for trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/StatisticsLogic.cs

Timestamp:

07/09/14 10:37:01 (10 years ago)

Author:

gkronber

Message:

#2206: made several changes / improvements to the data-preprocessing code while reviewing the code

File:

• trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/StatisticsLogic.cs (modified) (8 diffs)

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/StatisticsLogic.cs

@@ -49 +49 @@
 
       for (int i = 0; i < preprocessingData.Columns; ++i) {
-        if (preprocessingData.IsType<double>(i)) {
+        if (preprocessingData.VariableHasType<double>(i)) {
           ++count;
         }
@@ -82 +82 @@
     public double GetMedian(int columnIndex, bool considerSelection) {
       double median = double.NaN;
-      if (preprocessingData.IsType<double>(columnIndex)) {
+      if (preprocessingData.VariableHasType<double>(columnIndex)) {
         median = GetValuesWithoutNaN<double>(columnIndex, considerSelection).Median();
       }
@@ -90 +90 @@
     public double GetAverage(int columnIndex, bool considerSelection) {
       double avg = double.NaN;
-      if (preprocessingData.IsType<double>(columnIndex)) {
+      if (preprocessingData.VariableHasType<double>(columnIndex)) {
         avg = GetValuesWithoutNaN<double>(columnIndex, considerSelection).Average();
       }
@@ -98 +98 @@
     public DateTime GetMedianDateTime(int columnIndex, bool considerSelection) {
       DateTime median = new DateTime();
-      if (preprocessingData.IsType<DateTime>(columnIndex)) {
+      if (preprocessingData.VariableHasType<DateTime>(columnIndex)) {
         median = GetSecondsAsDateTime(GetDateTimeAsSeconds(columnIndex, considerSelection).Median());
       }
@@ -106 +106 @@
     public DateTime GetAverageDateTime(int columnIndex, bool considerSelection) {
       DateTime avg = new DateTime();
-      if (preprocessingData.IsType<DateTime>(columnIndex)) {
+      if (preprocessingData.VariableHasType<DateTime>(columnIndex)) {
         avg = GetSecondsAsDateTime(GetDateTimeAsSeconds(columnIndex, considerSelection).Average());
       }
@@ -127 +127 @@
     public double GetStandardDeviation(int columnIndex) {
       double stdDev = double.NaN;
-      if (preprocessingData.IsType<double>(columnIndex)) {
+      if (preprocessingData.VariableHasType<double>(columnIndex)) {
         stdDev = GetValuesWithoutNaN<double>(columnIndex).StandardDeviation();
-      } else if (preprocessingData.IsType<DateTime>(columnIndex)) {
+      } else if (preprocessingData.VariableHasType<DateTime>(columnIndex)) {
         stdDev = GetDateTimeAsSeconds(columnIndex).StandardDeviation();
       }
@@ -137 +137 @@
     public double GetVariance(int columnIndex) {
       double variance = double.NaN;
-      if (preprocessingData.IsType<double>(columnIndex)) {
+      if (preprocessingData.VariableHasType<double>(columnIndex)) {
         variance = GetValuesWithoutNaN<double>(columnIndex).Variance();
-      } else if (preprocessingData.IsType<DateTime>(columnIndex)) {
+      } else if (preprocessingData.VariableHasType<DateTime>(columnIndex)) {
         variance = GetDateTimeAsSeconds(columnIndex).Variance();
       }
@@ -163 +163 @@
     }
 
-    public bool IsType<T>(int columnIndex) {
-      return preprocessingData.IsType<T>(columnIndex);
+    public bool VariableHasType<T>(int columnIndex) {
+      return preprocessingData.VariableHasType<T>(columnIndex);
     }
 
     public string GetColumnTypeAsString(int columnIndex) {
-      if (preprocessingData.IsType<double>(columnIndex)) {
+      if (preprocessingData.VariableHasType<double>(columnIndex)) {
         return "double";
-      } else if (preprocessingData.IsType<string>(columnIndex)) {
+      } else if (preprocessingData.VariableHasType<string>(columnIndex)) {
         return "string";
-      } else if (preprocessingData.IsType<DateTime>(columnIndex)) {
+      } else if (preprocessingData.VariableHasType<DateTime>(columnIndex)) {
         return "DateTime";
       }