feedc0de/mp-units
1
0
Fork 0
forked from mpusz/mp-units
Code Pull Requests Activity

refactor: number() and number_in() renamed to value() and value_in()

Browse Source 
Resolves #423
This commit is contained in:
Mateusz Pusz
2023-08-23 17:15:32 +02:00
parent ae92b49775
commit a9204e2473
21 changed files with 349 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/unit_test/static/quantity_point_test.cpp
+59 -59
View File
@@ -241,16 +241,16 @@ static_assert(
// static member functions
////////////////////////////
static_assert(quantity_point<isq::height[m], mean_sea_level>::zero().quantity_from_origin().number() == 0);
static_assert(quantity_point<isq::height[m], mean_sea_level>::min().quantity_from_origin().number() ==
static_assert(quantity_point<isq::height[m], mean_sea_level>::zero().quantity_from_origin().value() == 0);
static_assert(quantity_point<isq::height[m], mean_sea_level>::min().quantity_from_origin().value() ==
std::numeric_limits<double>::lowest());
static_assert(quantity_point<isq::height[m], mean_sea_level>::max().quantity_from_origin().number() ==
static_assert(quantity_point<isq::height[m], mean_sea_level>::max().quantity_from_origin().value() ==
std::numeric_limits<double>::max());
static_assert(quantity_point<isq::height[m], ground_level, int>::zero().quantity_from_origin().number() == 0);
static_assert(quantity_point<isq::height[m], ground_level, int>::min().quantity_from_origin().number() ==
static_assert(quantity_point<isq::height[m], ground_level, int>::zero().quantity_from_origin().value() == 0);
static_assert(quantity_point<isq::height[m], ground_level, int>::min().quantity_from_origin().value() ==
std::numeric_limits<int>::lowest());
static_assert(quantity_point<isq::height[m], ground_level, int>::max().quantity_from_origin().number() ==
static_assert(quantity_point<isq::height[m], ground_level, int>::max().quantity_from_origin().value() ==
std::numeric_limits<int>::max());
@@ -576,15 +576,15 @@ static_assert(is_of_type<(ground_level + isq::height(short(42) * m)).point_for(m
// converting to a different unit
///////////////////////////////////
static_assert((mean_sea_level + 2. * km).in(km).quantity_from_origin().number() == 2.);
static_assert((mean_sea_level + 2. * km).in(m).quantity_from_origin().number() == 2000.);
static_assert((mean_sea_level + 2000. * m).in(km).quantity_from_origin().number() == 2.);
static_assert((ground_level + 2. * km).in(km).quantity_from_origin().number() == 2.);
static_assert((ground_level + 2. * km).in(m).quantity_from_origin().number() == 2000.);
static_assert((ground_level + 2000. * m).in(km).quantity_from_origin().number() == 2.);
static_assert((tower_peak + 2. * km).in(km).quantity_from_origin().number() == 2.);
static_assert((tower_peak + 2. * km).in(m).quantity_from_origin().number() == 2000.);
static_assert((tower_peak + 2000. * m).in(km).quantity_from_origin().number() == 2.);
static_assert((mean_sea_level + 2. * km).in(km).quantity_from_origin().value() == 2.);
static_assert((mean_sea_level + 2. * km).in(m).quantity_from_origin().value() == 2000.);
static_assert((mean_sea_level + 2000. * m).in(km).quantity_from_origin().value() == 2.);
static_assert((ground_level + 2. * km).in(km).quantity_from_origin().value() == 2.);
static_assert((ground_level + 2. * km).in(m).quantity_from_origin().value() == 2000.);
static_assert((ground_level + 2000. * m).in(km).quantity_from_origin().value() == 2.);
static_assert((tower_peak + 2. * km).in(km).quantity_from_origin().value() == 2.);
static_assert((tower_peak + 2. * km).in(m).quantity_from_origin().value() == 2000.);
static_assert((tower_peak + 2000. * m).in(km).quantity_from_origin().value() == 2.);
#if MP_UNITS_COMP_GCC != 10 || MP_UNITS_COMP_GCC_MINOR > 2
template<template<auto, auto, typename> typename QP>
@@ -657,14 +657,14 @@ static_assert([](auto v) {
////////////////////////
// same type
static_assert((mean_sea_level + 1 * m += 1 * m).quantity_from_origin().number() == 2);
static_assert((mean_sea_level + 2 * m -= 1 * m).quantity_from_origin().number() == 1);
static_assert((mean_sea_level + 1 * m += 1 * m).quantity_from_origin().value() == 2);
static_assert((mean_sea_level + 2 * m -= 1 * m).quantity_from_origin().value() == 1);
// different types
static_assert((mean_sea_level + 2.5 * m += 3 * m).quantity_from_origin().number() == 5.5);
static_assert((mean_sea_level + 123 * m += 1 * km).quantity_from_origin().number() == 1123);
static_assert((mean_sea_level + 5.5 * m -= 3 * m).quantity_from_origin().number() == 2.5);
static_assert((mean_sea_level + 1123 * m -= 1 * km).quantity_from_origin().number() == 123);
static_assert((mean_sea_level + 2.5 * m += 3 * m).quantity_from_origin().value() == 5.5);
static_assert((mean_sea_level + 123 * m += 1 * km).quantity_from_origin().value() == 1123);
static_assert((mean_sea_level + 5.5 * m -= 3 * m).quantity_from_origin().value() == 2.5);
static_assert((mean_sea_level + 1123 * m -= 1 * km).quantity_from_origin().value() == 123);
template<template<auto, auto, typename> typename QP>
@@ -930,24 +930,24 @@ static_assert(is_of_type<(1 * m + tower_peak) - (1 * m + other_ground_level), qu
// check for integral types promotion
static_assert(
is_same_v<decltype(((mean_sea_level + std::uint8_t(0) * m) + std::uint8_t(0) * m).quantity_from_origin().number()),
is_same_v<decltype(((mean_sea_level + std::uint8_t(0) * m) + std::uint8_t(0) * m).quantity_from_origin().value()),
int&&>);
static_assert(
is_same_v<decltype((std::uint8_t(0) * m + (mean_sea_level + std::uint8_t(0) * m)).quantity_from_origin().number()),
is_same_v<decltype((std::uint8_t(0) * m + (mean_sea_level + std::uint8_t(0) * m)).quantity_from_origin().value()),
int&&>);
static_assert(
is_same_v<decltype(((mean_sea_level + std::uint8_t(0) * m) - std::uint8_t(0) * m).quantity_from_origin().number()),
is_same_v<decltype(((mean_sea_level + std::uint8_t(0) * m) - std::uint8_t(0) * m).quantity_from_origin().value()),
int&&>);
static_assert(
is_same_v<decltype(((mean_sea_level + std::uint8_t(0) * m) - (mean_sea_level + std::uint8_t(0) * m)).number()),
is_same_v<decltype(((mean_sea_level + std::uint8_t(0) * m) - (mean_sea_level + std::uint8_t(0) * m)).value()),
int&&>);
static_assert(((mean_sea_level + std::uint8_t(128) * m) + std::uint8_t(128) * m).quantity_from_origin().number() ==
static_assert(((mean_sea_level + std::uint8_t(128) * m) + std::uint8_t(128) * m).quantity_from_origin().value() ==
std::uint8_t(128) + std::uint8_t(128));
static_assert((std::uint8_t(128) * m + (mean_sea_level + std::uint8_t(128) * m)).quantity_from_origin().number() ==
static_assert((std::uint8_t(128) * m + (mean_sea_level + std::uint8_t(128) * m)).quantity_from_origin().value() ==
std::uint8_t(128) + std::uint8_t(128));
static_assert(((mean_sea_level + std::uint8_t(0) * m) - std::uint8_t(1) * m).quantity_from_origin().number() ==
static_assert(((mean_sea_level + std::uint8_t(0) * m) - std::uint8_t(1) * m).quantity_from_origin().value() ==
std::uint8_t(0) - std::uint8_t(1));
static_assert(((mean_sea_level + std::uint8_t(0) * m) - (mean_sea_level + std::uint8_t(1) * m)).number() ==
static_assert(((mean_sea_level + std::uint8_t(0) * m) - (mean_sea_level + std::uint8_t(1) * m)).value() ==
std::uint8_t(0) - std::uint8_t(1));
// different representation types
@@ -1002,39 +1002,39 @@ static_assert(is_of_type<(mean_sea_level + 1 * km) - (mean_sea_level + 1. * m),
static_assert(is_of_type<(mean_sea_level + 1. * km) - (mean_sea_level + 1. * m), quantity<si::metre, double>>);
static_assert(((mean_sea_level + 1 * m) + 1 * m).quantity_from_origin().number() == 2);
static_assert((1 * m + (mean_sea_level + 1 * m)).quantity_from_origin().number() == 2);
static_assert(((mean_sea_level + 1 * m) + 1 * km).quantity_from_origin().number() == 1001);
static_assert((1 * m + (mean_sea_level + 1 * km)).quantity_from_origin().number() == 1001);
static_assert(((mean_sea_level + 1 * km) + 1 * m).quantity_from_origin().number() == 1001);
static_assert((1 * km + (mean_sea_level + 1 * m)).quantity_from_origin().number() == 1001);
static_assert(((mean_sea_level + 2 * m) - 1 * m).quantity_from_origin().number() == 1);
static_assert(((mean_sea_level + 1 * km) - 1 * m).quantity_from_origin().number() == 999);
static_assert(((mean_sea_level + 1 * m) + 1 * m).quantity_from_origin().value() == 2);
static_assert((1 * m + (mean_sea_level + 1 * m)).quantity_from_origin().value() == 2);
static_assert(((mean_sea_level + 1 * m) + 1 * km).quantity_from_origin().value() == 1001);
static_assert((1 * m + (mean_sea_level + 1 * km)).quantity_from_origin().value() == 1001);
static_assert(((mean_sea_level + 1 * km) + 1 * m).quantity_from_origin().value() == 1001);
static_assert((1 * km + (mean_sea_level + 1 * m)).quantity_from_origin().value() == 1001);
static_assert(((mean_sea_level + 2 * m) - 1 * m).quantity_from_origin().value() == 1);
static_assert(((mean_sea_level + 1 * km) - 1 * m).quantity_from_origin().value() == 999);
static_assert(((mean_sea_level + 1.5 * m) + 1 * m).quantity_from_origin().number() == 2.5);
static_assert((1.5 * m + (mean_sea_level + 1 * m)).quantity_from_origin().number() == 2.5);
static_assert(((mean_sea_level + 1.5 * m) + 1 * km).quantity_from_origin().number() == 1001.5);
static_assert((1.5 * m + (mean_sea_level + 1 * km)).quantity_from_origin().number() == 1001.5);
static_assert(((mean_sea_level + 1.5 * km) + 1 * m).quantity_from_origin().number() == 1501);
static_assert((1.5 * km + (mean_sea_level + 1 * m)).quantity_from_origin().number() == 1501);
static_assert(((mean_sea_level + 2.5 * m) - 1 * m).quantity_from_origin().number() == 1.5);
static_assert(((mean_sea_level + 1.5 * km) - 1 * m).quantity_from_origin().number() == 1499);
static_assert(((mean_sea_level + 1.5 * m) + 1 * m).quantity_from_origin().value() == 2.5);
static_assert((1.5 * m + (mean_sea_level + 1 * m)).quantity_from_origin().value() == 2.5);
static_assert(((mean_sea_level + 1.5 * m) + 1 * km).quantity_from_origin().value() == 1001.5);
static_assert((1.5 * m + (mean_sea_level + 1 * km)).quantity_from_origin().value() == 1001.5);
static_assert(((mean_sea_level + 1.5 * km) + 1 * m).quantity_from_origin().value() == 1501);
static_assert((1.5 * km + (mean_sea_level + 1 * m)).quantity_from_origin().value() == 1501);
static_assert(((mean_sea_level + 2.5 * m) - 1 * m).quantity_from_origin().value() == 1.5);
static_assert(((mean_sea_level + 1.5 * km) - 1 * m).quantity_from_origin().value() == 1499);
static_assert(((mean_sea_level + 1 * m) + 1.5 * m).quantity_from_origin().number() == 2.5);
static_assert((1 * m + (mean_sea_level + 1.5 * m)).quantity_from_origin().number() == 2.5);
static_assert(((mean_sea_level + 1 * m) + 1.5 * km).quantity_from_origin().number() == 1501);
static_assert((1 * m + (mean_sea_level + 1.5 * km)).quantity_from_origin().number() == 1501);
static_assert(((mean_sea_level + 1 * km) + 1.5 * m).quantity_from_origin().number() == 1001.5);
static_assert((1 * km + (mean_sea_level + 1.5 * m)).quantity_from_origin().number() == 1001.5);
static_assert(((mean_sea_level + 2 * m) - 1.5 * m).quantity_from_origin().number() == 0.5);
static_assert(((mean_sea_level + 1 * km) - 1.5 * m).quantity_from_origin().number() == 998.5);
static_assert(((mean_sea_level + 1 * m) + 1.5 * m).quantity_from_origin().value() == 2.5);
static_assert((1 * m + (mean_sea_level + 1.5 * m)).quantity_from_origin().value() == 2.5);
static_assert(((mean_sea_level + 1 * m) + 1.5 * km).quantity_from_origin().value() == 1501);
static_assert((1 * m + (mean_sea_level + 1.5 * km)).quantity_from_origin().value() == 1501);
static_assert(((mean_sea_level + 1 * km) + 1.5 * m).quantity_from_origin().value() == 1001.5);
static_assert((1 * km + (mean_sea_level + 1.5 * m)).quantity_from_origin().value() == 1001.5);
static_assert(((mean_sea_level + 2 * m) - 1.5 * m).quantity_from_origin().value() == 0.5);
static_assert(((mean_sea_level + 1 * km) - 1.5 * m).quantity_from_origin().value() == 998.5);
static_assert(((mean_sea_level + 2 * m) - (mean_sea_level + 1 * m)).number() == 1);
static_assert(((mean_sea_level + 1 * km) - (mean_sea_level + 1 * m)).number() == 999);
static_assert(((mean_sea_level + 2.5 * m) - (mean_sea_level + 1 * m)).number() == 1.5);
static_assert(((mean_sea_level + 1.5 * km) - (mean_sea_level + 1 * m)).number() == 1499);
static_assert(((mean_sea_level + 2 * m) - (mean_sea_level + 1.5 * m)).number() == 0.5);
static_assert(((mean_sea_level + 1 * km) - (mean_sea_level + 1.5 * m)).number() == 998.5);
static_assert(((mean_sea_level + 2 * m) - (mean_sea_level + 1 * m)).value() == 1);
static_assert(((mean_sea_level + 1 * km) - (mean_sea_level + 1 * m)).value() == 999);
static_assert(((mean_sea_level + 2.5 * m) - (mean_sea_level + 1 * m)).value() == 1.5);
static_assert(((mean_sea_level + 1.5 * km) - (mean_sea_level + 1 * m)).value() == 1499);
static_assert(((mean_sea_level + 2 * m) - (mean_sea_level + 1.5 * m)).value() == 0.5);
static_assert(((mean_sea_level + 1 * km) - (mean_sea_level + 1.5 * m)).value() == 998.5);
static_assert((mean_sea_level + 42 * m) - (ground_level + 42 * m) == -42 * m);
static_assert((ground_level + 42 * m) - (mean_sea_level + 42 * m) == 42 * m);