diff options
| author | tslil clingman <tslil@posteo.de> | 2022-10-22 13:12:04 +0200 |
|---|---|---|
| committer | tslil clingman <tslil@posteo.de> | 2022-10-22 13:14:57 +0200 |
| commit | f6d4be2195a9103e42b00c9aa362c62d079c3f4e (patch) | |
| tree | 333c1f15325e1f51096e47355e455790b540ac3e /srchr/src/evaluation.rs | |
| parent | 1fa7552c3018d541b617b5ceebc6abeaba013eaa (diff) | |
stats loading directly from json file
Diffstat (limited to 'srchr/src/evaluation.rs')
| -rw-r--r-- | srchr/src/evaluation.rs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/srchr/src/evaluation.rs b/srchr/src/evaluation.rs index b412d88..3d171b0 100644 --- a/srchr/src/evaluation.rs +++ b/srchr/src/evaluation.rs @@ -92,7 +92,6 @@ pub fn prelayout_fitness(corpus: &Corpus, layout: &Prelayout) -> f32 { pub struct Evaluation { keypress_perc: [f32; NUM_KEYS], - total_bigrams: u32, sfb: [f32; 8], dsfb: [f32; 8], } @@ -183,7 +182,6 @@ impl Evaluation { return Evaluation { keypress_perc, - total_bigrams: corpus.get_total_bigrams(), sfb, dsfb, }; @@ -191,8 +189,6 @@ impl Evaluation { fn output_eval(&self) -> String { let mut result = String::new(); - let big = self.total_bigrams as f32; - let tig = self.total_bigrams as f32; result += &"Percent per key:\n"; result += &format_block_output(self.keypress_perc.into_iter().map(|u| u * 100.0)); @@ -228,8 +224,8 @@ impl Evaluation { let sfb = self.sfb.iter().sum::<f32>(); let dsfb = self.dsfb.iter().sum::<f32>(); - result += &format!("\nTotal sfb: {:.3}% ({:.0})", sfb * 100.0, sfb * big); - result += &format!("\nTotal dsfb: {:.3}% ({:.0})", dsfb * 100.0, dsfb * tig); + result += &format!("\nTotal sfb: {:.3}%", sfb * 100.0); + result += &format!("\nTotal dsfb: {:.3}%", dsfb * 100.0); return result; } |