[release] hcn v2.0.0

feat(cli): parse arguments with clap
The binary now derives command-line parsing from clap instead of maintaining a custom parser. SEARCH_LIMIT remains an optional positional argument and keeps its default of 1_000_000_000, while clap now owns usage errors, --help, and --version output. The parser stores the limit as NonZeroU64 so zero is rejected before the search starts. The existing CLI parsing tests now exercise clap directly, and the README documents the generated help/version flags plus the top-level program structure. Test Plan: - cargo clippy - cargo clippy --benches - cargo clippy --tests - cargo test - cargo run -- --help Trailer: Refs: local request to replace custom argument parsing with clap Dependencies: none
2026-04-26 14:07:32 +02:00 · 2026-04-26 14:03:31 +02:00 · 2026-04-26 13:48:36 +02:00 · 2026-04-26 13:48:19 +02:00 · 2026-04-26 13:47:44 +02:00 · 2026-04-26 13:33:25 +02:00
5 changed files with 512 additions and 96 deletions
@@ -1,7 +1,186 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
+
+[[package]]
+name = "anstream"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
+
+[[package]]
+name = "anstyle-parse"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
+dependencies = [
+ "anstyle",
+ "once_cell_polyfill",
+ "windows-sys",
+]
+
+[[package]]
+name = "clap"
+version = "4.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"

 [[package]]
 name = "hcn"
-version = "1.0.0"
+version = "2.0.0"
+dependencies = [
+ "clap",
+]
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
+
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "syn"
+version = "2.0.117"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
+]
@@ -1,9 +1,10 @@
 [package]
 name = "hcn"
-version = "1.0.0"
-edition = "2021"
+version = "2.0.0"
+edition = "2024"

 [dependencies]
+clap = { version = "4", features = ["derive"] }

 [lints.rust]
 unsafe_code = "forbid"
@@ -0,0 +1,72 @@
+# hcn
+
+Find highly composite numbers up to a search limit.
+
+```bash
+cargo run --release -- [SEARCH_LIMIT]
+```
+
+If no limit is given, the default is `1_000_000_000`.
+Use `--help` to see the generated command-line help and `--version` to print
+the package version.
+
+## Structure
+
+- `src/main.rs`
+  - Command-line interface: parses the optional `SEARCH_LIMIT` argument with
+    `clap` and rejects non-positive limits before the search starts.
+  - Search setup: defines the default limit and the fixed prime list used for
+    candidate generation.
+  - Candidate generation: recursively builds only exponent sequences that can
+    produce highly composite record candidates.
+  - Record filtering: sorts candidates and prints each new divisor-count record.
+
+## Algorithm
+
+A number with prime factorization
+
+```text
+n = 2^a * 3^b * 5^c * ...
+```
+
+has
+
+```text
+(a + 1) * (b + 1) * (c + 1) * ...
+```
+
+divisors.
+
+The exact primes do not affect the divisor count; only the exponents do.
+For a fixed exponent list, the smallest possible number is made by putting the
+largest exponent on the smallest prime:
+
+```text
+a >= b >= c >= ...
+```
+
+If a larger exponent appears on a larger prime, swapping those two exponents
+keeps the divisor count unchanged but makes the number smaller.
+
+So a highly composite number cannot have that shape. If it did, the smaller
+swapped number would already have the same number of divisors, so the original
+number would not be the first record.
+
+That means record candidates are only numbers like:
+
+```text
+2^a * 3^b * 5^c * ...  where a >= b >= c >= ...
+```
+
+All other numbers are redundant for finding new records.
+
+The program:
+
+1. Recursively generates numbers from the first primes.
+2. Only tries exponent sequences where each exponent is no larger than the
+   previous one.
+3. Stops a branch as soon as the number exceeds the search limit.
+4. Computes the divisor count directly from the exponents.
+5. Sorts candidates by number and prints each new divisor-count record.
+
+This avoids factoring every number in the range.
@@ -1,64 +1,278 @@
-mod sieve;
+use std::{num::NonZeroU64, time::Instant};

-use std::time::Instant;
+use clap::Parser;

-use sieve::get_primes;
+const DEFAULT_SEARCH_LIMIT: u64 = 1_000_000_000;
+const FIRST_PRIMES: &[u64] = &[2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31];

-const MAX_SIEVED_PRIMES: usize = 100_000_000;
-
-fn count_prime_factor_exponent(prime: u64, mut nr: u64) -> u64 {
-    let mut count = 0;
-
-    while nr % prime == 0 {
-        nr /= prime;
-        count += 1;
-    }
-
-    count
+#[derive(Debug, Parser)]
+#[command(version, about = "Find highly composite numbers up to a search limit")]
+struct Cli {
+    #[arg(value_name = "SEARCH_LIMIT", default_value_t = NonZeroU64::new(DEFAULT_SEARCH_LIMIT).expect("default search limit is non-zero"))]
+    search_limit: NonZeroU64,
 }

-fn prime_factors(nr: u64, primes: &[u64]) -> u64 {
-    let mut num_teilers = 1;
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+struct Candidate {
+    nr: u64,
+    divisors: u64,
+}

-    // safety: nr <= 2.pow(53) must be fulfilled,
-    //         otherwise we have a precision loss
-    assert!(nr <= 2u64.pow(53));
-    #[allow(
-        clippy::cast_sign_loss,
-        clippy::cast_possible_truncation,
-        clippy::cast_precision_loss
-    )]
-    let nr_sqrt = (nr as f64).sqrt().ceil() as u64;
+fn max_exponent(limit: u64) -> u64 {
+    let mut exponent = 0;
+    let mut nr = 1_u64;

-    for prime in primes {
-        if *prime > nr_sqrt {
+    while let Some(next_nr) = nr.checked_mul(2) {
+        if next_nr > limit {
            break;
        }

-        let count = count_prime_factor_exponent(*prime, nr);
-        if count > 0 {
-            num_teilers *= count + 1;
+        nr = next_nr;
+        exponent += 1;
+    }
+
+    exponent
+}
+
+fn collect_hcn_candidates(
+    limit: u64,
+    prime_idx: usize,
+    max_exponent: u64,
+    nr: u64,
+    divisors: u64,
+    candidates: &mut Vec<Candidate>,
+) {
+    let Some(&prime) = FIRST_PRIMES.get(prime_idx) else {
+        return;
+    };
+
+    let mut next_nr = nr;
+
+    for exponent in 1..=max_exponent {
+        let Some(multiplied_nr) = next_nr.checked_mul(prime) else {
+            break;
+        };
+
+        if multiplied_nr > limit {
+            break;
+        }
+
+        next_nr = multiplied_nr;
+        let next_divisors = divisors * (exponent + 1);
+
+        candidates.push(Candidate {
+            nr: next_nr,
+            divisors: next_divisors,
+        });
+
+        collect_hcn_candidates(
+            limit,
+            prime_idx + 1,
+            exponent,
+            next_nr,
+            next_divisors,
+            candidates,
+        );
+    }
+}
+
+fn has_enough_primes(limit: u64) -> bool {
+    let mut primorial = 1_u64;
+
+    for &prime in FIRST_PRIMES {
+        let Some(next_primorial) = primorial.checked_mul(prime) else {
+            return true;
+        };
+
+        if next_primorial > limit {
+            return true;
+        }
+
+        primorial = next_primorial;
+    }
+
+    false
+}
+
+fn hcn_records(limit: u64) -> Vec<Candidate> {
+    assert!(
+        has_enough_primes(limit),
+        "not enough primes for search limit"
+    );
+
+    let mut candidates = Vec::new();
+    collect_hcn_candidates(limit, 0, max_exponent(limit), 1, 1, &mut candidates);
+    candidates.sort_unstable_by_key(|candidate| candidate.nr);
+
+    let mut records = Vec::new();
+    let mut max_divisors = 0;
+
+    for candidate in candidates {
+        if candidate.divisors > max_divisors {
+            records.push(candidate);
+            max_divisors = candidate.divisors;
        }
    }

-    num_teilers
+    records
 }

 fn main() {
-    let start = Instant::now();
-    println!("Precalculating primes...");
-    let primes = get_primes(MAX_SIEVED_PRIMES);
-    println!("{} primes. Took {:?}", primes.len(), start.elapsed());
-
-    let mut max_teilers = 0;
+    let search_limit = Cli::parse().search_limit.get();

    let start = Instant::now();
+    let records = hcn_records(search_limit);

-    for nr in (2..1_000_000_000).step_by(2) {
-        let teilers = prime_factors(nr, &primes);
-        if teilers > max_teilers {
-            println!("{nr}: {teilers} ({:?} since start)", start.elapsed());
-            max_teilers = teilers;
+    for Candidate { nr, divisors } in records {
+        println!("{nr}: {divisors} ({:?} since start)", start.elapsed());
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use clap::Parser;
+
+    use super::{Candidate, Cli, DEFAULT_SEARCH_LIMIT, hcn_records, max_exponent};
+
+    fn count_divisors(mut nr: u64) -> u64 {
+        let mut divisor_count = 1;
+        let mut divisor = 2;
+
+        while divisor * divisor <= nr {
+            let mut exponent = 0;
+
+            while nr.is_multiple_of(divisor) {
+                nr /= divisor;
+                exponent += 1;
+            }
+
+            if exponent > 0 {
+                divisor_count *= exponent + 1;
+            }
+
+            divisor += if divisor == 2 { 1 } else { 2 };
        }
+
+        if nr > 1 {
+            divisor_count *= 2;
+        }
+
+        divisor_count
+    }
+
+    fn brute_force_hcn_records(limit: u64) -> Vec<Candidate> {
+        let mut records = Vec::new();
+        let mut max_divisors = 0;
+
+        for nr in 2..=limit {
+            let divisors = count_divisors(nr);
+
+            if divisors > max_divisors {
+                records.push(Candidate { nr, divisors });
+                max_divisors = divisors;
+            }
+        }
+
+        records
+    }
+
+    #[test]
+    fn max_exponent_counts_powers_of_two_up_to_limit() {
+        assert_eq!(max_exponent(1), 0);
+        assert_eq!(max_exponent(2), 1);
+        assert_eq!(max_exponent(3), 1);
+        assert_eq!(max_exponent(16), 4);
+    }
+
+    #[test]
+    fn finds_highly_composite_records_up_to_one_thousand() {
+        let records = hcn_records(1_000);
+
+        assert_eq!(
+            records,
+            vec![
+                Candidate { nr: 2, divisors: 2 },
+                Candidate { nr: 4, divisors: 3 },
+                Candidate { nr: 6, divisors: 4 },
+                Candidate {
+                    nr: 12,
+                    divisors: 6,
+                },
+                Candidate {
+                    nr: 24,
+                    divisors: 8,
+                },
+                Candidate {
+                    nr: 36,
+                    divisors: 9,
+                },
+                Candidate {
+                    nr: 48,
+                    divisors: 10,
+                },
+                Candidate {
+                    nr: 60,
+                    divisors: 12,
+                },
+                Candidate {
+                    nr: 120,
+                    divisors: 16,
+                },
+                Candidate {
+                    nr: 180,
+                    divisors: 18,
+                },
+                Candidate {
+                    nr: 240,
+                    divisors: 20,
+                },
+                Candidate {
+                    nr: 360,
+                    divisors: 24,
+                },
+                Candidate {
+                    nr: 720,
+                    divisors: 30,
+                },
+                Candidate {
+                    nr: 840,
+                    divisors: 32,
+                },
+            ],
+        );
+    }
+
+    #[test]
+    fn matches_brute_force_records_up_to_ten_thousand() {
+        assert_eq!(hcn_records(10_000), brute_force_hcn_records(10_000));
+    }
+
+    #[test]
+    fn parses_default_search_limit_without_arg() {
+        assert_eq!(
+            Cli::try_parse_from(["hcn"])
+                .expect("CLI should parse without an explicit search limit")
+                .search_limit
+                .get(),
+            DEFAULT_SEARCH_LIMIT
+        );
+    }
+
+    #[test]
+    fn parses_search_limit_arg() {
+        assert_eq!(
+            Cli::try_parse_from(["hcn", "42000"])
+                .expect("CLI should parse an explicit search limit")
+                .search_limit
+                .get(),
+            42_000
+        );
+    }
+
+    #[test]
+    fn rejects_invalid_search_limit_arg() {
+        assert!(Cli::try_parse_from(["hcn", "nope"]).is_err());
+        assert!(Cli::try_parse_from(["hcn", "0"]).is_err());
+        assert!(Cli::try_parse_from(["hcn", "100", "200"]).is_err());
    }
 }
@@ -1,50 +0,0 @@
-pub fn get_primes(max_nr: usize) -> Vec<u64> {
-    let mut sieve = vec![true; max_nr + 1];
-
-    let mut primes = Vec::with_capacity(1_000_000);
-
-    sieve[0] = false;
-    sieve[1] = false;
-
-    let mut nr = 2;
-    primes.push(2);
-
-    loop {
-        check_off_multiples_of_nr(nr, &mut sieve);
-
-        if find_next_prime(&mut nr, &mut sieve).is_none() {
-            break;
-        }
-
-        primes.push(nr);
-    }
-
-    primes
-}
-
-fn find_next_prime(nr: &mut u64, sieve: &mut [bool]) -> Option<u64> {
-    let start_idx = usize::try_from(*nr).ok()? + 1;
-
-    if let Some((idx, _)) = sieve
-        .iter()
-        .enumerate()
-        .skip(start_idx)
-        .find(|&(_, &is_prime)| is_prime)
-    {
-        *nr = idx as u64;
-        return Some(*nr);
-    }
-
-    None
-}
-
-#[allow(clippy::unwrap_used)]
-fn check_off_multiples_of_nr(nr: u64, sieve: &mut [bool]) {
-    let nr = usize::try_from(nr).unwrap();
-
-    sieve
-        .iter_mut()
-        .skip(nr.checked_mul(2).unwrap())
-        .step_by(nr)
-        .for_each(|nr| *nr = false);
-}
Author	SHA1	Message	Date
ddidderr	4eb304bbf1	[release] hcn v2.0.0	2026-04-26 14:07:32 +02:00
ddidderr	04bb89375c	feat(cli): parse arguments with clap The binary now derives command-line parsing from clap instead of maintaining a custom parser. SEARCH_LIMIT remains an optional positional argument and keeps its default of 1_000_000_000, while clap now owns usage errors, --help, and --version output. The parser stores the limit as NonZeroU64 so zero is rejected before the search starts. The existing CLI parsing tests now exercise clap directly, and the README documents the generated help/version flags plus the top-level program structure. Test Plan: - cargo clippy - cargo clippy --benches - cargo clippy --tests - cargo test - cargo run -- --help Trailer: Refs: local request to replace custom argument parsing with clap Dependencies: none	2026-04-26 14:03:31 +02:00
ddidderr	09967ad6d7	docs: explain HCN search algorithm Add a concise README that documents how the program finds highly composite numbers. The explanation covers the divisor-count formula, why exponent order lets the search skip arbitrary numbers, and how the implementation generates and filters record candidates. Test Plan: - Not run; documentation-only change. Refs: N/A	2026-04-26 13:48:36 +02:00
ddidderr	8222199a7d	feat: accept search limit as CLI argument Allow users to override the default HCN search limit by passing one optional positive integer argument. Bad input now exits with status 2 and prints a clear message instead of silently using a fixed range. Keep the existing one-billion default when no argument is provided, so current usage remains unchanged. Test Plan: - cargo clippy - cargo clippy --benches - cargo clippy --tests - cargo test Refs: N/A	2026-04-26 13:48:19 +02:00
ddidderr	e36cecd2d3	perf: generate HCN records from exponent vectors Replace the range scan and trial division with a search over prime exponent vectors. Highly composite records only need candidates whose exponents are non-increasing across ascending primes, so the program can compute divisor counts directly while pruning branches above the search limit. Remove the sieve module because the new search no longer factors each number. This makes the current one-billion limit finish in microseconds after startup instead of scanning hundreds of millions of inputs. Test Plan: - cargo clippy - cargo clippy --benches - cargo clippy --tests - cargo test Refs: N/A	2026-04-26 13:47:44 +02:00
ddidderr	ca93c145bb	clippy: fixes	2026-04-26 13:33:25 +02:00
ddidderr	0208637dd0	chore: update edition from 2021 to 2024	2026-04-26 13:33:03 +02:00