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

[statistics] For median and quartiles, compare absolute frequencies

Browse Source 
Instead of relative frequencies
This commit is contained in:
Léa Saviot
2018-09-11 09:56:06 +02:00
committed by EmilieNumworks
parent 8d95f408be
commit 0038cb537a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/statistics/store.cpp
View File

@@ -245,16 +245,18 @@ double Store::sortedElementAtCumulatedFrequency(int series, double k, bool creat
// TODO: use an other algorithm (ex quickselect) to avoid quadratic complexity
assert(k >= 0.0 && k <= 1.0);
double totalNumberOfElements = sumOfOccurrences(series);
double numberOfElementsAtFrequencyK = totalNumberOfElements * k;
double bufferValues[numberOfPairsOfSeries(series)];
memcpy(bufferValues, m_data[series][0], numberOfPairsOfSeries(series)*sizeof(double));
int sortedElementIndex = 0;
double cumulatedFrequency = 0.0;
while (cumulatedFrequency < k-DBL_EPSILON) {
double cumulatedNumberOfElements = 0.0;
while (cumulatedNumberOfElements < numberOfElementsAtFrequencyK-DBL_EPSILON) {
sortedElementIndex = minIndex(bufferValues, numberOfPairsOfSeries(series));
bufferValues[sortedElementIndex] = DBL_MAX;
cumulatedFrequency += m_data[series][1][sortedElementIndex] / totalNumberOfElements;
cumulatedNumberOfElements += m_data[series][1][sortedElementIndex];
}
if (createMiddleElement && std::fabs(cumulatedFrequency - k) < DBL_EPSILON) {
if (createMiddleElement && std::fabs(cumulatedNumberOfElements - numberOfElementsAtFrequencyK) < DBL_EPSILON) {
int nextElementIndex = minIndex(bufferValues, numberOfPairsOfSeries(series));
if (bufferValues[nextElementIndex] != DBL_MAX) {
return (m_data[series][0][sortedElementIndex] + m_data[series][0][nextElementIndex]) / 2.0;