Skip to content

Commit 26fc830

Browse files
mpuszmpusz
committed
fix: stop to use deprecated quanity_from_zero 
1 parent 2c7f55e commit 26fc830

File tree

5 files changed

+36
-35
lines changed

5 files changed

+36
-35
lines changed

‎example/currency.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ template<UnitOf<currency> auto To, QuantityPointOf<currency> From>
9090
QuantityPointOf<currency> auto exchange_to(From qp, std::chrono::sys_seconds timestamp)
9191
{
9292
const auto rate = static_cast<From::rep>(exchange_rate<From::unit, To>(timestamp) *
93-
qp.quantity_from_zero().numerical_value_in(qp.unit));
93+
qp.quantity_from_unit_zero().numerical_value_in(qp.unit));
9494
return quantity_point{rate * From::quantity_spec[To], From::point_origin};
9595
}
9696

@@ -103,6 +103,7 @@ int main()
103103
const quantity_point price_usd{100 * USD};
104104
const quantity_point price_euro = exchange_to<euro>(price_usd, timestamp);
105105

106-
std::cout << price_usd.quantity_from_zero() << " -> " << price_euro.quantity_from_zero() << "\n";
107-
// std::cout << price_usd.quantity_from_zero() + price_euro.quantity_from_zero() << "\n"; // does not compile
106+
std::cout << price_usd.quantity_from_unit_zero() << " -> " << price_euro.quantity_from_unit_zero() << "\n";
107+
// std::cout << price_usd.quantity_from_unit_zero() + price_euro.quantity_from_unit_zero() << "\n"; // does not
108+
// compile
108109
}

‎example/hw_voltage.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ std::optional<hw_voltage_quantity_point> read_hw_voltage()
7878

7979
void print(QuantityPoint auto qp)
8080
{
81-
std::cout << MP_UNITS_STD_FMT::format("{:10} ({:5})", qp.quantity_from_zero(),
82-
value_cast<double, si::volt>(qp).quantity_from_zero())
81+
std::cout << MP_UNITS_STD_FMT::format("{:10} ({:5})", qp.quantity_from_unit_zero(),
82+
value_cast<double, si::volt>(qp).quantity_from_unit_zero())
8383
<< "\n";
8484
}
8585

‎example/include/geographic.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,10 @@ distance spherical_distance(position<T> from, position<T> to)
191191

192192
using si::sin, si::cos, si::asin, si::acos;
193193

194-
const quantity from_lat = from.lat.quantity_from_zero();
195-
const quantity from_lon = from.lon.quantity_from_zero();
196-
const quantity to_lat = to.lat.quantity_from_zero();
197-
const quantity to_lon = to.lon.quantity_from_zero();
194+
const quantity from_lat = from.lat.quantity_from_unit_zero();
195+
const quantity from_lon = from.lon.quantity_from_unit_zero();
196+
const quantity to_lat = to.lat.quantity_from_unit_zero();
197+
const quantity to_lon = to.lon.quantity_from_unit_zero();
198198

199199
// https://en.wikipedia.org/wiki/Great-circle_distance#Formulae
200200
if constexpr (sizeof(T) >= 8) {

‎example/unmanned_aerial_vehicle.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ template<earth_gravity_model M>
109109
hae_altitude<M> to_hae(msl_altitude msl, position<double> pos)
110110
{
111111
const auto geoid_undulation =
112-
isq::height(GeographicLibWhatsMyOffset(pos.lat.quantity_from_zero().numerical_value_in(si::degree),
113-
pos.lon.quantity_from_zero().numerical_value_in(si::degree)) *
112+
isq::height(GeographicLibWhatsMyOffset(pos.lat.quantity_from_unit_zero().numerical_value_in(si::degree),
113+
pos.lon.quantity_from_unit_zero().numerical_value_in(si::degree)) *
114114
si::metre);
115115
return height_above_ellipsoid<M> + (msl - mean_sea_level - geoid_undulation);
116116
}

‎test/static/limits_test.cpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -139,60 +139,60 @@ static_assert(std::numeric_limits<qp_int>::has_infinity == false);
139139
static_assert(std::numeric_limits<qp_double>::min() == qp_double::min());
140140
static_assert(std::numeric_limits<qp_int>::min() == qp_int::min());
141141

142-
static_assert(std::numeric_limits<qp_double>::min().quantity_from_zero().numerical_value_in(mp_units::si::metre) ==
142+
static_assert(std::numeric_limits<qp_double>::min().quantity_from_unit_zero().numerical_value_in(mp_units::si::metre) ==
143143
std::numeric_limits<double>::lowest());
144-
static_assert(std::numeric_limits<qp_int>::min().quantity_from_zero().numerical_value_in(mp_units::si::metre) ==
144+
static_assert(std::numeric_limits<qp_int>::min().quantity_from_unit_zero().numerical_value_in(mp_units::si::metre) ==
145145
std::numeric_limits<int>::lowest());
146146

147147
// max
148148
static_assert(std::numeric_limits<qp_double>::max() == qp_double::max());
149149
static_assert(std::numeric_limits<qp_int>::max() == qp_int::max());
150150

151-
static_assert(std::numeric_limits<qp_double>::max().quantity_from_zero().numerical_value_in(mp_units::si::metre) ==
151+
static_assert(std::numeric_limits<qp_double>::max().quantity_from_unit_zero().numerical_value_in(mp_units::si::metre) ==
152152
std::numeric_limits<double>::max());
153-
static_assert(std::numeric_limits<qp_int>::max().quantity_from_zero().numerical_value_in(mp_units::si::metre) ==
153+
static_assert(std::numeric_limits<qp_int>::max().quantity_from_unit_zero().numerical_value_in(mp_units::si::metre) ==
154154
std::numeric_limits<int>::max());
155155

156156
// lowest
157-
static_assert(std::numeric_limits<qp_double>::lowest().quantity_from_zero().numerical_value_in(mp_units::si::metre) ==
158-
std::numeric_limits<double>::lowest());
159-
static_assert(std::numeric_limits<qp_int>::lowest().quantity_from_zero().numerical_value_in(mp_units::si::metre) ==
157+
static_assert(std::numeric_limits<qp_double>::lowest().quantity_from_unit_zero().numerical_value_in(
158+
mp_units::si::metre) == std::numeric_limits<double>::lowest());
159+
static_assert(std::numeric_limits<qp_int>::lowest().quantity_from_unit_zero().numerical_value_in(mp_units::si::metre) ==
160160
std::numeric_limits<int>::lowest());
161161

162162
// epsilon
163-
static_assert(std::numeric_limits<qp_double>::epsilon().quantity_from_zero().numerical_value_in(mp_units::si::metre) ==
164-
std::numeric_limits<double>::epsilon());
165-
static_assert(std::numeric_limits<qp_int>::epsilon().quantity_from_zero().numerical_value_in(mp_units::si::metre) ==
166-
std::numeric_limits<int>::epsilon());
163+
static_assert(std::numeric_limits<qp_double>::epsilon().quantity_from_unit_zero().numerical_value_in(
164+
mp_units::si::metre) == std::numeric_limits<double>::epsilon());
165+
static_assert(std::numeric_limits<qp_int>::epsilon().quantity_from_unit_zero().numerical_value_in(
166+
mp_units::si::metre) == std::numeric_limits<int>::epsilon());
167167

168168
// round_error
169-
static_assert(std::numeric_limits<qp_double>::round_error().quantity_from_zero().numerical_value_in(
169+
static_assert(std::numeric_limits<qp_double>::round_error().quantity_from_unit_zero().numerical_value_in(
170170
mp_units::si::metre) == std::numeric_limits<double>::round_error());
171-
static_assert(std::numeric_limits<qp_int>::round_error().quantity_from_zero().numerical_value_in(mp_units::si::metre) ==
172-
std::numeric_limits<int>::round_error());
171+
static_assert(std::numeric_limits<qp_int>::round_error().quantity_from_unit_zero().numerical_value_in(
172+
mp_units::si::metre) == std::numeric_limits<int>::round_error());
173173

174174
// infinity
175-
static_assert(std::numeric_limits<qp_double>::infinity().quantity_from_zero().numerical_value_in(mp_units::si::metre) ==
176-
std::numeric_limits<double>::infinity());
177-
static_assert(std::numeric_limits<qp_int>::infinity().quantity_from_zero().numerical_value_in(mp_units::si::metre) ==
178-
std::numeric_limits<int>::infinity());
175+
static_assert(std::numeric_limits<qp_double>::infinity().quantity_from_unit_zero().numerical_value_in(
176+
mp_units::si::metre) == std::numeric_limits<double>::infinity());
177+
static_assert(std::numeric_limits<qp_int>::infinity().quantity_from_unit_zero().numerical_value_in(
178+
mp_units::si::metre) == std::numeric_limits<int>::infinity());
179179

180180
#if MP_UNITS_HOSTED && (__cpp_lib_constexpr_cmath || MP_UNITS_COMP_GCC)
181181

182182
// quiet_NaN
183-
static_assert(
184-
std::isnan(std::numeric_limits<qp_double>::quiet_NaN().quantity_from_zero().numerical_value_in(mp_units::si::metre)));
183+
static_assert(std::isnan(
184+
std::numeric_limits<qp_double>::quiet_NaN().quantity_from_unit_zero().numerical_value_in(mp_units::si::metre)));
185185

186186
// signaling_NaN
187187
static_assert(std::isnan(
188-
std::numeric_limits<qp_double>::signaling_NaN().quantity_from_zero().numerical_value_in(mp_units::si::metre)));
188+
std::numeric_limits<qp_double>::signaling_NaN().quantity_from_unit_zero().numerical_value_in(mp_units::si::metre)));
189189

190190
#endif
191191

192192
// denorm_min
193-
static_assert(std::numeric_limits<qp_double>::denorm_min().quantity_from_zero().numerical_value_in(
193+
static_assert(std::numeric_limits<qp_double>::denorm_min().quantity_from_unit_zero().numerical_value_in(
194194
mp_units::si::metre) == std::numeric_limits<double>::denorm_min());
195-
static_assert(std::numeric_limits<qp_int>::denorm_min().quantity_from_zero().numerical_value_in(mp_units::si::metre) ==
196-
std::numeric_limits<int>::denorm_min());
195+
static_assert(std::numeric_limits<qp_int>::denorm_min().quantity_from_unit_zero().numerical_value_in(
196+
mp_units::si::metre) == std::numeric_limits<int>::denorm_min());
197197

198198
} // namespace

0 commit comments

Comments
 (0)