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

simplify integral calculation code

Browse Source
This commit is contained in:
Simon Gardling 2022-03-02 23:40:38 -05:00
parent 395deb70da
commit a25b840ab2
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/function.rs
View File

@ -198,7 +198,7 @@ impl Function {
} }
false => { false => {
debug_log("front_cache: regen"); debug_log("front_cache: regen");
let (data, area) = self.integral_rectangles(self.sum); let (data, area) = self.integral_rectangles();
let bars: Vec<Bar> = data.iter().map(|(x, y)| Bar::new(*x, *y)).collect(); let bars: Vec<Bar> = data.iter().map(|(x, y)| Bar::new(*x, *y)).collect();
let output = (bars, area); let output = (bars, area);
@ -213,7 +213,7 @@ impl Function {
} }
// Creates and does the math for creating all the rectangles under the graph // Creates and does the math for creating all the rectangles under the graph
fn integral_rectangles(&self, riemann: RiemannSum) -> (Vec<(f64, f64)>, f64) { fn integral_rectangles(&self) -> (Vec<(f64, f64)>, f64) {
if self.integral_min_x.is_nan() { if self.integral_min_x.is_nan() {
panic!("integral_min_x is NaN") panic!("integral_min_x is NaN")
} else if self.integral_max_x.is_nan() { } else if self.integral_max_x.is_nan() {
@ -226,34 +226,29 @@ impl Function {
let data2: Vec<(f64, f64)> = (0..self.integral_num) let data2: Vec<(f64, f64)> = (0..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 > 0.0 { let x2: f64 = match x.is_sign_positive() {
true => x + step, true => x + step,
false => x - step, false => x - step,
}; };
let left_x: f64 = match x > 0.0 { let (left_x, right_x) = match x.is_sign_positive() {
true => x, true => (x, x2),
false => x2, false => (x2, x),
};
let right_x: f64 = match x > 0.0 {
true => x2,
false => x,
}; };
let y: f64 = match riemann { let y: f64 = 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),
RiemannSum::Middle => (self.run_func(left_x) + self.run_func(right_x)) / 2.0, RiemannSum::Middle => (self.run_func(left_x) + self.run_func(right_x)) / 2.0,
}; };
let mut output = (x, y);
// Applies `half_step` in order to make the bar graph display properly (
if output.0 > 0.0 { match x.is_sign_positive() {
output.0 += half_step; true => x + half_step,
} else { false => x - half_step,
output.0 -= half_step; },
} y,
output )
}) })
.filter(|(_, y)| !y.is_nan()) .filter(|(_, y)| !y.is_nan())
.collect(); .collect();