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: introduce a few user-defined literals for unit types

Browse source 
Thise makes initialization of unit types more palatable.

For example:

    surface.time = sample.time - duration_t { .seconds = 20 };
=>  surface.time = sample.time - 20_sec;

    delta_depth.mm = feet_to_mm(1.0); // 1ft
=>  delta_depth = 1_ft;

    get_cylinderid_at_time(..., { .seconds = 20 * 60 + 1 }));
=>  get_cylinderid_at_time(..., 20_min + 1_sec));

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-09-03 17:04:48 +02:00 • committed by bstoeger
parent f09601bc93
commit ae81b42fe2
36 changed files with 320 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

166
tests/testformatDiveGasString.cpp
View file

@ -19,8 +19,8 @@ void TestformatDiveGasString::test_air()
struct dive dive;
cylinder_t *cylinder = dive.get_or_create_cylinder(0);
cylinder->start.mbar = 230000;
cylinder->end.mbar = 100000;
cylinder->start = 230_bar;
cylinder->end = 100_bar;
QCOMPARE(formatDiveGasString(&dive), "air");
}
@ -30,9 +30,9 @@ void TestformatDiveGasString::test_nitrox()
struct dive dive;
cylinder_t *cylinder = dive.get_or_create_cylinder(0);
cylinder->gasmix.o2.permille = 320;
cylinder->start.mbar = 230000;
cylinder->end.mbar = 100000;
cylinder->gasmix.o2 = 32_percent;
cylinder->start = 230_bar;
cylinder->end = 100_bar;
QCOMPARE(formatDiveGasString(&dive), "32%");
}
@ -42,16 +42,16 @@ void TestformatDiveGasString::test_nitrox_not_use()
struct dive dive;
cylinder_t *cylinder = dive.get_or_create_cylinder(0);
cylinder->gasmix.o2.permille = 320;
cylinder->start.mbar = 230000;
cylinder->end.mbar = 100000;
cylinder->gasmix.o2 = 32_percent;
cylinder->start = 230_bar;
cylinder->end = 100_bar;
cylinder = dive.get_or_create_cylinder(1);
cylinder->gasmix.o2.permille = 1000;
cylinder->gasmix.o2 = 100_percent;
cylinder->cylinder_use = NOT_USED;
cylinder->start.mbar = 230000;
cylinder->end.mbar = 100000;
cylinder->start = 230_bar;
cylinder->end = 100_bar;
QCOMPARE(formatDiveGasString(&dive), "32%");
}
@ -61,15 +61,15 @@ void TestformatDiveGasString::test_nitrox_deco()
struct dive dive;
cylinder_t *cylinder = dive.get_or_create_cylinder(0);
cylinder->gasmix.o2.permille = 320;
cylinder->start.mbar = 230000;
cylinder->end.mbar = 100000;
cylinder->gasmix.o2 = 32_percent;
cylinder->start = 230_bar;
cylinder->end = 100_bar;
cylinder = dive.get_or_create_cylinder(1);
cylinder->gasmix.o2.permille = 1000;
cylinder->start.mbar = 230000;
cylinder->end.mbar = 100000;
cylinder->gasmix.o2 = 100_percent;
cylinder->start = 230_bar;
cylinder->end = 100_bar;
QCOMPARE(formatDiveGasString(&dive), "32…100%");
}
@ -79,15 +79,15 @@ void TestformatDiveGasString::test_reverse_nitrox_deco()
struct dive dive;
cylinder_t *cylinder = dive.get_or_create_cylinder(0);
cylinder->gasmix.o2.permille = 1000;
cylinder->start.mbar = 230000;
cylinder->end.mbar = 100000;
cylinder->gasmix.o2 = 100_percent;
cylinder->start = 230_bar;
cylinder->end = 100_bar;
cylinder = dive.get_or_create_cylinder(1);
cylinder->gasmix.o2.permille = 270;
cylinder->start.mbar = 230000;
cylinder->end.mbar = 100000;
cylinder->gasmix.o2 = 27_percent;
cylinder->start = 230_bar;
cylinder->end = 100_bar;
QCOMPARE(formatDiveGasString(&dive), "27…100%");
}
@ -97,10 +97,10 @@ void TestformatDiveGasString::test_trimix()
struct dive dive;
cylinder_t *cylinder = dive.get_or_create_cylinder(0);
cylinder->gasmix.o2.permille = 210;
cylinder->gasmix.he.permille = 350;
cylinder->start.mbar = 230000;
cylinder->end.mbar = 100000;
cylinder->gasmix.o2 = 21_percent;
cylinder->gasmix.he = 35_percent;
cylinder->start = 230_bar;
cylinder->end = 100_bar;
QCOMPARE(formatDiveGasString(&dive), "21/35");
}
@ -110,23 +110,23 @@ void TestformatDiveGasString::test_trimix_deco()
struct dive dive;
cylinder_t *cylinder = dive.get_or_create_cylinder(0);
cylinder->gasmix.o2.permille = 210;
cylinder->gasmix.he.permille = 350;
cylinder->start.mbar = 230000;
cylinder->end.mbar = 100000;
cylinder->gasmix.o2 = 21_percent;
cylinder->gasmix.he = 35_percent;
cylinder->start = 230_bar;
cylinder->end = 100_bar;
cylinder = dive.get_or_create_cylinder(1);
cylinder->gasmix.o2.permille = 500;
cylinder->gasmix.he.permille = 200;
cylinder->start.mbar = 230000;
cylinder->end.mbar = 100000;
cylinder->gasmix.o2 = 50_percent;
cylinder->gasmix.he = 20_percent;
cylinder->start = 230_bar;
cylinder->end = 100_bar;
cylinder = dive.get_or_create_cylinder(2);
cylinder->gasmix.o2.permille = 1000;
cylinder->start.mbar = 230000;
cylinder->end.mbar = 100000;
cylinder->gasmix.o2 = 100_percent;
cylinder->start = 230_bar;
cylinder->end = 100_bar;
QCOMPARE(formatDiveGasString(&dive), "21/35…100%");
}
@ -136,23 +136,23 @@ void TestformatDiveGasString::test_reverse_trimix_deco()
struct dive dive;
cylinder_t *cylinder = dive.get_or_create_cylinder(0);
cylinder->gasmix.o2.permille = 1000;
cylinder->start.mbar = 230000;
cylinder->end.mbar = 100000;
cylinder->gasmix.o2 = 100_percent;
cylinder->start = 230_bar;
cylinder->end = 100_bar;
cylinder = dive.get_or_create_cylinder(1);
cylinder->gasmix.o2.permille = 500;
cylinder->gasmix.he.permille = 200;
cylinder->start.mbar = 230000;
cylinder->end.mbar = 100000;
cylinder->gasmix.o2 = 50_percent;
cylinder->gasmix.he = 20_percent;
cylinder->start = 230_bar;
cylinder->end = 100_bar;
cylinder = dive.get_or_create_cylinder(2);
cylinder->gasmix.o2.permille = 210;
cylinder->gasmix.he.permille = 350;
cylinder->start.mbar = 230000;
cylinder->end.mbar = 100000;
cylinder->gasmix.o2 = 21_percent;
cylinder->gasmix.he = 35_percent;
cylinder->start = 230_bar;
cylinder->end = 100_bar;
QCOMPARE(formatDiveGasString(&dive), "21/35…100%");
}
@ -162,17 +162,17 @@ void TestformatDiveGasString::test_trimix_and_nitrox_same_o2()
struct dive dive;
cylinder_t *cylinder = dive.get_or_create_cylinder(0);
cylinder->gasmix.o2.permille = 250;
cylinder->gasmix.he.permille = 0;
cylinder->start.mbar = 230000;
cylinder->end.mbar = 100000;
cylinder->gasmix.o2 = 25_percent;
cylinder->gasmix.he = 0_percent;
cylinder->start = 230_bar;
cylinder->end = 100_bar;
cylinder = dive.get_or_create_cylinder(1);
cylinder->gasmix.o2.permille = 250;
cylinder->gasmix.he.permille = 250;
cylinder->start.mbar = 230000;
cylinder->end.mbar = 100000;
cylinder->gasmix.o2 = 25_percent;
cylinder->gasmix.he = 25_percent;
cylinder->start = 230_bar;
cylinder->end = 100_bar;
QCOMPARE(formatDiveGasString(&dive), "25/25");
}
@ -182,17 +182,17 @@ void TestformatDiveGasString::test_trimix_and_nitrox_lower_o2()
struct dive dive;
cylinder_t *cylinder = dive.get_or_create_cylinder(0);
cylinder->gasmix.o2.permille = 220;
cylinder->gasmix.he.permille = 0;
cylinder->start.mbar = 230000;
cylinder->end.mbar = 100000;
cylinder->gasmix.o2 = 22_percent;
cylinder->gasmix.he = 0_percent;
cylinder->start = 230_bar;
cylinder->end = 100_bar;
cylinder = dive.get_or_create_cylinder(1);
cylinder->gasmix.o2.permille = 250;
cylinder->gasmix.he.permille = 250;
cylinder->start.mbar = 230000;
cylinder->end.mbar = 100000;
cylinder->gasmix.o2 = 25_percent;
cylinder->gasmix.he = 25_percent;
cylinder->start = 230_bar;
cylinder->end = 100_bar;
QCOMPARE(formatDiveGasString(&dive), "25/25");
}
@ -202,18 +202,18 @@ void TestformatDiveGasString::test_ccr()
struct dive dive;
cylinder_t *cylinder = dive.get_or_create_cylinder(0);
cylinder->gasmix.o2.permille = 1000;
cylinder->gasmix.o2 = 100_percent;
cylinder->cylinder_use = OXYGEN;
cylinder->start.mbar = 230000;
cylinder->end.mbar = 100000;
cylinder->start = 230_bar;
cylinder->end = 100_bar;
cylinder = dive.get_or_create_cylinder(1);
cylinder->gasmix.o2.permille = 210;
cylinder->gasmix.he.permille = 350;
cylinder->gasmix.o2 = 21_percent;
cylinder->gasmix.he = 35_percent;
cylinder->cylinder_use = DILUENT;
cylinder->start.mbar = 230000;
cylinder->end.mbar = 100000;
cylinder->start = 230_bar;
cylinder->end = 100_bar;
QCOMPARE(formatDiveGasString(&dive), "21/35");
}
@ -223,25 +223,25 @@ void TestformatDiveGasString::test_ccr_bailout()
struct dive dive;
cylinder_t *cylinder = dive.get_or_create_cylinder(0);
cylinder->gasmix.o2.permille = 1000;
cylinder->gasmix.o2 = 100_percent;
cylinder->cylinder_use = OXYGEN;
cylinder->start.mbar = 230000;
cylinder->end.mbar = 100000;
cylinder->start = 230_bar;
cylinder->end = 100_bar;
cylinder = dive.get_or_create_cylinder(1);
cylinder->gasmix.o2.permille = 220;
cylinder->gasmix.he.permille = 200;
cylinder->gasmix.o2 = 22_percent;
cylinder->gasmix.he = 20_percent;
cylinder->cylinder_use = DILUENT;
cylinder->start.mbar = 230000;
cylinder->end.mbar = 100000;
cylinder->start = 230_bar;
cylinder->end = 100_bar;
cylinder = dive.get_or_create_cylinder(2);
cylinder->gasmix.o2.permille = 210;
cylinder->gasmix.he.permille = 0;
cylinder->start.mbar = 230000;
cylinder->end.mbar = 100000;
cylinder->gasmix.o2 = 21_percent;
cylinder->gasmix.he = 0_percent;
cylinder->start = 230_bar;
cylinder->end = 100_bar;
QCOMPARE(formatDiveGasString(&dive), "22/20");
}