Mark/daisy
1
1
Fork 0
mirror of https://github.com/rm-dr/daisy synced 2025-07-01 06:33:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed unit matching

Browse Source
This commit is contained in:
Mark
2023-07-28 09:28:08 -07:00
parent 625be634bf
commit 185b0415ff
2 changed files with 35 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/quantity/unit/unit.rs
View File

@ -161,52 +161,6 @@ impl Unit {
return o == s;
}
// True if these two units have a common factor
pub fn common_factor(&self, other: &Unit) -> Option<Quantity> {
if self.unitless() || other.unitless() { return None; }
let mut failed = false;
// What to convert `other` to before multiplying
let mut factor = Quantity::new_rational_from_string("1").unwrap();
let mut flag;
for (us, _) in self.get_val() {
flag = false;
for (uo, po) in other.get_val() {
if {
us.to_base().unit.compatible_with(&uo.to_base().unit)
} {
factor.insert_unit(us.clone(), po.clone());
flag = true;
break;
}
}
if !flag { failed = true }
}
if !failed { return Some(factor);}
let mut factor = Quantity::new_rational_from_string("1").unwrap();
for (uo, po) in other.get_val() {
flag = false;
for (us, _) in self.get_val() {
if {
us.to_base().unit.compatible_with(&uo.to_base().unit)
} {
factor.insert_unit(us.clone(), po.clone());
flag = true;
break;
}
}
if !flag { return None; }
}
return Some(factor);
}
pub fn insert(&mut self, u: FreeUnit, p: Scalar) {
let v = self.get_val_mut();
match v.get_mut(&u) {