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

refactor: Quantity no longer can be constructed with a raw value

Browse Source 
Resolves #434
This commit is contained in:
Mateusz Pusz
2023-02-09 09:42:00 -08:00
parent bb6c942e0c
commit d70b95237c
5 changed files with 54 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
example/glide_computer/include/geographic.h
+12 -12
View File
@@ -62,29 +62,29 @@ std::basic_ostream<CharT, Traits>& operator<<(std::basic_ostream<CharT, Traits>&
inline namespace literals {
constexpr auto operator"" _N(long double v) { return latitude<long double>(latitude<long double>::rep(v)); }
constexpr auto operator"" _S(long double v) { return latitude<long double>(latitude<long double>::rep(v)); }
constexpr auto operator"" _E(long double v) { return longitude<long double>(longitude<long double>::rep(v)); }
constexpr auto operator"" _W(long double v) { return longitude<long double>(longitude<long double>::rep(v)); }
constexpr auto operator"" _N(unsigned long long v)
constexpr latitude<long double> operator"" _N(long double v) { return v * mp_units::si::degree; }
constexpr latitude<long double> operator"" _S(long double v) { return -v * mp_units::si::degree; }
constexpr longitude<long double> operator"" _E(long double v) { return v * mp_units::si::degree; }
constexpr longitude<long double> operator"" _W(long double v) { return -v * mp_units::si::degree; }
constexpr latitude<std::int64_t> operator"" _N(unsigned long long v)
{
gsl_ExpectsAudit(std::in_range<std::int64_t>(v));
return latitude<std::int64_t>(latitude<std::int64_t>::rep(static_cast<std::int64_t>(v)));
return static_cast<std::int64_t>(v) * mp_units::si::degree;
}
constexpr auto operator"" _S(unsigned long long v)
constexpr latitude<std::int64_t> operator"" _S(unsigned long long v)
{
gsl_ExpectsAudit(std::in_range<std::int64_t>(v));
return latitude<std::int64_t>(-latitude<std::int64_t>::rep(static_cast<std::int64_t>(v)));
return -static_cast<std::int64_t>(v) * mp_units::si::degree;
}
constexpr auto operator"" _E(unsigned long long v)
constexpr longitude<std::int64_t> operator"" _E(unsigned long long v)
{
gsl_ExpectsAudit(std::in_range<std::int64_t>(v));
return longitude<std::int64_t>(longitude<std::int64_t>::rep(static_cast<std::int64_t>(v)));
return static_cast<std::int64_t>(v) * mp_units::si::degree;
}
constexpr auto operator"" _W(unsigned long long v)
constexpr longitude<std::int64_t> operator"" _W(unsigned long long v)
{
gsl_ExpectsAudit(std::in_range<std::int64_t>(v));
return longitude<std::int64_t>(-longitude<std::int64_t>::rep(static_cast<std::int64_t>(v)));
return -static_cast<std::int64_t>(v) * mp_units::si::degree;
}
} // namespace literals
example/linear_algebra.cpp
+11 -11
View File
@@ -89,8 +89,8 @@ void quantity_of_vector_cast()
{
std::cout << "\nquantity_of_vector_cast:\n";
quantity<isq::position_vector[m], vector<int>> v{vector<int>{1001, 1002, 1003}};
quantity<isq::position_vector[km], vector<int>> u{vector<int>{3, 2, 1}};
auto v = vector<int>{1001, 1002, 1003} * isq::position_vector[m];
auto u = vector<int>{3, 2, 1} * isq::position_vector[km];
std::cout << "v = " << v << "\n";
std::cout << "u = " << u << "\n";
@@ -103,7 +103,7 @@ void quantity_of_vector_multiply_by_scalar_value()
{
std::cout << "\nquantity_of_vector_multiply_scalar_value:\n";
quantity<isq::position_vector[m], vector<int>> v{vector<int>{1, 2, 3}};
auto v = vector<int>{1, 2, 3} * isq::position_vector[m];
std::cout << "v = " << v << "\n";
@@ -114,7 +114,7 @@ void quantity_of_vector_divide_by_scalar_value()
{
std::cout << "\nquantity_of_vector_divide_scalar_value:\n";
quantity<isq::position_vector[m], vector<int>> v{vector<int>{2, 4, 6}};
auto v = vector<int>{2, 4, 6} * isq::position_vector[m];
std::cout << "v = " << v << "\n";
@@ -131,9 +131,9 @@ void quantity_of_vector_add()
// auto t = vector<int>{3, 2, 1} * isq::position_vector[km];
// quantity<isq::distance[m], vector<int>> v{vector<int>{1, 2, 3}}; // should not compile
quantity<isq::position_vector[m], vector<int>> v{vector<int>{1, 2, 3}};
quantity<isq::position_vector[m], vector<int>> u{vector<int>{3, 2, 1}};
quantity<isq::position_vector[km], vector<int>> t{vector<int>{3, 2, 1}};
auto v = vector<int>{1, 2, 3} * isq::position_vector[m];
auto u = vector<int>{3, 2, 1} * isq::position_vector[m];
auto t = vector<int>{3, 2, 1} * isq::position_vector[km];
std::cout << "v = " << v << "\n";
std::cout << "u = " << u << "\n";
@@ -147,9 +147,9 @@ void quantity_of_vector_subtract()
{
std::cout << "\nquantity_of_vector_subtract:\n";
quantity<isq::position_vector[m], vector<int>> v{vector<int>{1, 2, 3}};
quantity<isq::position_vector[m], vector<int>> u{vector<int>{3, 2, 1}};
quantity<isq::position_vector[km], vector<int>> t{vector<int>{3, 2, 1}};
auto v = vector<int>{1, 2, 3} * isq::position_vector[m];
auto u = vector<int>{3, 2, 1} * isq::position_vector[m];
auto t = vector<int>{3, 2, 1} * isq::position_vector[km];
std::cout << "v = " << v << "\n";
std::cout << "u = " << u << "\n";
@@ -163,7 +163,7 @@ void quantity_of_vector_divide_by_scalar_quantity()
{
std::cout << "\nquantity_of_vector_divide_scalar:\n";
quantity<isq::position_vector[km], vector<int>> pos{vector<int>{30, 20, 10}};
auto pos = vector<int>{30, 20, 10} * isq::position_vector[km];
auto dur = 2 * isq::duration[h];
quantity<isq::velocity[km / h], vector<int>> v = pos / dur;