max/units-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: max:7fb0b6cda38c3e3413aacf5fd0b3226619be279f
Branches Tags
max:main
..
compare: max:44ff54160cf0fdb13d71e23dae1b713429f00625
Branches Tags
max:main

No commits in common. "7fb0b6cda38c3e3413aacf5fd0b3226619be279f" and "44ff54160cf0fdb13d71e23dae1b713429f00625" have entirely different histories.
7fb0b6cda3 ... 44ff54160c

4 changed files with 243 additions and 470 deletions
Show Stats Expand all files Collapse all files

6
Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "units"
version = "0.2.0"
version = "0.1.0"
edition = "2021"
description = "Si units for typesafe calculations"
license = "MIT or Apache-2.0"
@ -13,12 +13,10 @@ categories = ["Science", "Simulation"]
[dependencies]
typenum = "1.16"
num-traits = { version = "0.2", default-features = false }
num-traits = {version = "0.2", default-features = false}
defmt = { version = "0.3", optional = true }
fixed = { version = "1.23.0", optional = true }
[features]
default = ["std"]
defmt = ["dep:defmt"]
fixed = ["dep:fixed"]
std = ["num-traits/std"]

167
src/display.rs
View File

@ -1,16 +1,19 @@
#[cfg(not(feature = "std"))]
use core::fmt::{self, Display, Formatter};
#[cfg(feature = "std")]
use std::fmt::{self, Display, Formatter};
use typenum::Integer;
use crate::{
types::{
AmperePerMetre, AmperePerSquareMetre, Coulomb, CoulombPerCubicMetre, CoulombPerKilogram,
CoulombPerSquareMetre, CubicMetrePerKilogram, Farad, FaradPerMetre, Gray, GrayPerSecond,
Henry, HenryPerMetre, Herz, Joule, JoulePerKelvin, JoulePerKilogramKelvin, JoulePerMole,
JoulePerMoleKelvin, Katal, KatalPerCubicMetre, KilogramPerCubicMetre,
KilogramPerSquareMetre, Lux, MetrePerSecond, MetrePerSquareSecond, MolePerCubicMetre,
Newton, NewtonPerMetre, Ohm, Pascal, PascalSecond, Siemens, Tesla, Volt, VoltPerMetre,
Watt, WattPerMetreKelvin, WattPerSquareMetre, Weber,
AmperePerMeter, AmperePerSquareMeter, Coulomb, CoulombPerCubicMeter, CoulombPerKilogram,
CoulombPerSquareMeter, CubicMeterPerKilogram, Farad, FaradPerMeter, Gray, GrayPerSecond,
Henry, HenryPerMeter, Herz, Joule, JoulePerKelvin, JoulePerKilogramKelvin, JoulePerMole,
JoulePerMoleKelvin, Katal, KatalPerCubicMeter, KilogramPerCubicMeter,
KilogramPerSquareMeter, Lux, MeterPerSecond, MeterPerSquareSecond, MolePerCubicMeter,
Newton, NewtonPerMeter, Ohm, Pascal, PascalSecond, Siemens, Tesla, Volt, VoltPerMeter,
Watt, WattPerMeterKelvin, WattPerSquareMeter, Weber,
},
SiUnit,
};
@ -50,11 +53,11 @@ macro_rules! display_special_unit_defmt {
}
#[cfg(feature = "defmt")]
impl<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela> defmt::Format
for SiUnit<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>
impl<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela> defmt::Format
for SiUnit<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela>
where
Second: Integer,
Metre: Integer,
Meter: Integer,
Kilogram: Integer,
Ampere: Integer,
Kelvin: Integer,
@ -86,43 +89,43 @@ where
);
// derived units
display_special_unit_defmt!(f, Self,
("m/s", MetrePerSecond<T>),
("m/s²", MetrePerSquareSecond<T>),
("kg/m³", KilogramPerCubicMetre<T>),
("kg/m²", KilogramPerSquareMetre<T>),
("m³/kg", CubicMetrePerKilogram<T>),
("A/m²", AmperePerSquareMetre<T>),
("A/m", AmperePerMetre<T>),
("mol/m³", MolePerCubicMetre<T>),
("m/s", MeterPerSecond<T>),
("m/s²", MeterPerSquareSecond<T>),
("kg/m³", KilogramPerCubicMeter<T>),
("kg/m²", KilogramPerSquareMeter<T>),
("m³/kg", CubicMeterPerKilogram<T>),
("A/m²", AmperePerSquareMeter<T>),
("A/m", AmperePerMeter<T>),
("mol/m³", MolePerCubicMeter<T>),
);
// derived units including special names
display_special_unit_defmt!(f, Self,
("Pa*s", PascalSecond<T>),
("N/m", NewtonPerMetre<T>),
("W/m²", WattPerSquareMetre<T>),
("N/m", NewtonPerMeter<T>),
("W/m²", WattPerSquareMeter<T>),
("J/K", JoulePerKelvin<T>),
("J/(kg*K)", JoulePerKilogramKelvin<T>),
("W/(m*K)", WattPerMetreKelvin<T>),
("V/m", VoltPerMetre<T>),
("C/m³", CoulombPerCubicMetre<T>),
("C/m²", CoulombPerSquareMetre<T>),
("F/m", FaradPerMetre<T>),
("H/m", HenryPerMetre<T>),
("W/(m*K)", WattPerMeterKelvin<T>),
("V/m", VoltPerMeter<T>),
("C/m³", CoulombPerCubicMeter<T>),
("C/m²", CoulombPerSquareMeter<T>),
("F/m", FaradPerMeter<T>),
("H/m", HenryPerMeter<T>),
("J/mol", JoulePerMole<T>),
("J/(mol*K)", JoulePerMoleKelvin<T>),
("C/kg", CoulombPerKilogram<T>),
("Gy/s", GrayPerSecond<T>),
("kat/m³", KatalPerCubicMetre<T>),
("kat/m³", KatalPerCubicMeter<T>),
);
// base units
display_unit_defmt!(f, Second, "s", Metre, Kilogram, Ampere, Kelvin, Mole, Candela);
display_unit_defmt!(f, Metre, "m", Second, Kilogram, Ampere, Kelvin, Mole, Candela);
display_unit_defmt!(f, Kilogram, "kg", Second, Metre, Ampere, Kelvin, Mole, Candela);
display_unit_defmt!(f, Ampere, "A", Second, Metre, Kilogram, Kelvin, Mole, Candela);
display_unit_defmt!(f, Kelvin, "K", Second, Metre, Kilogram, Ampere, Mole, Candela);
display_unit_defmt!(f, Mole, "mol", Second, Metre, Kilogram, Ampere, Kelvin, Candela);
display_unit_defmt!(f, Candela, "cd", Second, Metre, Kilogram, Ampere, Kelvin, Mole);
display_unit_defmt!(f, Second, "s", Meter, Kilogram, Ampere, Kelvin, Mole, Candela);
display_unit_defmt!(f, Meter, "m", Second, Kilogram, Ampere, Kelvin, Mole, Candela);
display_unit_defmt!(f, Kilogram, "kg", Second, Meter, Ampere, Kelvin, Mole, Candela);
display_unit_defmt!(f, Ampere, "A", Second, Meter, Kilogram, Kelvin, Mole, Candela);
display_unit_defmt!(f, Kelvin, "K", Second, Meter, Kilogram, Ampere, Mole, Candela);
display_unit_defmt!(f, Mole, "mol", Second, Meter, Kilogram, Ampere, Kelvin, Candela);
display_unit_defmt!(f, Candela, "cd", Second, Meter, Kilogram, Ampere, Kelvin, Mole);
}
}
@ -157,11 +160,11 @@ macro_rules! display_special_unit {
};
}
impl<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela> Display
for SiUnit<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>
impl<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela> Display
for SiUnit<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela>
where
Second: Integer,
Metre: Integer,
Meter: Integer,
Kilogram: Integer,
Ampere: Integer,
Kelvin: Integer,
@ -192,67 +195,65 @@ where
);
// derived units
display_special_unit!(f, Self,
("m/s", MetrePerSecond<T>),
("m/s²", MetrePerSquareSecond<T>),
("kg/m³", KilogramPerCubicMetre<T>),
("kg/m²", KilogramPerSquareMetre<T>),
("m³/kg", CubicMetrePerKilogram<T>),
("A/m²", AmperePerSquareMetre<T>),
("A/m", AmperePerMetre<T>),
("mol/m³", MolePerCubicMetre<T>),
("m/s", MeterPerSecond<T>),
("m/s²", MeterPerSquareSecond<T>),
("kg/m³", KilogramPerCubicMeter<T>),
("kg/m²", KilogramPerSquareMeter<T>),
("m³/kg", CubicMeterPerKilogram<T>),
("A/m²", AmperePerSquareMeter<T>),
("A/m", AmperePerMeter<T>),
("mol/m³", MolePerCubicMeter<T>),
);
// derived units including special names
display_special_unit!(f, Self,
("Pa*s", PascalSecond<T>),
("N/m", NewtonPerMetre<T>),
("W/m²", WattPerSquareMetre<T>),
("N/m", NewtonPerMeter<T>),
("W/m²", WattPerSquareMeter<T>),
("J/K", JoulePerKelvin<T>),
("J/(kg*K)", JoulePerKilogramKelvin<T>),
("W/(m*K)", WattPerMetreKelvin<T>),
("V/m", VoltPerMetre<T>),
("C/m³", CoulombPerCubicMetre<T>),
("C/m²", CoulombPerSquareMetre<T>),
("F/m", FaradPerMetre<T>),
("H/m", HenryPerMetre<T>),
("W/(m*K)", WattPerMeterKelvin<T>),
("V/m", VoltPerMeter<T>),
("C/m³", CoulombPerCubicMeter<T>),
("C/m²", CoulombPerSquareMeter<T>),
("F/m", FaradPerMeter<T>),
("H/m", HenryPerMeter<T>),
("J/mol", JoulePerMole<T>),
("J/(mol*K)", JoulePerMoleKelvin<T>),
("C/kg", CoulombPerKilogram<T>),
("Gy/s", GrayPerSecond<T>),
("kat/m³", KatalPerCubicMetre<T>),
("kat/m³", KatalPerCubicMeter<T>),
);
// base units
display_unit!(f, Second, "s", Metre, Kilogram, Ampere, Kelvin, Mole, Candela);
display_unit!(f, Metre, "m", Second, Kilogram, Ampere, Kelvin, Mole, Candela);
display_unit!(f, Kilogram, "kg", Second, Metre, Ampere, Kelvin, Mole, Candela);
display_unit!(f, Ampere, "A", Second, Metre, Kilogram, Kelvin, Mole, Candela);
display_unit!(f, Kelvin, "K", Second, Metre, Kilogram, Ampere, Mole, Candela);
display_unit!(f, Mole, "mol", Second, Metre, Kilogram, Ampere, Kelvin, Candela);
display_unit!(f, Candela, "cd", Second, Metre, Kilogram, Ampere, Kelvin, Mole);
display_unit!(f, Second, "s", Meter, Kilogram, Ampere, Kelvin, Mole, Candela);
display_unit!(f, Meter, "m", Second, Kilogram, Ampere, Kelvin, Mole, Candela);
display_unit!(f, Kilogram, "kg", Second, Meter, Ampere, Kelvin, Mole, Candela);
display_unit!(f, Ampere, "A", Second, Meter, Kilogram, Kelvin, Mole, Candela);
display_unit!(f, Kelvin, "K", Second, Meter, Kilogram, Ampere, Mole, Candela);
display_unit!(f, Mole, "mol", Second, Meter, Kilogram, Ampere, Kelvin, Candela);
display_unit!(f, Candela, "cd", Second, Meter, Kilogram, Ampere, Kelvin, Mole);
Ok(())
}
}
#[cfg(test)]
mod test {
use crate::types::{Ampere, Candela, Kelvin, Kilogram, Metre, Mole, Second, Unit};
use crate::types::{Ampere, Candela, Kelvin, Kilogram, Meter, Mole, Second, Unit};
use super::*;
#[test]
#[cfg(feature = "std")]
fn debug() {
let m = Metre::new(2);
let m = Meter::new(2);
assert_eq!(format!("{m:?}"), "SiUnit { value: 2, _s: PhantomData<typenum::int::Z0>, _m: PhantomData<typenum::int::PInt<typenum::uint::UInt<typenum::uint::UTerm, typenum::bit::B1>>>, _kg: PhantomData<typenum::int::Z0>, _a: PhantomData<typenum::int::Z0>, _k: PhantomData<typenum::int::Z0>, _mol: PhantomData<typenum::int::Z0>, _cd: PhantomData<typenum::int::Z0> }".to_owned());
}
#[test]
#[allow(clippy::cognitive_complexity)]
#[cfg(feature = "std")]
fn display() {
let unit = Unit::new(2);
let second = Second::new(2);
let meter = Metre::new(2);
let meter = Meter::new(2);
let kilogram = Kilogram::new(2);
let ampere = Ampere::new(2);
let kelvin = Kelvin::new(2);
@ -298,30 +299,30 @@ mod test {
assert_eq!(Gray::new(2).to_string(), "2Gy|Sv");
assert_eq!(Katal::new(2).to_string(), "2kat");
assert_eq!(MetrePerSecond::new(2).to_string(), "2m/s");
assert_eq!(MetrePerSquareSecond::new(2).to_string(), "2m/s²");
assert_eq!(KilogramPerCubicMetre::new(2).to_string(), "2kg/m³");
assert_eq!(KilogramPerSquareMetre::new(2).to_string(), "2kg/m²");
assert_eq!(CubicMetrePerKilogram::new(2).to_string(), "2m³/kg");
assert_eq!(AmperePerSquareMetre::new(2).to_string(), "2A/m²");
assert_eq!(AmperePerMetre::new(2).to_string(), "2A/m");
assert_eq!(MolePerCubicMetre::new(2).to_string(), "2mol/m³");
assert_eq!(MeterPerSecond::new(2).to_string(), "2m/s");
assert_eq!(MeterPerSquareSecond::new(2).to_string(), "2m/s²");
assert_eq!(KilogramPerCubicMeter::new(2).to_string(), "2kg/m³");
assert_eq!(KilogramPerSquareMeter::new(2).to_string(), "2kg/m²");
assert_eq!(CubicMeterPerKilogram::new(2).to_string(), "2m³/kg");
assert_eq!(AmperePerSquareMeter::new(2).to_string(), "2A/m²");
assert_eq!(AmperePerMeter::new(2).to_string(), "2A/m");
assert_eq!(MolePerCubicMeter::new(2).to_string(), "2mol/m³");
assert_eq!(PascalSecond::new(2).to_string(), "2Pa*s");
assert_eq!(NewtonPerMetre::new(2).to_string(), "2N/m");
assert_eq!(WattPerSquareMetre::new(2).to_string(), "2W/m²");
assert_eq!(NewtonPerMeter::new(2).to_string(), "2N/m");
assert_eq!(WattPerSquareMeter::new(2).to_string(), "2W/m²");
assert_eq!(JoulePerKelvin::new(2).to_string(), "2J/K");
assert_eq!(JoulePerKilogramKelvin::new(2).to_string(), "2J/(kg*K)");
assert_eq!(WattPerMetreKelvin::new(2).to_string(), "2W/(m*K)");
assert_eq!(VoltPerMetre::new(2).to_string(), "2V/m");
assert_eq!(CoulombPerCubicMetre::new(2).to_string(), "2C/m³");
assert_eq!(CoulombPerSquareMetre::new(2).to_string(), "2C/m²");
assert_eq!(FaradPerMetre::new(2).to_string(), "2F/m");
assert_eq!(HenryPerMetre::new(2).to_string(), "2H/m");
assert_eq!(WattPerMeterKelvin::new(2).to_string(), "2W/(m*K)");
assert_eq!(VoltPerMeter::new(2).to_string(), "2V/m");
assert_eq!(CoulombPerCubicMeter::new(2).to_string(), "2C/m³");
assert_eq!(CoulombPerSquareMeter::new(2).to_string(), "2C/m²");
assert_eq!(FaradPerMeter::new(2).to_string(), "2F/m");
assert_eq!(HenryPerMeter::new(2).to_string(), "2H/m");
assert_eq!(JoulePerMole::new(2).to_string(), "2J/mol");
assert_eq!(JoulePerMoleKelvin::new(2).to_string(), "2J/(mol*K)");
assert_eq!(CoulombPerKilogram::new(2).to_string(), "2C/kg");
assert_eq!(GrayPerSecond::new(2).to_string(), "2Gy/s");
assert_eq!(KatalPerCubicMetre::new(2).to_string(), "2kat/m³");
assert_eq!(KatalPerCubicMeter::new(2).to_string(), "2kat/m³");
}
}

490
src/lib.rs
View File

@ -2,6 +2,7 @@
mod display;
pub mod types;
#[cfg(not(feature = "std"))]
use core::{
marker::PhantomData,
ops::{
@ -9,18 +10,24 @@ use core::{
SubAssign,
},
};
#[cfg(feature = "std")]
use std::{
marker::PhantomData,
ops::{
Add, AddAssign, Deref, DerefMut, Div, DivAssign, Mul, MulAssign, Neg, Rem, RemAssign, Sub,
SubAssign,
},
};
#[cfg(feature = "fixed")]
use fixed::types::*;
use num_traits::{Num, One, Zero};
use typenum::{int::Z0, op, Integer};
use types::Unit;
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy)]
pub struct SiUnit<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>
pub struct SiUnit<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela>
where
Second: Integer,
Metre: Integer,
Meter: Integer,
Kilogram: Integer,
Ampere: Integer,
Kelvin: Integer,
@ -29,7 +36,7 @@ where
{
value: T,
_s: PhantomData<Second>,
_m: PhantomData<Metre>,
_m: PhantomData<Meter>,
_kg: PhantomData<Kilogram>,
_a: PhantomData<Ampere>,
_k: PhantomData<Kelvin>,
@ -37,11 +44,11 @@ where
_cd: PhantomData<Candela>,
}
impl<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela> Deref
for SiUnit<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>
impl<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela> Deref
for SiUnit<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela>
where
Second: Integer,
Metre: Integer,
Meter: Integer,
Kilogram: Integer,
Ampere: Integer,
Kelvin: Integer,
@ -55,11 +62,11 @@ where
}
}
impl<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela> DerefMut
for SiUnit<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>
impl<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela> DerefMut
for SiUnit<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela>
where
Second: Integer,
Metre: Integer,
Meter: Integer,
Kilogram: Integer,
Ampere: Integer,
Kelvin: Integer,
@ -71,11 +78,11 @@ where
}
}
impl<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela> Neg
for SiUnit<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>
impl<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela> Neg
for SiUnit<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela>
where
Second: Integer,
Metre: Integer,
Meter: Integer,
Kilogram: Integer,
Ampere: Integer,
Kelvin: Integer,
@ -83,18 +90,18 @@ where
Candela: Integer,
T: Neg,
{
type Output = SiUnit<T::Output, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>;
type Output = SiUnit<T::Output, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela>;
fn neg(self) -> Self::Output {
Self::Output::new(-self.value)
}
}
impl<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela> Zero
for SiUnit<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>
impl<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela> Zero
for SiUnit<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela>
where
Second: Integer,
Metre: Integer,
Meter: Integer,
Kilogram: Integer,
Ampere: Integer,
Kelvin: Integer,
@ -111,11 +118,11 @@ where
}
}
impl<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela> One
for SiUnit<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>
impl<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela> One
for SiUnit<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela>
where
Second: Integer + Add<Output = Second>,
Metre: Integer + Add<Output = Metre>,
Meter: Integer + Add<Output = Meter>,
Kilogram: Integer + Add<Output = Kilogram>,
Ampere: Integer + Add<Output = Ampere>,
Kelvin: Integer + Add<Output = Kelvin>,
@ -123,7 +130,7 @@ where
Candela: Integer + Add<Output = Candela>,
T: One,
<Second as Add>::Output: Integer,
<Metre as Add>::Output: Integer,
<Meter as Add>::Output: Integer,
<Kilogram as Add>::Output: Integer,
<Ampere as Add>::Output: Integer,
<Kelvin as Add>::Output: Integer,
@ -135,11 +142,11 @@ where
}
}
impl<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela> Num
for SiUnit<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>
impl<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela> Num
for SiUnit<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela>
where
Second: Integer + Add<Output = Second> + Sub<Output = Second> + PartialEq,
Metre: Integer + Add<Output = Metre> + Sub<Output = Metre> + PartialEq,
Meter: Integer + Add<Output = Meter> + Sub<Output = Meter> + PartialEq,
Kilogram: Integer + Add<Output = Kilogram> + Sub<Output = Kilogram> + PartialEq,
Ampere: Integer + Add<Output = Ampere> + Sub<Output = Ampere> + PartialEq,
Kelvin: Integer + Add<Output = Kelvin> + Sub<Output = Kelvin> + PartialEq,
@ -154,11 +161,11 @@ where
}
}
impl<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela> Add
for SiUnit<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>
impl<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela> Add
for SiUnit<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela>
where
Second: Integer,
Metre: Integer,
Meter: Integer,
Kilogram: Integer,
Ampere: Integer,
Kelvin: Integer,
@ -166,18 +173,18 @@ where
Candela: Integer,
T: Add,
{
type Output = SiUnit<T::Output, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>;
type Output = SiUnit<T::Output, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela>;
fn add(self, rhs: Self) -> Self::Output {
Self::Output::new(self.value + rhs.value)
}
}
impl<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela> AddAssign
for SiUnit<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>
impl<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela> AddAssign
for SiUnit<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela>
where
Second: Integer,
Metre: Integer,
Meter: Integer,
Kilogram: Integer,
Ampere: Integer,
Kelvin: Integer,
@ -190,11 +197,11 @@ where
}
}
impl<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela> Sub
for SiUnit<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>
impl<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela> Sub
for SiUnit<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela>
where
Second: Integer,
Metre: Integer,
Meter: Integer,
Kilogram: Integer,
Ampere: Integer,
Kelvin: Integer,
@ -202,18 +209,18 @@ where
Candela: Integer,
T: Sub,
{
type Output = SiUnit<T::Output, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>;
type Output = SiUnit<T::Output, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela>;
fn sub(self, rhs: Self) -> Self::Output {
Self::Output::new(self.value - rhs.value)
}
}
impl<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela> SubAssign
for SiUnit<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>
impl<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela> SubAssign
for SiUnit<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela>
where
Second: Integer,
Metre: Integer,
Meter: Integer,
Kilogram: Integer,
Ampere: Integer,
Kelvin: Integer,
@ -226,11 +233,11 @@ where
}
}
impl<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela> Mul<T>
for SiUnit<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>
impl<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela> Mul<T>
for SiUnit<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela>
where
Second: Integer,
Metre: Integer,
Meter: Integer,
Kilogram: Integer,
Ampere: Integer,
Kelvin: Integer,
@ -245,88 +252,11 @@ where
}
}
macro_rules! rev_mul_impl {
($($t:ty),* $(,)?) => {
$(
impl<Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>
Mul<SiUnit<$t, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>> for $t
where
Second: Integer + Add<Z0, Output = Second>,
Metre: Integer + Add<Z0, Output = Second>,
Kilogram: Integer + Add<Z0, Output = Second>,
Ampere: Integer + Add<Z0, Output = Second>,
Kelvin: Integer + Add<Z0, Output = Second>,
Mole: Integer + Add<Z0, Output = Second>,
Candela: Integer + Add<Z0, Output = Second>,
{
type Output = <Unit<$t> as Mul<
SiUnit<$t, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>,
>>::Output;
fn mul(
self,
rhs: SiUnit<$t, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>,
) -> Self::Output {
Unit::new(self) * rhs
}
}
)*
};
}
rev_mul_impl!(i8, i16, i32, i64, i128, u8, u16, u32, u64, u128, f32, f64);
#[cfg(feature = "fixed")]
rev_mul_impl!(
I0F8, I0F16, I0F32, I0F64, I0F128, I1F7, I1F15, I1F31, I1F63, I1F127, I2F6, I2F14, I2F30,
I2F62, I2F126, I3F5, I3F13, I3F29, I3F61, I3F125, I4F4, I4F12, I4F28, I4F60, I4F124, I5F3,
I5F11, I5F27, I5F59, I5F123, I6F2, I6F10, I6F26, I6F58, I6F122, I7F1, I7F9, I7F25, I7F57,
I7F121, I8F0, I8F8, I8F24, I8F56, I8F120, I9F7, I9F23, I9F55, I9F119, I10F6, I10F22, I10F54,
I10F118, I11F5, I11F21, I11F53, I11F117, I12F4, I12F20, I12F52, I12F116, I13F3, I13F19, I13F51,
I13F115, I14F2, I14F18, I14F50, I14F114, I15F1, I15F17, I15F49, I15F113, I16F0, I16F16, I16F48,
I16F112, I17F15, I17F47, I17F111, I18F14, I18F46, I18F110, I19F13, I19F45, I19F109, I20F12,
I20F44, I20F108, I21F11, I21F43, I21F107, I22F10, I22F42, I22F106, I23F9, I23F41, I23F105,
I24F8, I24F40, I24F104, I25F7, I25F39, I25F103, I26F6, I26F38, I26F102, I27F5, I27F37, I27F101,
I28F4, I28F36, I28F100, I29F3, I29F35, I29F99, I30F2, I30F34, I30F98, I31F1, I31F33, I31F97,
I32F0, I32F32, I32F96, I33F31, I33F95, I34F30, I34F94, I35F29, I35F93, I36F28, I36F92, I37F27,
I37F91, I38F26, I38F90, I39F25, I39F89, I40F24, I40F88, I41F23, I41F87, I42F22, I42F86, I43F21,
I43F85, I44F20, I44F84, I45F19, I45F83, I46F18, I46F82, I47F17, I47F81, I48F16, I48F80, I49F15,
I49F79, I50F14, I50F78, I51F13, I51F77, I52F12, I52F76, I53F11, I53F75, I54F10, I54F74, I55F9,
I55F73, I56F8, I56F72, I57F7, I57F71, I58F6, I58F70, I59F5, I59F69, I60F4, I60F68, I61F3,
I61F67, I62F2, I62F66, I63F1, I63F65, I64F0, I64F64, I65F63, I66F62, I67F61, I68F60, I69F59,
I70F58, I71F57, I72F56, I73F55, I74F54, I75F53, I76F52, I77F51, I78F50, I79F49, I80F48, I81F47,
I82F46, I83F45, I84F44, I85F43, I86F42, I87F41, I88F40, I89F39, I90F38, I91F37, I92F36, I93F35,
I94F34, I95F33, I96F32, I97F31, I98F30, I99F29, I100F28, I101F27, I102F26, I103F25, I104F24,
I105F23, I106F22, I107F21, I108F20, I109F19, I110F18, I111F17, I112F16, I113F15, I114F14,
I115F13, I116F12, I117F11, I118F10, I119F9, I120F8, I121F7, I122F6, I123F5, I124F4, I125F3,
I126F2, I127F1, I128F0, U0F8, U0F16, U0F32, U0F64, U0F128, U1F7, U1F15, U1F31, U1F63, U1F127,
U2F6, U2F14, U2F30, U2F62, U2F126, U3F5, U3F13, U3F29, U3F61, U3F125, U4F4, U4F12, U4F28,
U4F60, U4F124, U5F3, U5F11, U5F27, U5F59, U5F123, U6F2, U6F10, U6F26, U6F58, U6F122, U7F1,
U7F9, U7F25, U7F57, U7F121, U8F0, U8F8, U8F24, U8F56, U8F120, U9F7, U9F23, U9F55, U9F119,
U10F6, U10F22, U10F54, U10F118, U11F5, U11F21, U11F53, U11F117, U12F4, U12F20, U12F52, U12F116,
U13F3, U13F19, U13F51, U13F115, U14F2, U14F18, U14F50, U14F114, U15F1, U15F17, U15F49, U15F113,
U16F0, U16F16, U16F48, U16F112, U17F15, U17F47, U17F111, U18F14, U18F46, U18F110, U19F13,
U19F45, U19F109, U20F12, U20F44, U20F108, U21F11, U21F43, U21F107, U22F10, U22F42, U22F106,
U23F9, U23F41, U23F105, U24F8, U24F40, U24F104, U25F7, U25F39, U25F103, U26F6, U26F38, U26F102,
U27F5, U27F37, U27F101, U28F4, U28F36, U28F100, U29F3, U29F35, U29F99, U30F2, U30F34, U30F98,
U31F1, U31F33, U31F97, U32F0, U32F32, U32F96, U33F31, U33F95, U34F30, U34F94, U35F29, U35F93,
U36F28, U36F92, U37F27, U37F91, U38F26, U38F90, U39F25, U39F89, U40F24, U40F88, U41F23, U41F87,
U42F22, U42F86, U43F21, U43F85, U44F20, U44F84, U45F19, U45F83, U46F18, U46F82, U47F17, U47F81,
U48F16, U48F80, U49F15, U49F79, U50F14, U50F78, U51F13, U51F77, U52F12, U52F76, U53F11, U53F75,
U54F10, U54F74, U55F9, U55F73, U56F8, U56F72, U57F7, U57F71, U58F6, U58F70, U59F5, U59F69,
U60F4, U60F68, U61F3, U61F67, U62F2, U62F66, U63F1, U63F65, U64F0, U64F64, U65F63, U66F62,
U67F61, U68F60, U69F59, U70F58, U71F57, U72F56, U73F55, U74F54, U75F53, U76F52, U77F51, U78F50,
U79F49, U80F48, U81F47, U82F46, U83F45, U84F44, U85F43, U86F42, U87F41, U88F40, U89F39, U90F38,
U91F37, U92F36, U93F35, U94F34, U95F33, U96F32, U97F31, U98F30, U99F29, U100F28, U101F27,
U102F26, U103F25, U104F24, U105F23, U106F22, U107F21, U108F20, U109F19, U110F18, U111F17,
U112F16, U113F15, U114F14, U115F13, U116F12, U117F11, U118F10, U119F9, U120F8, U121F7, U122F6,
U123F5, U124F4, U125F3, U126F2, U127F1, U128F0
);
impl<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela> MulAssign<T>
for SiUnit<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>
impl<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela> MulAssign<T>
for SiUnit<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela>
where
Second: Integer,
Metre: Integer,
Meter: Integer,
Kilogram: Integer,
Ampere: Integer,
Kelvin: Integer,
@ -339,11 +269,11 @@ where
}
}
impl<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela> Div<T>
for SiUnit<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>
impl<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela> Div<T>
for SiUnit<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela>
where
Second: Integer + Sub<Z0>,
Metre: Integer + Sub<Z0>,
Meter: Integer + Sub<Z0>,
Kilogram: Integer + Sub<Z0>,
Ampere: Integer + Sub<Z0>,
Kelvin: Integer + Sub<Z0>,
@ -351,7 +281,7 @@ where
Candela: Integer + Sub<Z0>,
T: Div,
<Second as Sub<Z0>>::Output: Integer,
<Metre as Sub<Z0>>::Output: Integer,
<Meter as Sub<Z0>>::Output: Integer,
<Kilogram as Sub<Z0>>::Output: Integer,
<Ampere as Sub<Z0>>::Output: Integer,
<Kelvin as Sub<Z0>>::Output: Integer,
@ -365,89 +295,11 @@ where
}
}
macro_rules! rev_div_impl {
($($t:ty),* $(,)?) => {
$(
impl<Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>
Div<SiUnit<$t, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>> for $t
where
Second: Integer,
Metre: Integer,
Kilogram: Integer,
Ampere: Integer,
Kelvin: Integer,
Mole: Integer,
Candela: Integer,
Z0: Sub<Second, Output = Second> + Sub<Metre, Output = Metre> + Sub<Kilogram, Output = Kilogram> + Sub<Ampere, Output = Ampere> + Sub<Kelvin, Output = Kelvin> + Sub<Mole, Output = Mole> + Sub<Candela, Output = Candela>
{
type Output = <Unit<$t> as Div<
SiUnit<$t, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>,
>>::Output;
fn div(
self,
rhs: SiUnit<$t, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>,
) -> Self::Output {
Unit::new(self) / rhs
}
}
)*
};
}
rev_div_impl!(i8, i16, i32, i64, i128, u8, u16, u32, u64, u128, f32, f64);
#[cfg(feature = "fixed")]
rev_div_impl!(
I0F8, I0F16, I0F32, I0F64, I0F128, I1F7, I1F15, I1F31, I1F63, I1F127, I2F6, I2F14, I2F30,
I2F62, I2F126, I3F5, I3F13, I3F29, I3F61, I3F125, I4F4, I4F12, I4F28, I4F60, I4F124, I5F3,
I5F11, I5F27, I5F59, I5F123, I6F2, I6F10, I6F26, I6F58, I6F122, I7F1, I7F9, I7F25, I7F57,
I7F121, I8F0, I8F8, I8F24, I8F56, I8F120, I9F7, I9F23, I9F55, I9F119, I10F6, I10F22, I10F54,
I10F118, I11F5, I11F21, I11F53, I11F117, I12F4, I12F20, I12F52, I12F116, I13F3, I13F19, I13F51,
I13F115, I14F2, I14F18, I14F50, I14F114, I15F1, I15F17, I15F49, I15F113, I16F0, I16F16, I16F48,
I16F112, I17F15, I17F47, I17F111, I18F14, I18F46, I18F110, I19F13, I19F45, I19F109, I20F12,
I20F44, I20F108, I21F11, I21F43, I21F107, I22F10, I22F42, I22F106, I23F9, I23F41, I23F105,
I24F8, I24F40, I24F104, I25F7, I25F39, I25F103, I26F6, I26F38, I26F102, I27F5, I27F37, I27F101,
I28F4, I28F36, I28F100, I29F3, I29F35, I29F99, I30F2, I30F34, I30F98, I31F1, I31F33, I31F97,
I32F0, I32F32, I32F96, I33F31, I33F95, I34F30, I34F94, I35F29, I35F93, I36F28, I36F92, I37F27,
I37F91, I38F26, I38F90, I39F25, I39F89, I40F24, I40F88, I41F23, I41F87, I42F22, I42F86, I43F21,
I43F85, I44F20, I44F84, I45F19, I45F83, I46F18, I46F82, I47F17, I47F81, I48F16, I48F80, I49F15,
I49F79, I50F14, I50F78, I51F13, I51F77, I52F12, I52F76, I53F11, I53F75, I54F10, I54F74, I55F9,
I55F73, I56F8, I56F72, I57F7, I57F71, I58F6, I58F70, I59F5, I59F69, I60F4, I60F68, I61F3,
I61F67, I62F2, I62F66, I63F1, I63F65, I64F0, I64F64, I65F63, I66F62, I67F61, I68F60, I69F59,
I70F58, I71F57, I72F56, I73F55, I74F54, I75F53, I76F52, I77F51, I78F50, I79F49, I80F48, I81F47,
I82F46, I83F45, I84F44, I85F43, I86F42, I87F41, I88F40, I89F39, I90F38, I91F37, I92F36, I93F35,
I94F34, I95F33, I96F32, I97F31, I98F30, I99F29, I100F28, I101F27, I102F26, I103F25, I104F24,
I105F23, I106F22, I107F21, I108F20, I109F19, I110F18, I111F17, I112F16, I113F15, I114F14,
I115F13, I116F12, I117F11, I118F10, I119F9, I120F8, I121F7, I122F6, I123F5, I124F4, I125F3,
I126F2, I127F1, I128F0, U0F8, U0F16, U0F32, U0F64, U0F128, U1F7, U1F15, U1F31, U1F63, U1F127,
U2F6, U2F14, U2F30, U2F62, U2F126, U3F5, U3F13, U3F29, U3F61, U3F125, U4F4, U4F12, U4F28,
U4F60, U4F124, U5F3, U5F11, U5F27, U5F59, U5F123, U6F2, U6F10, U6F26, U6F58, U6F122, U7F1,
U7F9, U7F25, U7F57, U7F121, U8F0, U8F8, U8F24, U8F56, U8F120, U9F7, U9F23, U9F55, U9F119,
U10F6, U10F22, U10F54, U10F118, U11F5, U11F21, U11F53, U11F117, U12F4, U12F20, U12F52, U12F116,
U13F3, U13F19, U13F51, U13F115, U14F2, U14F18, U14F50, U14F114, U15F1, U15F17, U15F49, U15F113,
U16F0, U16F16, U16F48, U16F112, U17F15, U17F47, U17F111, U18F14, U18F46, U18F110, U19F13,
U19F45, U19F109, U20F12, U20F44, U20F108, U21F11, U21F43, U21F107, U22F10, U22F42, U22F106,
U23F9, U23F41, U23F105, U24F8, U24F40, U24F104, U25F7, U25F39, U25F103, U26F6, U26F38, U26F102,
U27F5, U27F37, U27F101, U28F4, U28F36, U28F100, U29F3, U29F35, U29F99, U30F2, U30F34, U30F98,
U31F1, U31F33, U31F97, U32F0, U32F32, U32F96, U33F31, U33F95, U34F30, U34F94, U35F29, U35F93,
U36F28, U36F92, U37F27, U37F91, U38F26, U38F90, U39F25, U39F89, U40F24, U40F88, U41F23, U41F87,
U42F22, U42F86, U43F21, U43F85, U44F20, U44F84, U45F19, U45F83, U46F18, U46F82, U47F17, U47F81,
U48F16, U48F80, U49F15, U49F79, U50F14, U50F78, U51F13, U51F77, U52F12, U52F76, U53F11, U53F75,
U54F10, U54F74, U55F9, U55F73, U56F8, U56F72, U57F7, U57F71, U58F6, U58F70, U59F5, U59F69,
U60F4, U60F68, U61F3, U61F67, U62F2, U62F66, U63F1, U63F65, U64F0, U64F64, U65F63, U66F62,
U67F61, U68F60, U69F59, U70F58, U71F57, U72F56, U73F55, U74F54, U75F53, U76F52, U77F51, U78F50,
U79F49, U80F48, U81F47, U82F46, U83F45, U84F44, U85F43, U86F42, U87F41, U88F40, U89F39, U90F38,
U91F37, U92F36, U93F35, U94F34, U95F33, U96F32, U97F31, U98F30, U99F29, U100F28, U101F27,
U102F26, U103F25, U104F24, U105F23, U106F22, U107F21, U108F20, U109F19, U110F18, U111F17,
U112F16, U113F15, U114F14, U115F13, U116F12, U117F11, U118F10, U119F9, U120F8, U121F7, U122F6,
U123F5, U124F4, U125F3, U126F2, U127F1, U128F0
);
impl<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela> DivAssign<T>
for SiUnit<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>
impl<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela> DivAssign<T>
for SiUnit<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela>
where
Second: Integer,
Metre: Integer,
Meter: Integer,
Kilogram: Integer,
Ampere: Integer,
Kelvin: Integer,
@ -460,11 +312,11 @@ where
}
}
impl<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela> Rem<T>
for SiUnit<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>
impl<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela> Rem<T>
for SiUnit<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela>
where
Second: Integer + Sub<Z0>,
Metre: Integer + Sub<Z0>,
Meter: Integer + Sub<Z0>,
Kilogram: Integer + Sub<Z0>,
Ampere: Integer + Sub<Z0>,
Kelvin: Integer + Sub<Z0>,
@ -472,7 +324,7 @@ where
Candela: Integer + Sub<Z0>,
T: Rem,
<Second as Sub<Z0>>::Output: Integer,
<Metre as Sub<Z0>>::Output: Integer,
<Meter as Sub<Z0>>::Output: Integer,
<Kilogram as Sub<Z0>>::Output: Integer,
<Ampere as Sub<Z0>>::Output: Integer,
<Kelvin as Sub<Z0>>::Output: Integer,
@ -486,89 +338,11 @@ where
}
}
macro_rules! rev_rem_impl {
($($t:ty),* $(,)?) => {
$(
impl<Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>
Rem<SiUnit<$t, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>> for $t
where
Second: Integer,
Metre: Integer,
Kilogram: Integer,
Ampere: Integer,
Kelvin: Integer,
Mole: Integer,
Candela: Integer,
Z0: Sub<Second, Output = Second> + Sub<Metre, Output = Metre> + Sub<Kilogram, Output = Kilogram> + Sub<Ampere, Output = Ampere> + Sub<Kelvin, Output = Kelvin> + Sub<Mole, Output = Mole> + Sub<Candela, Output = Candela>
{
type Output = <Unit<$t> as Rem<
SiUnit<$t, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>,
>>::Output;
fn rem(
self,
rhs: SiUnit<$t, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>,
) -> Self::Output {
Unit::new(self) % rhs
}
}
)*
};
}
rev_rem_impl!(i8, i16, i32, i64, i128, u8, u16, u32, u64, u128, f32, f64);
#[cfg(feature = "fixed")]
rev_rem_impl!(
I0F8, I0F16, I0F32, I0F64, I0F128, I1F7, I1F15, I1F31, I1F63, I1F127, I2F6, I2F14, I2F30,
I2F62, I2F126, I3F5, I3F13, I3F29, I3F61, I3F125, I4F4, I4F12, I4F28, I4F60, I4F124, I5F3,
I5F11, I5F27, I5F59, I5F123, I6F2, I6F10, I6F26, I6F58, I6F122, I7F1, I7F9, I7F25, I7F57,
I7F121, I8F0, I8F8, I8F24, I8F56, I8F120, I9F7, I9F23, I9F55, I9F119, I10F6, I10F22, I10F54,
I10F118, I11F5, I11F21, I11F53, I11F117, I12F4, I12F20, I12F52, I12F116, I13F3, I13F19, I13F51,
I13F115, I14F2, I14F18, I14F50, I14F114, I15F1, I15F17, I15F49, I15F113, I16F0, I16F16, I16F48,
I16F112, I17F15, I17F47, I17F111, I18F14, I18F46, I18F110, I19F13, I19F45, I19F109, I20F12,
I20F44, I20F108, I21F11, I21F43, I21F107, I22F10, I22F42, I22F106, I23F9, I23F41, I23F105,
I24F8, I24F40, I24F104, I25F7, I25F39, I25F103, I26F6, I26F38, I26F102, I27F5, I27F37, I27F101,
I28F4, I28F36, I28F100, I29F3, I29F35, I29F99, I30F2, I30F34, I30F98, I31F1, I31F33, I31F97,
I32F0, I32F32, I32F96, I33F31, I33F95, I34F30, I34F94, I35F29, I35F93, I36F28, I36F92, I37F27,
I37F91, I38F26, I38F90, I39F25, I39F89, I40F24, I40F88, I41F23, I41F87, I42F22, I42F86, I43F21,
I43F85, I44F20, I44F84, I45F19, I45F83, I46F18, I46F82, I47F17, I47F81, I48F16, I48F80, I49F15,
I49F79, I50F14, I50F78, I51F13, I51F77, I52F12, I52F76, I53F11, I53F75, I54F10, I54F74, I55F9,
I55F73, I56F8, I56F72, I57F7, I57F71, I58F6, I58F70, I59F5, I59F69, I60F4, I60F68, I61F3,
I61F67, I62F2, I62F66, I63F1, I63F65, I64F0, I64F64, I65F63, I66F62, I67F61, I68F60, I69F59,
I70F58, I71F57, I72F56, I73F55, I74F54, I75F53, I76F52, I77F51, I78F50, I79F49, I80F48, I81F47,
I82F46, I83F45, I84F44, I85F43, I86F42, I87F41, I88F40, I89F39, I90F38, I91F37, I92F36, I93F35,
I94F34, I95F33, I96F32, I97F31, I98F30, I99F29, I100F28, I101F27, I102F26, I103F25, I104F24,
I105F23, I106F22, I107F21, I108F20, I109F19, I110F18, I111F17, I112F16, I113F15, I114F14,
I115F13, I116F12, I117F11, I118F10, I119F9, I120F8, I121F7, I122F6, I123F5, I124F4, I125F3,
I126F2, I127F1, I128F0, U0F8, U0F16, U0F32, U0F64, U0F128, U1F7, U1F15, U1F31, U1F63, U1F127,
U2F6, U2F14, U2F30, U2F62, U2F126, U3F5, U3F13, U3F29, U3F61, U3F125, U4F4, U4F12, U4F28,
U4F60, U4F124, U5F3, U5F11, U5F27, U5F59, U5F123, U6F2, U6F10, U6F26, U6F58, U6F122, U7F1,
U7F9, U7F25, U7F57, U7F121, U8F0, U8F8, U8F24, U8F56, U8F120, U9F7, U9F23, U9F55, U9F119,
U10F6, U10F22, U10F54, U10F118, U11F5, U11F21, U11F53, U11F117, U12F4, U12F20, U12F52, U12F116,
U13F3, U13F19, U13F51, U13F115, U14F2, U14F18, U14F50, U14F114, U15F1, U15F17, U15F49, U15F113,
U16F0, U16F16, U16F48, U16F112, U17F15, U17F47, U17F111, U18F14, U18F46, U18F110, U19F13,
U19F45, U19F109, U20F12, U20F44, U20F108, U21F11, U21F43, U21F107, U22F10, U22F42, U22F106,
U23F9, U23F41, U23F105, U24F8, U24F40, U24F104, U25F7, U25F39, U25F103, U26F6, U26F38, U26F102,
U27F5, U27F37, U27F101, U28F4, U28F36, U28F100, U29F3, U29F35, U29F99, U30F2, U30F34, U30F98,
U31F1, U31F33, U31F97, U32F0, U32F32, U32F96, U33F31, U33F95, U34F30, U34F94, U35F29, U35F93,
U36F28, U36F92, U37F27, U37F91, U38F26, U38F90, U39F25, U39F89, U40F24, U40F88, U41F23, U41F87,
U42F22, U42F86, U43F21, U43F85, U44F20, U44F84, U45F19, U45F83, U46F18, U46F82, U47F17, U47F81,
U48F16, U48F80, U49F15, U49F79, U50F14, U50F78, U51F13, U51F77, U52F12, U52F76, U53F11, U53F75,
U54F10, U54F74, U55F9, U55F73, U56F8, U56F72, U57F7, U57F71, U58F6, U58F70, U59F5, U59F69,
U60F4, U60F68, U61F3, U61F67, U62F2, U62F66, U63F1, U63F65, U64F0, U64F64, U65F63, U66F62,
U67F61, U68F60, U69F59, U70F58, U71F57, U72F56, U73F55, U74F54, U75F53, U76F52, U77F51, U78F50,
U79F49, U80F48, U81F47, U82F46, U83F45, U84F44, U85F43, U86F42, U87F41, U88F40, U89F39, U90F38,
U91F37, U92F36, U93F35, U94F34, U95F33, U96F32, U97F31, U98F30, U99F29, U100F28, U101F27,
U102F26, U103F25, U104F24, U105F23, U106F22, U107F21, U108F20, U109F19, U110F18, U111F17,
U112F16, U113F15, U114F14, U115F13, U116F12, U117F11, U118F10, U119F9, U120F8, U121F7, U122F6,
U123F5, U124F4, U125F3, U126F2, U127F1, U128F0
);
impl<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela> RemAssign<T>
for SiUnit<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>
impl<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela> RemAssign<T>
for SiUnit<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela>
where
Second: Integer,
Metre: Integer,
Meter: Integer,
Kilogram: Integer,
Ampere: Integer,
Kelvin: Integer,
@ -581,11 +355,11 @@ where
}
}
impl<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>
SiUnit<T, Second, Metre, Kilogram, Ampere, Kelvin, Mole, Candela>
impl<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela>
SiUnit<T, Second, Meter, Kilogram, Ampere, Kelvin, Mole, Candela>
where
Second: Integer,
Metre: Integer,
Meter: Integer,
Kilogram: Integer,
Ampere: Integer,
Kelvin: Integer,
@ -609,21 +383,21 @@ where
impl<
T,
Second1,
Metre1,
Meter1,
Kilogram1,
Ampere1,
Kelvin1,
Mole1,
Candela1,
Second2,
Metre2,
Meter2,
Kilogram2,
Ampere2,
Kelvin2,
Mole2,
Candela2,
> Mul<SiUnit<T, Second1, Metre1, Kilogram1, Ampere1, Kelvin1, Mole1, Candela1>>
for SiUnit<T, Second2, Metre2, Kilogram2, Ampere2, Kelvin2, Mole2, Candela2>
> Mul<SiUnit<T, Second1, Meter1, Kilogram1, Ampere1, Kelvin1, Mole1, Candela1>>
for SiUnit<T, Second2, Meter2, Kilogram2, Ampere2, Kelvin2, Mole2, Candela2>
where
Mole2: Integer,
Candela2: Integer,
@ -632,16 +406,16 @@ where
Kelvin1: Integer + Add<Kelvin2>,
Ampere1: Integer + Add<Ampere2>,
Kilogram1: Integer + Add<Kilogram2>,
Metre1: Integer + Add<Metre2>,
Meter1: Integer + Add<Meter2>,
Second1: Integer + Add<Second2>,
Kelvin2: Integer,
Ampere2: Integer,
Kilogram2: Integer,
Metre2: Integer,
Meter2: Integer,
Second2: Integer,
T: Mul,
Second1::Output: Integer,
Metre1::Output: Integer,
Meter1::Output: Integer,
Kilogram1::Output: Integer,
Ampere1::Output: Integer,
Kelvin1::Output: Integer,
@ -651,7 +425,7 @@ where
type Output = SiUnit<
T::Output,
op!(Second1 + Second2),
op!(Metre1 + Metre2),
op!(Meter1 + Meter2),
op!(Kilogram1 + Kilogram2),
op!(Ampere1 + Ampere2),
op!(Kelvin1 + Kelvin2),
@ -661,7 +435,7 @@ where
fn mul(
self,
rhs: SiUnit<T, Second1, Metre1, Kilogram1, Ampere1, Kelvin1, Mole1, Candela1>,
rhs: SiUnit<T, Second1, Meter1, Kilogram1, Ampere1, Kelvin1, Mole1, Candela1>,
) -> Self::Output {
Self::Output::new(self.value * rhs.value)
}
@ -670,31 +444,31 @@ where
impl<
T,
Second1,
Metre1,
Meter1,
Kilogram1,
Ampere1,
Kelvin1,
Mole1,
Candela1,
Second2,
Metre2,
Meter2,
Kilogram2,
Ampere2,
Kelvin2,
Mole2,
Candela2,
> Div<SiUnit<T, Second1, Metre1, Kilogram1, Ampere1, Kelvin1, Mole1, Candela1>>
for SiUnit<T, Second2, Metre2, Kilogram2, Ampere2, Kelvin2, Mole2, Candela2>
> Div<SiUnit<T, Second1, Meter1, Kilogram1, Ampere1, Kelvin1, Mole1, Candela1>>
for SiUnit<T, Second2, Meter2, Kilogram2, Ampere2, Kelvin2, Mole2, Candela2>
where
Second1: Integer,
Metre1: Integer,
Meter1: Integer,
Kilogram1: Integer,
Ampere1: Integer,
Kelvin1: Integer,
Mole1: Integer,
Candela1: Integer,
Second2: Integer + Sub<Second1>,
Metre2: Integer + Sub<Metre1>,
Meter2: Integer + Sub<Meter1>,
Kilogram2: Integer + Sub<Kilogram1>,
Ampere2: Integer + Sub<Ampere1>,
Kelvin2: Integer + Sub<Kelvin1>,
@ -702,7 +476,7 @@ where
Candela2: Integer + Sub<Candela1>,
T: Div,
Second2::Output: Integer,
Metre2::Output: Integer,
Meter2::Output: Integer,
Kilogram2::Output: Integer,
Ampere2::Output: Integer,
Kelvin2::Output: Integer,
@ -712,7 +486,7 @@ where
type Output = SiUnit<
T::Output,
op!(Second2 - Second1),
op!(Metre2 - Metre1),
op!(Meter2 - Meter1),
op!(Kilogram2 - Kilogram1),
op!(Ampere2 - Ampere1),
op!(Kelvin2 - Kelvin1),
@ -722,7 +496,7 @@ where
fn div(
self,
rhs: SiUnit<T, Second1, Metre1, Kilogram1, Ampere1, Kelvin1, Mole1, Candela1>,
rhs: SiUnit<T, Second1, Meter1, Kilogram1, Ampere1, Kelvin1, Mole1, Candela1>,
) -> Self::Output {
Self::Output::new(self.value / rhs.value)
}
@ -731,31 +505,31 @@ where
impl<
T,
Second1,
Metre1,
Meter1,
Kilogram1,
Ampere1,
Kelvin1,
Mole1,
Candela1,
Second2,
Metre2,
Meter2,
Kilogram2,
Ampere2,
Kelvin2,
Mole2,
Candela2,
> Rem<SiUnit<T, Second1, Metre1, Kilogram1, Ampere1, Kelvin1, Mole1, Candela1>>
for SiUnit<T, Second2, Metre2, Kilogram2, Ampere2, Kelvin2, Mole2, Candela2>
> Rem<SiUnit<T, Second1, Meter1, Kilogram1, Ampere1, Kelvin1, Mole1, Candela1>>
for SiUnit<T, Second2, Meter2, Kilogram2, Ampere2, Kelvin2, Mole2, Candela2>
where
Second1: Integer,
Metre1: Integer,
Meter1: Integer,
Kilogram1: Integer,
Ampere1: Integer,
Kelvin1: Integer,
Mole1: Integer,
Candela1: Integer,
Second2: Integer + Sub<Second1>,
Metre2: Integer + Sub<Metre1>,
Meter2: Integer + Sub<Meter1>,
Kilogram2: Integer + Sub<Kilogram1>,
Ampere2: Integer + Sub<Ampere1>,
Kelvin2: Integer + Sub<Kelvin1>,
@ -763,7 +537,7 @@ where
Candela2: Integer + Sub<Candela1>,
T: Rem,
Second2::Output: Integer,
Metre2::Output: Integer,
Meter2::Output: Integer,
Kilogram2::Output: Integer,
Ampere2::Output: Integer,
Kelvin2::Output: Integer,
@ -773,7 +547,7 @@ where
type Output = SiUnit<
T::Output,
op!(Second2 - Second1),
op!(Metre2 - Metre1),
op!(Meter2 - Meter1),
op!(Kilogram2 - Kilogram1),
op!(Ampere2 - Ampere1),
op!(Kelvin2 - Kelvin1),
@ -783,7 +557,7 @@ where
fn rem(
self,
rhs: SiUnit<T, Second1, Metre1, Kilogram1, Ampere1, Kelvin1, Mole1, Candela1>,
rhs: SiUnit<T, Second1, Meter1, Kilogram1, Ampere1, Kelvin1, Mole1, Candela1>,
) -> Self::Output {
Self::Output::new(self.value % rhs.value)
}
@ -792,20 +566,20 @@ where
#[cfg(test)]
mod test {
use super::types::{
Ampere, Coulomb, CubicMetre, Metre, ReciprocalMetre, Second, SquareMetre, Unit, Volt, Watt,
Ampere, Coulomb, CubicMeter, Meter, ReciprocalMeter, Second, SquareMeter, Unit, Volt, Watt,
};
use num_traits::{Num, One, Zero};
#[test]
fn clone() {
let m = Metre::new(2);
let m = Meter::new(2);
assert_eq!(m.clone(), m);
}
#[test]
fn ord() {
let a = Metre::new(2);
let b = Metre::new(3);
let a = Meter::new(2);
let b = Meter::new(3);
assert!(a < b);
assert!(b > a);
assert!(a == a);
@ -816,27 +590,27 @@ mod test {
#[test]
fn deref() {
let m = Metre::new(2);
let m = Meter::new(2);
assert_eq!(*m, 2);
}
#[test]
fn deref_mut() {
let mut m = Metre::new(2);
let mut m = Meter::new(2);
*m = 3;
assert_eq!(*m, 3);
}
#[test]
fn neg() {
let m = Metre::new(2);
assert_eq!(-m, Metre::new(-2));
let m = Meter::new(2);
assert_eq!(-m, Meter::new(-2));
}
#[test]
fn zero() {
let z = Metre::zero();
assert_eq!(z, Metre::new(0));
let z = Meter::zero();
assert_eq!(z, Meter::new(0));
assert!(z.is_zero());
}
@ -853,89 +627,89 @@ mod test {
#[test]
fn add() {
let m = Metre::new(2);
assert_eq!(m + m, Metre::new(4));
assert_eq!(m + m + m, Metre::new(6));
let m = Meter::new(2);
assert_eq!(m + m, Meter::new(4));
assert_eq!(m + m + m, Meter::new(6));
}
#[test]
fn add_assign() {
let mut m = Metre::new(2);
let mut m = Meter::new(2);
m += m;
assert_eq!(m, Metre::new(4));
assert_eq!(m, Meter::new(4));
}
#[test]
fn sub() {
let m = Metre::new(2);
assert_eq!(m - m, Metre::new(0));
assert_eq!(m - m - m, Metre::new(-2));
let m = Meter::new(2);
assert_eq!(m - m, Meter::new(0));
assert_eq!(m - m - m, Meter::new(-2));
}
#[test]
fn sub_assign() {
let mut m = Metre::new(2);
let mut m = Meter::new(2);
m -= m;
assert_eq!(m, Metre::new(0));
assert_eq!(m, Meter::new(0));
}
#[test]
fn mul() {
let m = Metre::new(2);
assert_eq!(m * m, SquareMetre::new(4));
assert_eq!(m * m * m, CubicMetre::new(8));
let m = Meter::new(2);
assert_eq!(m * m, SquareMeter::new(4));
assert_eq!(m * m * m, CubicMeter::new(8));
let s = Second::new(1);
let a = Ampere::new(2);
assert_eq!(s * a, Coulomb::new(2));
let v = Volt::new(2);
assert_eq!(v * a, Watt::new(4));
assert_eq!(m * 2, Metre::new(4));
assert_eq!(m * 2, Meter::new(4));
}
#[test]
fn mul_assign() {
let mut m = Metre::new(2);
let mut m = Meter::new(2);
m *= 2;
assert_eq!(m, Metre::new(4));
assert_eq!(m, Meter::new(4));
}
#[test]
fn div() {
let m = Metre::new(2);
let m = Meter::new(2);
assert_eq!(m / m, Unit::new(1));
assert_eq!(m / m / m, ReciprocalMetre::new(0));
assert_eq!(m / m / m, ReciprocalMeter::new(0));
let c = Coulomb::new(4);
let a = Ampere::new(2);
assert_eq!(c / a, Second::new(2));
let w = Watt::new(2);
assert_eq!(w / a, Volt::new(1));
assert_eq!(m / 2, Metre::new(1));
assert_eq!(m / 2, Meter::new(1));
}
#[test]
fn div_assign() {
let mut m = Metre::new(2);
let mut m = Meter::new(2);
m /= 2;
assert_eq!(m, Metre::new(1));
assert_eq!(m, Meter::new(1));
}
#[test]
fn rem() {
let m = Metre::new(2);
let m = Meter::new(2);
assert_eq!(m % m, Unit::new(0));
assert_eq!(m / m % m, ReciprocalMetre::new(1));
assert_eq!(m / m % m, ReciprocalMeter::new(1));
let c = Coulomb::new(4);
let a = Ampere::new(2);
assert_eq!(c % a, Second::new(0));
let w = Watt::new(2);
assert_eq!(w % a, Volt::new(0));
assert_eq!(m % 2, Metre::new(0));
assert_eq!(m % 2, Meter::new(0));
}
#[test]
fn rem_assign() {
let mut m = Metre::new(2);
let mut m = Meter::new(2);
m %= 2;
assert_eq!(m, Metre::new(0));
assert_eq!(m, Meter::new(0));
}
}

50
src/types.rs
View File

@ -6,7 +6,7 @@ pub type Unit<T> = SiUnit<T, Z0, Z0, Z0, Z0, Z0, Z0, Z0>;
/// time
pub type Second<T> = SiUnit<T, P1, Z0, Z0, Z0, Z0, Z0, Z0>;
/// length
pub type Metre<T> = SiUnit<T, Z0, P1, Z0, Z0, Z0, Z0, Z0>;
pub type Meter<T> = SiUnit<T, Z0, P1, Z0, Z0, Z0, Z0, Z0>;
/// mass
pub type Kilogram<T> = SiUnit<T, Z0, Z0, P1, Z0, Z0, Z0, Z0>;
/// electric current
@ -64,43 +64,43 @@ pub type Katal<T> = SiUnit<T, N1, Z0, Z0, Z0, Z0, P1, Z0>;
// Derived units without special names
/// area
pub type SquareMetre<T> = SiUnit<T, Z0, P2, Z0, Z0, Z0, Z0, Z0>;
pub type SquareMeter<T> = SiUnit<T, Z0, P2, Z0, Z0, Z0, Z0, Z0>;
/// volume
pub type CubicMetre<T> = SiUnit<T, Z0, P3, Z0, Z0, Z0, Z0, Z0>;
pub type CubicMeter<T> = SiUnit<T, Z0, P3, Z0, Z0, Z0, Z0, Z0>;
/// speed, velocity
pub type MetrePerSecond<T> = SiUnit<T, N1, P1, Z0, Z0, Z0, Z0, Z0>;
pub type MeterPerSecond<T> = SiUnit<T, N1, P1, Z0, Z0, Z0, Z0, Z0>;
/// acceleration
pub type MetrePerSquareSecond<T> = SiUnit<T, N2, P1, Z0, Z0, Z0, Z0, Z0>;
pub type MeterPerSquareSecond<T> = SiUnit<T, N2, P1, Z0, Z0, Z0, Z0, Z0>;
/// wavenumber, vergence
pub type ReciprocalMetre<T> = SiUnit<T, Z0, N1, Z0, Z0, Z0, Z0, Z0>;
pub type ReciprocalMeter<T> = SiUnit<T, Z0, N1, Z0, Z0, Z0, Z0, Z0>;
/// density, mass concentration
pub type KilogramPerCubicMetre<T> = SiUnit<T, Z0, N3, P1, Z0, Z0, Z0, Z0>;
pub type KilogramPerCubicMeter<T> = SiUnit<T, Z0, N3, P1, Z0, Z0, Z0, Z0>;
/// surface density
pub type KilogramPerSquareMetre<T> = SiUnit<T, Z0, N2, P1, Z0, Z0, Z0, Z0>;
pub type KilogramPerSquareMeter<T> = SiUnit<T, Z0, N2, P1, Z0, Z0, Z0, Z0>;
/// specific density
pub type CubicMetrePerKilogram<T> = SiUnit<T, Z0, P3, N1, Z0, Z0, Z0, Z0>;
pub type CubicMeterPerKilogram<T> = SiUnit<T, Z0, P3, N1, Z0, Z0, Z0, Z0>;
/// current density
pub type AmperePerSquareMetre<T> = SiUnit<T, Z0, N2, Z0, P1, Z0, Z0, Z0>;
pub type AmperePerSquareMeter<T> = SiUnit<T, Z0, N2, Z0, P1, Z0, Z0, Z0>;
/// magnetic field strength
pub type AmperePerMetre<T> = SiUnit<T, Z0, N1, Z0, P1, Z0, Z0, Z0>;
pub type AmperePerMeter<T> = SiUnit<T, Z0, N1, Z0, P1, Z0, Z0, Z0>;
/// concentration
pub type MolePerCubicMetre<T> = SiUnit<T, Z0, N3, Z0, Z0, Z0, P1, Z0>;
pub type MolePerCubicMeter<T> = SiUnit<T, Z0, N3, Z0, Z0, Z0, P1, Z0>;
/// luminance
pub type CandelaPerSquareMetre<T> = SiUnit<T, Z0, N2, Z0, Z0, Z0, Z0, P1>;
pub type CandelaPerSquareMeter<T> = SiUnit<T, Z0, N2, Z0, Z0, Z0, Z0, P1>;
// Derived units including special names
/// dynamic viscosity
pub type PascalSecond<T> = SiUnit<T, N1, N1, P1, Z0, Z0, Z0, Z0>;
/// moment of force
pub type NewtonMetre<T> = SiUnit<T, N2, P2, P1, Z0, Z0, Z0, Z0>;
pub type NewtonMeter<T> = SiUnit<T, N2, P2, P1, Z0, Z0, Z0, Z0>;
/// surface tension
pub type NewtonPerMetre<T> = SiUnit<T, N2, Z0, P1, Z0, Z0, Z0, Z0>;
pub type NewtonPerMeter<T> = SiUnit<T, N2, Z0, P1, Z0, Z0, Z0, Z0>;
/// angular velocity, angular frequency
pub type RadianPerSecond<T> = SiUnit<T, N1, Z0, Z0, Z0, Z0, Z0, Z0>;
/// angular acceleration
pub type RadianPerSquareSecond<T> = SiUnit<T, N2, Z0, Z0, Z0, Z0, Z0, Z0>;
/// heat flux density, irradiance
pub type WattPerSquareMetre<T> = SiUnit<T, N3, Z0, P1, Z0, Z0, Z0, Z0>;
pub type WattPerSquareMeter<T> = SiUnit<T, N3, Z0, P1, Z0, Z0, Z0, Z0>;
/// entropy, heat capacity
pub type JoulePerKelvin<T> = SiUnit<T, N2, P2, P1, Z0, N1, Z0, Z0>;
/// specific heat capacity, specific entropy
@ -108,19 +108,19 @@ pub type JoulePerKilogramKelvin<T> = SiUnit<T, N2, P2, Z0, Z0, N1, Z0, Z0>;
/// specific energy
pub type JoulePerKilogram<T> = SiUnit<T, N2, P2, Z0, Z0, Z0, Z0, Z0>;
/// themal conductivity
pub type WattPerMetreKelvin<T> = SiUnit<T, N3, P1, P1, Z0, N1, Z0, Z0>;
pub type WattPerMeterKelvin<T> = SiUnit<T, N3, P1, P1, Z0, N1, Z0, Z0>;
/// energy density
pub type JoulePerCubicMetre<T> = SiUnit<T, N2, N1, P1, Z0, Z0, Z0, Z0>;
pub type JoulePerCubicMeter<T> = SiUnit<T, N2, N1, P1, Z0, Z0, Z0, Z0>;
/// electric field strength
pub type VoltPerMetre<T> = SiUnit<T, N3, P1, P1, N1, Z0, Z0, Z0>;
pub type VoltPerMeter<T> = SiUnit<T, N3, P1, P1, N1, Z0, Z0, Z0>;
/// electric charge density
pub type CoulombPerCubicMetre<T> = SiUnit<T, P1, N3, Z0, P1, Z0, Z0, Z0>;
pub type CoulombPerCubicMeter<T> = SiUnit<T, P1, N3, Z0, P1, Z0, Z0, Z0>;
/// surface charge density, electirc flusx density, electric displacement
pub type CoulombPerSquareMetre<T> = SiUnit<T, P1, N2, Z0, P1, Z0, Z0, Z0>;
pub type CoulombPerSquareMeter<T> = SiUnit<T, P1, N2, Z0, P1, Z0, Z0, Z0>;
/// permittivity
pub type FaradPerMetre<T> = SiUnit<T, P4, N3, N1, P2, Z0, Z0, Z0>;
pub type FaradPerMeter<T> = SiUnit<T, P4, N3, N1, P2, Z0, Z0, Z0>;
/// permeability
pub type HenryPerMetre<T> = SiUnit<T, N2, P1, P1, N2, Z0, Z0, Z0>;
pub type HenryPerMeter<T> = SiUnit<T, N2, P1, P1, N2, Z0, Z0, Z0>;
/// molar energy
pub type JoulePerMole<T> = SiUnit<T, N2, P2, P1, Z0, Z0, N1, Z0>;
/// molar entropy, molar heat capacity
@ -132,6 +132,6 @@ pub type GrayPerSecond<T> = SiUnit<T, N3, P2, Z0, Z0, Z0, Z0, Z0>;
/// radiant intensity
pub type WattPerSteradian<T> = SiUnit<T, N3, P2, P1, Z0, Z0, Z0, Z0>;
/// radiance
pub type WattPerSquareMetreSteradian<T> = SiUnit<T, N3, Z0, P1, Z0, Z0, Z0, Z0>;
pub type WattPerSquareMeterSteradian<T> = SiUnit<T, N3, Z0, P1, Z0, Z0, Z0, Z0>;
/// catalytic activity concentration
pub type KatalPerCubicMetre<T> = SiUnit<T, N1, N3, Z0, Z0, Z0, P1, Z0>;
pub type KatalPerCubicMeter<T> = SiUnit<T, N1, N3, Z0, Z0, Z0, P1, Z0>;