From 0497cd810d4e7d5e1602695fc27cbd3060586257 Mon Sep 17 00:00:00 2001
From: Mark <mark@betalupi.com>
Date: Tue, 11 Apr 2023 09:05:37 -0700
Subject: [PATCH] Fixed unit powers

---
 src/quantity/quantity.rs |  9 ++++-----
 src/quantity/unit.rs     | 43 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/src/quantity/quantity.rs b/src/quantity/quantity.rs
index 20c97c4..02194b4 100644
--- a/src/quantity/quantity.rs
+++ b/src/quantity/quantity.rs
@@ -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)
 		}
 	}
 }
diff --git a/src/quantity/unit.rs b/src/quantity/unit.rs
index 1081dc0..e774780 100644
--- a/src/quantity/unit.rs
+++ b/src/quantity/unit.rs
@@ -4,8 +4,7 @@ use std::ops::{
 	MulAssign, DivAssign
 };
 
-use crate::quantity::Scalar;
-
+use super::Scalar;
 use super::Quantity;
 
 #[derive(Debug)]
@@ -44,7 +43,7 @@ impl BaseUnit {
 		match self {
 			BaseUnit::Foot => Some(Quantity {
 				v: Scalar::new_float_from_string("0.3048").unwrap(),
-				u: Unit::from_array(&[(BaseUnit::Meter, 1f64)])
+				u: Unit::from_array(&[(BaseUnit::Meter, Scalar::new_rational(1f64).unwrap())])
 			}),
 			_ => None
 		}
@@ -56,7 +55,7 @@ impl BaseUnit {
 #[derive(Clone)]
 pub struct Unit {
 	// Unit, power.
-	pub val: HashMap<BaseUnit, f64>
+	pub val: HashMap<BaseUnit, Scalar>
 }
 
 
@@ -68,7 +67,7 @@ impl ToString for Unit {
 		let mut bottom_empty = true;
 
 		for (_, p) in &self.val {
-			if *p > 0f64 {
+			if p.is_positive() {
 				top_empty = false;
 			} else {
 				bottom_empty = false;
@@ -91,21 +90,21 @@ impl ToString for Unit {
 				BaseUnit::Foot => "ft",
 			};
 
-			if *p == 1f64 {
+			if *p == Scalar::new_rational(1f64).unwrap() {
 				t.push_str(&format!("{c}·"));
-			} else if *p == -1f64 {
+			} else if *p == Scalar::new_rational(-1f64).unwrap() {
 				if top_empty {
 					b.push_str(&format!("{c}⁻¹·"));
 				} else {
 					b.push_str(&format!("{c}·"));
 				}
-			} else if *p > 0f64 {
-				t.push_str(&format!("{c}^{p}·"));
+			} else if p.is_positive() {
+				t.push_str(&format!("{c}^{}·", p.to_string()));
 			} else {
 				if top_empty {
-					b.push_str(&format!("{c}^{}·", p));
+					b.push_str(&format!("{c}^{}·", p.to_string()));
 				} else {
-					b.push_str(&format!("{c}^{}·", -p));
+					b.push_str(&format!("{c}^{}·", (-p.clone()).to_string()));
 				}
 			}
 		};
@@ -129,22 +128,22 @@ impl Unit {
 		}
 	}
 
-	pub fn from_array(a: &[(BaseUnit, f64)]) -> Unit {
+	pub fn from_array(a: &[(BaseUnit, Scalar)]) -> Unit {
 		let mut n = Unit::new();
 		for (u, p) in a.iter() {
-			n.insert(*u, *p);
+			n.insert(*u, p.clone());
 		}
 		return n;
 	}
 
 	pub fn unitless(&self) -> bool { self.val.len() == 0 }
 
-	pub fn insert(&mut self, u: BaseUnit, p: f64) {
+	pub fn insert(&mut self, u: BaseUnit, p: Scalar) {
 		match self.val.get_mut(&u) {
 			Some(i) => {
-				let n = *i + p;
+				let n = i.clone() + p;
 
-				if n == 0f64 {
+				if n.is_zero() {
 					self.val.remove(&u);
 				} else { *i = n; }
 			},
@@ -152,10 +151,10 @@ impl Unit {
 		};
 	}
 
-	pub fn pow(&self, pwr: f64) -> Unit {
+	pub fn pow(&self, pwr: Scalar) -> Unit {
 		let mut u = self.clone();
 		for (_, p) in &mut u.val {
-			*p *= pwr;
+			*p *= pwr.clone();
 		};
 		return u;
 	}
@@ -179,14 +178,14 @@ impl Mul for Unit {
 
 	fn mul(self, other: Self) -> Self::Output {
 		let mut o = self.clone();
-		for (u, p) in &other.val { o.insert(*u, *p); }
+		for (u, p) in &other.val { o.insert(*u, p.clone()); }
 		return o;
 	}
 }
 
 impl MulAssign for Unit where {
 	fn mul_assign(&mut self, other: Self) {
-		for (u, p) in &other.val { self.insert(*u, *p); }
+		for (u, p) in &other.val { self.insert(*u, p.clone()); }
 	}
 }
 
@@ -195,13 +194,13 @@ impl Div for Unit {
 
 	fn div(self, other: Self) -> Self::Output {
 		let mut o = self.clone();
-		for (u, p) in &other.val { o.insert(*u, -*p); }
+		for (u, p) in &other.val { o.insert(*u, -p.clone()); }
 		return o;
 	}
 }
 
 impl DivAssign for Unit where {
 	fn div_assign(&mut self, other: Self) {
-		for (u, p) in &other.val { self.insert(*u, -*p); }
+		for (u, p) in &other.val { self.insert(*u, -p.clone()); }
 	}
 }