From f6d4be2195a9103e42b00c9aa362c62d079c3f4e Mon Sep 17 00:00:00 2001
From: tslil clingman <tslil@posteo.de>
Date: Sat, 22 Oct 2022 13:12:04 +0200
Subject: stats loading directly from json file

---
 srchr/src/evaluation.rs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'srchr/src/evaluation.rs')

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;
     }
-- 
cgit v1.3.1