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

core: make round_to parameter of gas_mod() and gas_mnd() a depth_t

Browse source 
Simplifies practically all the callers.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-12-14 10:35:56 +01:00
parent e9c14c523c
commit c46579c006
6 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

36
tests/testplan.cpp
View file

@ -65,8 +65,8 @@ diveplan setupPlan()
reset_cylinders(&dive, true);
int droptime = m_or_ft(79, 260).mm * 60 / m_or_ft(23, 75).mm;
plan_add_segment(dp, 0, dive.gas_mod(ean36, po2, m_or_ft(3, 10).mm).mm, 1, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(oxygen, po2, m_or_ft(3, 10).mm).mm, 2, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(ean36, po2, m_or_ft(3, 10)).mm, 1, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(oxygen, po2, m_or_ft(3, 10)).mm, 2, 0, 1, OC);
plan_add_segment(dp, droptime, m_or_ft(79, 260).mm, 0, 0, 1, OC);
plan_add_segment(dp, 30 * 60 - droptime, m_or_ft(79, 260).mm, 0, 0, 1, OC);
return dp;
@ -100,8 +100,8 @@ diveplan setupPlanVpmb45m30mTx()
reset_cylinders(&dive, true);
int droptime = m_or_ft(45, 150).mm * 60 / m_or_ft(23, 75).mm;
plan_add_segment(dp, 0, dive.gas_mod(ean50, po2, m_or_ft(3, 10).mm).mm, 1, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(oxygen, po2, m_or_ft(3, 10).mm).mm, 2, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(ean50, po2, m_or_ft(3, 10)).mm, 1, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(oxygen, po2, m_or_ft(3, 10)).mm, 2, 0, 1, OC);
plan_add_segment(dp, droptime, m_or_ft(45, 150).mm, 0, 0, 1, OC);
plan_add_segment(dp, 30 * 60 - droptime, m_or_ft(45, 150).mm, 0, 0, 1, OC);
return dp;
@ -135,8 +135,8 @@ diveplan setupPlanVpmb60m10mTx()
reset_cylinders(&dive, true);
int droptime = m_or_ft(60, 200).mm * 60 / m_or_ft(23, 75).mm;
plan_add_segment(dp, 0, dive.gas_mod(tx50_15, po2, m_or_ft(3, 10).mm).mm, 1, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(oxygen, po2, m_or_ft(3, 10).mm).mm, 2, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(tx50_15, po2, m_or_ft(3, 10)).mm, 1, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(oxygen, po2, m_or_ft(3, 10)).mm, 2, 0, 1, OC);
plan_add_segment(dp, droptime, m_or_ft(60, 200).mm, 0, 0, 1, OC);
plan_add_segment(dp, 10 * 60 - droptime, m_or_ft(60, 200).mm, 0, 0, 1, OC);
return dp;
@ -188,7 +188,7 @@ diveplan setupPlanVpmb60m30minEan50()
reset_cylinders(&dive, true);
int droptime = m_or_ft(60, 200).mm * 60 / m_or_ft(99, 330).mm;
plan_add_segment(dp, 0, dive.gas_mod(ean50, po2, m_or_ft(3, 10).mm).mm, 1, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(ean50, po2, m_or_ft(3, 10)).mm, 1, 0, 1, OC);
plan_add_segment(dp, droptime, m_or_ft(60, 200).mm, 0, 0, 1, OC);
plan_add_segment(dp, 30 * 60 - droptime, m_or_ft(60, 200).mm, 0, 0, 1, OC);
return dp;
@ -218,7 +218,7 @@ diveplan setupPlanVpmb60m30minTx()
reset_cylinders(&dive, true);
int droptime = m_or_ft(60, 200).mm * 60 / m_or_ft(99, 330).mm;
plan_add_segment(dp, 0, dive.gas_mod(ean50, po2, m_or_ft(3, 10).mm).mm, 1, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(ean50, po2, m_or_ft(3, 10)).mm, 1, 0, 1, OC);
plan_add_segment(dp, droptime, m_or_ft(60, 200).mm, 0, 0, 1, OC);
plan_add_segment(dp, 30 * 60 - droptime, m_or_ft(60, 200).mm, 0, 0, 1, OC);
return dp;
@ -275,8 +275,8 @@ diveplan setupPlanVpmb100m60min()
reset_cylinders(&dive, true);
int droptime = m_or_ft(100, 330).mm * 60 / m_or_ft(99, 330).mm;
plan_add_segment(dp, 0, dive.gas_mod(ean50, po2, m_or_ft(3, 10).mm).mm, 1, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(oxygen, po2, m_or_ft(3, 10).mm).mm, 2, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(ean50, po2, m_or_ft(3, 10)).mm, 1, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(oxygen, po2, m_or_ft(3, 10)).mm, 2, 0, 1, OC);
plan_add_segment(dp, droptime, m_or_ft(100, 330).mm, 0, 0, 1, OC);
plan_add_segment(dp, 60 * 60 - droptime, m_or_ft(100, 330).mm, 0, 0, 1, OC);
return dp;
@ -309,8 +309,8 @@ diveplan setupPlanVpmb100m10min()
reset_cylinders(&dive, true);
int droptime = m_or_ft(100, 330).mm * 60 / m_or_ft(99, 330).mm;
plan_add_segment(dp, 0, dive.gas_mod(ean50, po2, m_or_ft(3, 10).mm).mm, 1, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(oxygen, po2, m_or_ft(3, 10).mm).mm, 2, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(ean50, po2, m_or_ft(3, 10)).mm, 1, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(oxygen, po2, m_or_ft(3, 10)).mm, 2, 0, 1, OC);
plan_add_segment(dp, droptime, m_or_ft(100, 330).mm, 0, 0, 1, OC);
plan_add_segment(dp, 10 * 60 - droptime, m_or_ft(100, 330).mm, 0, 0, 1, OC);
return dp;
@ -368,9 +368,9 @@ diveplan setupPlanVpmb100mTo70m30min()
reset_cylinders(&dive, true);
int droptime = m_or_ft(100, 330).mm * 60 / m_or_ft(18, 60).mm;
plan_add_segment(dp, 0, dive.gas_mod(tx21_35, po2, m_or_ft(3, 10).mm).mm, 1, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(ean50, po2, m_or_ft(3, 10).mm).mm, 2, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(oxygen, po2, m_or_ft(3, 10).mm).mm, 3, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(tx21_35, po2, m_or_ft(3, 10)).mm, 1, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(ean50, po2, m_or_ft(3, 10)).mm, 2, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(oxygen, po2, m_or_ft(3, 10)).mm, 3, 0, 1, OC);
plan_add_segment(dp, droptime, m_or_ft(100, 330).mm, 0, 0, 1, OC);
plan_add_segment(dp, 20 * 60 - droptime, m_or_ft(100, 330).mm, 0, 0, 1, OC);
plan_add_segment(dp, 3 * 60, m_or_ft(70, 230).mm, 0, 0, 1, OC);
@ -431,14 +431,14 @@ diveplan setupPlanCcr()
cylinder_t *cyl0 = dive.get_or_create_cylinder(0);
cylinder_t *cyl1 = dive.get_or_create_cylinder(1);
cyl0->gasmix = diluent;
cyl0->depth = dive.gas_mod(diluent, po2, m_or_ft(3, 10).mm);
cyl0->depth = dive.gas_mod(diluent, po2, m_or_ft(3, 10));
cyl0->type.size = 3_l;
cyl0->type.workingpressure = 200_bar;
cyl0->cylinder_use = DILUENT;
cyl1->gasmix = ean53;
cyl1->depth = dive.gas_mod(ean53, po2, m_or_ft(3, 10).mm);
cyl1->depth = dive.gas_mod(ean53, po2, m_or_ft(3, 10));
cyl2->gasmix = tx19_33;
cyl2->depth = dive.gas_mod(tx19_33, po2, m_or_ft(3, 10).mm);
cyl2->depth = dive.gas_mod(tx19_33, po2, m_or_ft(3, 10));
reset_cylinders(&dive, true);
plan_add_segment(dp, 0, cyl1->depth.mm, 1, 0, false, OC);