more changes to make old files work

Author: jackyarndley

default.toml

@@ -2,7 +2,7 @@ image_width = 1000
 image_height = 1000
 rotate = 0
 approximation_order = 0
-glitch_tolerance = 0.001
+glitch_percentage = 0.001
 frames = 1
 frame_offset = 0
 zoom_scale = 2.0

high.toml

@@ -2,7 +2,7 @@ image_width = 1920
 image_height = 1080
 rotate = 0
 approximation_order = 48
-glitch_tolerance = 0.001
+glitch_percentage = 0.001
 frames = 1
 frame_offset = 0
 zoom_scale = 2.0

high_experimental.toml

@@ -6,10 +6,10 @@ glitch_percentage = 0.001
 frames = 1
 frame_offset = 0
 zoom_scale = 2.0
-display_glitches = true
+display_glitches = false
 auto_adjust_iterations = true
 probe_sampling = 12
-remove_centre = false
+remove_centre = true
 export = "png"
 
 # By default this is squared tolerance. 1e-6 works normally, 1.4e-6 is low tolerance.
@@ -19,5 +19,4 @@ glitch_tolerance = 1.4e-6
 experimental = true 
 high_precision_data_interval = 100
 valid_iteration_frame_multiplier = 0.75
-valid_iteration_probe_multiplier = 0.98
-
+valid_iteration_probe_multiplier = 0.98

locations/super_dense.toml

@@ -0,0 +1,4 @@
+real = "-1.94151209635203446394399999999999999999995"
+imag = "0.00663498740113024706519999999999999999995"
+zoom = "1.53916775627E16"
+iterations = 10000000

low.toml

@@ -2,7 +2,7 @@ image_width = 500
 image_height = 500
 rotate = 0
 approximation_order = 16
-glitch_tolerance = 0.001
+glitch_percentage = 0.001
 frames = 1
 frame_offset = 0
 zoom_scale = 2.0

src/math/series_approximation.rs

@@ -173,7 +173,7 @@ impl SeriesApproximation {
             let mut valid_iterations_array = Vec::new();
             valid_iterations_array.push(first_valid_iterations);
 
-            let new_start_iterations = (first_valid_iterations as f32 * self.valid_iteration_probe_multiplier) as usize;
+            let new_start_iterations = max(1, (first_valid_iterations as f32 * self.valid_iteration_probe_multiplier) as usize);
 
             // we now have a value for valid iterations, lets do the rest of the probes, but with 0.95 * that iteration
 

src/renderer.rs

@@ -207,24 +207,14 @@ impl FractalRenderer {
                 );
 
                 let chosen_iteration = if self.experimental {
-                    let mut test1 = ((self.series_approximation.probe_sampling - 1) as f64 * i as f64 / self.image_width as f64).floor() as usize;
-                    let mut test2 = ((self.series_approximation.probe_sampling - 1) as f64 * j as f64 / self.image_height as f64).floor() as usize;
-
-                    if test1 >= (self.series_approximation.probe_sampling - 1) {
-                        test1 -= 1;
-                    }
-
-                    if test2 >= (self.series_approximation.probe_sampling - 1) {
-                        test2 -= 1;
-                    }
+                    let test1 = ((self.series_approximation.probe_sampling - 1) as f64 * i as f64 / self.image_width as f64).floor() as usize;
+                    let test2 = ((self.series_approximation.probe_sampling - 1) as f64 * j as f64 / self.image_height as f64).floor() as usize;
 
                     let pos1 = test1 * self.series_approximation.probe_sampling + test2;
                     let pos2 = test1 * self.series_approximation.probe_sampling + test2 + 1;
                     let pos3 = test1 * self.series_approximation.probe_sampling + test2 + self.series_approximation.probe_sampling;
                     let pos4 = test1 * self.series_approximation.probe_sampling + test2 + self.series_approximation.probe_sampling + 1;
 
-                    // println!("{}, {}, {}, {}", i, j, test1, test2);
-
                     [self.series_approximation.valid_iterations[pos1], 
                         self.series_approximation.valid_iterations[pos2], 
                         self.series_approximation.valid_iterations[pos3], 
@@ -246,8 +236,6 @@ impl FractalRenderer {
                     derivative_current: ComplexFixed::new(1.0, 0.0),
                     glitched: false,
                     escaped: false,
-                    series_approximation_delta: new_delta,
-                    series_approximation_iteration: chosen_iteration
                 }
             }).collect::<Vec<PixelData>>();
 
@@ -327,6 +315,9 @@ impl FractalRenderer {
             self.zoom.reduce();
 
             if self.zoom.to_float() < 1e10 {
+                self.series_approximation.valid_iteration_frame_multiplier = 0.0;
+                self.series_approximation.valid_iteration_probe_multiplier = 0.0;
+
                 // SA has some problems with precision with lots of terms at lot zoom levels
                 if self.series_approximation.order > 8 {
                     // Overwrite the series approximation order

src/util/mod.rs

@@ -163,6 +163,4 @@ pub struct PixelData {
     pub derivative_current: ComplexFixed<f64>,
     pub glitched: bool,
     pub escaped: bool,
-    pub series_approximation_delta: ComplexExtended,
-    pub series_approximation_iteration: usize
 }