eryn/cryptopals
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove prints from letter frequency stuff

Browse source
This commit is contained in:
Eryn Wells 2018-04-08 09:27:01 -07:00
parent c5f8321c84
commit 149993f16d
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/letter_frequency.rs
View file

@ -39,7 +39,6 @@ impl<'a> LetterFreq for &'a str {
if english_letters.contains(&c_str) { if english_letters.contains(&c_str) {
*freqs.entry(c_str).or_insert(0f32) += 1f32; *freqs.entry(c_str).or_insert(0f32) += 1f32;
} }
println!("{:?}: {:?}", c, freqs);
} }
freqs freqs
} }
@ -52,12 +51,9 @@ impl<'a> LetterFreq for &'a str {
let freqs = self.letter_freqs(lang); let freqs = self.letter_freqs(lang);
let english_freqs = english_letter_freqs(); let english_freqs = english_letter_freqs();
let num_letters = freqs.values().sum::<f32>(); let num_letters = freqs.values().sum::<f32>();
println!("freqs:{:?}, num:{}", freqs, num_letters);
let score = english_freqs.into_iter() let score = english_freqs.into_iter()
.map(|(c, sc)| (freqs.get(&c).map_or(0f32, |c| *c), sc * num_letters)) .map(|(c, sc)| (freqs.get(&c).map_or(0f32, |c| *c), sc * num_letters))
.inspect(|c| println!("{:?}", c))
.fold(0f32, |acc, (obs, exp)| acc + ((obs - exp).powf(2.0) / exp)); .fold(0f32, |acc, (obs, exp)| acc + ((obs - exp).powf(2.0) / exp));
println!("chi2 -> {}", score);
score score
} }
} }