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

Added nounit and tobase functions

Browse Source
This commit is contained in:
Mark
2023-06-14 09:24:34 -07:00
parent aa02b35cc5
commit 061f58ba53
6 changed files with 83 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/quantity/quantity.rs
View File

@ -99,16 +99,19 @@ impl Quantity {
pub fn insert_unit(&mut self, ui: FreeUnit, pi: Scalar) { self.unit.insert(ui, pi) }
pub fn set_unit(&mut self, u: Unit) { self.unit = u; }
pub fn without_unit(&self) -> Quantity { Quantity::from_scalar(self.scalar.clone()) }
pub fn convert_to(self, other: Quantity) -> Option<Quantity> {
pub fn convert_to(&self, other: Quantity) -> Option<Quantity> {
if !self.unit.compatible_with(&other.unit) { return None; }
let n = self.clone();
let fa = self.unit.to_base_factor();
let fb = other.unit.to_base_factor();
return Some(self.mul_no_convert(fa).div_no_convert(fb))
return Some(n.mul_no_convert(fa).div_no_convert(fb))
}
pub fn convert_to_base(&self) -> Quantity { self.convert_to(self.unit.to_base()).unwrap() }
}