hxd/core-decimal-calc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use f32

Browse Source
This commit is contained in:
Hexa Dust
2025-07-18 21:19:30 +01:00
parent 77928c8fcb
commit cfee5d2214
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/calc.rs
View File

@@ -72,8 +72,8 @@ impl<const SS: usize, const DS: usize, E: PrimInt + Unsigned> StackCalc<SS, DS,
pub fn add(&mut self) -> Result<Decimal<DS, E>, StackCalcError> { pub fn add(&mut self) -> Result<Decimal<DS, E>, StackCalcError> {
let a = self.pop()?; let a = self.pop()?;
let b = self.pop()?; let b = self.pop()?;
let a = f64::try_from(a)?; let a = f32::try_from(a)?;
let b = f64::try_from(b)?; let b = f32::try_from(b)?;
let res = Decimal::try_from(a + b)?; let res = Decimal::try_from(a + b)?;
self.push(res)?; self.push(res)?;
Ok(res) Ok(res)

40
src/lib.rs
View File

@@ -60,10 +60,10 @@ impl<const S: usize, E: Display> Display for Decimal<S, E> {
} }
} }
impl<const S: usize, E: PrimInt + Unsigned> TryFrom<f64> for Decimal<S, E> { impl<const S: usize, E: PrimInt + Unsigned> TryFrom<f32> for Decimal<S, E> {
type Error = DecimalError; type Error = DecimalError;
fn try_from(mut f: f64) -> Result<Self, Self::Error> { fn try_from(mut f: f32) -> Result<Self, Self::Error> {
if !f.is_finite() { if !f.is_finite() {
return Err(DecimalError::NotANumber); return Err(DecimalError::NotANumber);
} }
@@ -92,7 +92,7 @@ impl<const S: usize, E: PrimInt + Unsigned> TryFrom<f64> for Decimal<S, E> {
for i in 0..S { for i in 0..S {
let s = f as u8; let s = f as u8;
f *= 10.0; f *= 10.0;
f -= (s * 10) as f64; f -= (s * 10) as f32;
significant[i] = s; significant[i] = s;
} }
Ok(Decimal { Ok(Decimal {
@@ -104,7 +104,7 @@ impl<const S: usize, E: PrimInt + Unsigned> TryFrom<f64> for Decimal<S, E> {
} }
} }
impl<const S: usize, E: PrimInt + Unsigned> TryFrom<Decimal<S, E>> for f64 { impl<const S: usize, E: PrimInt + Unsigned> TryFrom<Decimal<S, E>> for f32 {
type Error = DecimalError; type Error = DecimalError;
fn try_from(val: Decimal<S, E>) -> Result<Self, Self::Error> { fn try_from(val: Decimal<S, E>) -> Result<Self, Self::Error> {
@@ -119,14 +119,14 @@ impl<const S: usize, E: PrimInt + Unsigned> TryFrom<Decimal<S, E>> for f64 {
if minus_exponent { if minus_exponent {
e = -e; e = -e;
} }
let e = 10.0f64.powi(e); let e = 10.0f32.powi(e);
let mut f: f64 = 0.0; let mut f: f32 = 0.0;
for i in (0..S).rev() { for i in (0..S).rev() {
f /= 10.0; f /= 10.0;
let s = significant[i]; let s = significant[i];
f += (s as f64) * e; f += (s as f32) * e;
} }
if minus { if minus {
@@ -189,13 +189,13 @@ mod tests {
#[test] #[test]
fn float_to_decimal_nan() { fn float_to_decimal_nan() {
let err = Decimal::<7>::try_from(f64::NAN).unwrap_err(); let err = Decimal::<7>::try_from(f32::NAN).unwrap_err();
assert!(matches!(err, DecimalError::NotANumber)); assert!(matches!(err, DecimalError::NotANumber));
} }
#[test] #[test]
fn float_to_decimal_max() { fn float_to_decimal_max() {
let dec = Decimal::<7>::try_from(f64::MAX).unwrap(); let dec = Decimal::<7>::try_from(f32::MAX).unwrap();
assert!(!dec.minus); assert!(!dec.minus);
assert_eq!(dec.significant, [1, 7, 9, 7, 6, 9, 3]); assert_eq!(dec.significant, [1, 7, 9, 7, 6, 9, 3]);
assert!(!dec.minus_exponent); assert!(!dec.minus_exponent);
@@ -204,13 +204,13 @@ mod tests {
#[test] #[test]
fn float_to_decimal_max_overflow() { fn float_to_decimal_max_overflow() {
let err = Decimal::<7, u8>::try_from(f64::MAX).unwrap_err(); let err = Decimal::<7, u8>::try_from(f32::MAX).unwrap_err();
assert!(matches!(err, DecimalError::ExponentOverflow)); assert!(matches!(err, DecimalError::ExponentOverflow));
} }
#[test] #[test]
fn float_to_decimal_min() { fn float_to_decimal_min() {
let dec = Decimal::<7>::try_from(f64::MIN).unwrap(); let dec = Decimal::<7>::try_from(f32::MIN).unwrap();
assert!(dec.minus); assert!(dec.minus);
assert_eq!(dec.significant, [1, 7, 9, 7, 6, 9, 3]); assert_eq!(dec.significant, [1, 7, 9, 7, 6, 9, 3]);
assert!(!dec.minus_exponent); assert!(!dec.minus_exponent);
@@ -219,13 +219,13 @@ mod tests {
#[test] #[test]
fn float_to_decimal_min_overflow() { fn float_to_decimal_min_overflow() {
let err = Decimal::<7, u8>::try_from(f64::MIN).unwrap_err(); let err = Decimal::<7, u8>::try_from(f32::MIN).unwrap_err();
assert!(matches!(err, DecimalError::ExponentOverflow)); assert!(matches!(err, DecimalError::ExponentOverflow));
} }
#[test] #[test]
fn float_to_decimal_epsilon() { fn float_to_decimal_epsilon() {
let dec = Decimal::<7>::try_from(f64::EPSILON).unwrap(); let dec = Decimal::<7>::try_from(f32::EPSILON).unwrap();
assert!(!dec.minus); assert!(!dec.minus);
assert_eq!(dec.significant, [2, 2, 2, 0, 4, 4, 6]); assert_eq!(dec.significant, [2, 2, 2, 0, 4, 4, 6]);
assert!(dec.minus_exponent); assert!(dec.minus_exponent);
@@ -235,7 +235,7 @@ mod tests {
#[test] #[test]
fn decimal_to_float_zero() { fn decimal_to_float_zero() {
let dec = Decimal::<5, u8>::default(); let dec = Decimal::<5, u8>::default();
assert_eq!(f64::try_from(dec).unwrap(), 0.0); assert_eq!(f32::try_from(dec).unwrap(), 0.0);
} }
#[test] #[test]
@@ -243,7 +243,7 @@ mod tests {
let mut dec = Decimal::<7, u8>::default(); let mut dec = Decimal::<7, u8>::default();
dec.significant = [1, 3, 3, 7, 4, 2, 0]; dec.significant = [1, 3, 3, 7, 4, 2, 0];
dec.exponent = 3; dec.exponent = 3;
assert_eq!(f64::try_from(dec).unwrap(), 1337.42); assert_eq!(f32::try_from(dec).unwrap(), 1337.42);
} }
#[test] #[test]
@@ -252,7 +252,7 @@ mod tests {
dec.significant = [1, 3, 3, 7, 4, 2, 0]; dec.significant = [1, 3, 3, 7, 4, 2, 0];
dec.minus_exponent = true; dec.minus_exponent = true;
dec.exponent = 2; dec.exponent = 2;
assert_eq!(f64::try_from(dec).unwrap(), 0.0133742); assert_eq!(f32::try_from(dec).unwrap(), 0.0133742);
} }
#[test] #[test]
@@ -261,7 +261,7 @@ mod tests {
dec.minus = true; dec.minus = true;
dec.significant = [1, 3, 3, 7, 4, 2, 0]; dec.significant = [1, 3, 3, 7, 4, 2, 0];
dec.exponent = 3; dec.exponent = 3;
assert_eq!(f64::try_from(dec).unwrap(), -1337.42); assert_eq!(f32::try_from(dec).unwrap(), -1337.42);
} }
#[test] #[test]
@@ -271,14 +271,14 @@ mod tests {
dec.significant = [1, 3, 3, 7, 4, 2, 0]; dec.significant = [1, 3, 3, 7, 4, 2, 0];
dec.minus_exponent = true; dec.minus_exponent = true;
dec.exponent = 2; dec.exponent = 2;
assert_eq!(f64::try_from(dec).unwrap(), -0.0133742); assert_eq!(f32::try_from(dec).unwrap(), -0.0133742);
} }
#[test] #[test]
#[ignore = "not working due to precission issues"] #[ignore = "not working due to precission issues"]
fn decimal_to_float_max() { fn decimal_to_float_max() {
let dec = Decimal::<16>::try_from(f64::MAX).unwrap(); let dec = Decimal::<16>::try_from(f32::MAX).unwrap();
assert_eq!(f64::try_from(dec).unwrap(), f64::MAX); assert_eq!(f32::try_from(dec).unwrap(), f32::MAX);
} }
#[test] #[test]