nortega/indivisible-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify to normal VecDeque.

Browse Source
This commit is contained in:
Nicolás A. Ortega Froysa
2025-12-05 11:29:55 +01:00
parent 00da4333bf
commit 65314d52ac
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main.rs
View File

@@ -16,13 +16,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
use std::cell::RefCell;
use std::collections::VecDeque; use std::collections::VecDeque;
use std::fs::File; use std::fs::File;
use std::io::{BufRead, BufReader}; use std::io::{BufRead, BufReader};
use std::path::PathBuf; use std::path::PathBuf;
use std::process; use std::process;
use std::rc::Rc;
use structopt::StructOpt; use structopt::StructOpt;
mod candidate; mod candidate;
@@ -47,13 +45,13 @@ struct Opt {
fn main() { fn main() {
let opts = Opt::from_args(); let opts = Opt::from_args();
let prime_list = Rc::new(RefCell::new(VecDeque::<u64>::new())); let mut prime_list = VecDeque::<u64>::new();
if opts.import.is_some() { if opts.import.is_some() {
let in_file = File::open(opts.import.unwrap()).unwrap(); let in_file = File::open(opts.import.unwrap()).unwrap();
let reader = BufReader::new(in_file); let reader = BufReader::new(in_file);
for p in reader.lines().into_iter() { for p in reader.lines().into_iter() {
prime_list.borrow_mut().push_back(p.unwrap().parse().unwrap()); prime_list.push_back(p.unwrap().parse().unwrap());
} }
} }
@@ -62,20 +60,20 @@ fn main() {
process::exit(1); process::exit(1);
} }
if opts.test && *prime_list.borrow().back().unwrap_or(&0) >= opts.num { if opts.test && *prime_list.back().unwrap_or(&0) >= opts.num {
for i in prime_list.borrow().iter() { for i in prime_list.iter() {
if *i == opts.num { if *i == opts.num {
process::exit(0) process::exit(0)
} }
} }
process::exit(1) process::exit(1)
} else if !opts.test && prime_list.borrow().len() >= opts.num as usize { } else if !opts.test && prime_list.len() >= opts.num as usize {
let res = *prime_list.borrow().get(opts.num as usize).unwrap(); let res = *prime_list.get(opts.num as usize).unwrap();
println!("{}", res); println!("{}", res);
} else { } else {
let mut cand_gen = CandidateGenerator::new(); let mut cand_gen = CandidateGenerator::new();
if !prime_list.borrow().is_empty() { if !prime_list.is_empty() {
cand_gen.calc_base(*prime_list.borrow().back().unwrap()); cand_gen.calc_base(*prime_list.back().unwrap());
} }
loop { loop {
@@ -85,7 +83,7 @@ fn main() {
} }
let mut is_prime = true; let mut is_prime = true;
for p in prime_list.borrow().iter() { for p in prime_list.iter() {
if cand % *p == 0 { if cand % *p == 0 {
is_prime = false; is_prime = false;
break; break;
@@ -93,25 +91,25 @@ fn main() {
} }
if is_prime { if is_prime {
prime_list.borrow_mut().push_back(cand); prime_list.push_back(cand);
if opts.verbose { if opts.verbose {
println!("{}", cand); println!("{}", cand);
} }
if !opts.test && prime_list.borrow().len() == opts.num as usize { if !opts.test && prime_list.len() == opts.num as usize {
break; break;
} }
} }
} }
if opts.test { if opts.test {
if *prime_list.borrow().back().unwrap() == opts.num { if *prime_list.back().unwrap() == opts.num {
process::exit(0) process::exit(0)
} else { } else {
process::exit(1) process::exit(1)
} }
} else if !opts.verbose { } else if !opts.verbose {
let last_prime = *prime_list.borrow().back().unwrap(); let last_prime = *prime_list.back().unwrap();
println!("{}", last_prime); println!("{}", last_prime);
} }
} }