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

stop newton iteration if outside display range

Browse Source
This commit is contained in:
Simon Gardling 2022-03-09 22:36:34 -05:00
parent c0ef293da9
commit 79da65792b
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/function.rs
View File

@ -308,14 +308,26 @@ impl FunctionEntry {
let x = { let x = {
let mut x1: f64 = last_ele.unwrap().x; let mut x1: f64 = last_ele.unwrap().x;
let mut x2: f64; let mut x2: f64;
let mut fail: bool = false;
for _ in 0..NEWTON_LOOPS { for _ in 0..NEWTON_LOOPS {
x2 = x1 - (self.function.get(x1) / self.function.derivative(x1)); x2 = x1 - (self.function.get(x1) / self.function.derivative(x1));
if !(self.min_x..self.max_x).contains(&x2) {
fail = true;
break;
}
x1 = x2; x1 = x2;
} }
x1
match fail {
true => f64::NAN,
false => x1,
}
}; };
if !x.is_nan() {
root_list.push(Value::new(x, self.function.get(x))); root_list.push(Value::new(x, self.function.get(x)));
} }
}
last_ele = Some(*ele); last_ele = Some(*ele);
} }
self.output.roots = Some(root_list); self.output.roots = Some(root_list);
@ -343,15 +355,27 @@ impl FunctionEntry {
let x = { let x = {
let mut x1: f64 = last_ele.unwrap().x; let mut x1: f64 = last_ele.unwrap().x;
let mut x2: f64; let mut x2: f64;
let mut fail: bool = false;
for _ in 0..NEWTON_LOOPS { for _ in 0..NEWTON_LOOPS {
x2 = x1 x2 = x1
- (self.function.derivative(x1) / self.function.get_derivative_2(x1)); - (self.function.derivative(x1) / self.function.get_derivative_2(x1));
if !(self.min_x..self.max_x).contains(&x2) {
fail = true;
break;
}
x1 = x2; x1 = x2;
} }
x1
match fail {
true => f64::NAN,
false => x1,
}
}; };
if !x.is_nan() {
extrama_list.push(Value::new(x, self.function.get(x))); extrama_list.push(Value::new(x, self.function.get(x)));
} }
}
last_ele = Some(*ele); last_ele = Some(*ele);
} }
self.output.extrema = Some(extrama_list); self.output.extrema = Some(extrama_list);