7 * So when we re-calculate maxdepth and meandepth, we will
8 * not override the old numbers if they are close to the
11 * Why? Because a dive computer may well actually track the
12 * max depth and mean depth at finer granularity than the
13 * samples it stores. So it's possible that the max and mean
14 * have been reported more correctly originally.
16 * Only if the values calculated from the samples are clearly
17 * different do we override the normal depth values.
19 * This considers 1m to be "clearly different". That's
20 * a totally random number.
22 static void update_depth(depth_t *depth, int new)
27 if (abs(old - new) > 1000)
32 static void update_duration(duration_t *duration, int new)
35 duration->seconds = new;
38 static void update_temperature(temperature_t *temperature, int new)
41 int old = temperature->mkelvin;
43 if (abs(old - new) > 1000)
44 temperature->mkelvin = new;
48 static void fixup_pressure(struct dive *dive, struct sample *sample)
50 unsigned int pressure, index;
53 pressure = sample->cylinderpressure.mbar;
56 index = sample->cylinderindex;
57 if (index >= MAX_CYLINDERS)
59 cyl = dive->cylinder + index;
61 cyl->start.mbar = pressure;
62 if (!cyl->end.mbar || pressure < cyl->end.mbar)
63 cyl->end.mbar = pressure;
66 struct dive *fixup_dive(struct dive *dive)
71 int start = -1, end = -1;
72 int maxdepth = 0, mintemp = 0;
75 temperature_t *redundant_temp = NULL;
77 for (i = 0; i < dive->samples; i++) {
78 struct sample *sample = dive->sample + i;
79 int time = sample->time.seconds;
80 int depth = sample->depth.mm;
81 int temp = sample->temperature.mkelvin;
93 fixup_pressure(dive, sample);
97 * If we have consecutive identical
98 * temperature readings, throw away
99 * the redundant ones. We care about
102 if (lasttemp == temp) {
104 redundant_temp->mkelvin = 0;
105 redundant_temp = &sample->temperature;
107 redundant_temp = NULL;
111 if (!mintemp || temp < mintemp)
114 depthtime += (time - lasttime) * (lastdepth + depth) / 2;
121 update_duration(&dive->duration, end - start);
123 depthtime /= (end - start);
125 update_depth(&dive->meandepth, depthtime);
126 update_temperature(&dive->watertemp, mintemp);
127 update_depth(&dive->maxdepth, maxdepth);
132 /* Don't pick a zero for MERGE_MIN() */
133 #define MIN(a,b) ((a)<(b)?(a):(b))
134 #define MAX(a,b) ((a)>(b)?(a):(b))
135 #define MERGE_MAX(res, a, b, n) res->n = MAX(a->n, b->n)
136 #define MERGE_MIN(res, a, b, n) res->n = (a->n)?(b->n)?MIN(a->n, b->n):(a->n):(b->n)
138 static int alloc_samples;
140 static struct dive *add_sample(struct sample *sample, int time, struct dive *dive)
142 int nr = dive->samples;
145 if (nr >= alloc_samples) {
146 alloc_samples = (alloc_samples + 64) * 3 / 2;
147 dive = realloc(dive, dive_size(alloc_samples));
151 dive->samples = nr+1;
152 d = dive->sample + nr;
155 d->time.seconds = time;
160 * Merge samples. Dive 'a' is "offset" seconds before Dive 'b'
162 static struct dive *merge_samples(struct dive *res, struct dive *a, struct dive *b, int offset)
164 int asamples = a->samples;
165 int bsamples = b->samples;
166 struct sample *as = a->sample;
167 struct sample *bs = b->sample;
171 struct sample sample;
176 at = asamples ? as->time.seconds : -1;
177 bt = bsamples ? bs->time.seconds + offset : -1;
179 /* No samples? All done! */
180 if (at < 0 && bt < 0)
181 return fixup_dive(res);
183 /* Only samples from a? */
186 res = add_sample(as, at, res);
192 /* Only samples from b? */
195 res = add_sample(bs, bt, res);
206 /* same-time sample: add a merged sample. Take the non-zero ones */
209 sample.depth = as->depth;
210 if (as->temperature.mkelvin)
211 sample.temperature = as->temperature;
212 if (as->cylinderpressure.mbar)
213 sample.cylinderpressure = as->cylinderpressure;
214 if (as->cylinderindex)
215 sample.cylinderindex = as->cylinderindex;
217 res = add_sample(&sample, at, res);
226 static char *merge_text(const char *a, const char *b)
236 res = malloc(strlen(a) + strlen(b) + 9);
239 sprintf(res, "(%s) or (%s)", a, b);
243 /* Pick whichever has any info (if either). Prefer 'a' */
244 static void merge_cylinder_type(cylinder_type_t *res, cylinder_type_t *a, cylinder_type_t *b)
251 static void merge_cylinder_mix(gasmix_t *res, gasmix_t *a, gasmix_t *b)
258 static void merge_cylinder_info(cylinder_t *res, cylinder_t *a, cylinder_t *b)
260 merge_cylinder_type(&res->type, &a->type, &b->type);
261 merge_cylinder_mix(&res->gasmix, &a->gasmix, &b->gasmix);
262 MERGE_MAX(res, a, b, start.mbar);
263 MERGE_MIN(res, a, b, end.mbar);
267 * This could do a lot more merging. Right now it really only
268 * merges almost exact duplicates - something that happens easily
269 * with overlapping dive downloads.
271 struct dive *try_to_merge(struct dive *a, struct dive *b)
276 if (a->when != b->when)
280 res = malloc(dive_size(alloc_samples));
283 memset(res, 0, dive_size(alloc_samples));
286 res->location = merge_text(a->location, b->location);
287 res->notes = merge_text(a->notes, b->notes);
288 MERGE_MAX(res, a, b, maxdepth.mm);
289 res->meandepth.mm = 0;
290 MERGE_MAX(res, a, b, duration.seconds);
291 MERGE_MAX(res, a, b, surfacetime.seconds);
292 MERGE_MAX(res, a, b, airtemp.mkelvin);
293 MERGE_MIN(res, a, b, watertemp.mkelvin);
294 for (i = 0; i < MAX_CYLINDERS; i++)
295 merge_cylinder_info(res->cylinder+i, a->cylinder + i, b->cylinder + i);
297 return merge_samples(res, a, b, 0);