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

Unit cleanup

Browse Source
This commit is contained in:
Mark
2023-04-11 08:21:30 -07:00
parent 175261b5c0
commit 84f2d6e30c
3 changed files with 38 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/quantity/quantity.rs
View File

@ -9,7 +9,6 @@ use std::cmp::Ordering;
use crate::quantity::Unit;
use crate::quantity::BaseUnit;
use crate::quantity::CompoundUnit;
use crate::quantity::Scalar;
@ -17,8 +16,8 @@ use crate::quantity::Scalar;
#[derive(Debug)]
#[derive(Clone)]
pub struct Quantity {
v: Scalar,
u: Unit
pub v: Scalar,
pub u: Unit
}
@ -97,6 +96,7 @@ impl Quantity {
"k" => Some(BaseUnit::Kelvin),
"mol" => Some(BaseUnit::Mole),
"c" => Some(BaseUnit::Candela),
"ft" => Some(BaseUnit::Foot),
_ => { None }
};
@ -110,21 +110,6 @@ impl Quantity {
return Some(q);
};
// Compound units
let b = match s {
"ft" => Some(CompoundUnit::FOOT),
_ => { None }
};
if b.is_some() {
let b = b.unwrap();
let q = Quantity{
v: b.coef(),
u: b.unit()
};
return Some(q);
};
return None;
}