Merge remote-tracking branch 'origin/master'

# Conflicts:
#	primes/rust/src/main.rs
This commit is contained in:
CORR1T 2021-06-07 16:36:35 +02:00
commit 4810d487c0
3 changed files with 4 additions and 6 deletions

View file

@ -7,5 +7,5 @@ Printing time is not included.
| ---------| -------| | ---------| -------|
| Java | 1836ms | | Java | 1836ms |
| Javascript | 1778ms | | Javascript | 1778ms |
| Rust | 577ms | | Rust | 577ms (different PC) |
| python3 | 34361ms | | python3 | 34361ms |

View file

@ -10,7 +10,7 @@ public class DefaultPrimes implements Primes {
primesList.add(2); primesList.add(2);
for (int i = 3; i < max; i += 2) { //go through all numbers for (int i = 3; i < max; i++) { //go through all numbers
boolean isPrime = true; boolean isPrime = true;
double sqrRoot = Math.sqrt(i); double sqrRoot = Math.sqrt(i);
for (int j = 0; j < primesList.size(); j++) { //test each number for (int j = 0; j < primesList.size(); j++) { //test each number

View file

@ -25,9 +25,8 @@ fn primes(max: u32) -> Vec<u32> {
primes_list.push(2); primes_list.push(2);
for mut i in 3..max { for mut i in 3..max {
let sqr_root: u32 = (i as f64).sqrt() as u32;
for prime in &primes_list { //test each number for prime in &primes_list { //test each number
if *prime > sqr_root { if *prime > (i as f64).sqrt() as u32 {
primes_list.push(i); primes_list.push(i);
break; break;
} }
@ -35,7 +34,6 @@ fn primes(max: u32) -> Vec<u32> {
break; break;
} }
} }
i += 1
} }
primes_list primes_list