extern/kalker
1
0
Fork 0
mirror of https://github.com/PaddiM8/kalker.git synced 2024-12-13 01:50:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed panic for numbers like 6.6666667

Browse Source
This commit is contained in:
bakk 2022-01-22 02:21:16 +01:00
parent 09cee0f463
commit ba2a840a28
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kalk/src/kalk_value/rounding.rs
View File

@ -115,13 +115,17 @@ fn equivalent_fraction(value: f64) -> Option<String> {
// https://goodcalculators.com/repeating-decimal-to-fraction-conversion-calculator/ // https://goodcalculators.com/repeating-decimal-to-fraction-conversion-calculator/
let (mut numer, mut denom) = if let Some(repeatend_str) = find_repeatend(&abs_value_str) { let (mut numer, mut denom) = if let Some(repeatend_str) = find_repeatend(&abs_value_str) {
let repeatend_pos = abs_value_str.find(&repeatend_str)?; let dot_pos = abs_value_str.find('.')?;
let non_repeating_str = &abs_value_str[..repeatend_pos]; let repeatend_pos = abs_value_str[dot_pos..].find(&repeatend_str)? + dot_pos;
let non_repeating_str = &abs_value_str[..repeatend_pos].trim_end_matches('.');
// non-repeating // non-repeating
let non_repeating = non_repeating_str.parse::<f64>().unwrap_or(0f64); let non_repeating = non_repeating_str.parse::<f64>().unwrap_or(0f64);
let non_repeating_dec_count = let non_repeating_dec_count = if let Some(dot_pos) = non_repeating_str.find('.') {
non_repeating_str.len() - non_repeating_str.find('.').unwrap_or(0) - 1; non_repeating_str.len() - dot_pos - 1
} else {
0
};
let a = non_repeating.fract(); let a = non_repeating.fract();
// repeatend // repeatend