From f9fd2834f187faf48e6355ad877c648b7edb05ee Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Thu, 11 Sep 2025 18:10:07 +0200 Subject: [PATCH] Solver, no clap tho --- Cargo.toml | 2 -- src/main.rs | 70 ++++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 53 insertions(+), 19 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 725d417..14e2a68 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,5 +2,3 @@ name = "wodol" version = "0.1.0" edition = "2024" - -[dependencies] diff --git a/src/main.rs b/src/main.rs index 702a504..585d67c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,7 +4,7 @@ // find better weight #![allow(dead_code)] -use std::fs::read_to_string; +use std::{fmt::Display, fs::read_to_string}; #[derive(Debug, Eq, PartialEq, Clone)] struct Word { @@ -94,6 +94,17 @@ struct Wordlist { inner: Vec, } +impl Display for Wordlist { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + let o = self + .inner + .iter() + .map(|w| w.origin.clone()) + .collect::>() + .join(", "); + write!(f, "{}", o) + } +} impl Wordlist { fn new(inner: Vec) -> Self { Self { inner } @@ -133,7 +144,16 @@ impl TotalScore { } impl Ord for TotalScore { fn cmp(&self, other: &Self) -> std::cmp::Ordering { - self.score.cmp(&other.score) + match self.score.cmp(&other.score) { + std::cmp::Ordering::Equal => { + if let (Some(w1), Some(w2)) = (self.words.first(), other.words.first()) { + w1.cmp(w2) + } else { + std::cmp::Ordering::Equal + } + } + a => a, + } } } @@ -154,13 +174,13 @@ fn backtrack_best( } else { // Sort original data let mut list = origin_list.clone(); - let mut weights = origin_weights.clone(); + let weights = origin_weights.clone(); list.update_weights(&weights); list.sort(); // Pick n bests word, backtrack their score and return the best of the best results let mut list_guesses = Vec::new(); - for i in 0..5 { + for i in 0..10 { let guess = list.guess(i); // println!("{:?}", guess); let mut weights = origin_weights.clone(); @@ -187,17 +207,33 @@ fn main() { let weights = wl.make_weights(); // println!("{:?}", wl); - let best = backtrack_best(&wl, &weights, TotalScore::default(), 3); - println!("Best: {:?}", best); - let list: Vec<&Word> = wl - .inner - .iter() - .filter(|w| { - String::from("ware") - .chars() - .into_iter() - .all(|c| w.origin.contains(c)) - }) - .collect(); - println!("{:?}", list); + // let best = backtrack_best(&wl, &weights, TotalScore::default(), 5); + // println!( + // "Best 5: {:?}", + // backtrack_best(&wl, &weights, TotalScore::default(), 5) + // ); + // println!( + // "Best 4: {:?}", + // backtrack_best(&wl, &weights, TotalScore::default(), 4) + // ); + println!( + "Best 3: {:#?}", + backtrack_best(&wl, &weights, TotalScore::default(), 3) + ); + println!( + "Best 2: {:#?}", + backtrack_best(&wl, &weights, TotalScore::default(), 2) + ); + let list = Wordlist::new( + wl.inner + .into_iter() + .filter(|w| { + String::from("olen") + .chars() + .into_iter() + .all(|c| w.origin.contains(c)) + }) + .collect(), + ); + println!("{}", list); }