Mark/daisy
1
1
Fork 0
mirror of https://github.com/rm-dr/daisy synced 2025-10-20 00:54:28 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compound unit conversion

Browse Source
This commit is contained in:
Mark
2023-06-11 16:44:44 -07:00
parent e816cea236
commit 91b2361f28
6 changed files with 108 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/quantity/unit/freeunit.rs
View File

@ -8,8 +8,8 @@ use super::Unit;
use super::unit_db;
#[derive(Hash)]
#[derive(Debug)]
#[derive(Hash)]
#[derive(Copy, Clone)]
#[derive(PartialEq, Eq)]
pub struct FreeUnit {
@ -18,6 +18,25 @@ pub struct FreeUnit {
}
macro_rules! unpack_string {
(
$u:expr, $s:expr,
$( $_:expr ),*
) => { $s };
}
impl ToString for FreeUnit {
fn to_string(&self) -> String {
let s = unit_db!(self.base, unpack_string);
let p = self.prefix.to_string();
format!("{p}{s}")
}
}
macro_rules! unpack_base_factor {
(
$unit:expr,
@ -90,6 +109,8 @@ impl FreeUnit {
pub fn set_prefix(&mut self, prefix: Prefix) { self.prefix = prefix; }
pub fn get_prefix(&self) -> Prefix { self.prefix }
/// Returns a quantity q, so that self * q
/// gives a quantity in base units.
pub fn to_base_factor(&self) -> Quantity {
let q = unit_db!(self.base, unpack_base_factor);
@ -102,23 +123,17 @@ impl FreeUnit {
return q;
}
}
// Get this unit in terms of base units
pub fn get_base(&self) -> Quantity {
let q = unit_db!(self.base, unpack_base_factor);
let mut q = q.unwrap_or(Quantity::new_rational_from_string("1").unwrap());
// Don't divide by self
q.insert_unit(FreeUnit::from_base(self.base), Scalar::new_rational(1f64).unwrap());
macro_rules! unpack_string {
(
$u:expr, $s:expr,
$( $_:expr ),*
) => { $s };
}
impl ToString for FreeUnit {
fn to_string(&self) -> String {
let s = unit_db!(self.base, unpack_string);
let p = self.prefix.to_string();
format!("{p}{s}")
return q;
}
}