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

profile: remove min/max entries from plot_data

Browse source 
These were the minimum and maximum of a 9-min window.
The profile now uses an adaptive peak-search, so this is not
used anymore.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2021-10-18 15:41:53 +02:00 • committed by Dirk Hohndel
parent 7ef0ae02a8
commit 01af4bcd00
2 changed files with 0 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
core/profile.c
View file

@ -128,50 +128,6 @@ static int get_local_sac(struct plot_info *pi, int idx1, int idx2, struct dive *
return lrint(airuse / atm * 60 / duration); return lrint(airuse / atm * 60 / duration);
} }
#define HALF_INTERVAL 9 * 30
/*
* Run the min/max calculations: over a 9 minute interval
* around the entry point (indices 0, 1, 2 respectively).
*/
static void analyze_plot_info_minmax(struct plot_info *pi, int entry_index)
{
struct plot_data *plot_entry = pi->entry + entry_index; // fixed
struct plot_data *p = plot_entry; // moves with 'entry'
int start = p->sec - HALF_INTERVAL, end = p->sec + HALF_INTERVAL;
int min, max;
/* Go back 'seconds' in time */
while (entry_index > 0) {
if (p[-1].sec < start)
break;
entry_index--;
p--;
}
// indices to the min/max entries
min = max = entry_index;
/* Then go forward until we hit an entry past the time */
while (entry_index < pi->nr) {
int time = p->sec;
int depth = p->depth;
if (time > end)
break;
if (depth < pi->entry[min].depth)
min = entry_index;
if (depth > pi->entry[max].depth)
max = entry_index;
p++;
entry_index++;
}
plot_entry->min = min;
plot_entry->max = max;
}
static velocity_t velocity(int speed) static velocity_t velocity(int speed)
{ {
velocity_t v; velocity_t v;
@ -232,10 +188,6 @@ static void analyze_plot_info(struct plot_info *pi)
entry->speed = 0; entry->speed = 0;
} }
} }
/* get minmax data */
for (i = 0; i < nr; i++)
analyze_plot_info_minmax(pi, i);
} }
/* /*

2
core/profile.h
View file

@ -61,8 +61,6 @@ struct plot_data {
int mod, ead, end, eadd; int mod, ead, end, eadd;
velocity_t velocity; velocity_t velocity;
int speed; int speed;
// stats over 9 minute window:
int min, max; // indices into pi->entry[]
/* values calculated by us */ /* values calculated by us */
unsigned int in_deco_calc : 1; unsigned int in_deco_calc : 1;
int ndl_calc; int ndl_calc;