refactor: 💥 basic_concepts, quantity and quantity_cast refactored

BREAKING CHANGE: ScalableNumber renamed to QuantityValue Resolves #107
2020-10-06 18:17:52 +02:00
1 parent 40f205b381
commit cfc90f4aac
@@ -29,35 +29,35 @@
 namespace units::physical::natural {

 struct dim_length : physical::dim_length<inverted_gigaelectronvolt> {};
-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_length> U, QuantityValue Rep = double>
 using length = quantity<dim_length, U, Rep>;

 struct dim_time : physical::dim_time<inverted_gigaelectronvolt> {};
-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_time> U, QuantityValue Rep = double>
 using time = quantity<dim_time, U, Rep>;

 struct dim_mass : physical::dim_mass<gigaelectronvolt> {};
-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_mass> U, QuantityValue Rep = double>
 using mass = quantity<dim_mass, U, Rep>;

 struct dim_speed : physical::dim_speed<dim_speed, one, dim_length, dim_time> {};
-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_speed> U, QuantityValue Rep = double>
 using speed = quantity<dim_speed, U, Rep>;

 struct dim_acceleration : physical::dim_acceleration<dim_acceleration, gigaelectronvolt, dim_length, dim_time> {};
-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_acceleration> U, QuantityValue Rep = double>
 using acceleration = quantity<dim_acceleration, U, Rep>;

 struct dim_force : physical::dim_force<dim_force, square_gigaelectronvolt, dim_mass, dim_acceleration> {};
-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_force> U, QuantityValue Rep = double>
 using force = quantity<dim_force, U, Rep>;

 struct dim_momentum : physical::dim_momentum<dim_momentum, gigaelectronvolt, dim_mass, dim_speed> {};
-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_momentum> U, QuantityValue Rep = double>
 using momentum = quantity<dim_momentum, U, Rep>;

 struct dim_energy : physical::dim_energy<dim_energy, gigaelectronvolt, dim_force, dim_length> {};
-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_force> U, QuantityValue Rep = double>
 using energy = quantity<dim_force, U, Rep>;

 // Typical UDLs will not work here as the same units are reused by many quantities.
@@ -26,7 +26,7 @@

 namespace units::physical::natural {

-template<ScalableNumber Rep = double>
+template<QuantityValue Rep = double>
 inline constexpr auto speed_of_light = speed<one, Rep>(1);

 }  // namespace units::physical::natural
@@ -32,7 +32,7 @@ struct mole : named_unit<mole, "mol", prefix> {};

 struct dim_amount_of_substance : physical::dim_amount_of_substance<mole> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_amount_of_substance> U, QuantityValue Rep = double>
 using amount_of_substance = quantity<dim_amount_of_substance, U, Rep>;

 inline namespace literals {
@@ -52,7 +52,7 @@ struct yottaampere : prefixed_unit<yottaampere, yotta, ampere> {};

 struct dim_electric_current : physical::dim_electric_current<ampere> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_electric_current> U, QuantityValue Rep = double>
 using electric_current = quantity<dim_electric_current, U, Rep>;

 inline namespace literals {
@@ -54,7 +54,7 @@ struct astronomical_unit : named_scaled_unit<astronomical_unit, "au", no_prefix,

 struct dim_length : physical::dim_length<metre> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_length> U, QuantityValue Rep = double>
 using length = quantity<dim_length, U, Rep>;

 inline namespace literals {
@@ -52,7 +52,7 @@ struct yottacandela : prefixed_unit<yottacandela, yotta, candela> {};

 struct dim_luminous_intensity : physical::dim_luminous_intensity<candela> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_luminous_intensity> U, QuantityValue Rep = double>
 using luminous_intensity = quantity<dim_luminous_intensity, U, Rep>;

 inline namespace literals {
@@ -76,7 +76,7 @@ struct dalton : named_scaled_unit<dalton, "Da", no_prefix, ratio(16'605'390'666'

 struct dim_mass : physical::dim_mass<kilogram> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_mass> U, QuantityValue Rep = double>
 using mass = quantity<dim_mass, U, Rep>;

 inline namespace literals {
@@ -31,7 +31,7 @@ struct kelvin : named_unit<kelvin, "K", no_prefix> {};

 struct dim_thermodynamic_temperature : physical::dim_thermodynamic_temperature<kelvin> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_thermodynamic_temperature> U, QuantityValue Rep = double>
 using thermodynamic_temperature = quantity<dim_thermodynamic_temperature, U, Rep>;

 inline namespace literals {
@@ -43,7 +43,7 @@ struct day : named_scaled_unit<day, "d", no_prefix, ratio(24), hour> {};

 struct dim_time : physical::dim_time<second> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_time> U, QuantityValue Rep = double>
 using time = quantity<dim_time, U, Rep>;

 inline namespace literals {
@@ -31,7 +31,7 @@ using si::centimetre;

 struct dim_length : physical::dim_length<centimetre> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_length> U, QuantityValue Rep = double>
 using length = quantity<dim_length, U, Rep>;

 inline namespace literals {
@@ -31,7 +31,7 @@ using si::gram;

 struct dim_mass : physical::dim_mass<gram> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_mass> U, QuantityValue Rep = double>
 using mass = quantity<dim_mass, U, Rep>;

 inline namespace literals {
@@ -31,7 +31,7 @@ namespace units::physical::si::cgs {
 struct gal : named_unit<gal, "Gal", si::prefix> {};
 struct dim_acceleration : physical::dim_acceleration<dim_acceleration, gal, dim_length, dim_time> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_acceleration> U, QuantityValue Rep = double>
 using acceleration = quantity<dim_acceleration, U, Rep>;

 inline namespace literals {
@@ -32,7 +32,7 @@ using si::square_centimetre;

 struct dim_area : physical::dim_area<dim_area, square_centimetre, dim_length> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_area> U, QuantityValue Rep = double>
 using area = quantity<dim_area, U, Rep>;

 inline namespace literals {
@@ -33,7 +33,7 @@ struct erg : named_unit<erg, "erg", si::prefix> {};

 struct dim_energy : physical::dim_energy<dim_energy, erg, dim_force, dim_length> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_energy> U, QuantityValue Rep = double>
 using energy = quantity<dim_energy, U, Rep>;

 inline namespace literals {
@@ -34,7 +34,7 @@ struct dyne : named_unit<dyne, "dyn", si::prefix> {};

 struct dim_force : physical::dim_force<dim_force, dyne, dim_mass, dim_acceleration> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_force> U, QuantityValue Rep = double>
 using force = quantity<dim_force, U, Rep>;

 inline namespace literals {
@@ -33,7 +33,7 @@ struct erg_per_second : unit<erg_per_second> {};

 struct dim_power : physical::dim_power<dim_power, erg_per_second, dim_energy, dim_time> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_power> U, QuantityValue Rep = double>
 using power = quantity<dim_power, U, Rep>;

 inline namespace literals {
@@ -34,7 +34,7 @@ struct barye : named_unit<barye, "Ba", si::prefix> {};

 struct dim_pressure : physical::dim_pressure<dim_pressure, barye, dim_force, dim_area> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_pressure> U, QuantityValue Rep = double>
 using pressure = quantity<dim_pressure, U, Rep>;

 inline namespace literals {
@@ -32,7 +32,7 @@ namespace units::physical::si::cgs {
 struct centimetre_per_second : unit<centimetre_per_second> {};
 struct dim_speed : physical::dim_speed<dim_speed, centimetre_per_second, dim_length, dim_time> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_speed> U, QuantityValue Rep = double>
 using speed = quantity<dim_speed, U, Rep>;

 inline namespace literals {
@@ -32,31 +32,31 @@

 namespace units::physical::si::si2019 {

-template<ScalableNumber Rep = double>
+template<QuantityValue Rep = double>
 inline constexpr auto planck_constant = energy<joule, Rep>(6.62607015e-34) * time<second, Rep>(1);

-template<ScalableNumber Rep = double>
+template<QuantityValue Rep = double>
 inline constexpr auto reduced_planck_constant = energy<gigaelectronvolt, Rep>(6.582119569e-10) * time<second, Rep>(1);

-template<ScalableNumber Rep = double>
+template<QuantityValue Rep = double>
 inline constexpr auto elementary_charge = electric_charge<coulomb, Rep>(1.602176634e-19);

-template<ScalableNumber Rep = double>
+template<QuantityValue Rep = double>
 inline constexpr auto boltzmann_constant = energy<joule, Rep>(1.380649e-23) / temperature<kelvin, Rep>(1);

-template<ScalableNumber Rep = double>
+template<QuantityValue Rep = double>
 inline constexpr auto avogadro_constant = Rep(6.02214076e23) / substance<mole, Rep>(1);

-template<ScalableNumber Rep = double>
+template<QuantityValue Rep = double>
 inline constexpr auto speed_of_light = speed<metre_per_second, Rep>(299'792'458);

-template<ScalableNumber Rep = double>
+template<QuantityValue Rep = double>
 inline constexpr auto hyperfine_structure_transition_frequency = frequency<hertz, Rep>(9'192'631'770);

-// template<ScalableNumber Rep = double>
+// template<QuantityValue Rep = double>
 // inline constexpr auto luminous_efficacy = 683_q_lm / 1_q_W;

-template<ScalableNumber Rep = double>
+template<QuantityValue Rep = double>
 inline constexpr auto standard_gravity = acceleration<metre_per_second_sq, Rep>(9.80665);

 }  // namespace units::physical::si::si2019
@@ -53,7 +53,7 @@ struct yottagray : prefixed_unit<yottagray, yotta, gray> {};

 struct dim_absorbed_dose : physical::dim_absorbed_dose<dim_absorbed_dose, gray, dim_energy, dim_mass> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_absorbed_dose> U, QuantityValue Rep = double>
 using absorbed_dose = quantity<dim_absorbed_dose, U, Rep>;

 inline namespace literals {
@@ -31,7 +31,7 @@ namespace units::physical::si {
 struct metre_per_second_sq : unit<metre_per_second_sq> {};
 struct dim_acceleration : physical::dim_acceleration<dim_acceleration, metre_per_second_sq, dim_length, dim_time> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_acceleration> U, QuantityValue Rep = double>
 using acceleration = quantity<dim_acceleration, U, Rep>;

 inline namespace literals {
@@ -34,7 +34,7 @@ struct radian_per_second : named_unit<radian_per_second, basic_symbol_text{"ω",

 struct dim_angular_velocity : physical::dim_angular_velocity<dim_angular_velocity, radian_per_second, dim_angle<>, dim_time> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_angular_velocity> U, QuantityValue Rep = double>
 using angular_velocity = quantity<dim_angular_velocity, U, Rep>;

 inline namespace literals {
@@ -54,7 +54,7 @@ struct square_yottametre : deduced_unit<square_yottametre, dim_area, yottametre>

 struct hectare : alias_unit<square_hectometre, "ha", no_prefix> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_area> U, QuantityValue Rep = double>
 using area = quantity<dim_area, U, Rep>;

 inline namespace literals {
@@ -54,7 +54,7 @@ struct yottafarad : prefixed_unit<yottafarad, yotta, farad> {};

 struct dim_capacitance : physical::dim_capacitance<dim_capacitance, farad, dim_electric_charge, dim_voltage> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_capacitance> U, QuantityValue Rep = double>
 using capacitance = quantity<dim_capacitance, U, Rep>;

 inline namespace literals {
@@ -56,7 +56,7 @@ struct enzyme_unit : named_scaled_unit<enzyme_unit, "U", prefix, ratio(1, 60, -6

 struct dim_catalytic_activity : physical::dim_catalytic_activity<dim_catalytic_activity, katal, dim_time, dim_amount_of_substance> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_catalytic_activity> U, QuantityValue Rep = double>
 using catalytic_activity = quantity<dim_catalytic_activity, U, Rep>;

 inline namespace literals {
@@ -36,10 +36,10 @@ struct coulomb_per_metre_sq : unit<coulomb_per_metre_sq> {};
 struct dim_charge_density : physical::dim_charge_density<dim_charge_density, coulomb_per_metre_cub, dim_electric_charge, dim_length> {};
 struct dim_surface_charge_density : physical::dim_surface_charge_density<dim_surface_charge_density, coulomb_per_metre_sq, dim_electric_charge, dim_length> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_charge_density> U, QuantityValue Rep = double>
 using charge_density = quantity<dim_charge_density, U, Rep>;

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_surface_charge_density> U, QuantityValue Rep = double>
 using surface_charge_density = quantity<dim_surface_charge_density, U, Rep>;

 inline namespace literals {
@@ -32,7 +32,7 @@ namespace units::physical::si {
 struct mol_per_metre_cub : unit<mol_per_metre_cub> {};
 struct dim_concentration : physical::dim_concentration<dim_concentration, mol_per_metre_cub, dim_amount_of_substance, dim_length> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_concentration> U, QuantityValue Rep = double>
 using concentration = quantity<dim_concentration, U, Rep>;

 inline namespace literals {
@@ -49,7 +49,7 @@ struct yottasiemens : prefixed_unit<yottasiemens, yotta, siemens> {};

 struct dim_conductance : physical::dim_conductance<dim_conductance, siemens, dim_resistance> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_conductance> U, QuantityValue Rep = double>
 using conductance = quantity<dim_conductance, U, Rep>;

 inline namespace literals {
@@ -34,7 +34,7 @@ struct ampere_per_metre_sq : unit<ampere_per_metre_sq> {};

 struct dim_current_density : physical::dim_current_density<dim_current_density, ampere_per_metre_sq, dim_electric_current, dim_length> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_current_density> U, QuantityValue Rep = double>
 using current_density = quantity<dim_current_density, U, Rep>;

 inline namespace literals {
@@ -34,7 +34,7 @@ struct kilogram_per_metre_cub : unit<kilogram_per_metre_cub> {};

 struct dim_density : physical::dim_density<dim_density, kilogram_per_metre_cub, dim_mass, dim_length> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_density> U, QuantityValue Rep = double>
 using density = quantity<dim_density, U, Rep>;

 inline namespace literals {
@@ -32,7 +32,7 @@ namespace units::physical::si {
 struct pascal_second : unit<pascal_second> {};
 struct dim_dynamic_viscosity : physical::dim_dynamic_viscosity<dim_dynamic_viscosity, pascal_second, dim_pressure, dim_time> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_dynamic_viscosity> U, QuantityValue Rep = double>
 using dynamic_viscosity = quantity<dim_dynamic_viscosity, U, Rep>;

 inline namespace literals {
@@ -33,7 +33,7 @@ struct coulomb : named_unit<coulomb, "C", prefix> {};

 struct dim_electric_charge : physical::dim_electric_charge<dim_electric_charge, coulomb, dim_time, dim_electric_current> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_electric_charge> U, QuantityValue Rep = double>
 using electric_charge = quantity<dim_electric_charge, U, Rep>;

 inline namespace literals {
@@ -31,7 +31,7 @@ namespace units::physical::si {
 struct volt_per_metre : unit<volt_per_metre> {};
 struct dim_electric_field_strength : physical::dim_electric_field_strength<dim_electric_field_strength, volt_per_metre, dim_voltage, dim_length> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_electric_field_strength> U, QuantityValue Rep = double>
 using electric_field_strength = quantity<dim_electric_field_strength, U, Rep>;

 inline namespace literals {
@@ -52,7 +52,7 @@ struct gigaelectronvolt : prefixed_unit<gigaelectronvolt, giga, electronvolt> {}

 struct dim_energy : physical::dim_energy<dim_energy, joule, dim_force, dim_length> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_energy> U, QuantityValue Rep = double>
 using energy = quantity<dim_energy, U, Rep>;

 inline namespace literals {
@@ -54,7 +54,7 @@ struct yottanewton : prefixed_unit<yottanewton, yotta, newton> {};

 struct dim_force : physical::dim_force<dim_force, newton, dim_mass, dim_acceleration> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_force> U, QuantityValue Rep = double>
 using force = quantity<dim_force, U, Rep>;

 inline namespace literals {
@@ -48,7 +48,7 @@ struct yottahertz : prefixed_unit<yottahertz, yotta, hertz> {};

 struct dim_frequency : physical::dim_frequency<dim_frequency, hertz, dim_time> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_frequency> U, QuantityValue Rep = double>
 using frequency = quantity<dim_frequency, U, Rep>;

 inline namespace literals {
@@ -39,13 +39,13 @@ struct dim_heat_capacity : physical::dim_heat_capacity<dim_heat_capacity, joule_
 struct dim_specific_heat_capacity : physical::dim_specific_heat_capacity<dim_specific_heat_capacity, joule_per_kilogram_kelvin, dim_heat_capacity, dim_mass> {};
 struct dim_molar_heat_capacity : physical::dim_molar_heat_capacity<dim_molar_heat_capacity, joule_per_mole_kelvin, dim_heat_capacity, dim_amount_of_substance> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_heat_capacity> U, QuantityValue Rep = double>
 using heat_capacity = quantity<dim_heat_capacity, U, Rep>;

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_specific_heat_capacity> U, QuantityValue Rep = double>
 using specific_heat_capacity = quantity<dim_specific_heat_capacity, U, Rep>;

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_molar_heat_capacity> U, QuantityValue Rep = double>
 using molar_heat_capacity = quantity<dim_molar_heat_capacity, U, Rep>;

 inline namespace literals {
@@ -50,7 +50,7 @@ struct yottahenry : prefixed_unit<yottahenry, yotta, henry> {};

 struct dim_inductance : physical::dim_inductance<dim_inductance, henry, dim_magnetic_flux, dim_electric_current> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_inductance> U, QuantityValue Rep = double>
 using inductance = quantity<dim_inductance, U, Rep>;

 inline namespace literals {
@@ -32,7 +32,7 @@ namespace units::physical::si {
 struct candela_per_metre_sq : unit<candela_per_metre_sq> {};
 struct dim_luminance : physical::dim_luminance<dim_luminance, candela_per_metre_sq, dim_luminous_intensity, dim_length> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_luminance> U, QuantityValue Rep = double>
 using luminance = quantity<dim_luminance, U, Rep>;

 inline namespace literals {
@@ -50,7 +50,7 @@ struct yottaweber : prefixed_unit<yottaweber, yotta, weber> {};

 struct dim_magnetic_flux : physical::dim_magnetic_flux<dim_magnetic_flux, weber, dim_magnetic_induction, dim_area> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_magnetic_flux> U, QuantityValue Rep = double>
 using magnetic_flux = quantity<dim_magnetic_flux, U, Rep>;

 inline namespace literals {
@@ -54,7 +54,7 @@ struct gauss : named_scaled_unit<gauss, "G", prefix, ratio(1, 10'000), tesla> {}

 struct dim_magnetic_induction : physical::dim_magnetic_induction<dim_magnetic_induction, tesla, dim_voltage, dim_time, dim_length> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_magnetic_induction> U, QuantityValue Rep = double>
 using magnetic_induction = quantity<dim_magnetic_induction, U, Rep>;

 inline namespace literals {
@@ -34,7 +34,7 @@ struct joule_per_mole : unit<joule_per_mole> {};

 struct dim_molar_energy : physical::dim_molar_energy<dim_molar_energy, joule_per_mole, dim_energy, dim_amount_of_substance> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_molar_energy> U, QuantityValue Rep = double>
 using molar_energy = quantity<dim_molar_energy, U, Rep>;

 inline namespace literals {
@@ -32,7 +32,7 @@ namespace units::physical::si {
 struct kilogram_metre_per_second : unit<kilogram_metre_per_second> {};
 struct dim_momentum : physical::dim_momentum<dim_momentum, kilogram_metre_per_second, dim_mass, dim_speed> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_momentum> U, QuantityValue Rep = double>
 using momentum = quantity<dim_momentum, U, Rep>;

 inline namespace literals {
@@ -33,7 +33,7 @@ struct henry_per_metre : unit<henry_per_metre> {};

 struct dim_permeability : physical::dim_permeability<dim_permeability, henry_per_metre, dim_inductance, dim_length> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_permeability> U, QuantityValue Rep = double>
 using permeability = quantity<dim_permeability, U, Rep>;

 inline namespace literals {
@@ -33,7 +33,7 @@ struct farad_per_metre : unit<farad_per_metre> {};

 struct dim_permittivity : physical::dim_permittivity<dim_permittivity, farad_per_metre, dim_capacitance, dim_length> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_permittivity> U, QuantityValue Rep = double>
 using permittivity = quantity<dim_permittivity, U, Rep>;

 inline namespace literals {
@@ -49,7 +49,7 @@ struct yottawatt : prefixed_unit<yottawatt, yotta, watt> {};

 struct dim_power : physical::dim_power<dim_power, watt, dim_energy, dim_time> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_power> U, QuantityValue Rep = double>
 using power = quantity<dim_power, U, Rep>;

 inline namespace literals {
@@ -54,7 +54,7 @@ struct yottapascal : prefixed_unit<yottapascal, yotta, pascal> {};

 struct dim_pressure : physical::dim_pressure<dim_pressure, pascal, dim_force, dim_area> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_pressure> U, QuantityValue Rep = double>
 using pressure = quantity<dim_pressure, U, Rep>;

 inline namespace literals {
@@ -50,7 +50,7 @@ struct yottaohm : prefixed_unit<yottaohm, yotta, ohm> {};

 struct dim_resistance : physical::dim_resistance<dim_resistance, ohm, dim_voltage, dim_electric_current> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_resistance> U, QuantityValue Rep = double>
 using resistance = quantity<dim_resistance, U, Rep>;

 inline namespace literals {
@@ -34,7 +34,7 @@ struct dim_speed : physical::dim_speed<dim_speed, metre_per_second, dim_length,

 struct kilometre_per_hour : deduced_unit<kilometre_per_hour, dim_speed, kilometre, hour> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_speed> U, QuantityValue Rep = double>
 using speed = quantity<dim_speed, U, Rep>;

 inline namespace literals {
@@ -32,7 +32,7 @@ struct newton_per_metre : unit<newton_per_metre> {};

 struct dim_surface_tension : physical::dim_surface_tension<dim_surface_tension, newton_per_metre, dim_force, dim_length> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_surface_tension> U, QuantityValue Rep = double>
 using surface_tension = quantity<dim_surface_tension, U, Rep>;

 inline namespace literals {
@@ -33,7 +33,7 @@ struct watt_per_metre_kelvin : unit<watt_per_metre_kelvin> {};

 struct dim_thermal_conductivity : physical::dim_thermal_conductivity<dim_thermal_conductivity, watt_per_metre_kelvin, dim_power, dim_length, dim_thermodynamic_temperature> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_thermal_conductivity> U, QuantityValue Rep = double>
 using thermal_conductivity = quantity<dim_thermal_conductivity, U, Rep>;

 inline namespace literals {
@@ -34,7 +34,7 @@ struct newton_metre : named_unit<newton_metre, "Nm", prefix> {};

 struct dim_torque : physical::dim_torque<dim_torque, newton_metre, dim_energy, dim_angle<>> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_torque> U, QuantityValue Rep = double>
 using torque = quantity<dim_torque, U, Rep>;

 inline namespace literals {
@@ -54,7 +54,7 @@ struct yottavolt : prefixed_unit<yottavolt, yotta, volt> {};

 struct dim_voltage : physical::dim_voltage<dim_voltage, volt, dim_power, dim_electric_current> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_voltage> U, QuantityValue Rep = double>
 using voltage = quantity<dim_voltage, U, Rep>;

 inline namespace literals {
@@ -74,7 +74,7 @@ struct exalitre : prefixed_unit<petalitre, exa, litre> {};
 struct zettalitre : prefixed_alias_unit<cubic_megametre, zetta, litre> {};
 struct yottalitre : prefixed_unit<yottalitre, yotta, litre> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_volume> U, QuantityValue Rep = double>
 using volume = quantity<dim_volume, U, Rep>;

 inline namespace literals {
@@ -51,7 +51,7 @@ struct nautical_mile : named_scaled_unit<nautical_mile, "mi(naut)", no_prefix, r

 struct dim_length : physical::dim_length<foot> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_length> U, QuantityValue Rep = double>
 using length = quantity<dim_length, U, Rep>;

 inline namespace literals {
@@ -32,7 +32,7 @@ struct pound : named_scaled_unit<pound, "lb", no_prefix, ratio(45'359'237, 100'0

 struct dim_mass : physical::dim_mass<pound> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_mass> U, QuantityValue Rep = double>
 using mass = quantity<dim_mass, U, Rep>;

 struct grain : named_scaled_unit<grain, "gr", no_prefix, ratio(1, 7000), pound>{};
@@ -31,7 +31,7 @@ namespace units::physical::si::fps {
 struct foot_per_second_sq : unit<foot_per_second_sq> {};
 struct dim_acceleration : physical::dim_acceleration<dim_acceleration, foot_per_second_sq, dim_length, dim_time> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_acceleration> U, QuantityValue Rep = double>
 using acceleration = quantity<dim_acceleration, U, Rep>;

 inline namespace literals {
@@ -32,7 +32,7 @@ struct square_foot : unit<square_foot> {};
 struct dim_area : physical::dim_area<dim_area, square_foot, dim_length> {};


-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_area> U, QuantityValue Rep = double>
 using area = quantity<dim_area, U, Rep>;

 inline namespace literals {
@@ -33,7 +33,7 @@ struct pound_per_foot_cub : unit<pound_per_foot_cub> {};

 struct dim_density : physical::dim_density<dim_density, pound_per_foot_cub, dim_mass, dim_length> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_density> U, QuantityValue Rep = double>
 using density = quantity<dim_density, U, Rep>;

 inline namespace literals {
@@ -39,7 +39,7 @@ struct foot_pound_force : noble_deduced_unit<foot_pound_force, dim_energy, pound



-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_energy> U, QuantityValue Rep = double>
 using energy = quantity<dim_energy, U, Rep>;


@@ -43,7 +43,7 @@ struct kip : alias_unit<kilopound_force, "klbf", no_prefix> {};

 struct dim_force : physical::dim_force<dim_force, poundal, dim_mass, dim_acceleration> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_force> U, QuantityValue Rep = double>
 using force = quantity<dim_force, U, Rep>;

 inline namespace literals {
@@ -37,7 +37,7 @@ struct foot_pound_force_per_second : deduced_unit<foot_pound_force_per_second, d

 struct horse_power : named_scaled_unit<horse_power, "hp", no_prefix, ratio(550), foot_pound_force_per_second> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_power> U, QuantityValue Rep = double>
 using power = quantity<dim_power, U, Rep>;

 inline namespace literals {
@@ -34,7 +34,7 @@ struct poundal_per_foot_sq : unit<poundal_per_foot_sq> {};

 struct dim_pressure : physical::dim_pressure<dim_pressure, poundal_per_foot_sq, dim_force, dim_area> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_pressure> U, QuantityValue Rep = double>
 using pressure = quantity<dim_pressure, U, Rep>;

 struct pound_force_per_foot_sq : named_scaled_unit<pound_force_per_foot_sq, "lbf ft2", si::prefix, ratio(32'174'049, 1'000'000), poundal_per_foot_sq> {};
@@ -32,7 +32,7 @@ namespace units::physical::si::fps {
 struct foot_per_second : unit<foot_per_second> {};
 struct dim_speed : physical::dim_speed<dim_speed, foot_per_second, dim_length, dim_time> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_speed> U, QuantityValue Rep = double>
 using speed = quantity<dim_speed, U, Rep>;

 struct mile_per_hour : deduced_unit<mile_per_hour, dim_speed, mile, hour>{};
@@ -33,7 +33,7 @@ struct dim_volume : physical::dim_volume<dim_volume, cubic_foot, dim_length> {};

 struct cubic_yard : deduced_unit<cubic_yard, dim_volume, yard> {};

-template<Unit U, ScalableNumber Rep = double>
+template<UnitOf<dim_volume> U, QuantityValue Rep = double>
 using volume = quantity<dim_volume, U, Rep>;

 inline namespace literals {