feat: finish up from_scaled implementation

OliverNChalk · Sep 15, 2024 · 2ca56e3 · 2ca56e3
1 parent 87dbf77
commit 2ca56e3
Show file tree

Hide file tree

Showing 14 changed files with 171 additions and 66 deletions.
diff --git a/benches/add.rs b/benches/add.rs
@@ -1,4 +1,4 @@
-use const_decimal::{Decimal, Integer};
+use const_decimal::{Decimal, ScaledInteger};
 use criterion::measurement::WallTime;
 use criterion::{black_box, BatchSize, BenchmarkGroup};
 use num_traits::PrimInt;
@@ -8,7 +8,7 @@ use proptest::prelude::*;
 
 pub fn bench_all<const D: u8, I>(group: &mut BenchmarkGroup<'_, WallTime>)
 where
-    I: Integer<D> + Arbitrary,
+    I: ScaledInteger<D> + Arbitrary,
 {
     bench_primitive_add::<I>(group);
     bench_decimal_add::<D, I>(group);
@@ -33,7 +33,7 @@ where
 
 fn bench_decimal_add<const D: u8, I>(group: &mut BenchmarkGroup<'_, WallTime>)
 where
-    I: Integer<D> + Arbitrary,
+    I: ScaledInteger<D> + Arbitrary,
 {
     // Use proptest to generate arbitrary input values.
     let mut runner = TestRunner::deterministic();

diff --git a/benches/div.rs b/benches/div.rs
@@ -1,7 +1,7 @@
 use std::fmt::Debug;
 use std::ops::Div;
 
-use const_decimal::{Decimal, Integer};
+use const_decimal::{Decimal, ScaledInteger};
 use criterion::measurement::WallTime;
 use criterion::{black_box, BatchSize, BenchmarkGroup};
 use num_traits::{ConstOne, ConstZero, PrimInt};
@@ -14,7 +14,7 @@ pub fn bench_all<const D: u8, I>(
     lo_strategy: impl Strategy<Value = I> + Clone,
     hi_strategy: impl Strategy<Value = I> + Clone,
 ) where
-    I: Integer<D> + Debug + Div<Output = I>,
+    I: ScaledInteger<D> + Debug + Div<Output = I>,
 {
     primitive_div::<I>(group, lo_strategy.clone(), "lo");
     decimal_div::<D, I>(group, lo_strategy, "lo");
@@ -56,7 +56,7 @@ fn decimal_div<const D: u8, I>(
     strategy: impl Strategy<Value = I> + Clone,
     strategy_label: &str,
 ) where
-    I: Integer<D> + Debug,
+    I: ScaledInteger<D> + Debug,
 {
     // Use proptest to generate arbitrary input values.
     let mut runner = TestRunner::deterministic();

diff --git a/benches/main.rs b/benches/main.rs
@@ -1,7 +1,7 @@
 use std::fmt::Debug;
 use std::ops::{Div, Neg};
 
-use const_decimal::Integer;
+use const_decimal::ScaledInteger;
 use criterion::measurement::WallTime;
 use criterion::BenchmarkGroup;
 use num_traits::ConstOne;
@@ -67,7 +67,7 @@ fn bench_integers<const D: u8, I>(
     hi_mul_range: impl Strategy<Value = I> + Clone + Debug,
     hi_div_range: impl Strategy<Value = I> + Clone + Debug,
 ) where
-    I: Integer<D> + Arbitrary + Div<Output = I>,
+    I: ScaledInteger<D> + Arbitrary + Div<Output = I>,
 {
     add::bench_all::<D, I>(group);
     sub::bench_all::<D, I>(group);

diff --git a/benches/mul.rs b/benches/mul.rs
@@ -1,6 +1,6 @@
 use std::fmt::Debug;
 
-use const_decimal::{Decimal, Integer};
+use const_decimal::{Decimal, ScaledInteger};
 use criterion::measurement::WallTime;
 use criterion::{black_box, BatchSize, BenchmarkGroup};
 use num_traits::PrimInt;
@@ -13,7 +13,7 @@ pub fn bench_all<const D: u8, I>(
     lo_strategy: impl Strategy<Value = I> + Clone,
     hi_strategy: impl Strategy<Value = I> + Clone,
 ) where
-    I: Integer<D> + Debug,
+    I: ScaledInteger<D> + Debug,
 {
     primitive_mul::<I>(group, lo_strategy.clone(), "lo");
     decimal_mul::<D, I>(group, lo_strategy, "lo");
@@ -46,7 +46,7 @@ fn decimal_mul<const D: u8, I>(
     strategy: impl Strategy<Value = I> + Clone,
     strategy_label: &str,
 ) where
-    I: Integer<D> + Debug,
+    I: ScaledInteger<D> + Debug,
 {
     // Use proptest to generate arbitrary input values.
     let mut runner = TestRunner::deterministic();

diff --git a/benches/sub.rs b/benches/sub.rs
@@ -1,4 +1,4 @@
-use const_decimal::{Decimal, Integer};
+use const_decimal::{Decimal, ScaledInteger};
 use criterion::measurement::WallTime;
 use criterion::{black_box, BatchSize, BenchmarkGroup};
 use num_traits::PrimInt;
@@ -8,7 +8,7 @@ use proptest::prelude::*;
 
 pub fn bench_all<const D: u8, I>(group: &mut BenchmarkGroup<'_, WallTime>)
 where
-    I: Integer<D> + Arbitrary,
+    I: ScaledInteger<D> + Arbitrary,
 {
     bench_primitive_sub::<I>(group);
     bench_decimal_sub::<D, I>(group);
@@ -33,7 +33,7 @@ where
 
 fn bench_decimal_sub<const D: u8, I>(group: &mut BenchmarkGroup<'_, WallTime>)
 where
-    I: Integer<D> + Arbitrary,
+    I: ScaledInteger<D> + Arbitrary,
 {
     // Use proptest to generate arbitrary input values.
     let mut runner = TestRunner::deterministic();

diff --git a/src/algorithms.rs b/src/algorithms.rs
@@ -0,0 +1,11 @@
+use crate::ScaledInteger;
+
+pub(crate) fn log10<const D: u8, I: ScaledInteger<D>>(mut input: I) -> I {
+    let mut result = I::ZERO;
+    while input > I::ZERO {
+        input /= I::TEN;
+        result += I::ONE;
+    }
+
+    result
+}