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

Added prefix-generating macros

Browse Source
This commit is contained in:
Mark
2023-04-13 11:33:51 -07:00
parent 78b0262f61
commit 3948f10bd7
4 changed files with 287 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,9 +6,11 @@ use std::ops::{
use crate::quantity::Scalar;
use crate::quantity::Quantity;
use super::FreeUnit;
use super::UnitBase;
use super::Prefix;
use super::FreeUnit;
use super::fromstring_db;
use super::str_to_prefix;
#[derive(Debug)]
#[derive(Clone)]
@ -74,6 +76,15 @@ impl Unit {
}
}
pub fn from_free(f: FreeUnit) -> Unit {
let mut u = Unit {
val: HashMap::new()
};
u.insert(f, Scalar::new_rational(1f64).unwrap());
return u;
}
pub fn get_val(&self) -> &HashMap<FreeUnit, Scalar> { &self.val }
pub fn get_val_mut(&mut self) -> &mut HashMap<FreeUnit, Scalar> { &mut self.val }
pub fn unitless(&self) -> bool { self.get_val().len() == 0 }
@ -149,68 +160,6 @@ impl Unit {
return u;
}
pub fn from_string(s: &str) -> Option<Quantity> {
// Base Units
let b = match s {
"m" => Some(UnitBase::Meter),
"s" => Some(UnitBase::Second),
"sec" => Some(UnitBase::Second),
"g" => Some(UnitBase::Gram),
"a" => Some(UnitBase::Ampere),
"k" => Some(UnitBase::Kelvin),
"mol" => Some(UnitBase::Mole),
"c" => Some(UnitBase::Candela),
"ft" => Some(UnitBase::Foot),
"mile" => Some(UnitBase::Mile),
"hour" => Some(UnitBase::Hour),
"min" => Some(UnitBase::Minute),
"day" => Some(UnitBase::Day),
_ => { None }
};
if b.is_some() {
let mut u = Unit::new();
let b = FreeUnit::from_base(b.unwrap());
u.insert(b, Scalar::new_rational(1f64).unwrap());
let mut q = Quantity::new_rational(1f64).unwrap();
q.set_unit(u);
return Some(q);
};
if b.is_none() {
if s == "kg" {
let mut u = Unit::new();
let b = FreeUnit::from_base_prefix(UnitBase::Gram, Prefix::Kilo);
u.insert(b, Scalar::new_rational(1f64).unwrap());
let mut q = Quantity::new_rational(1f64).unwrap();
q.set_unit(u);
return Some(q);
}
if s == "km" {
let mut u = Unit::new();
let b = FreeUnit::from_base_prefix(UnitBase::Meter, Prefix::Kilo);
u.insert(b, Scalar::new_rational(1f64).unwrap());
let mut q = Quantity::new_rational(1f64).unwrap();
q.set_unit(u);
return Some(q);
}
}
return None;
}
pub fn to_base_factor(&self) -> Quantity {
let mut q = Quantity::new_rational(1f64).unwrap();
@ -224,6 +173,55 @@ impl Unit {
}
impl Unit {
pub fn from_string(s: &str) -> Option<Quantity> {
macro_rules! unpack_fromstring {
(
$(
(
$unit:expr,
$string:literal
$(, (
$( $prefix:tt ),*
))?
)
),*
) => {
// Build match statement for each unit and prefix
match s {
$(
// No prefix--every unit has this
$string => Some(FreeUnit::from_base($unit)),
// Arms for prefixes
$($(
concat!(
$prefix,
$string
) => Some(FreeUnit::from_base_prefix($unit, str_to_prefix!($prefix))),
)*)*
)*
_ => None
}
};
}
// Big match statement
let b = fromstring_db!(unpack_fromstring);
if b.is_none() { return None; }
let b = Unit::from_free(b.unwrap());
let mut q = Quantity::new_rational(1f64).unwrap();
q.set_unit(b);
return Some(q);
}
}
impl PartialEq for Unit {
fn eq(&self, other: &Self) -> bool {
let v = self.get_val();