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

simplify

Browse Source
This commit is contained in:
Simon Gardling 2022-03-03 21:35:03 -05:00
parent 4645cec778
commit e201d61045
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/function.rs
View File

@ -186,14 +186,11 @@ impl Function {
let step = (self.integral_min_x - self.integral_max_x).abs() / (self.integral_num as f64); let step = (self.integral_min_x - self.integral_max_x).abs() / (self.integral_num as f64);
let half_step = step / 2.0;
let data2: Vec<(f64, f64)> = (1..=self.integral_num) let data2: Vec<(f64, f64)> = (1..=self.integral_num)
.map(|e| { .map(|e| {
let x: f64 = ((e as f64) * step) + self.integral_min_x; let x: f64 = ((e as f64) * step) + self.integral_min_x;
let x2: f64 = match x.is_sign_positive() { let step_offset = step * x.signum();
true => x + step, let x2: f64 = x + step_offset;
false => x - step,
};
let (left_x, right_x) = match x.is_sign_positive() { let (left_x, right_x) = match x.is_sign_positive() {
true => (x, x2), true => (x, x2),
@ -201,10 +198,7 @@ impl Function {
}; };
( (
match x.is_sign_positive() { x + (step_offset / 2.0),
true => x + half_step,
false => x - half_step,
},
match self.sum { match self.sum {
RiemannSum::Left => self.run_func(left_x), RiemannSum::Left => self.run_func(left_x),
RiemannSum::Right => self.run_func(right_x), RiemannSum::Right => self.run_func(right_x),