UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/stats] Fix quartiles computation for non integers value sizes

Browse Source
This commit is contained in:
Léa Saviot
2018-05-24 09:45:33 +02:00
parent 19cc3fd60b
commit 8997a7671e
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/statistics/store.cpp
View File

@@ -174,12 +174,12 @@ double Store::sampleStandardDeviation(int series) {
}
double Store::firstQuartile(int series) {
int firstQuartileIndex = std::ceil(sumOfOccurrences(series)/4);
double firstQuartileIndex = sumOfOccurrences(series)/4.0f;
return sortedElementNumber(series, firstQuartileIndex);
}
double Store::thirdQuartile(int series) {
int thirdQuartileIndex = std::ceil(3*sumOfOccurrences(series)/4);
double thirdQuartileIndex = 3*sumOfOccurrences(series)/4.0f;
return sortedElementNumber(series, thirdQuartileIndex);
}
@@ -188,15 +188,15 @@ double Store::quartileRange(int series) {
}
double Store::median(int series) {
int total = sumOfOccurrences(series);
int halfTotal = total/2;
double total = sumOfOccurrences(series);
double halfTotal = total/2;
int totalMod2 = total - 2*halfTotal;
if (totalMod2 == 0) {
double minusMedian = sortedElementNumber(series, halfTotal);
double maxMedian = sortedElementNumber(series, halfTotal+1);
double maxMedian = sortedElementNumber(series, halfTotal+1.0);
return (minusMedian+maxMedian)/2.0;
} else {
return sortedElementNumber(series, halfTotal+1);
return sortedElementNumber(series, halfTotal+1.0);
}
}
@@ -232,7 +232,7 @@ double Store::sumOfValuesBetween(int series, double x1, double x2) {
return result;
}
double Store::sortedElementNumber(int series, int k) {
double Store::sortedElementNumber(int series, double k) {
// TODO: use an other algorithm (ex quickselect) to avoid quadratic complexity
double bufferValues[m_numberOfPairs[series]];
memcpy(bufferValues, m_data[series][0], m_numberOfPairs[series]*sizeof(double));