Merge pull request #38 from KG32/fix/deco-runtime-gas-switches

Fix/deco runtime gas switches

Author: KG32

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "dive-deco"
-version = "4.3.0"
+version = "4.3.1"
 edition = "2021"
 license = "MIT"
 description = "A dive decompression models library (Buehlmann ZH-L 16C)"

Cargo.toml

@@ -34,7 +34,6 @@ The Bühlmann decompression set of parameters is an Haldanian mathematical model
 ### Planned features
 
 - extended deco model config [metric/imperial units, water density and more] (currently metric and density assumed to be 1.03kg/l as salt water)
-- OTU (Oxygen Toxicity Units)
 - travel records optimization (linear ascent / descent records using Schreiner equation instead of iterative Haldane equation)
 - other deco algorithms (VPM-B)
 - other optimizations

README.md

@@ -303,10 +303,12 @@ impl Deco {
                 } else {
                     // ascent to next gas switch depth if next gas' MOD below ceiling
                     if let Some(next_switch_gas) = next_switch_gas {
-                        return Ok((
-                            Some(DecoAction::AscentToGasSwitchDepth),
-                            Some(next_switch_gas),
-                        ));
+                        if next_switch_gas.max_operating_depth(1.6) >= ceiling {
+                            return Ok((
+                                Some(DecoAction::AscentToGasSwitchDepth),
+                                Some(next_switch_gas),
+                            ));
+                        }
                     }
                     Ok((Some(DecoAction::AscentToCeil), None))
                 }

src/common/deco.rs

@@ -174,7 +174,6 @@ fn test_example_ceiling_start() {
     );
 
     let air = Gas::air();
-    // let ean_50 = Gas::new(0.50, 0.);
 
     // instant drop to 40m on air for 10min
     model.record(40., 10 * 60, &air);
@@ -218,15 +217,15 @@ fn test_gradual_ascent_with_deco() {
             .with_surface_pressure(1013),
     );
     let air = Gas::air();
-    let ean50 = Gas::new(0.21, 0.50);
+    let ean_50 = Gas::new(0.50, 0.);
     model.record(45., 30 * 60, &air);
     loop {
         let depth = model.dive_state().depth;
         if depth <= 0. {
             break;
         }
         model.record_travel_with_rate(depth - 3., 10., &air);
-        model.deco(vec![air, ean50]).unwrap();
+        model.deco(vec![air, ean_50]).unwrap();
     }
 }
 

tests/buehlmann_tests.rs

@@ -1,6 +1,6 @@
 use dive_deco::{
-    BuehlmannConfig, BuehlmannModel, DecoModel, DecoRuntime, DecoStage, DecoStageType, Depth, Gas,
-    MinutesSigned,
+    BuehlmannConfig, BuehlmannModel, CeilingType, DecoModel, DecoRuntime, DecoStage, DecoStageType,
+    Depth, Gas, MinutesSigned,
 };
 
 pub mod fixtures;
@@ -248,6 +248,39 @@ fn test_runtime_on_missed_stop() {
     }
 }
 
+#[test]
+fn test_deco_runtime_integrity() {
+    let config = BuehlmannConfig::new()
+        .with_gradient_factors(30, 70)
+        .with_ceiling_type(CeilingType::Adaptive);
+    let mut model = BuehlmannModel::new(config);
+    let air = Gas::air();
+    let ean_50 = Gas::new(0.50, 0.);
+    let oxygen = Gas::new(1., 0.);
+    model.record(40., 20 * 60, &air);
+
+    let deco_runtime = model.deco(vec![air, ean_50, oxygen]).unwrap();
+    let deco_stages = deco_runtime.deco_stages;
+
+    deco_stages.iter().reduce(|a, b| {
+        // validate depth order
+        assert!(
+            b.start_depth == a.end_depth,
+            "next stage start depth ({:?}@{}m) should equal previous stage end depth ({:?}@{}m)",
+            b.stage_type,
+            b.start_depth,
+            a.stage_type,
+            a.end_depth
+        );
+        // validate gas switch MOD
+        if a.stage_type == DecoStageType::GasSwitch {
+            let gas_switch_target_mod = a.gas.max_operating_depth(1.6);
+            assert!(a.start_depth <= gas_switch_target_mod);
+        }
+        b
+    });
+}
+
 fn get_first_deco_stop_depth(deco: DecoRuntime) -> Option<Depth> {
     let first_stop = deco
         .deco_stages