Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion benches/main.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,27 @@
use {
criterion::{Criterion, criterion_group, criterion_main},
rug::{Integer, Rational},
std::hint::black_box,
val::{Environment, Evaluator},
val::{Config, Environment, Evaluator, Number},
};

fn bench_decimal_display(criterion: &mut Criterion) {
let mut group = criterion.benchmark_group("decimal_display");

for &(factor, exponent) in &[(2, 100), (2, 1_000), (5, 100), (5, 1_000)] {
let mut denominator = Integer::from(Integer::u_pow_u(factor, exponent));
denominator *= 3;

let number = Number::Exact(Rational::from((1, denominator)));

group.bench_function(format!("3 * {factor}^{exponent}"), |bencher| {
bencher.iter(|| black_box(number.display(Config::default())));
});
}

group.finish();
}

fn bench_increment_value(criterion: &mut Criterion) {
let mut group = criterion.benchmark_group("increment_value");

Expand Down Expand Up @@ -104,6 +122,7 @@ fn bench_recursive_factorial(criterion: &mut Criterion) {

criterion_group!(
benches,
bench_decimal_display,
bench_increment_value,
bench_prime_count,
bench_recursive_factorial
Expand Down
24 changes: 9 additions & 15 deletions src/decimal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,15 @@ impl Decimal {
pub(crate) fn from_rational(number: &Rational) -> Option<Self> {
let mut denominator = number.denom().clone();

let (twos, fives) = (
Self::remove_factor(&mut denominator, 2),
Self::remove_factor(&mut denominator, 5),
);
let twos = usize::try_from(
denominator.remove_factor_mut(&MiniInteger::from(2).borrow()),
)
.unwrap();

let fives = usize::try_from(
denominator.remove_factor_mut(&MiniInteger::from(5).borrow()),
)
.unwrap();

if denominator != 1 {
return None;
Expand Down Expand Up @@ -110,17 +115,6 @@ impl Decimal {
}
}

fn remove_factor(number: &mut Integer, factor: u32) -> usize {
let mut count = 0;

while number.is_divisible_u(factor) {
*number /= factor;
count += 1;
}

count
}

fn scientific_string(&self, exponent: i64) -> String {
let mantissa = if self.digits.len() == 1 {
self.digits.clone()
Expand Down
1 change: 1 addition & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use {
rug::{
Complete, Float, Integer, Rational,
float::{Constant, Round},
integer::MiniInteger,
ops::Pow,
},
std::{
Expand Down
Loading