+/* dive.c */
+/* maintains the internal dive list structure */
#include <string.h>
#include <stdio.h>
#include "dive.h"
+struct dive *alloc_dive(void)
+{
+ const int initial_samples = 5;
+ unsigned int size;
+ struct dive *dive;
+
+ size = dive_size(initial_samples);
+ dive = malloc(size);
+ if (!dive)
+ exit(1);
+ memset(dive, 0, size);
+ dive->alloc_samples = initial_samples;
+ return dive;
+}
+
+struct sample *prepare_sample(struct dive **divep)
+{
+ struct dive *dive = *divep;
+ if (dive) {
+ int nr = dive->samples;
+ int alloc_samples = dive->alloc_samples;
+ struct sample *sample;
+ if (nr >= alloc_samples) {
+ unsigned int size;
+
+ alloc_samples = (alloc_samples * 3)/2 + 10;
+ size = dive_size(alloc_samples);
+ dive = realloc(dive, size);
+ if (!dive)
+ return NULL;
+ dive->alloc_samples = alloc_samples;
+ *divep = dive;
+ }
+ sample = dive->sample + nr;
+ memset(sample, 0, sizeof(*sample));
+ return sample;
+ }
+ return NULL;
+}
+
+void finish_sample(struct dive *dive, struct sample *sample)
+{
+ dive->samples++;
+}
+
/*
* So when we re-calculate maxdepth and meandepth, we will
* not override the old numbers if they are close to the
}
}
-static void update_pressure(pressure_t *pressure, int new)
-{
- if (new) {
- int old = pressure->mbar;
-
- if (abs(old - new) > 1000)
- pressure->mbar = new;
- }
-}
-
static void update_duration(duration_t *duration, int new)
{
if (new)
}
}
+static void fixup_pressure(struct dive *dive, struct sample *sample)
+{
+ unsigned int pressure, index;
+ cylinder_t *cyl;
+
+ pressure = sample->cylinderpressure.mbar;
+ if (!pressure)
+ return;
+ index = sample->cylinderindex;
+ if (index >= MAX_CYLINDERS)
+ return;
+ cyl = dive->cylinder + index;
+ if (!cyl->start.mbar)
+ cyl->start.mbar = pressure;
+ if (!cyl->end.mbar || pressure < cyl->end.mbar)
+ cyl->end.mbar = pressure;
+}
+
struct dive *fixup_dive(struct dive *dive)
{
int i;
double depthtime = 0;
int lasttime = 0;
int start = -1, end = -1;
- int startpress = 0, endpress = 0;
int maxdepth = 0, mintemp = 0;
int lastdepth = 0;
int lasttemp = 0;
- temperature_t *redundant_temp = NULL;
for (i = 0; i < dive->samples; i++) {
struct sample *sample = dive->sample + i;
int time = sample->time.seconds;
int depth = sample->depth.mm;
- int press = sample->cylinderpressure.mbar;
int temp = sample->temperature.mkelvin;
if (lastdepth)
if (depth > maxdepth)
maxdepth = depth;
}
- if (press) {
- endpress = press;
- if (!startpress)
- startpress = press;
- }
+
+ fixup_pressure(dive, sample);
+
if (temp) {
/*
* If we have consecutive identical
* temperature readings, throw away
- * the redundant ones. We care about
- * the "edges" only.
+ * the redundant ones.
*/
- if (lasttemp == temp) {
- if (redundant_temp)
- redundant_temp->mkelvin = 0;
- redundant_temp = &sample->temperature;
- } else {
- redundant_temp = NULL;
+ if (lasttemp == temp)
+ sample->temperature.mkelvin = 0;
+ else
lasttemp = temp;
- }
if (!mintemp || temp < mintemp)
mintemp = temp;
depthtime /= (end - start);
update_depth(&dive->meandepth, depthtime);
- update_pressure(&dive->beginning_pressure, startpress);
- update_pressure(&dive->end_pressure, endpress);
update_temperature(&dive->watertemp, mintemp);
update_depth(&dive->maxdepth, maxdepth);
}
/* Don't pick a zero for MERGE_MIN() */
-#define MIN(a,b) ((a)<(b)?(a):(b))
-#define MAX(a,b) ((a)>(b)?(a):(b))
#define MERGE_MAX(res, a, b, n) res->n = MAX(a->n, b->n)
#define MERGE_MIN(res, a, b, n) res->n = (a->n)?(b->n)?MIN(a->n, b->n):(a->n):(b->n)
-static int alloc_samples;
-
static struct dive *add_sample(struct sample *sample, int time, struct dive *dive)
{
- int nr = dive->samples;
- struct sample *d;
-
- if (nr >= alloc_samples) {
- alloc_samples = (alloc_samples + 64) * 3 / 2;
- dive = realloc(dive, dive_size(alloc_samples));
- if (!dive)
- return NULL;
- }
- dive->samples = nr+1;
- d = dive->sample + nr;
+ struct sample *p = prepare_sample(&dive);
- *d = *sample;
- d->time.seconds = time;
+ if (!p)
+ return NULL;
+ *p = *sample;
+ p->time.seconds = time;
+ finish_sample(dive, p);
return dive;
}
*res = *b;
}
-static void merge_cylinder_mix(gasmix_t *res, gasmix_t *a, gasmix_t *b)
+static void merge_cylinder_mix(struct gasmix *res, struct gasmix *a, struct gasmix *b)
{
if (a->o2.permille)
b = a;
{
merge_cylinder_type(&res->type, &a->type, &b->type);
merge_cylinder_mix(&res->gasmix, &a->gasmix, &b->gasmix);
+ MERGE_MAX(res, a, b, start.mbar);
+ MERGE_MIN(res, a, b, end.mbar);
}
/*
if (a->when != b->when)
return NULL;
- alloc_samples = 5;
- res = malloc(dive_size(alloc_samples));
- if (!res)
- return NULL;
- memset(res, 0, dive_size(alloc_samples));
+ res = alloc_dive();
res->when = a->when;
res->location = merge_text(a->location, b->location);
res->notes = merge_text(a->notes, b->notes);
+ MERGE_MAX(res, a, b, number);
MERGE_MAX(res, a, b, maxdepth.mm);
res->meandepth.mm = 0;
MERGE_MAX(res, a, b, duration.seconds);
MERGE_MAX(res, a, b, surfacetime.seconds);
MERGE_MAX(res, a, b, airtemp.mkelvin);
MERGE_MIN(res, a, b, watertemp.mkelvin);
- MERGE_MAX(res, a, b, beginning_pressure.mbar);
- MERGE_MAX(res, a, b, end_pressure.mbar);
for (i = 0; i < MAX_CYLINDERS; i++)
merge_cylinder_info(res->cylinder+i, a->cylinder + i, b->cylinder + i);
projects / ext / subsurface.git / blobdiff