refactor/clean a bit

This commit is contained in:
code002lover 2024-07-18 15:52:58 +02:00
parent f125145690
commit 2af65c41f0
2 changed files with 4 additions and 4 deletions

View File

@ -7,7 +7,7 @@ pub mod prime_utils {
} }
#[must_use] #[must_use]
pub fn is_prime(number: &BigUint, g_primes: &Vec<BigUint>) -> bool { pub fn is_prime(number: &BigUint, g_primes: &[BigUint]) -> bool {
if BigUint::from(1u8) == *number { if BigUint::from(1u8) == *number {
return false; return false;
} }
@ -27,8 +27,8 @@ pub mod prime_utils {
let sqrtnum = number.sqrt() + &one; //fake ceil function let sqrtnum = number.sqrt() + &one; //fake ceil function
for prime in g_primes { for prime in g_primes.iter().filter(|p| p < &&sqrtnum) {
if prime < &sqrtnum && number % prime == ZERO { if number % prime == ZERO {
return false; return false;
} }
} }

View File

@ -23,7 +23,7 @@ fn p(n: f64) -> f64 {
let ln_ln_ln_n = ln_ln_n.ln(); let ln_ln_ln_n = ln_ln_n.ln();
n * (ln_n + ln_ln_n - 1.0 + (ln_ln_ln_n - 2.0) / ln_n n * (ln_n + ln_ln_n - 1.0 + (ln_ln_ln_n - 2.0) / ln_n
- ((ln_ln_n).powi(2) - 6.0 * ln_ln_n + 11.0) / (2.0 * 2.0f64.log2() * ln_n) - ((ln_ln_n).powi(2) - 6.0 * ln_ln_n + 11.0) / (2.0 * ln_n)
+ ((ln_ln_n / ln_n).powi(3)) * (1.0 / ln_n)) + ((ln_ln_n / ln_n).powi(3)) * (1.0 / ln_n))
} }