Deduced units symbols refactoring started
This commit is contained in:
Mateusz Pusz committed
1 parent
7e844ef773
commit
91bcfedf1e
31 files changed
+329
-128
No files matched your search
@@ -31,7 +31,7 @@ namespace units {
|
||||
template<typename T>
|
||||
concept Acceleration = QuantityOf<T, acceleration>;
|
||||
|
||||
struct metre_per_second_sq : coherent_derived_unit<metre_per_second_sq, "m/s^2", acceleration> {};
|
||||
struct metre_per_second_sq : coherent_derived_unit<metre_per_second_sq, acceleration> {};
|
||||
|
||||
inline namespace literals {
|
||||
|
||||
|
||||
@@ -31,11 +31,11 @@ namespace units {
|
||||
template<typename T>
|
||||
concept Area = QuantityOf<T, area>;
|
||||
|
||||
struct square_metre : coherent_derived_unit<square_metre, "m^2", area> {};
|
||||
struct square_millimetre : deduced_derived_unit<square_millimetre, "mm^2", area, millimetre> {};
|
||||
struct square_centimetre : deduced_derived_unit<square_centimetre, "cm^2", area, centimetre> {};
|
||||
struct square_kilometre : deduced_derived_unit<square_kilometre, "km^2", area, kilometre> {};
|
||||
struct square_foot : deduced_derived_unit<square_foot, "ft^2", area, foot> {};
|
||||
struct square_metre : coherent_derived_unit<square_metre, area> {};
|
||||
struct square_millimetre : deduced_derived_unit<square_millimetre, area, millimetre> {};
|
||||
struct square_centimetre : deduced_derived_unit<square_centimetre, area, centimetre> {};
|
||||
struct square_kilometre : deduced_derived_unit<square_kilometre, area, kilometre> {};
|
||||
struct square_foot : deduced_derived_unit<square_foot, area, foot> {};
|
||||
|
||||
inline namespace literals {
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ namespace units {
|
||||
template<typename T>
|
||||
concept Capacitance = QuantityOf<T, capacitance>;
|
||||
|
||||
struct farad : coherent_derived_unit<farad, "F", capacitance, si_prefix> {};
|
||||
struct farad : named_coherent_derived_unit<farad, "F", capacitance, si_prefix> {};
|
||||
|
||||
inline namespace literals {
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ namespace units {
|
||||
template<typename T>
|
||||
concept Current = QuantityOf<T, current>;
|
||||
|
||||
struct ampere : coherent_derived_unit<ampere, "A", current, si_prefix> {};
|
||||
struct ampere : named_coherent_derived_unit<ampere, "A", current, si_prefix> {};
|
||||
|
||||
inline namespace literals {
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ namespace units {
|
||||
template<typename T>
|
||||
concept ElectricCharge = QuantityOf<T, electric_charge>;
|
||||
|
||||
struct coulomb : coherent_derived_unit<coulomb, "C", electric_charge, si_prefix> {};
|
||||
struct coulomb : named_coherent_derived_unit<coulomb, "C", electric_charge, si_prefix> {};
|
||||
|
||||
inline namespace literals {
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace units {
|
||||
template<typename T>
|
||||
concept Energy = QuantityOf<T, energy>;
|
||||
|
||||
struct joule : coherent_derived_unit<joule, "J", energy, si_prefix> {};
|
||||
struct joule : named_coherent_derived_unit<joule, "J", energy, si_prefix> {};
|
||||
struct millijoule : prefixed_derived_unit<millijoule, milli, joule> {};
|
||||
struct kilojoule : prefixed_derived_unit<kilojoule, kilo, joule> {};
|
||||
struct megajoule : prefixed_derived_unit<megajoule, mega, joule> {};
|
||||
|
||||
@@ -33,7 +33,7 @@ namespace units {
|
||||
template<typename T>
|
||||
concept Force = QuantityOf<T, force>;
|
||||
|
||||
struct newton : coherent_derived_unit<newton, "N", force, si_prefix> {};
|
||||
struct newton : named_coherent_derived_unit<newton, "N", force, si_prefix> {};
|
||||
|
||||
inline namespace literals {
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ namespace units {
|
||||
template<typename T>
|
||||
concept Frequency = QuantityOf<T, frequency>;
|
||||
|
||||
struct hertz : coherent_derived_unit<hertz, "Hz", frequency, si_prefix> {};
|
||||
struct hertz : named_coherent_derived_unit<hertz, "Hz", frequency, si_prefix> {};
|
||||
struct millihertz : prefixed_derived_unit<millihertz, milli, hertz> {};
|
||||
struct kilohertz : prefixed_derived_unit<kilohertz, kilo, hertz> {};
|
||||
struct megahertz : prefixed_derived_unit<megahertz, mega, hertz> {};
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace units {
|
||||
concept Length = QuantityOf<T, length>;
|
||||
|
||||
// SI units
|
||||
struct metre : coherent_derived_unit<metre, "m", length, si_prefix> {};
|
||||
struct metre : named_coherent_derived_unit<metre, "m", length, si_prefix> {};
|
||||
struct millimetre : prefixed_derived_unit<millimetre, milli, metre> {};
|
||||
struct centimetre : prefixed_derived_unit<centimetre, centi, metre> {};
|
||||
struct kilometre : prefixed_derived_unit<kilometre, kilo, metre> {};
|
||||
@@ -60,10 +60,10 @@ namespace units {
|
||||
} // namespace literals
|
||||
|
||||
// US customary units
|
||||
struct yard : derived_unit<yard, "yd", length, ratio<9'144, 10'000>> {};
|
||||
struct foot : derived_unit<foot, "ft", length, ratio_multiply<ratio<1, 3>, yard::ratio>> {};
|
||||
struct inch : derived_unit<inch, "in", length, ratio_multiply<ratio<1, 12>, foot::ratio>> {};
|
||||
struct mile : derived_unit<mile, "mi", length, ratio_multiply<ratio<1'760>, yard::ratio>> {};
|
||||
struct yard : named_derived_unit<yard, "yd", length, ratio<9'144, 10'000>> {};
|
||||
struct foot : named_derived_unit<foot, "ft", length, ratio_multiply<ratio<1, 3>, yard::ratio>> {};
|
||||
struct inch : named_derived_unit<inch, "in", length, ratio_multiply<ratio<1, 12>, foot::ratio>> {};
|
||||
struct mile : named_derived_unit<mile, "mi", length, ratio_multiply<ratio<1'760>, yard::ratio>> {};
|
||||
|
||||
inline namespace literals {
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ namespace units {
|
||||
template<typename T>
|
||||
concept LuminousIntensity = QuantityOf<T, luminous_intensity>;
|
||||
|
||||
struct candela : coherent_derived_unit<candela, "cd", luminous_intensity, si_prefix> {};
|
||||
struct candela : named_coherent_derived_unit<candela, "cd", luminous_intensity, si_prefix> {};
|
||||
|
||||
inline namespace literals {
|
||||
|
||||
|
||||
@@ -32,8 +32,8 @@ namespace units {
|
||||
template<typename T>
|
||||
concept Mass = QuantityOf<T, mass>;
|
||||
|
||||
struct kilogram : coherent_derived_unit<kilogram, "kg", mass> {};
|
||||
struct gram : derived_unit<gram, "g", mass, ratio<1, 1000>> {};
|
||||
struct gram : named_derived_unit<gram, "g", mass, ratio<1, 1000>> {};
|
||||
struct kilogram : prefixed_derived_unit<kilogram, kilo, gram> {};
|
||||
|
||||
inline namespace literals {
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ namespace units {
|
||||
template<typename T>
|
||||
concept Power = QuantityOf<T, power>;
|
||||
|
||||
struct watt : coherent_derived_unit<watt, "W", power, si_prefix> {};
|
||||
struct watt : named_coherent_derived_unit<watt, "W", power, si_prefix> {};
|
||||
struct milliwatt : prefixed_derived_unit<milliwatt, milli, watt> {};
|
||||
struct kilowatt : prefixed_derived_unit<kilowatt, kilo, watt> {};
|
||||
struct megawatt : prefixed_derived_unit<megawatt, mega, watt> {};
|
||||
|
||||
@@ -33,7 +33,7 @@ namespace units {
|
||||
template<typename T>
|
||||
concept Pressure = QuantityOf<T, pressure>;
|
||||
|
||||
struct pascal : coherent_derived_unit<pascal, "Pa", pressure, si_prefix> {};
|
||||
struct pascal : named_coherent_derived_unit<pascal, "Pa", pressure, si_prefix> {};
|
||||
|
||||
inline namespace literals {
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ namespace units {
|
||||
struct femto : prefix<femto, si_prefix, ratio<1, std::femto::den>, "f"> {};
|
||||
struct pico : prefix<pico, si_prefix, ratio<1, std::pico::den>, "p"> {};
|
||||
struct nano : prefix<nano, si_prefix, ratio<1, std::nano::den>, "n"> {};
|
||||
struct micro : prefix<micro, si_prefix, ratio<1, std::micro::den>, "µ"> {};
|
||||
struct micro : prefix<micro, si_prefix, ratio<1, std::micro::den>, "\u00b5"> {};
|
||||
struct milli : prefix<milli, si_prefix, ratio<1, std::milli::den>, "m"> {};
|
||||
struct centi : prefix<centi, si_prefix, ratio<1, std::centi::den>, "c"> {};
|
||||
struct deci : prefix<deci, si_prefix, ratio<1, std::deci::den>, "d"> {};
|
||||
|
||||
@@ -32,7 +32,7 @@ namespace units {
|
||||
template<typename T>
|
||||
concept Substance = QuantityOf<T, substance>;
|
||||
|
||||
struct mole : coherent_derived_unit<mole, "mol", substance, si_prefix> {};
|
||||
struct mole : named_coherent_derived_unit<mole, "mol", substance, si_prefix> {};
|
||||
|
||||
inline namespace literals {
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ namespace units {
|
||||
template<typename T>
|
||||
concept ThermodynamicTemperature = QuantityOf<T, temperature>;
|
||||
|
||||
struct kelvin : coherent_derived_unit<kelvin, "K", temperature> {};
|
||||
struct kelvin : named_coherent_derived_unit<kelvin, "K", temperature> {};
|
||||
|
||||
inline namespace literals {
|
||||
|
||||
|
||||
@@ -33,12 +33,12 @@ namespace units {
|
||||
template<typename T>
|
||||
concept Time = QuantityOf<T, time>;
|
||||
|
||||
struct second : coherent_derived_unit<second, "s", time, si_prefix> {};
|
||||
struct second : named_coherent_derived_unit<second, "s", time, si_prefix> {};
|
||||
struct nanosecond : prefixed_derived_unit<nanosecond, nano, second> {};
|
||||
struct microsecond : prefixed_derived_unit<microsecond, micro, second> {};
|
||||
struct millisecond : prefixed_derived_unit<millisecond, milli, second> {};
|
||||
struct minute : derived_unit<minute, "min", time, ratio<60>> {};
|
||||
struct hour : derived_unit<hour, "h", time, ratio<3600>> {};
|
||||
struct minute : named_derived_unit<minute, "min", time, ratio<60>> {};
|
||||
struct hour : named_derived_unit<hour, "h", time, ratio<3600>> {};
|
||||
|
||||
inline namespace literals {
|
||||
|
||||
|
||||
@@ -32,9 +32,9 @@ namespace units {
|
||||
template<typename T>
|
||||
concept Velocity = QuantityOf<T, velocity>;
|
||||
|
||||
struct metre_per_second : coherent_derived_unit<metre_per_second, "m/s", velocity> {};
|
||||
struct kilometre_per_hour : deduced_derived_unit<kilometre_per_hour, "km/h", velocity, kilometre, hour> {};
|
||||
struct mile_per_hour : deduced_derived_unit<mile_per_hour, "mi/h", velocity, mile, hour> {};
|
||||
struct metre_per_second : coherent_derived_unit<metre_per_second, velocity> {};
|
||||
struct kilometre_per_hour : deduced_derived_unit<kilometre_per_hour, velocity, kilometre, hour> {};
|
||||
struct mile_per_hour : deduced_derived_unit<mile_per_hour, velocity, mile, hour> {};
|
||||
|
||||
inline namespace literals {
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ namespace units {
|
||||
template<typename T>
|
||||
concept Voltage = QuantityOf<T, voltage>;
|
||||
|
||||
struct volt : coherent_derived_unit<volt, "V", voltage, si_prefix> {};
|
||||
struct volt : named_coherent_derived_unit<volt, "V", voltage, si_prefix> {};
|
||||
|
||||
inline namespace literals {
|
||||
|
||||
|
||||
@@ -31,11 +31,11 @@ namespace units {
|
||||
template<typename T>
|
||||
concept Volume = QuantityOf<T, volume>;
|
||||
|
||||
struct cubic_metre : coherent_derived_unit<cubic_metre, "m^3", volume> {};
|
||||
struct cubic_millimetre : deduced_derived_unit<cubic_millimetre, "mm^3", volume, millimetre> {};
|
||||
struct cubic_centimetre : deduced_derived_unit<cubic_centimetre, "cm^3", volume, centimetre> {};
|
||||
struct cubic_kilometre : deduced_derived_unit<cubic_kilometre, "km^3", volume, kilometre, metre> {};
|
||||
struct cubic_foot : deduced_derived_unit<cubic_foot, "ft^3", volume, foot> {};
|
||||
struct cubic_metre : coherent_derived_unit<cubic_metre, volume> {};
|
||||
struct cubic_millimetre : deduced_derived_unit<cubic_millimetre, volume, millimetre> {};
|
||||
struct cubic_centimetre : deduced_derived_unit<cubic_centimetre, volume, centimetre> {};
|
||||
struct cubic_kilometre : deduced_derived_unit<cubic_kilometre, volume, kilometre, metre> {};
|
||||
struct cubic_foot : deduced_derived_unit<cubic_foot, volume, foot> {};
|
||||
|
||||
inline namespace literals {
|
||||
|
||||
|
||||
Reference in new issue
Block a user