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

Fix broken average SAC calculation

Browse source 
old_sac_time was always 0 when calculating average air consumption.
Thus the results were incorrect.  Move the counter to stats_t structure
as suggested by Linus.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Miika Turkia 2012-03-30 08:10:05 +03:00 • committed by Linus Torvalds
parent f69be7b571
commit 9fad1cb50f
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
statistics.c
View file

@ -69,6 +69,7 @@ typedef struct {
unsigned int combined_temp; unsigned int combined_temp;
unsigned int combined_count; unsigned int combined_count;
unsigned int selection_size; unsigned int selection_size;
unsigned int total_sac_time;
} stats_t; } stats_t;
static stats_t stats; static stats_t stats;
@ -93,14 +94,14 @@ static void process_dive(struct dive *dp, stats_t *stats)
stats->avg_depth.mm = (1.0 * old_tt * stats->avg_depth.mm + stats->avg_depth.mm = (1.0 * old_tt * stats->avg_depth.mm +
dp->duration.seconds * dp->meandepth.mm) / stats->total_time.seconds; dp->duration.seconds * dp->meandepth.mm) / stats->total_time.seconds;
if (dp->sac > 2800) { /* less than .1 cuft/min (2800ml/min) is bogus */ if (dp->sac > 2800) { /* less than .1 cuft/min (2800ml/min) is bogus */
int old_sac_time = sac_time; sac_time = stats->total_sac_time + dp->duration.seconds;
sac_time += dp->duration.seconds; stats->avg_sac.mliter = (1.0 * stats->total_sac_time * stats->avg_sac.mliter +
stats->avg_sac.mliter = (1.0 * old_sac_time * stats->avg_sac.mliter +
dp->duration.seconds * dp->sac) / sac_time ; dp->duration.seconds * dp->sac) / sac_time ;
if (dp->sac > stats->max_sac.mliter) if (dp->sac > stats->max_sac.mliter)
stats->max_sac.mliter = dp->sac; stats->max_sac.mliter = dp->sac;
if (stats->min_sac.mliter == 0 || dp->sac < stats->min_sac.mliter) if (stats->min_sac.mliter == 0 || dp->sac < stats->min_sac.mliter)
stats->min_sac.mliter = dp->sac; stats->min_sac.mliter = dp->sac;
stats->total_sac_time = sac_time;
} }
if (dp->watertemp.mkelvin) { if (dp->watertemp.mkelvin) {
if (stats->min_temp == 0 || dp->watertemp.mkelvin < stats->min_temp) if (stats->min_temp == 0 || dp->watertemp.mkelvin < stats->min_temp)