⚡ Choose weighted for onset/coda

Thaza-Kun · May 26, 2024 · 92e84db · 92e84db
1 parent 2c3716a
commit 92e84db
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/wasm-rs/onc/src/phonotactics.rs b/wasm-rs/onc/src/phonotactics.rs
@@ -47,12 +47,21 @@ impl PhonotacticRule {
         let mut fake = String::new();
         let mut inner_definition = self.definition.clone();
         // Possibly empty onset or coda
+        // The onset/coda are inversely weighted by its length (short onset/coda are prioritized)
         inner_definition.onset.items.push("".into());
         inner_definition.coda.items.push("".into());
         for _ in 0..syllables {
-            let onset = inner_definition.onset.items.choose(rng).unwrap();
+            let onset = inner_definition
+                .onset
+                .items
+                .choose_weighted(rng, |i| 2 / (i.len() + 1))
+                .unwrap();
             let nucleus = inner_definition.nucleus.items.choose(rng).unwrap();
-            let coda = inner_definition.coda.items.choose(rng).unwrap();
+            let coda = inner_definition
+                .coda
+                .items
+                .choose_weighted(rng, |i| 2 / (i.len() + 1))
+                .unwrap();
             fake = format!("{}{}{}{}", fake, onset, nucleus, coda);
         }
         fake

diff --git a/wasm-rs/onc/src/phonotactics/tags.rs b/wasm-rs/onc/src/phonotactics/tags.rs
@@ -5,16 +5,16 @@ use nom::{
 
 use super::{Phrase, SyllableUnit};
 
-#[derive(Clone, Default)]
-#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
+#[derive(Clone, Default, serde::Deserialize)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize))]
 pub struct AltTagVec<T> {
     pub items: Vec<T>,
     #[serde(skip)]
     index: usize,
 }
 
-#[derive(Clone, Default)]
-#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
+#[derive(Clone, Default, serde::Deserialize)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize))]
 pub struct SyllableTags<T> {
     pub onset: AltTagVec<T>,
     pub nucleus: AltTagVec<T>,