titaniumtown/YTBN-Graphing-Software
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't display 0/0, display 'Undefined'

Browse Source
This commit is contained in:
Simon Gardling 2022-04-12 15:05:15 -04:00
parent 316305b89e
commit 1e73f69506
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/parsing.rs
View File

@ -57,7 +57,8 @@ impl BackingFunction {
let derivative_1 = function let derivative_1 = function
.partial(0) .partial(0)
.unwrap_or_else(|_| EMPTY_FUNCTION.clone()); .unwrap_or_else(|_| EMPTY_FUNCTION.clone());
let derivative_1_str = derivative_1.unparse().to_owned().replace("{x}", "x");
let derivative_1_str = prettyify_function_str(derivative_1.unparse());
let derivative_2 = function let derivative_2 = function
.partial_iter([0, 0].iter()) .partial_iter([0, 0].iter())
@ -109,14 +110,24 @@ impl BackingFunction {
self.nth_derivative = Some(( self.nth_derivative = Some((
n, n,
new_func.clone(), new_func.clone(),
new_func.unparse().to_owned().replace("{x}", "x"), prettyify_function_str(new_func.unparse()),
)); ));
return new_func.eval(&[x]).unwrap_or(f64::NAN); new_func.eval(&[x]).unwrap_or(f64::NAN)
} }
} }
} }
} }
fn prettyify_function_str(func: &str) -> String {
let new_str = func.to_owned().replace("{x}", "x");
if &new_str == "0/0" {
"Undefined".to_owned()
} else {
new_str
}
}
const VALID_VARIABLES: [char; 5] = ['x', 'X', 'e', 'E', 'π']; const VALID_VARIABLES: [char; 5] = ['x', 'X', 'e', 'E', 'π'];
const LETTERS: [char; 52] = [ const LETTERS: [char; 52] = [
'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's',