diff options
| -rw-r--r-- | planner.c | 43 | ||||
| -rw-r--r-- | qt-ui/diveplanner.cpp | 10 |
2 files changed, 39 insertions, 14 deletions
@@ -13,6 +13,9 @@ #include "planner.h" #include "gettext.h" +#define TIMESTEP 1 /* second */ +#define DECOTIMESTEP 60 /* seconds. Unit of deco stop times */ + int decostoplevels[] = { 0, 3000, 6000, 9000, 12000, 15000, 18000, 21000, 24000, 27000, 30000, 33000, 36000, 39000, 42000, 45000, 48000, 51000, 54000, 57000, 60000, 63000, 66000, 69000, 72000, 75000, 78000, 81000, 84000, 87000, @@ -603,6 +606,7 @@ void plan(struct diveplan *diveplan, char **cached_datap, struct dive **divep, b return; record_dive(dive); + /* Let's start at the last 'sample', i.e. the last manually entered waypoint. */ sample = &dive->dc.sample[dive->dc.samples - 1]; /* we start with gas 0, then check if that was changed */ o2 = dive->cylinder[0].gasmix.o2.permille; @@ -634,28 +638,33 @@ void plan(struct diveplan *diveplan, char **cached_datap, struct dive **divep, b printf("depth %5.2lfm ceiling %5.2lfm\n", depth / 1000.0, ceiling / 1000.0); #endif + /* Find the gases available for deco */ gaschanges = analyze_gaslist(diveplan, dive, &gaschangenr, depth); + /* Find the first potential decostopdepth above current depth */ for (stopidx = 0; stopidx < sizeof(decostoplevels) / sizeof(int); stopidx++) if (decostoplevels[stopidx] >= depth) break; if (stopidx > 0) stopidx--; + /* Stoplevels are either depths of gas changes or potential deco stop depths. */ stoplevels = sort_stops(decostoplevels, stopidx + 1, gaschanges, gaschangenr); stopidx += gaschangenr; + /* Keep time during the ascend */ clock = previous_point_time = dive->dc.sample[dive->dc.samples - 1].time.seconds; gi = gaschangenr - 1; while (1) { /* We will break out when we hit the surface */ do { - /* Ascend in one second steps to next stop depth */ - int deltad = ascend_velocity(depth); + /* Ascend to next stop depth */ + assert(deco_allowed_depth(tissue_tolerance, diveplan->surface_pressure / 1000.0, dive, 1) < depth); + int deltad = ascend_velocity(depth) * TIMESTEP; if (depth - deltad < stoplevels[stopidx]) deltad = depth - stoplevels[stopidx]; - tissue_tolerance = add_segment(depth_to_mbar(depth, dive) / 1000.0, &dive->cylinder[current_cylinder].gasmix, 1, po2, dive); - ++clock; + tissue_tolerance = add_segment(depth_to_mbar(depth, dive) / 1000.0, &dive->cylinder[current_cylinder].gasmix, TIMESTEP, po2, dive); + clock += TIMESTEP; depth -= deltad; } while (depth > stoplevels[stopidx]); @@ -664,6 +673,8 @@ void plan(struct diveplan *diveplan, char **cached_datap, struct dive **divep, b if (gi >= 0 && stoplevels[stopidx] == gaschanges[gi].depth) { + /* We have reached a gas change. + * Record this in the dive plan */ plan_add_segment(diveplan, clock - previous_point_time, depth, o2, he, po2, false); previous_point_time = clock; stopping = true; @@ -678,16 +689,17 @@ void plan(struct diveplan *diveplan, char **cached_datap, struct dive **divep, b gi--; } - /* trial ascend */ --stopidx; + + /* Save the current state and try to ascend to the next stopdepth */ int trial_depth = depth; cache_deco_state(tissue_tolerance, &trial_cache); while(1) { - /* Try to ascend to next stop, go back and wait if we hit the ceiling on the way */ + /* Check if ascending to next stop is clear, go back and wait if we hit the ceiling on the way */ clear_to_ascend = true; while (trial_depth > stoplevels[stopidx]) { - int deltad = ascend_velocity(trial_depth); - tissue_tolerance = add_segment(depth_to_mbar(trial_depth, dive) / 1000.0, &dive->cylinder[current_cylinder].gasmix, 1, po2, dive); + int deltad = ascend_velocity(trial_depth) * TIMESTEP; + tissue_tolerance = add_segment(depth_to_mbar(trial_depth, dive) / 1000.0, &dive->cylinder[current_cylinder].gasmix, TIMESTEP, po2, dive); if (deco_allowed_depth(tissue_tolerance, diveplan->surface_pressure / 1000.0, dive, 1) > trial_depth - deltad){ /* We should have stopped */ clear_to_ascend = false; @@ -696,28 +708,33 @@ void plan(struct diveplan *diveplan, char **cached_datap, struct dive **divep, b trial_depth -= deltad; } restore_deco_state(trial_cache); - /* The next stop is clear */ + if(clear_to_ascend) - break; + break; /* We did not hit the ceiling */ - /* Wait a minute */ + /* Add a minute of deco time and then try again */ if (!stopping) { + /* The last segment was an ascend segment. + * Add a waypoint for start of this deco stop */ plan_add_segment(diveplan, clock - previous_point_time, depth, o2, he, po2, false); previous_point_time = clock; stopping = true; } - tissue_tolerance = add_segment(depth_to_mbar(depth, dive) / 1000.0, &dive->cylinder[current_cylinder].gasmix, 60, po2, dive); + tissue_tolerance = add_segment(depth_to_mbar(depth, dive) / 1000.0, &dive->cylinder[current_cylinder].gasmix, DECOTIMESTEP, po2, dive); cache_deco_state(tissue_tolerance, &trial_cache); - clock += 60; + clock += DECOTIMESTEP; trial_depth = depth; } if (stopping) { + /* Next we will ascend again. Add a waypoint if we have spend deco time */ plan_add_segment(diveplan, clock - previous_point_time, depth, o2, he, po2, false); previous_point_time = clock; stopping = false; } } + + /* We made it to the surface */ plan_add_segment(diveplan, clock - previous_point_time, 0, o2, he, po2, false); delete_single_dive(dive_table.nr - 1); *divep = dive = create_dive_from_plan(diveplan); diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index 93826675c..4ca9a4938 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -1044,6 +1044,9 @@ bool DivePlannerPointsModel::isPlanner() return mode == PLAN; } +/* When the planner adds deco stops to the model, adding those should not trigger a new deco calculation. + * We thus start the planner only when recalc is true. */ + bool DivePlannerPointsModel::setRecalc(bool rec) { bool old = recalc; @@ -1245,6 +1248,8 @@ bool DivePlannerPointsModel::addGas(int o2, int he) fill_default_cylinder(cyl); cyl->gasmix.o2.permille = o2; cyl->gasmix.he.permille = he; + /* The depth to change to that gas is given by the depth where its pO2 is 1.6 bar. + * The user should be able to change this depth manually. */ if (!o2) cyl->depth.mm = 1600 * 1000 / O2_IN_AIR * 10 - 10000; else @@ -1326,6 +1331,8 @@ int DivePlannerPointsModel::addStop(int milimeters, int seconds, int o2, int he, } } } + + // Get rid of deco stops before adding waypoints bool oldRecalc = setRecalc(false); if (oldRecalc) { QVector<int> computedPoints; @@ -1582,7 +1589,8 @@ void DivePlannerPointsModel::createPlan() int consumption = ((depth_to_mbar(mean[i], tempDive) * duration[i] / 60) * sac) / (cyl->type.size.mliter / 1000); cyl->end.mbar = cyl->start.mbar - consumption; } else { - /* Cylider without a proper size are easily emptied */ + // Cylinders without a proper size are easily emptied. + // Don't attempt to to calculate the infinite pressure drop. cyl->end.mbar = 0; } } |