yume/unitdc-rs
1
0
Fork 0
mirror of https://github.com/eternal-flame-AD/unitdc-rs.git synced 2025-02-17 10:17:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle derived units when multiplying

Browse source
This commit is contained in:
ゆめ 2023-08-22 21:19:56 -05:00
parent a44f045d85
commit 979951b940
2 changed files with 50 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/quantity/mod.rs
View file

@ -92,7 +92,12 @@ impl Add for Quantity {
let number = self.number + rhs.number; let number = self.number + rhs.number;
let unit = self.unit; let unit = self.unit;
let use_derived_unit = rhs.use_derived_unit; let mut use_derived_unit = self.use_derived_unit.clone();
for d in &rhs.use_derived_unit {
if !use_derived_unit.contains(d) {
use_derived_unit.push(d.clone());
}
}
Ok(Quantity { Ok(Quantity {
number, number,
@ -112,7 +117,12 @@ impl Sub for Quantity {
let number = self.number - rhs.number; let number = self.number - rhs.number;
let unit = self.unit; let unit = self.unit;
let use_derived_unit = rhs.use_derived_unit; let mut use_derived_unit = self.use_derived_unit.clone();
for d in &rhs.use_derived_unit {
if !use_derived_unit.contains(d) {
use_derived_unit.push(d.clone());
}
}
Ok(Quantity { Ok(Quantity {
number, number,
@ -128,7 +138,12 @@ impl Mul for Quantity {
fn mul(self, rhs: Self) -> Self::Output { fn mul(self, rhs: Self) -> Self::Output {
let number = self.number * rhs.number; let number = self.number * rhs.number;
let unit = self.unit * rhs.unit; let unit = self.unit * rhs.unit;
let use_derived_unit = rhs.use_derived_unit; let mut use_derived_unit = Vec::new();
for lhs_d in &self.use_derived_unit {
for rhs_d in &rhs.use_derived_unit {
use_derived_unit.push(lhs_d.clone() * rhs_d.clone());
}
}
Quantity { Quantity {
number, number,
@ -144,7 +159,12 @@ impl Div for Quantity {
fn div(self, rhs: Self) -> Self::Output { fn div(self, rhs: Self) -> Self::Output {
let number = self.number / rhs.number; let number = self.number / rhs.number;
let unit = self.unit / rhs.unit; let unit = self.unit / rhs.unit;
let use_derived_unit = rhs.use_derived_unit; let mut use_derived_unit = Vec::new();
for lhs_d in &self.use_derived_unit {
for rhs_d in &rhs.use_derived_unit {
use_derived_unit.push(lhs_d.clone() / rhs_d.clone());
}
}
Quantity { Quantity {
number, number,

26
src/quantity/units.rs
View file

@ -76,6 +76,32 @@ pub struct DerivedUnit {
pub exponents: UnitCombo, pub exponents: UnitCombo,
} }
impl Mul for DerivedUnit {
type Output = Self;
fn mul(self, rhs: Self) -> Self::Output {
DerivedUnit {
symbol: format!("{}*{}", self.symbol, rhs.symbol),
offset: self.offset * rhs.scale.clone() + rhs.offset,
scale: self.scale * rhs.scale,
exponents: self.exponents * rhs.exponents,
}
}
}
impl Div for DerivedUnit {
type Output = Self;
fn div(self, rhs: Self) -> Self::Output {
DerivedUnit {
symbol: format!("{}/{}", self.symbol, rhs.symbol),
offset: self.offset * rhs.scale.clone() - rhs.offset,
scale: self.scale / rhs.scale,
exponents: self.exponents / rhs.exponents,
}
}
}
impl Display for DerivedUnit { impl Display for DerivedUnit {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{}", self.symbol) write!(f, "{}", self.symbol)