added more probe points for better series approximation skip calculation

Author: jackyarndley

assemble_video.py

@@ -8,7 +8,7 @@
 from PIL import Image
 
 frames_between_keyframes = 60
-maximum_keyframe_number = 9
+maximum_keyframe_number = 47
 zoom_scale = 2.0
 
 # log1.1 of 2 is 7.27

default.toml

@@ -1,9 +1,9 @@
 image_width = 1920
 image_height = 1080
-frames = 9999
-export = "raw"
-glitch_tolerance = 0.000001
+frames = 17
+export = "colour"
+glitch_tolerance = 0.001
 zoom_scale = 2.0
 auto_adjust_iterations = true
-approximation_order = 64
+approximation_order = 32
 frame_offset = 0

locations/lya.toml

@@ -0,0 +1,4 @@
+real = "-1.76904090125288168240284276810365472222460651367280300612031519864776551390840630119504817227707689276670981344397551593371805167279428144061791279408701383958080000000000000000000000002e+00"
+imag = "-3.1605400272558568759745268636087334444350515177571908056976983793515506960262149704114708190147368048572976192049103272074188848768835600195188510326583157513e-03"
+zoom = "7.5E139"
+iterations = 350000

segments.txt

@@ -1 +1,5 @@
+file 'segments/segment_00000004.mp4'
+file 'segments/segment_00000003.mp4'
+file 'segments/segment_00000002.mp4'
+file 'segments/segment_00000001.mp4'
 file 'segments/segment_00000000.mp4'

src/math/series_approximation.rs

@@ -82,16 +82,20 @@ impl SeriesApproximation {
         self.approximation_probes = Vec::new();
         self.approximation_probes_derivative = Vec::new();
 
-        self.add_probe(ComplexExtended::new2(self.delta_top_left.mantissa.re, self.delta_top_left.mantissa.im, self.delta_top_left.exponent));
-        self.add_probe(ComplexExtended::new2(self.delta_top_left.mantissa.re, -self.delta_top_left.mantissa.im, self.delta_top_left.exponent));
-        self.add_probe(ComplexExtended::new2(-self.delta_top_left.mantissa.re, self.delta_top_left.mantissa.im, self.delta_top_left.exponent));
-        self.add_probe(ComplexExtended::new2(-self.delta_top_left.mantissa.re, -self.delta_top_left.mantissa.im, self.delta_top_left.exponent));
-
-        // Middle edges
-        // self.add_probe(ComplexExtended::new2(self.delta_top_left.mantissa.re, 0.0, self.delta_top_left.exponent));
-        // self.add_probe(ComplexExtended::new2(-self.delta_top_left.mantissa.re, 0.0, self.delta_top_left.exponent));
-        // self.add_probe(ComplexExtended::new2(0.0, self.delta_top_left.mantissa.im, self.delta_top_left.exponent));
-        // self.add_probe(ComplexExtended::new2(0.0, -self.delta_top_left.mantissa.im, self.delta_top_left.exponent));
+        let probe_sampling = 3;
+
+        for i in 0..probe_sampling {
+            for j in 0..probe_sampling {
+                if probe_sampling % 2 == 1 && (i == probe_sampling / 2 && j == probe_sampling / 2) {
+                    continue;
+                } else {
+                    let real = (1.0 - 2.0 * (i as f64 / (probe_sampling as f64 - 1.0))) * self.delta_top_left.mantissa.re;
+                    let imag = (1.0 - 2.0 * (j as f64 / (probe_sampling as f64 - 1.0))) * self.delta_top_left.mantissa.im;
+
+                    self.add_probe(ComplexExtended::new2(real, imag, self.delta_top_left.exponent));
+                }
+            }
+        }
 
         self.valid_iteration = (0..self.probe_start.len()).into_par_iter()
             .map(|i| {

src/renderer.rs

@@ -236,16 +236,7 @@ impl FractalRenderer {
             self.zoom.reduce();
 
             if self.auto_adjust_iterations {
-                // test
-                // let mut temp = self.data_export.iterations.clone();
-                // temp.sort();
-
-                // let new_iteration_value = *(&self.data_export.iterations).into_iter().max().unwrap() as usize;
-                // Set to value of 0.1%
-                // let value = 0.999 * temp.len() as f64;
-                // let new_iteration_value = temp[value as usize] as usize;
-
-                if self.zoom.to_float() < 1e10 {
+                if self.zoom.to_float() < 1e10 && self.maximum_iteration > 10000 {
                     let new_iteration_value = 10000;
 
                     if self.center_reference.current_iteration >= 10000 {