added max valid iterations

Author: jackyarndley

src/math/series_approximation.rs

@@ -20,6 +20,7 @@ pub struct SeriesApproximation {
     approximation_probes: Vec<Vec<ComplexExtended>>,
     approximation_probes_derivative: Vec<Vec<ComplexExtended>>,
     pub min_valid_iteration: usize,
+    pub max_valid_iteration: usize,
     pub valid_iterations: Vec<usize>,
     pub valid_interpolation: Vec<usize>,
     pub probe_sampling: usize,
@@ -49,6 +50,7 @@ impl SeriesApproximation {
             approximation_probes: Vec::new(),
             approximation_probes_derivative: Vec::new(),
             min_valid_iteration: 1,
+            max_valid_iteration: 1,
             valid_iterations: Vec::new(),
             valid_interpolation: Vec::new(),
             probe_sampling,
@@ -360,6 +362,8 @@ impl SeriesApproximation {
             }
         }
 
+        self.max_valid_iteration = self.valid_interpolation.iter().max().unwrap().clone();
+
         // println!("series approximation valid interpolation buffer:");
         // let temp_size = self.probe_sampling - 1;
         // for i in 0..temp_size {

src/renderer.rs

@@ -217,6 +217,7 @@ impl FractalRenderer {
             self.center_reference.run(&self.progress.reference, &self.progress.reference_maximum, &stop_flag);
 
             if stop_flag.get() >= 1 {
+                self.progress.reset();
                 self.render_time = frame_time.elapsed().as_millis();
                 return;
             };
@@ -244,6 +245,7 @@ impl FractalRenderer {
         }
 
         if stop_flag.get() >= 1 {
+            self.progress.reset();
             self.render_time = frame_time.elapsed().as_millis();
             return;
         };
@@ -276,9 +278,12 @@ impl FractalRenderer {
             &self.center_reference,
             &self.progress.series_validation);
 
-        self.progress.min_series_approximation.add(self.series_approximation.min_valid_iteration);
+        // -1 because we already know that 1 iteration can be skipped (take z = c)
+        self.progress.min_series_approximation.add(self.series_approximation.min_valid_iteration - 1);
+        self.progress.max_series_approximation.add(self.series_approximation.max_valid_iteration - 1);
 
         if stop_flag.get() >= 1 {
+            self.progress.reset();
             self.render_time = frame_time.elapsed().as_millis();
             return;
         };
@@ -377,6 +382,7 @@ impl FractalRenderer {
         };
 
         if stop_flag.get() >= 1 {
+            self.progress.reset();
             self.render_time = frame_time.elapsed().as_millis();
             return;
         };
@@ -470,6 +476,7 @@ impl FractalRenderer {
 
             if stop_flag.get() >= 1 {
                 self.render_time = frame_time.elapsed().as_millis();
+                self.progress.reset();
                 return;
             };
 

src/util/progress.rs

@@ -7,6 +7,7 @@ pub struct ProgressCounters {
     pub reference_maximum: Arc<RelaxedCounter>,
     pub series_approximation: Arc<RelaxedCounter>,
     pub min_series_approximation: Arc<RelaxedCounter>,
+    pub max_series_approximation: Arc<RelaxedCounter>,
     pub series_validation: Arc<RelaxedCounter>,
     pub iteration: Arc<RelaxedCounter>,
     pub glitched_maximum: Arc<RelaxedCounter>,
@@ -18,7 +19,8 @@ impl ProgressCounters {
             reference: Arc::new(RelaxedCounter::new(0)),
             reference_maximum: Arc::new(RelaxedCounter::new(maximum_iteration - 1)),
             series_approximation: Arc::new(RelaxedCounter::new(0)),
-            min_series_approximation: Arc::new(RelaxedCounter::new(0)),
+            min_series_approximation: Arc::new(RelaxedCounter::new(1)),
+            max_series_approximation: Arc::new(RelaxedCounter::new(1)),
             series_validation: Arc::new(RelaxedCounter::new(0)),
             iteration: Arc::new(RelaxedCounter::new(0)),
             glitched_maximum: Arc::new(RelaxedCounter::new(0))
@@ -28,7 +30,8 @@ impl ProgressCounters {
     // TODO just set these to zero rather than reset
     // Reset without the series approximation changed
     pub fn reset(&mut self) {
-        self.min_series_approximation = Arc::new(RelaxedCounter::new(0));
+        self.min_series_approximation = Arc::new(RelaxedCounter::new(1));
+        self.max_series_approximation = Arc::new(RelaxedCounter::new(1));
         self.series_validation = Arc::new(RelaxedCounter::new(0));
         self.iteration = Arc::new(RelaxedCounter::new(0));
         self.glitched_maximum = Arc::new(RelaxedCounter::new(0));