mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

statistics: save dive list with quartiles

Browse source 
To make box-and-whiskers charts selectable (select corresponding
dives when clicking on box), save the dive list with the quartile
data.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2021-01-20 14:49:49 +01:00 • committed by Dirk Hohndel
parent 18a5b5b593
commit b7e62307c5
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
stats/boxseries.cpp
View file

@ -98,7 +98,7 @@ std::vector<QString> BoxSeries::formatInformation(const Item &item) const
{
QLocale loc;
return {
StatsTranslations::tr("%1 (%2 dives)").arg(item.binName, loc.toString(item.q.count)),
StatsTranslations::tr("%1 (%2 dives)").arg(item.binName, loc.toString((int)item.q.dives.size())),
QStringLiteral("%1:").arg(variable),
infoItem(StatsTranslations::tr("min"), unit, decimals, item.q.min),
infoItem(StatsTranslations::tr("Q1"), unit, decimals, item.q.q1),

17
stats/statsvariables.cpp
View file

@ -92,7 +92,7 @@ template<> QString invalid_value<QString>()
template<> StatsQuartiles invalid_value<StatsQuartiles>()
{
double NaN = std::numeric_limits<double>::quiet_NaN();
return { NaN, NaN, NaN, NaN, NaN, 0 };
return { std::vector<dive *>(), NaN, NaN, NaN, NaN, NaN };
}
static bool is_invalid_value(int i)
@ -170,7 +170,7 @@ static bool is_invalid_value(const std::vector<StatsValue> &v)
static bool is_invalid_value(const StatsQuartiles &q)
{
return std::isnan(q.min);
return q.dives.empty();
}
bool StatsQuartiles::isValid() const
@ -414,17 +414,22 @@ StatsQuartiles StatsVariable::quartiles(const std::vector<StatsValue> &vec)
int s = (int)vec.size();
if (s <= 0)
return invalid_value<StatsQuartiles>();
std::vector<dive *> dives;
dives.reserve(vec.size());
for (const auto &[v, d]: vec)
dives.push_back(d);
switch (s % 4) {
default:
// gcc doesn't recognize that we catch all possible values. disappointing.
case 0:
return { vec[0].v, q3(&vec[s/4 - 1]), q2(&vec[s/2 - 1]), q1(&vec[s - s/4 - 1]), vec[s - 1].v, s };
return { std::move(dives), vec[0].v, q3(&vec[s/4 - 1]), q2(&vec[s/2 - 1]), q1(&vec[s - s/4 - 1]), vec[s - 1].v };
case 1:
return { vec[0].v, vec[s/4].v, vec[s/2].v, vec[s - s/4 - 1].v, vec[s - 1].v, s };
return { std::move(dives), vec[0].v, vec[s/4].v, vec[s/2].v, vec[s - s/4 - 1].v, vec[s - 1].v };
case 2:
return { vec[0].v, q1(&vec[s/4]), q2(&vec[s/2 - 1]), q3(&vec[s - s/4 - 2]), vec[s - 1].v, s };
return { std::move(dives), vec[0].v, q1(&vec[s/4]), q2(&vec[s/2 - 1]), q3(&vec[s - s/4 - 2]), vec[s - 1].v };
case 3:
return { vec[0].v, q2(&vec[s/4]), vec[s/2].v, q2(&vec[s - s/4 - 2]), vec[s - 1].v, s };
return { std::move(dives), vec[0].v, q2(&vec[s/4]), vec[s/2].v, q2(&vec[s - s/4 - 2]), vec[s - 1].v };
}
}

2
stats/statsvariables.h
View file

@ -47,10 +47,10 @@ struct StatsOperationResults {
// For median and quartiles.
struct StatsQuartiles {
std::vector<dive *> dives;
double min;
double q1, q2, q3;
double max;
int count;
bool isValid() const;
};