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

allow alternate exponential representation

Browse Source
This commit is contained in:
Simon Gardling 2022-04-23 20:37:07 -04:00
parent 8434a95b71
commit 7058cd7123
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
parsing/src/parsing.rs
View File

@ -154,7 +154,8 @@ pub fn process_func_str(function_in: &str) -> String {
let function = function_in let function = function_in
.replace("log10(", "log(") // log10 -> log .replace("log10(", "log(") // log10 -> log
.replace("pi", "π") // pi -> π .replace("pi", "π") // pi -> π
.replace("exp", "\u{1fc93}"); // replace 'exp' with this random unicode character because it can't be parsed correctly .replace("exp", "\u{1fc93}") // replace 'exp' with this random unicode character because it can't be parsed correctly
.replace("**", "^"); // alternate exponential representation
let function_chars: Vec<char> = function.chars().collect(); let function_chars: Vec<char> = function.chars().collect();
let mut output_string: String = String::new(); let mut output_string: String = String::new();
for (i, c) in function_chars.iter().enumerate() { for (i, c) in function_chars.iter().enumerate() {
@ -284,6 +285,7 @@ mod tests {
"e^sin(x)", "e^sin(x)",
"E^sin(x)", "E^sin(x)",
"e^x", "e^x",
"x**2",
]; ];
for func_str in functions.iter().cloned() { for func_str in functions.iter().cloned() {
@ -332,6 +334,7 @@ mod tests {
("emax(x)", "e*max(x)"), ("emax(x)", "e*max(x)"),
("pisin(x)", "π*sin(x)"), ("pisin(x)", "π*sin(x)"),
("e^sin(x)", "e^sin(x)"), ("e^sin(x)", "e^sin(x)"),
("x**2", "x^2"),
]); ]);
for (key, value) in values { for (key, value) in values {