refactor: 💥 ! " ⋅ " replaced with "⋅" in derived unit symbols

This commit is contained in:
Mateusz Pusz
2022-05-24 12:48:07 +02:00
parent 43844c484c
commit db09a065ab
6 changed files with 26 additions and 26 deletions

View File

@@ -303,15 +303,15 @@ will result in a different unnamed unit symbol:
struct dim_momentum : derived_dimension<dim_momentum, kilogram_metre_per_second, struct dim_momentum : derived_dimension<dim_momentum, kilogram_metre_per_second,
exponent<si::dim_mass, 1>, exponent<si::dim_mass, 1>,
exponent<si::dim_length, 1>, exponent<si::dim_length, 1>,
exponent<si::dim_time, -1>> {}; // kgm/s exponent<si::dim_time, -1>> {}; // kgm/s
struct dim_momentum : derived_dimension<dim_momentum, kilogram_metre_per_second, struct dim_momentum : derived_dimension<dim_momentum, kilogram_metre_per_second,
exponent<si::dim_length, 1>, exponent<si::dim_length, 1>,
exponent<si::dim_mass, 1>, exponent<si::dim_mass, 1>,
exponent<si::dim_time, -1>> {}; // mkg/s exponent<si::dim_time, -1>> {}; // mkg/s
struct dim_momentum : derived_dimension<dim_momentum, kilogram_metre_per_second, struct dim_momentum : derived_dimension<dim_momentum, kilogram_metre_per_second,
exponent<si::dim_time, -1>, exponent<si::dim_time, -1>,
exponent<si::dim_length, 1>, exponent<si::dim_length, 1>,
exponent<si::dim_mass, 1>> {}; // 1/s ⋅ m ⋅ kg exponent<si::dim_mass, 1>> {}; // 1/s⋅m⋅kg
where ``kilogram_metre_per_second`` is defined as:: where ``kilogram_metre_per_second`` is defined as::
@@ -325,7 +325,7 @@ However, the easiest way to define momentum is just to use the
struct dim_momentum : derived_dimension<dim_momentum, kilogram_metre_per_second, struct dim_momentum : derived_dimension<dim_momentum, kilogram_metre_per_second,
exponent<si::dim_mass, 1>, exponent<si::dim_mass, 1>,
exponent<si::dim_speed, 1>> {}; // kgm/s exponent<si::dim_speed, 1>> {}; // kgm/s
In such a case the library will do its magic and will automatically In such a case the library will do its magic and will automatically
unpack a provided derived dimension to its base dimensions in order to unpack a provided derived dimension to its base dimensions in order to

View File

@@ -42,7 +42,7 @@ constexpr auto operator_text()
if constexpr (Divide && NegativeExpCount == 1) { if constexpr (Divide && NegativeExpCount == 1) {
return basic_fixed_string("/"); return basic_fixed_string("/");
} else { } else {
return basic_symbol_text("", " "); return basic_symbol_text("", " ");
} }
} }
} }

View File

@@ -318,7 +318,7 @@ TEST_CASE("operator<< on a quantity", "[text][ostream][fmt]")
const auto q = 2_q_s * 2_q_m * 2_q_kg; const auto q = 2_q_s * 2_q_m * 2_q_kg;
os << q; os << q;
SECTION("iostream") { CHECK(os.str() == "8 m ⋅ kg ⋅ s"); } SECTION("iostream") { CHECK(os.str() == "8 m⋅kg⋅s"); }
SECTION("fmt with default format {} on a quantity") { CHECK(STD_FMT::format("{}", q) == os.str()); } SECTION("fmt with default format {} on a quantity") { CHECK(STD_FMT::format("{}", q) == os.str()); }
@@ -330,7 +330,7 @@ TEST_CASE("operator<< on a quantity", "[text][ostream][fmt]")
const auto q = 2._q_s * si::cgs::length<si::cgs::centimetre>(2) * si::cgs::mass<si::cgs::gram>(2); const auto q = 2._q_s * si::cgs::length<si::cgs::centimetre>(2) * si::cgs::mass<si::cgs::gram>(2);
os << q; os << q;
SECTION("iostream") { CHECK(os.str() == "8 cm ⋅ g ⋅ s"); } SECTION("iostream") { CHECK(os.str() == "8 cm⋅g⋅s"); }
SECTION("fmt with default format {} on a quantity") { CHECK(STD_FMT::format("{}", q) == os.str()); } SECTION("fmt with default format {} on a quantity") { CHECK(STD_FMT::format("{}", q) == os.str()); }
@@ -343,7 +343,7 @@ TEST_CASE("operator<< on a quantity", "[text][ostream][fmt]")
const auto q = 4_q_km * 2_q_s; const auto q = 4_q_km * 2_q_s;
os << q; os << q;
SECTION("iostream") { CHECK(os.str() == "8 × 10³ ms"); } SECTION("iostream") { CHECK(os.str() == "8 × 10³ ms"); }
SECTION("fmt with default format {} on a quantity") { CHECK(STD_FMT::format("{}", q) == os.str()); } SECTION("fmt with default format {} on a quantity") { CHECK(STD_FMT::format("{}", q) == os.str()); }
@@ -379,7 +379,7 @@ TEST_CASE("operator<< on a quantity", "[text][ostream][fmt]")
const auto q = 2._q_s * si::cgs::length<si::metre>(2) * si::cgs::mass<si::kilogram>(2); const auto q = 2._q_s * si::cgs::length<si::metre>(2) * si::cgs::mass<si::kilogram>(2);
os << q; os << q;
SECTION("iostream") { CHECK(os.str() == "8 × 10⁵ cm ⋅ g ⋅ s"); } SECTION("iostream") { CHECK(os.str() == "8 × 10⁵ cm⋅g⋅s"); }
SECTION("fmt with default format {} on a quantity") { CHECK(STD_FMT::format("{}", q) == os.str()); } SECTION("fmt with default format {} on a quantity") { CHECK(STD_FMT::format("{}", q) == os.str()); }
@@ -392,7 +392,7 @@ TEST_CASE("operator<< on a quantity", "[text][ostream][fmt]")
os << q; os << q;
// TODO(chogg): Reinstate after format/Magnitude design. // TODO(chogg): Reinstate after format/Magnitude design.
// SECTION("iostream") { CHECK(os.str() == "30 [6 × 10⁻²] 1/ms"); } // SECTION("iostream") { CHECK(os.str() == "30 [6 × 10⁻²] 1/ms"); }
SECTION("fmt with default format {} on a quantity") { CHECK(STD_FMT::format("{}", q) == os.str()); } SECTION("fmt with default format {} on a quantity") { CHECK(STD_FMT::format("{}", q) == os.str()); }
@@ -404,7 +404,7 @@ TEST_CASE("operator<< on a quantity", "[text][ostream][fmt]")
const auto q = 4_q_m * 2_q_s; const auto q = 4_q_m * 2_q_s;
os << q; os << q;
SECTION("iostream") { CHECK(os.str() == "8 ms"); } SECTION("iostream") { CHECK(os.str() == "8 ms"); }
SECTION("fmt with default format {} on a quantity") { CHECK(STD_FMT::format("{}", q) == os.str()); } SECTION("fmt with default format {} on a quantity") { CHECK(STD_FMT::format("{}", q) == os.str()); }
@@ -416,7 +416,7 @@ TEST_CASE("operator<< on a quantity", "[text][ostream][fmt]")
const auto q = 4_q_m * 2_q_s * 2_q_s; const auto q = 4_q_m * 2_q_s * 2_q_s;
os << q; os << q;
SECTION("iostream") { CHECK(os.str() == "16 m"); } SECTION("iostream") { CHECK(os.str() == "16 m"); }
SECTION("fmt with default format {} on a quantity") { CHECK(STD_FMT::format("{}", q) == os.str()); } SECTION("fmt with default format {} on a quantity") { CHECK(STD_FMT::format("{}", q) == os.str()); }
@@ -428,7 +428,7 @@ TEST_CASE("operator<< on a quantity", "[text][ostream][fmt]")
const auto q = 8_q_s / 2_q_m / 2_q_m; const auto q = 8_q_s / 2_q_m / 2_q_m;
os << q; os << q;
SECTION("iostream") { CHECK(os.str() == "2 1/m²s"); } SECTION("iostream") { CHECK(os.str() == "2 1/m²s"); }
SECTION("fmt with default format {} on a quantity") { CHECK(STD_FMT::format("{}", q) == os.str()); } SECTION("fmt with default format {} on a quantity") { CHECK(STD_FMT::format("{}", q) == os.str()); }

View File

@@ -167,7 +167,7 @@ TEST_CASE("std::format on synthesized unit symbols", "[text][fmt]")
SECTION("momentum") SECTION("momentum")
{ {
CHECK(STD_FMT::format("{}", 1_q_kg_m_per_s) == "1 kgm/s"); CHECK(STD_FMT::format("{}", 1_q_kg_m_per_s) == "1 kgm/s");
CHECK(STD_FMT::format("{:%Q %Aq}", 1_q_kg_m_per_s) == "1 kg m/s"); CHECK(STD_FMT::format("{:%Q %Aq}", 1_q_kg_m_per_s) == "1 kg m/s");
} }
@@ -244,7 +244,7 @@ TEST_CASE("std::format on synthesized unit symbols", "[text][fmt]")
SECTION("dynamic viscosity") SECTION("dynamic viscosity")
{ {
CHECK(STD_FMT::format("{}", 1_q_Pa_s) == "1 Pas"); CHECK(STD_FMT::format("{}", 1_q_Pa_s) == "1 Pas");
CHECK(STD_FMT::format("{:%Q %Aq}", 1_q_Pa_s) == "1 Pa s"); CHECK(STD_FMT::format("{:%Q %Aq}", 1_q_Pa_s) == "1 Pa s");
} }
@@ -252,19 +252,19 @@ TEST_CASE("std::format on synthesized unit symbols", "[text][fmt]")
SECTION("specific heat capacity") SECTION("specific heat capacity")
{ {
CHECK(STD_FMT::format("{}", 1_q_J_per_kg_K) == "1 J ⋅ K⁻¹ ⋅ kg⁻¹"); CHECK(STD_FMT::format("{}", 1_q_J_per_kg_K) == "1 J⋅K⁻¹⋅kg⁻¹");
CHECK(STD_FMT::format("{:%Q %Aq}", 1_q_J_per_kg_K) == "1 J K^-1 kg^-1"); CHECK(STD_FMT::format("{:%Q %Aq}", 1_q_J_per_kg_K) == "1 J K^-1 kg^-1");
} }
SECTION("molar heath capacity") SECTION("molar heath capacity")
{ {
CHECK(STD_FMT::format("{}", 1_q_J_per_mol_K) == "1 J ⋅ K⁻¹ ⋅ mol⁻¹"); CHECK(STD_FMT::format("{}", 1_q_J_per_mol_K) == "1 J⋅K⁻¹⋅mol⁻¹");
CHECK(STD_FMT::format("{:%Q %Aq}", 1_q_J_per_mol_K) == "1 J K^-1 mol^-1"); CHECK(STD_FMT::format("{:%Q %Aq}", 1_q_J_per_mol_K) == "1 J K^-1 mol^-1");
} }
SECTION("thermal conductivity") SECTION("thermal conductivity")
{ {
CHECK(STD_FMT::format("{}", 1_q_W_per_m_K) == "1 W ⋅ m⁻¹ ⋅ K⁻¹"); CHECK(STD_FMT::format("{}", 1_q_W_per_m_K) == "1 W⋅m⁻¹⋅K⁻¹");
CHECK(STD_FMT::format("{:%Q %Aq}", 1_q_W_per_m_K) == "1 W m^-1 K^-1"); CHECK(STD_FMT::format("{:%Q %Aq}", 1_q_W_per_m_K) == "1 W m^-1 K^-1");
} }
@@ -284,7 +284,7 @@ TEST_CASE("std::format on synthesized unit symbols", "[text][fmt]")
SECTION("molar energy") { CHECK(STD_FMT::format("{}", 1_q_J_per_mol) == "1 J/mol"); } SECTION("molar energy") { CHECK(STD_FMT::format("{}", 1_q_J_per_mol) == "1 J/mol"); }
SECTION("torque") { CHECK(STD_FMT::format("{}", 1_q_N_m_per_rad) == "1 Nm/rad"); } SECTION("torque") { CHECK(STD_FMT::format("{}", 1_q_N_m_per_rad) == "1 Nm/rad"); }
SECTION("storage_capacity") SECTION("storage_capacity")
{ {

View File

@@ -88,8 +88,8 @@ static_assert(10_q_pdl * 10_q_ft == 100_q_ft_pdl);
static_assert(100_q_ft_pdl / 10_q_ft == 10_q_pdl); static_assert(100_q_ft_pdl / 10_q_ft == 10_q_pdl);
static_assert(100_q_ft_pdl / 10_q_pdl == 10_q_ft); static_assert(100_q_ft_pdl / 10_q_pdl == 10_q_ft);
static_assert(detail::unit_text<dim_energy, foot_poundal>() == basic_symbol_text("ftpdl", "ft pdl")); static_assert(detail::unit_text<dim_energy, foot_poundal>() == basic_symbol_text("ftpdl", "ft pdl"));
static_assert(detail::unit_text<dim_energy, foot_pound_force>() == basic_symbol_text("ftlbf", "ft lbf")); static_assert(detail::unit_text<dim_energy, foot_pound_force>() == basic_symbol_text("ftlbf", "ft lbf"));
/* ************** DERIVED DIMENSIONS IN TERMS OF OTHER UNITS **************** */ /* ************** DERIVED DIMENSIONS IN TERMS OF OTHER UNITS **************** */
@@ -99,8 +99,8 @@ static_assert(10_q_ft_pdl / 10_q_s == 1_q_ft_pdl_per_s);
static_assert(1_q_ft_pdl_per_s * 10_q_s == 10_q_ft_pdl); static_assert(1_q_ft_pdl_per_s * 10_q_s == 10_q_ft_pdl);
static_assert(10_q_ft_pdl / 1_q_ft_pdl_per_s == 10_q_s); static_assert(10_q_ft_pdl / 1_q_ft_pdl_per_s == 10_q_s);
static_assert(detail::unit_text<dim_power, foot_poundal_per_second>() == basic_symbol_text("ftpdl/s", "ft pdl/s")); static_assert(detail::unit_text<dim_power, foot_poundal_per_second>() == basic_symbol_text("ftpdl/s", "ft pdl/s"));
static_assert(detail::unit_text<dim_power, foot_pound_force_per_second>() == static_assert(detail::unit_text<dim_power, foot_pound_force_per_second>() ==
basic_symbol_text("ftlbf/s", "ft lbf/s")); basic_symbol_text("ftlbf/s", "ft lbf/s"));
} // namespace } // namespace

View File

@@ -334,7 +334,7 @@ static_assert(detail::unit_text<dim_luminance, candela_per_metre_sq>() == basic_
// dynamic viscosity // dynamic viscosity
static_assert(1_q_Pa_s == 1_q_N * 1_q_s / 1_q_m2); static_assert(1_q_Pa_s == 1_q_N * 1_q_s / 1_q_m2);
static_assert(detail::unit_text<dim_dynamic_viscosity, pascal_second>() == basic_symbol_text("Pas", "Pa s")); static_assert(detail::unit_text<dim_dynamic_viscosity, pascal_second>() == basic_symbol_text("Pas", "Pa s"));
// [specific|molar] heath capacity // [specific|molar] heath capacity
@@ -344,13 +344,13 @@ static_assert(1_q_J_per_mol_K == 1_q_J_per_K / 1_q_mol);
static_assert(detail::unit_text<dim_heat_capacity, joule_per_kelvin>() == "J/K"); static_assert(detail::unit_text<dim_heat_capacity, joule_per_kelvin>() == "J/K");
static_assert(detail::unit_text<dim_specific_heat_capacity, joule_per_kilogram_kelvin>() == static_assert(detail::unit_text<dim_specific_heat_capacity, joule_per_kilogram_kelvin>() ==
basic_symbol_text("J ⋅ K⁻¹ ⋅ kg⁻¹", "J K^-1 kg^-1")); basic_symbol_text("J⋅K⁻¹⋅kg⁻¹", "J K^-1 kg^-1"));
// thermal conductivity // thermal conductivity
static_assert(20_q_W_per_m_K * 10_q_m * 300_q_K == 60'000_q_W); static_assert(20_q_W_per_m_K * 10_q_m * 300_q_K == 60'000_q_W);
static_assert(detail::unit_text<dim_thermal_conductivity, watt_per_metre_kelvin>() == static_assert(detail::unit_text<dim_thermal_conductivity, watt_per_metre_kelvin>() ==
basic_symbol_text("W ⋅ m⁻¹ ⋅ K⁻¹", "W m^-1 K^-1")); basic_symbol_text("W⋅m⁻¹⋅K⁻¹", "W m^-1 K^-1"));
// electric field strength // electric field strength