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

planner: make argument to plan_add_segment() depth_t

Browse source 
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-12-14 10:49:28 +01:00 • committed by Michael Keller
parent 6b57b3b745
commit 022b927755
4 changed files with 72 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

96
tests/testplan.cpp
View file

@ -65,10 +65,10 @@ 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, 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);
plan_add_segment(dp, 0, dive.gas_mod(ean36, po2, m_or_ft(3, 10)), 1, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(oxygen, po2, m_or_ft(3, 10)), 2, 0, 1, OC);
plan_add_segment(dp, droptime, m_or_ft(79, 260), 0, 0, 1, OC);
plan_add_segment(dp, 30 * 60 - droptime, m_or_ft(79, 260), 0, 0, 1, OC);
return dp;
}
@ -100,10 +100,10 @@ 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, 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);
plan_add_segment(dp, 0, dive.gas_mod(ean50, po2, m_or_ft(3, 10)), 1, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(oxygen, po2, m_or_ft(3, 10)), 2, 0, 1, OC);
plan_add_segment(dp, droptime, m_or_ft(45, 150), 0, 0, 1, OC);
plan_add_segment(dp, 30 * 60 - droptime, m_or_ft(45, 150), 0, 0, 1, OC);
return dp;
}
@ -135,10 +135,10 @@ 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, 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);
plan_add_segment(dp, 0, dive.gas_mod(tx50_15, po2, m_or_ft(3, 10)), 1, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(oxygen, po2, m_or_ft(3, 10)), 2, 0, 1, OC);
plan_add_segment(dp, droptime, m_or_ft(60, 200), 0, 0, 1, OC);
plan_add_segment(dp, 10 * 60 - droptime, m_or_ft(60, 200), 0, 0, 1, OC);
return dp;
}
@ -159,8 +159,8 @@ diveplan setupPlanVpmb60m30minAir()
reset_cylinders(&dive, true);
int droptime = m_or_ft(60, 200).mm * 60 / m_or_ft(99, 330).mm;
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);
plan_add_segment(dp, droptime, m_or_ft(60, 200), 0, 0, 1, OC);
plan_add_segment(dp, 30 * 60 - droptime, m_or_ft(60, 200), 0, 0, 1, OC);
return dp;
}
@ -188,9 +188,9 @@ 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, 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);
plan_add_segment(dp, 0, dive.gas_mod(ean50, po2, m_or_ft(3, 10)), 1, 0, 1, OC);
plan_add_segment(dp, droptime, m_or_ft(60, 200), 0, 0, 1, OC);
plan_add_segment(dp, 30 * 60 - droptime, m_or_ft(60, 200), 0, 0, 1, OC);
return dp;
}
@ -218,9 +218,9 @@ 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, 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);
plan_add_segment(dp, 0, dive.gas_mod(ean50, po2, m_or_ft(3, 10)), 1, 0, 1, OC);
plan_add_segment(dp, droptime, m_or_ft(60, 200), 0, 0, 1, OC);
plan_add_segment(dp, 30 * 60 - droptime, m_or_ft(60, 200), 0, 0, 1, OC);
return dp;
}
@ -241,10 +241,10 @@ diveplan setupPlanVpmbMultiLevelAir()
reset_cylinders(&dive, true);
int droptime = m_or_ft(20, 66).mm * 60 / m_or_ft(99, 330).mm;
plan_add_segment(dp, droptime, m_or_ft(20, 66).mm, 0, 0, 1, OC);
plan_add_segment(dp, 10 * 60 - droptime, m_or_ft(20, 66).mm, 0, 0, 1, OC);
plan_add_segment(dp, 1 * 60, m_or_ft(60, 200).mm, 0, 0, 1, OC);
plan_add_segment(dp, 29 * 60, m_or_ft(60, 200).mm, 0, 0, 1, OC);
plan_add_segment(dp, droptime, m_or_ft(20, 66), 0, 0, 1, OC);
plan_add_segment(dp, 10 * 60 - droptime, m_or_ft(20, 66), 0, 0, 1, OC);
plan_add_segment(dp, 1 * 60, m_or_ft(60, 200), 0, 0, 1, OC);
plan_add_segment(dp, 29 * 60, m_or_ft(60, 200), 0, 0, 1, OC);
return dp;
}
@ -275,10 +275,10 @@ 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, 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);
plan_add_segment(dp, 0, dive.gas_mod(ean50, po2, m_or_ft(3, 10)), 1, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(oxygen, po2, m_or_ft(3, 10)), 2, 0, 1, OC);
plan_add_segment(dp, droptime, m_or_ft(100, 330), 0, 0, 1, OC);
plan_add_segment(dp, 60 * 60 - droptime, m_or_ft(100, 330), 0, 0, 1, OC);
return dp;
}
@ -309,10 +309,10 @@ 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, 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);
plan_add_segment(dp, 0, dive.gas_mod(ean50, po2, m_or_ft(3, 10)), 1, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(oxygen, po2, m_or_ft(3, 10)), 2, 0, 1, OC);
plan_add_segment(dp, droptime, m_or_ft(100, 330), 0, 0, 1, OC);
plan_add_segment(dp, 10 * 60 - droptime, m_or_ft(100, 330), 0, 0, 1, OC);
return dp;
}
@ -333,8 +333,8 @@ diveplan setupPlanVpmb30m20min()
reset_cylinders(&dive, true);
int droptime = m_or_ft(30, 100).mm * 60 / m_or_ft(18, 60).mm;
plan_add_segment(dp, droptime, m_or_ft(30, 100).mm, 0, 0, 1, OC);
plan_add_segment(dp, 20 * 60 - droptime, m_or_ft(30, 100).mm, 0, 0, 1, OC);
plan_add_segment(dp, droptime, m_or_ft(30, 100), 0, 0, 1, OC);
plan_add_segment(dp, 20 * 60 - droptime, m_or_ft(30, 100), 0, 0, 1, OC);
return dp;
}
@ -368,13 +368,13 @@ 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, 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);
plan_add_segment(dp, (30 - 20 - 3) * 60, m_or_ft(70, 230).mm, 0, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(tx21_35, po2, m_or_ft(3, 10)), 1, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(ean50, po2, m_or_ft(3, 10)), 2, 0, 1, OC);
plan_add_segment(dp, 0, dive.gas_mod(oxygen, po2, m_or_ft(3, 10)), 3, 0, 1, OC);
plan_add_segment(dp, droptime, m_or_ft(100, 330), 0, 0, 1, OC);
plan_add_segment(dp, 20 * 60 - droptime, m_or_ft(100, 330), 0, 0, 1, OC);
plan_add_segment(dp, 3 * 60, m_or_ft(70, 230), 0, 0, 1, OC);
plan_add_segment(dp, (30 - 20 - 3) * 60, m_or_ft(70, 230), 0, 0, 1, OC);
return dp;
}
@ -403,10 +403,10 @@ diveplan setupPlanSeveralGases()
dive.surface_pressure = 1_atm;
reset_cylinders(&dive, true);
plan_add_segment(dp, 120, 40000, 0, 0, true, OC);
plan_add_segment(dp, 18 * 60, 40000, 0, 0, true, OC);
plan_add_segment(dp, 10 * 60, 10000, 1, 0, true, OC);
plan_add_segment(dp, 5 * 60, 10000, 0, 0, true, OC);
plan_add_segment(dp, 120, 40_m, 0, 0, true, OC);
plan_add_segment(dp, 18 * 60, 40_m, 0, 0, true, OC);
plan_add_segment(dp, 10 * 60, 10_m, 1, 0, true, OC);
plan_add_segment(dp, 5 * 60, 10_m, 0, 0, true, OC);
return dp;
}
@ -441,9 +441,9 @@ diveplan setupPlanCcr()
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);
plan_add_segment(dp, 0, cyl2->depth.mm, 2, 0, false, OC);
plan_add_segment(dp, 20 * 60, m_or_ft(60, 197).mm, 0, 1300, true, CCR);
plan_add_segment(dp, 0, cyl1->depth, 1, 0, false, OC);
plan_add_segment(dp, 0, cyl2->depth, 2, 0, false, OC);
plan_add_segment(dp, 20 * 60, m_or_ft(60, 197), 0, 1300, true, CCR);
return dp;
}