mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-08-04 20:54:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(example): foot_pound_second example now correctly uses international::knot which is typical for Marine industry

Browse Source 
Resolves #357
This commit is contained in:
Mateusz Pusz
2022-05-09 14:03:14 +02:00
parent 8b52f46bed
commit 0b8e5c0dfe
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
example/aliases/foot_pound_second.cpp
View File

@@ -26,6 +26,7 @@
#include <units/isq/si/fps/mass.h> #include <units/isq/si/fps/mass.h>
#include <units/isq/si/fps/power.h> #include <units/isq/si/fps/power.h>
#include <units/isq/si/fps/speed.h> #include <units/isq/si/fps/speed.h>
#include <units/isq/si/international/speed.h>
#include <units/isq/si/length.h> #include <units/isq/si/length.h>
#include <units/isq/si/mass.h> #include <units/isq/si/mass.h>
#include <units/isq/si/power.h> #include <units/isq/si/power.h>
@@ -68,7 +69,7 @@ void print_details(std::string_view description, const Ship& ship)
<< STD_FMT::format("{:20} : {}\n", "beam", fmt_line<si::fps::length::yd<>, si::length::m<>>(ship.beam)) << STD_FMT::format("{:20} : {}\n", "beam", fmt_line<si::fps::length::yd<>, si::length::m<>>(ship.beam))
<< STD_FMT::format("{:20} : {}\n", "mass", fmt_line<si::fps::mass::lton<>, si::mass::t<>>(ship.mass)) << STD_FMT::format("{:20} : {}\n", "mass", fmt_line<si::fps::mass::lton<>, si::mass::t<>>(ship.mass))
<< STD_FMT::format("{:20} : {}\n", "speed", << STD_FMT::format("{:20} : {}\n", "speed",
fmt_line<si::fps::speed::kn<>, si::speed::km_per_h<>>(ship.speed)) fmt_line<si::international::speed::kn<>, si::speed::km_per_h<>>(ship.speed))
<< STD_FMT::format("{:20} : {}\n", "power", fmt_line<si::fps::power::hp<>, si::power::kW<>>(ship.power)) << STD_FMT::format("{:20} : {}\n", "power", fmt_line<si::fps::power::hp<>, si::power::kW<>>(ship.power))
<< STD_FMT::format("{:20} : {}\n", "main guns", << STD_FMT::format("{:20} : {}\n", "main guns",
fmt_line<si::fps::length::in<>, si::length::mm<>>(ship.mainGuns)) fmt_line<si::fps::length::in<>, si::length::mm<>>(ship.mainGuns))
@@ -101,7 +102,7 @@ int main()
auto iowa = Ship{.length{ft<>(860.)}, auto iowa = Ship{.length{ft<>(860.)},
.draft{ft<>(37.) + in<>(2.)}, .draft{ft<>(37.) + in<>(2.)},
.beam{ft<>(108.) + in<>(2.)}, .beam{ft<>(108.) + in<>(2.)},
.speed{kn<>(33)}, .speed{international::kn<>(33)},
.mass{lton<>(57'540)}, .mass{lton<>(57'540)},
.mainGuns{in<>(16)}, .mainGuns{in<>(16)},
.shellMass{lb<>(2700)}, .shellMass{lb<>(2700)},
@@ -112,7 +113,7 @@ int main()
auto kgv = Ship{.length{ft<>(745.1)}, auto kgv = Ship{.length{ft<>(745.1)},
.draft{ft<>(33.) + in<>(7.5)}, .draft{ft<>(33.) + in<>(7.5)},
.beam{ft<>(103.2) + in<>(2.5)}, .beam{ft<>(103.2) + in<>(2.5)},
.speed{kn<>(28.3)}, .speed{international::kn<>(28.3)},
.mass{lton<>(42'245)}, .mass{lton<>(42'245)},
.mainGuns{in<>(14)}, .mainGuns{in<>(14)},
.shellMass{lb<>(1'590)}, .shellMass{lb<>(1'590)},

10
example/literals/foot_pound_second.cpp
View File

@@ -26,6 +26,7 @@
#include <units/isq/si/fps/mass.h> #include <units/isq/si/fps/mass.h>
#include <units/isq/si/fps/power.h> #include <units/isq/si/fps/power.h>
#include <units/isq/si/fps/speed.h> #include <units/isq/si/fps/speed.h>
#include <units/isq/si/international/speed.h>
#include <units/isq/si/length.h> #include <units/isq/si/length.h>
#include <units/isq/si/mass.h> #include <units/isq/si/mass.h>
#include <units/isq/si/power.h> #include <units/isq/si/power.h>
@@ -73,8 +74,9 @@ void print_details(std::string_view description, const Ship& ship)
fmt_line<si::fps::length<si::fps::yard>, si::length<si::metre>>(ship.beam)) fmt_line<si::fps::length<si::fps::yard>, si::length<si::metre>>(ship.beam))
<< STD_FMT::format("{:20} : {}\n", "mass", << STD_FMT::format("{:20} : {}\n", "mass",
fmt_line<si::fps::mass<si::fps::long_ton>, si::mass<si::tonne>>(ship.mass)) fmt_line<si::fps::mass<si::fps::long_ton>, si::mass<si::tonne>>(ship.mass))
<< STD_FMT::format("{:20} : {}\n", "speed", << STD_FMT::format(
fmt_line<si::fps::speed<si::fps::knot>, si::speed<si::kilometre_per_hour>>(ship.speed)) "{:20} : {}\n", "speed",
fmt_line<si::speed<si::international::knot>, si::speed<si::kilometre_per_hour>>(ship.speed))
<< STD_FMT::format("{:20} : {}\n", "power", << STD_FMT::format("{:20} : {}\n", "power",
fmt_line<si::fps::power<si::fps::horse_power>, si::power<si::kilowatt>>(ship.power)) fmt_line<si::fps::power<si::fps::horse_power>, si::power<si::kilowatt>>(ship.power))
<< STD_FMT::format("{:20} : {}\n", "main guns", << STD_FMT::format("{:20} : {}\n", "main guns",
@@ -108,7 +110,7 @@ int main()
auto iowa = Ship{.length{860._q_ft}, auto iowa = Ship{.length{860._q_ft},
.draft{37._q_ft + 2._q_in}, .draft{37._q_ft + 2._q_in},
.beam{108._q_ft + 2._q_in}, .beam{108._q_ft + 2._q_in},
.speed{33_q_kn}, .speed{si::speed<si::international::knot>{33}},
.mass{57'540_q_lton}, .mass{57'540_q_lton},
.mainGuns{16_q_in}, .mainGuns{16_q_in},
.shellMass{2700_q_lb}, .shellMass{2700_q_lb},
@@ -119,7 +121,7 @@ int main()
auto kgv = Ship{.length{745.1_q_ft}, auto kgv = Ship{.length{745.1_q_ft},
.draft{33._q_ft + 7.5_q_in}, .draft{33._q_ft + 7.5_q_in},
.beam{103.2_q_ft + 2.5_q_in}, .beam{103.2_q_ft + 2.5_q_in},
.speed{28.3_q_kn}, .speed{si::speed<si::international::knot>{28.3}},
.mass{42'245_q_lton}, .mass{42'245_q_lton},
.mainGuns{14_q_in}, .mainGuns{14_q_in},
.shellMass{1'590_q_lb}, .shellMass{1'590_q_lb},

10
example/references/foot_pound_second.cpp
View File

@@ -28,6 +28,7 @@
#include <units/isq/si/fps/speed.h> #include <units/isq/si/fps/speed.h>
#include <units/isq/si/fps/time.h> #include <units/isq/si/fps/time.h>
#include <units/isq/si/fps/volume.h> #include <units/isq/si/fps/volume.h>
#include <units/isq/si/international/speed.h>
#include <units/isq/si/length.h> #include <units/isq/si/length.h>
#include <units/isq/si/mass.h> #include <units/isq/si/mass.h>
#include <units/isq/si/power.h> #include <units/isq/si/power.h>
@@ -76,8 +77,9 @@ void print_details(std::string_view description, const Ship& ship)
fmt_line<si::fps::length<si::fps::yard>, si::length<si::metre>>(ship.beam)) fmt_line<si::fps::length<si::fps::yard>, si::length<si::metre>>(ship.beam))
<< STD_FMT::format("{:20} : {}\n", "mass", << STD_FMT::format("{:20} : {}\n", "mass",
fmt_line<si::fps::mass<si::fps::long_ton>, si::mass<si::tonne>>(ship.mass)) fmt_line<si::fps::mass<si::fps::long_ton>, si::mass<si::tonne>>(ship.mass))
<< STD_FMT::format("{:20} : {}\n", "speed", << STD_FMT::format(
fmt_line<si::fps::speed<si::fps::knot>, si::speed<si::kilometre_per_hour>>(ship.speed)) "{:20} : {}\n", "speed",
fmt_line<si::speed<si::international::knot>, si::speed<si::kilometre_per_hour>>(ship.speed))
<< STD_FMT::format("{:20} : {}\n", "power", << STD_FMT::format("{:20} : {}\n", "power",
fmt_line<si::fps::power<si::fps::horse_power>, si::power<si::kilowatt>>(ship.power)) fmt_line<si::fps::power<si::fps::horse_power>, si::power<si::kilowatt>>(ship.power))
<< STD_FMT::format("{:20} : {}\n", "main guns", << STD_FMT::format("{:20} : {}\n", "main guns",
@@ -112,7 +114,7 @@ int main()
auto iowa = Ship{.length{860. * ft}, auto iowa = Ship{.length{860. * ft},
.draft{37. * ft + 2. * in}, .draft{37. * ft + 2. * in},
.beam{108. * ft + 2. * in}, .beam{108. * ft + 2. * in},
.speed{33 * kn}, .speed{33 * units::isq::si::international::references::kn},
.mass{57'540 * lton}, .mass{57'540 * lton},
.mainGuns{16 * in}, .mainGuns{16 * in},
.shellMass{2700 * lb}, .shellMass{2700 * lb},
@@ -123,7 +125,7 @@ int main()
auto kgv = Ship{.length{745.1 * ft}, auto kgv = Ship{.length{745.1 * ft},
.draft{33. * ft + 7.5 * in}, .draft{33. * ft + 7.5 * in},
.beam{103.2 * ft + 2.5 * in}, .beam{103.2 * ft + 2.5 * in},
.speed{28.3 * kn}, .speed{28.3 * units::isq::si::international::references::kn},
.mass{42'245 * lton}, .mass{42'245 * lton},
.mainGuns{14 * in}, .mainGuns{14 * in},
.shellMass{1'590 * lb}, .shellMass{1'590 * lb},