From f593de8c6b2a5e0a71d92d810b32609abb372f5e Mon Sep 17 00:00:00 2001 From: itsubaki <1759459+itsubaki@users.noreply.github.com> Date: Wed, 5 Jun 2024 13:22:53 +0000 Subject: [PATCH] Update some files --- Cargo.toml | 2 +- src/main.rs | 10 +++++----- src/number.rs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index feb3728..6329898 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shor" -version = "0.0.2" +version = "0.0.3" license = "MIT" authors = ["itsubaki"] description = "Shor's factoring algorithm written in rust" diff --git a/src/main.rs b/src/main.rs index 42ae04a..560895f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -22,15 +22,15 @@ fn main() { return; } - if number::is_prime(n) { - println!("N={} is prime.", n); + if let Some((base, exp)) = number::base_exp(n) { + println!("N={}. N is exponentiation. {}^{}.", n, base, exp); return; } - if let Some((base, exp)) = number::base_exp(n) { - println!("N={}. N is exponentiation. {}^{}.", n, base, exp); + if number::is_prime(n) { + println!("N={} is prime.", n); return; - }; + } let mut used = vec![]; loop { diff --git a/src/number.rs b/src/number.rs index 3a6a32a..30100ad 100644 --- a/src/number.rs +++ b/src/number.rs @@ -157,7 +157,7 @@ pub fn find_order(a: u32, n: u32, bin: &[char]) -> (u32, u32, bool) { } pub fn is_trivial(n: u32, factor: &[u32]) -> bool { - for (_, p) in factor.iter().enumerate() { + for p in factor.iter() { if 1 < *p && *p < n && n % p == 0 { return false; }