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

remove movement cache functionality (it was insanely broken)

Browse Source
This commit is contained in:
Simon Gardling 2022-06-18 20:46:46 -04:00
parent 1110e92ef3
commit bb4640478a
2 changed files with 27 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TODO.md
View File

@ -19,4 +19,3 @@
10. Add Url hashes loading and setting 10. Add Url hashes loading and setting
11. Store settings in LocalStorage/Cookies and persist state 11. Store settings in LocalStorage/Cookies and persist state
12. Set x value to go to 12. Set x value to go to
13. Fix movement optimizations

102
src/function_entry.rs
View File

@ -285,88 +285,40 @@ impl FunctionEntry {
self.clear_integral(); self.clear_integral();
} }
let mut partial_regen = false; if width_changed | min_max_changed | did_zoom {
if width_changed {
self.clear_back();
self.clear_derivative();
} else if min_max_changed && !self.back_data.is_empty() && !did_zoom && {
let prev_min = unsafe { self.back_data.first().unwrap_unchecked() }.x;
let min_i = ((settings.min_x - prev_min) as f64 / resolution) as usize;
(prev_min < settings.min_x) && ((self.back_data.len() - 1) > min_i)
} {
partial_regen = true;
let prev_min = unsafe { self.back_data.first().unwrap_unchecked() }.x;
let min_i = ((settings.min_x - prev_min) as f64 / resolution) as usize;
{
let _ = self.back_data.drain(min_i..=settings.plot_width);
let mut new_data: Vec<Value> = (min_i..=settings.plot_width)
.map(move |x: usize| (x as f64 * resolution) + settings.min_x)
.map(|x: f64| Value::new(x, self.function.get(x)))
.collect();
self.back_data.append(&mut new_data);
debug_assert_eq!(self.back_data.len(), settings.plot_width + 1);
}
{
let _ = self.derivative_data.drain(min_i..=settings.plot_width);
let mut new_data: Vec<Value> = (min_i..=settings.plot_width)
.map(move |x: usize| (x as f64 * resolution) + settings.min_x)
.map(|x: f64| Value::new(x, self.function.get_derivative_1(x)))
.collect();
self.derivative_data.append(&mut new_data);
debug_assert_eq!(self.derivative_data.len(), settings.plot_width + 1);
}
if self.nth_derviative && let Some(data) = self.nth_derivative_data.as_mut() {
let _ = data.drain(min_i..=settings.plot_width);
let mut new_data: Vec<Value> = (min_i..=settings.plot_width)
.map(move |x: usize| (x as f64 * resolution) + settings.min_x)
.map(|x: f64| Value::new(x, self.function.get_nth_derivative(self.curr_nth, x)))
.collect();
data.append(&mut new_data);
debug_assert_eq!(data.len(), settings.plot_width + 1);
}
} else {
self.clear_back(); self.clear_back();
self.clear_derivative(); self.clear_derivative();
self.clear_nth();
} }
if !partial_regen { if self.back_data.is_empty() {
if self.back_data.is_empty() { let data: Vec<Value> = resolution_iter
let data: Vec<Value> = resolution_iter .clone()
.clone() .into_iter()
.into_iter() .map(|x| Value::new(x, self.function.get(x)))
.map(|x| Value::new(x, self.function.get(x))) .collect();
.collect(); debug_assert_eq!(data.len(), settings.plot_width + 1);
debug_assert_eq!(data.len(), settings.plot_width + 1);
self.back_data = data; self.back_data = data;
} }
if self.derivative_data.is_empty() { if self.derivative_data.is_empty() {
let data: Vec<Value> = resolution_iter let data: Vec<Value> = resolution_iter
.clone() .clone()
.into_iter() .into_iter()
.map(|x| Value::new(x, self.function.get_derivative_1(x))) .map(|x| Value::new(x, self.function.get_derivative_1(x)))
.collect(); .collect();
debug_assert_eq!(data.len(), settings.plot_width + 1); debug_assert_eq!(data.len(), settings.plot_width + 1);
self.derivative_data = data; self.derivative_data = data;
} }
if self.nth_derviative && self.nth_derivative_data.is_none() { if self.nth_derviative && self.nth_derivative_data.is_none() {
let data: Vec<Value> = resolution_iter let data: Vec<Value> = resolution_iter
.into_iter() .into_iter()
.map(|x| Value::new(x, self.function.get_nth_derivative(self.curr_nth, x))) .map(|x| Value::new(x, self.function.get_nth_derivative(self.curr_nth, x)))
.collect(); .collect();
debug_assert_eq!(data.len(), settings.plot_width + 1); debug_assert_eq!(data.len(), settings.plot_width + 1);
self.nth_derivative_data = Some(data); self.nth_derivative_data = Some(data);
}
} }
if self.integral { if self.integral {