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

Fixed unit powers

Browse Source
This commit is contained in:
Mark
2023-04-11 09:05:37 -07:00
parent 0ca7705122
commit 0497cd810d
2 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/quantity/quantity.rs
View File

@ -10,7 +10,6 @@ use std::cmp::Ordering;
use crate::quantity::Unit;
use crate::quantity::BaseUnit;
use crate::quantity::Scalar;
#[derive(Debug)]
@ -83,7 +82,7 @@ impl Quantity {
});
}
pub fn insert_unit(&mut self, ui: BaseUnit, pi: f64) { self.u.insert(ui, pi) }
pub fn insert_unit(&mut self, ui: BaseUnit, pi: Scalar) { self.u.insert(ui, pi) }
pub fn set_unit(&mut self, u: Unit) { self.u = u; }
pub fn from_unit_string(s: &str) -> Option<Quantity> {
@ -102,7 +101,7 @@ impl Quantity {
if b.is_some() {
let mut u = Unit::new();
u.insert(b.unwrap(), 1f64);
u.insert(b.unwrap(), Scalar::new_rational(1f64).unwrap());
let mut q = Quantity::new_rational(1f64).unwrap();
q.set_unit(u);
@ -170,8 +169,8 @@ impl Quantity {
pub fn pow(&self, pwr: Quantity) -> Quantity {
Quantity {
v: self.v.pow(pwr.v),
u: self.u.pow(2f64)
v: self.v.pow(pwr.v.clone()),
u: self.u.pow(pwr.v)
}
}
}