diff --git a/Cargo.lock b/Cargo.lock index ac3ad34..726f661 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,185 @@ # It is not intended for manual editing. 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 = "dynamic-pangramming" version = "0.1.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.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368" +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.118" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422" +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", +] diff --git a/Cargo.toml b/Cargo.toml index 7d9c4af..03256b5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,6 +4,7 @@ version = "0.1.0" edition = "2024" [dependencies] +clap = { version = "4.6.1", features = ["derive"] } [profile.release] # debug = true diff --git a/src/main.rs b/src/main.rs index 048fe4e..a496b81 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,3 +1,5 @@ +use clap::Parser; + use std::{ env, io::{self, BufRead, BufReader}, @@ -9,11 +11,8 @@ use crate::letterset::LetterSet; mod letterset; fn main() { - let search_limit = env::args() - .nth(1) - .and_then(|n| n.parse::().ok()) - .unwrap_or(1000); - eprintln!("search depth: {search_limit}"); + let cfg = SolveConfig::parse(); + println!("{cfg:#?}"); let mut dictionary: Vec<_> = BufReader::new(io::stdin().lock()) .lines() @@ -25,16 +24,47 @@ fn main() { .collect(); eprintln!("words: {}", dictionary.len()); - let Some((len, path)) = solve(&mut dictionary, search_limit) else { + preprocess_dict(&mut dictionary); + + let Some((len, path)) = solve(&dictionary, &cfg) else { println!("failed :("); process::exit(1); }; println!("{len}: {}", path.into_iter().collect::>().join(" ")); } -const MAX_SOLUTION_LENGTH: u8 = 200; +/// English pangram generator from custom dictionaries +#[derive(Parser, Clone, Debug)] +#[command(version, about)] +struct SolveConfig { + /// The maximum length of a solution. + /// + /// Smaller lengths are more likely to fail, but may be faster. Should be >=26. + #[arg(short, long, default_value_t = 30)] + max_length: u8, -fn solve(dictionary: &mut [(String, LetterSet)], search_limit: usize) -> Option<(u8, Vec<&str>)> { + /// The max number of valid words to search at once. + /// + /// Higher values will make things much slower with diminishing returns. + #[arg(short = 'l', long, default_value_t = 1000)] + search_limit: usize, + + /// Whether to require a PERFECT PANGRAM. + /// + /// Will probably fail without a very high search limit and a lot of attempts. + #[arg(short, long, default_value_t = false)] + perfect: bool, +} + +fn preprocess_dict(dictionary: &mut [(String, LetterSet)]) { + dictionary.sort_by_key(|(word, ls)| word.len() - usize::from(ls.len())); + eprintln!("sorted!"); +} + +fn solve<'d>( + dictionary: &'d [(String, LetterSet)], + cfg: &SolveConfig, +) -> Option<(u8, Vec<&'d str>)> { let target = LetterSet::FULL; let mut bests = (0..=LetterSet::FULL.to_index()) @@ -43,10 +73,7 @@ fn solve(dictionary: &mut [(String, LetterSet)], search_limit: usize) -> Option< eprintln!("allocated!"); bests[LetterSet::FULL.to_index()] = (0, None); - dictionary.sort_by_key(|(word, ls)| word.len() - usize::from(ls.len())); - eprintln!("sorted!"); - - score(dictionary, &mut bests, search_limit, target.negation(), 0); + score(dictionary, &mut bests, cfg, target.negation(), 0); eprintln!("scored!"); let (len, start) = bests[target.negation().to_index()]; @@ -72,11 +99,15 @@ fn solve(dictionary: &mut [(String, LetterSet)], search_limit: usize) -> Option< fn score<'d>( dictionary: &'d [(String, LetterSet)], bests: &mut [(u8, Option<&'d str>)], - search_limit: usize, + cfg @ SolveConfig { + max_length, + search_limit, + perfect, + }: &SolveConfig, done_letters: LetterSet, length: u8, ) -> u8 { - if length > MAX_SOLUTION_LENGTH { + if length > *max_length { return u8::MAX; } @@ -88,22 +119,20 @@ fn score<'d>( let Some((word, score)) = dictionary .iter() .filter(|(word, ls)| { - (!ls.difference(done_letters).is_empty()) - && u8::try_from(word.len()).unwrap().saturating_add(length) <= MAX_SOLUTION_LENGTH + if *perfect { + ls.intersection(done_letters).is_empty() + } else { + (!ls.difference(done_letters).is_empty()) + && u8::try_from(word.len()).unwrap().saturating_add(length) <= *max_length + } }) .map(|(word, ls)| { let word_len = u8::try_from(word.len()).unwrap(); let new_length = word_len.saturating_add(length); - let rest_score = score( - dictionary, - bests, - search_limit, - done_letters.union(*ls), - new_length, - ); + let rest_score = score(dictionary, bests, cfg, done_letters.union(*ls), new_length); (word, word_len.saturating_add(rest_score)) }) - .take(search_limit) + .take(*search_limit) .min_by_key(|(_, score)| *score) else { return u8::MAX;