- Timestamp:
- 07/09/14 13:21:16 (10 years ago)
- Location:
- stable
- Files:
-
- 2 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
-
stable/HeuristicLab.DataPreprocessing/3.4/Implementations/StatisticsLogic.cs
r10812 r11159 49 49 50 50 for (int i = 0; i < preprocessingData.Columns; ++i) { 51 if (preprocessingData. IsType<double>(i)) {51 if (preprocessingData.VariableHasType<double>(i)) { 52 52 ++count; 53 53 } … … 82 82 public double GetMedian(int columnIndex, bool considerSelection) { 83 83 double median = double.NaN; 84 if (preprocessingData. IsType<double>(columnIndex)) {84 if (preprocessingData.VariableHasType<double>(columnIndex)) { 85 85 median = GetValuesWithoutNaN<double>(columnIndex, considerSelection).Median(); 86 86 } … … 90 90 public double GetAverage(int columnIndex, bool considerSelection) { 91 91 double avg = double.NaN; 92 if (preprocessingData. IsType<double>(columnIndex)) {92 if (preprocessingData.VariableHasType<double>(columnIndex)) { 93 93 avg = GetValuesWithoutNaN<double>(columnIndex, considerSelection).Average(); 94 94 } … … 98 98 public DateTime GetMedianDateTime(int columnIndex, bool considerSelection) { 99 99 DateTime median = new DateTime(); 100 if (preprocessingData. IsType<DateTime>(columnIndex)) {100 if (preprocessingData.VariableHasType<DateTime>(columnIndex)) { 101 101 median = GetSecondsAsDateTime(GetDateTimeAsSeconds(columnIndex, considerSelection).Median()); 102 102 } … … 106 106 public DateTime GetAverageDateTime(int columnIndex, bool considerSelection) { 107 107 DateTime avg = new DateTime(); 108 if (preprocessingData. IsType<DateTime>(columnIndex)) {108 if (preprocessingData.VariableHasType<DateTime>(columnIndex)) { 109 109 avg = GetSecondsAsDateTime(GetDateTimeAsSeconds(columnIndex, considerSelection).Average()); 110 110 } … … 127 127 public double GetStandardDeviation(int columnIndex) { 128 128 double stdDev = double.NaN; 129 if (preprocessingData. IsType<double>(columnIndex)) {129 if (preprocessingData.VariableHasType<double>(columnIndex)) { 130 130 stdDev = GetValuesWithoutNaN<double>(columnIndex).StandardDeviation(); 131 } else if (preprocessingData. IsType<DateTime>(columnIndex)) {131 } else if (preprocessingData.VariableHasType<DateTime>(columnIndex)) { 132 132 stdDev = GetDateTimeAsSeconds(columnIndex).StandardDeviation(); 133 133 } … … 137 137 public double GetVariance(int columnIndex) { 138 138 double variance = double.NaN; 139 if (preprocessingData. IsType<double>(columnIndex)) {139 if (preprocessingData.VariableHasType<double>(columnIndex)) { 140 140 variance = GetValuesWithoutNaN<double>(columnIndex).Variance(); 141 } else if (preprocessingData. IsType<DateTime>(columnIndex)) {141 } else if (preprocessingData.VariableHasType<DateTime>(columnIndex)) { 142 142 variance = GetDateTimeAsSeconds(columnIndex).Variance(); 143 143 } … … 163 163 } 164 164 165 public bool IsType<T>(int columnIndex) {166 return preprocessingData. IsType<T>(columnIndex);165 public bool VariableHasType<T>(int columnIndex) { 166 return preprocessingData.VariableHasType<T>(columnIndex); 167 167 } 168 168 169 169 public string GetColumnTypeAsString(int columnIndex) { 170 if (preprocessingData. IsType<double>(columnIndex)) {170 if (preprocessingData.VariableHasType<double>(columnIndex)) { 171 171 return "double"; 172 } else if (preprocessingData. IsType<string>(columnIndex)) {172 } else if (preprocessingData.VariableHasType<string>(columnIndex)) { 173 173 return "string"; 174 } else if (preprocessingData. IsType<DateTime>(columnIndex)) {174 } else if (preprocessingData.VariableHasType<DateTime>(columnIndex)) { 175 175 return "DateTime"; 176 176 }
Note: See TracChangeset
for help on using the changeset viewer.