diff --git a/include/xo/unit/scaled_unit.hpp b/include/xo/unit/scaled_unit.hpp index 88bc9416..f9cc8245 100644 --- a/include/xo/unit/scaled_unit.hpp +++ b/include/xo/unit/scaled_unit.hpp @@ -46,6 +46,8 @@ namespace xo { } namespace su { + /* note: probably retire these */ + constexpr auto nanogram = detail::make_unit_rescale_result(nu::nanogram); constexpr auto microgram = detail::make_unit_rescale_result(nu::microgram); } diff --git a/utest/scaled_unit.test.cpp b/utest/scaled_unit.test.cpp index 2df16c4f..d9b1d3d6 100644 --- a/utest/scaled_unit.test.cpp +++ b/utest/scaled_unit.test.cpp @@ -69,6 +69,37 @@ namespace xo { static_assert(prod_rr.outer_scale_sq_ == 1.0); } } /*TEST_CASE(su_product)*/ + + TEST_CASE("scaled_unit0", "[scaled_unit0]") { + constexpr bool c_debug_flag = false; + + scope log(XO_DEBUG2(c_debug_flag, "TEST_CASE.scaled_unit0")); + + constexpr auto ng = su::nanogram; + constexpr auto ng2 = ng * ng; + + log && log(xtag("ng", ng)); + log && log(xtag("ng*ng", ng2)); + + static_assert(ng.natural_unit_.n_bpu() == 1); + static_assert(ng2.natural_unit_.n_bpu() == 1); + } /*TEST_CASE(scaled_unit0)*/ + + TEST_CASE("scaled_unit1", "[scaled_unit1]") { + constexpr bool c_debug_flag = false; + + scope log(XO_DEBUG2(c_debug_flag, "TEST_CASE.scaled_unit1")); + + constexpr auto ng = su::nanogram; + constexpr auto ng2 = ng / ng; + + log && log(xtag("ng", ng)); + log && log(xtag("ng/ng", ng2)); + + static_assert(ng.natural_unit_.n_bpu() == 1); + static_assert(ng2.natural_unit_.n_bpu() == 0); + } /*TEST_CASE(scaled_unit1)*/ + } /*namespace qty*/ } /*namespace xo*/ diff --git a/utest/unit.test.cpp b/utest/unit.test.cpp index d9cb80f0..04ba99b2 100644 --- a/utest/unit.test.cpp +++ b/utest/unit.test.cpp @@ -86,52 +86,6 @@ namespace xo { } /*TEST_CASE(basis_unit2_store)*/ - TEST_CASE("scaled_unit0", "[scaled_unit0]") { - constexpr bool c_debug_flag = true; - - // can get bits from /dev/random by uncommenting the 2nd line below - //uint64_t seed = xxx; - //rng::Seed seed; - - //auto rng = xo::rng::xoshiro256ss(seed); - - scope log(XO_DEBUG2(c_debug_flag, "TEST_CASE.scaled_unit0")); - //log && log("(A)", xtag("foo", foo)); - - constexpr auto ng = su::nanogram; - constexpr auto ng2 = ng * ng; - - log && log(xtag("ng", ng)); - log && log(xtag("ng*ng", ng2)); - //log && log(xtag("ng/ng", - - static_assert(ng.natural_unit_.n_bpu() == 1); - static_assert(ng2.natural_unit_.n_bpu() == 1); - } /*TEST_CASE(scaled_unit0)*/ - - TEST_CASE("scaled_unit1", "[scaled_unit1]") { - constexpr bool c_debug_flag = true; - - // can get bits from /dev/random by uncommenting the 2nd line below - //uint64_t seed = xxx; - //rng::Seed seed; - - //auto rng = xo::rng::xoshiro256ss(seed); - - scope log(XO_DEBUG2(c_debug_flag, "TEST_CASE.scaled_unit1")); - //log && log("(A)", xtag("foo", foo)); - - constexpr auto ng = su::nanogram; - constexpr auto ng2 = ng / ng; - - log && log(xtag("ng", ng)); - log && log(xtag("ng/ng", ng2)); - //log && log(xtag("ng/ng", - - static_assert(ng.natural_unit_.n_bpu() == 1); - static_assert(ng2.natural_unit_.n_bpu() == 0); - } /*TEST_CASE(scaled_unit1)*/ - } /*namespace ut*/ } /*namespace xo*/