roland/xo-alloc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xo-unit: refactor: su.outer_scale_exact -> outer_scale_factor

Browse source
This commit is contained in:
Roland Conybeare 2024-04-27 08:40:12 -04:00
commit b52ab13495
5 changed files with 31 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/xo/unit/Quantity.hpp
View file

@ -62,7 +62,7 @@ namespace xo {
*/
repr_type r_scale = (::sqrt(rr.outer_scale_sq_)
* rr.outer_scale_exact_.template to<repr_type>()
* rr.outer_scale_factor_.template to<repr_type>()
* this->scale_);
return Quantity(r_scale, unit2);
} else {
@ -101,7 +101,7 @@ namespace xo {
auto rr = detail::su_product<r_int_type, r_int2x_type>(x.unit(), y.unit());
r_repr_type r_scale = (::sqrt(rr.outer_scale_sq_)
* rr.outer_scale_exact_.template to<r_repr_type>()
* rr.outer_scale_factor_.template to<r_repr_type>()
* static_cast<r_repr_type>(x.scale())
* static_cast<r_repr_type>(y.scale()));
@ -125,7 +125,7 @@ namespace xo {
* so multiply is correct here
*/
r_repr_type r_scale = (::sqrt(rr.outer_scale_sq_)
* rr.outer_scale_exact_.template to<r_repr_type>()
* rr.outer_scale_factor_.template to<r_repr_type>()
* static_cast<r_repr_type>(x.scale())
/ static_cast<r_repr_type>(y.scale()));
@ -149,7 +149,7 @@ namespace xo {
if (rr.natural_unit_.is_dimensionless()) {
r_repr_type r_scale = (static_cast<r_repr_type>(x.scale())
+ (::sqrt(rr.outer_scale_sq_)
* rr.outer_scale_exact_.template to<r_repr_type>()
* rr.outer_scale_factor_.template to<r_repr_type>()
* static_cast<r_repr_type>(y.scale())));
return Quantity<r_repr_type, r_int_type>(r_scale, x.unit_.template to_repr<r_int_type>());
@ -176,7 +176,7 @@ namespace xo {
if (rr.natural_unit_.is_dimensionless()) {
r_repr_type r_scale = (static_cast<r_repr_type>(x.scale())
- (::sqrt(rr.outer_scale_sq_)
* rr.outer_scale_exact_.template to<r_repr_type>()
* rr.outer_scale_factor_.template to<r_repr_type>()
* static_cast<r_repr_type>(y.scale())));
return Quantity<r_repr_type, r_int_type>(r_scale, x.unit_.template to_repr<r_int_type>());
@ -223,7 +223,7 @@ namespace xo {
inline constexpr Quantity<Repr, Int>
unit_qty(const scaled_unit<Int> & u) {
return Quantity<Repr, Int>
(u.outer_scale_exact_.template to<double>() * ::sqrt(u.outer_scale_sq_),
(u.outer_scale_factor_.template to<double>() * ::sqrt(u.outer_scale_sq_),
u.natural_unit_);
}