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

Only consider non-zero average depth for statistics

Browse source 
Upon importing dives, the average depth can be undefined which we store as 0.
This zero should not contribute when computing the average depth for
the (yearly) statistics, only dives with average depth set now contribute.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Robert C. Helling 2016-11-10 10:15:11 +01:00 • committed by Dirk Hohndel
parent 2d69f8c9d0
commit 20e211d337
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/statistics.c
View file

@ -47,10 +47,10 @@ static void process_temperatures(struct dive *dp, stats_t *stats)
static void process_dive(struct dive *dp, stats_t *stats)
{
int old_tt, sac_time = 0;
int old_tadt, sac_time = 0;
uint32_t duration = dp->duration.seconds;
old_tt = stats->total_time.seconds;
old_tadt = stats->total_average_depth_time.seconds;
stats->total_time.seconds += duration;
if (duration > stats->longest_time.seconds)
stats->longest_time.seconds = duration;
@ -66,9 +66,12 @@ static void process_dive(struct dive *dp, stats_t *stats)
/* Maybe we should drop zero-duration dives */
if (!duration)
return;
stats->avg_depth.mm = (1.0 * old_tt * stats->avg_depth.mm +
duration * dp->meandepth.mm) /
stats->total_time.seconds;
if (dp->meandepth.mm) {
stats->total_average_depth_time.seconds += duration;
stats->avg_depth.mm = (1.0 * old_tadt * stats->avg_depth.mm +
duration * dp->meandepth.mm) /
stats->total_average_depth_time.seconds;
}
if (dp->sac > 100) { /* less than .1 l/min is bogus, even with a pSCR */
sac_time = stats->total_sac_time + duration;
stats->avg_sac.mliter = (1.0 * stats->total_sac_time * stats->avg_sac.mliter +

2
core/statistics.h
View file

@ -16,6 +16,8 @@ typedef struct
{
int period;
duration_t total_time;
/* total time of dives with non-zero average depth */
duration_t total_average_depth_time;
/* avg_time is simply total_time / nr -- let's not keep this */
duration_t shortest_time;
duration_t longest_time;