added jitter and fixed analytic derivatives

jackyarndley · jackyarndley · commit ab04452b18db · 2020-10-21T18:05:12.000+13:00
diff --git a/high.toml b/high.toml
@@ -8,7 +8,7 @@ frame_offset = 0
 zoom_scale = 2.0
 display_glitches = false
 auto_adjust_iterations = true
-remove_centre = true
+remove_centre = false
 export = "png"
 
 glitch_tolerance = 1.4e-6
@@ -22,4 +22,5 @@ valid_iteration_probe_multiplier = 0.01
 
 experimental = true  
 
-analytic_derivative = true
+analytic_derivative = false
+jitter = false
diff --git a/locations/e52465.toml b/locations/e52465.toml
diff --git a/locations/hard.toml b/locations/hard.toml
@@ -1,4 +1,4 @@
 real = "-1.9997740601362903593126807559602500475710416233856384007148508574291012335984591928248364190215796259575718318799960175396106897245889581254834492701372949636783094955897931317174101259095891469501748126725148714587333938548443819033709904187344921523413310221887295870857771431011674873342592895504186325482220668710775749899926429101099841583206278295793058921625817004481783699245865364627140554117737774937789463895102748671351750212506004241754983473339789940659968568850689353099462034492524909310777724611601104714214019347435268544619054369865904944457792527241696528695821059623303046651934176389789308453627525109367436309636375268231073110318555064708363221007235298404379856922536028913291478442839193381367508575286692330907891402483843152933153748354825108021776358693600801782904774626935265722056455978643513448489091026679036353407968495795003386248005939867069799946547181378474054113117046900560609110812439442002663909295191705374444149326937073460052706389967886211172676612720028299452788285465688867116337489531157494508508315428488520037968118008255840569742557333862639124341116894229885253643651920014148109308402199399127712572209466874971603743536096235390414412927589954662603878558182262865151900604451937214289079939337905846647369517138325441736853526711818853134657265043099539402286244220638999824999819000131999789999857999958"
 imag = "0.0000000032900403214794350534969786759266805967852946505878410088326046927853549452991056352681196631150325234171525664335353457621247922992470898021063583060218954321140472066153878996044171428801408137278072521468882260382336298800961530905692393992277070012433445706657829475924367459793505729004118759963065667029896464160298608486277109065108339157276150465318584383757554775431988245033409975361804443001325241206485033571912765723551757793318752425925728969073157628495924710926832527350298951594826689051400340011140584507852761857568007670527511272585460136585523090533629795012272916453744029579624949223464015705500594059847850617137983380334184205468184810116554041390142120676993959768153409797953194054452153167317775439590270326683890021272963306430827680201998682699627962109145863135950941097962048870017412568065614566213639455841624790306469846132055305041523313740204187090956921716703959797752042569621665723251356946610646735381744551743865516477084313729738832141633286400726001116308041460406558452004662264165125100793429491308397667995852591271957435535504083325331161340230101590756539955554407081416407239097101967362512942992702550533040602039494984081681370518238283847808934080198642728761205332894028474812918370467949299531287492728394399650466260849557177609714181271299409118059191938687461000000000000000000000000000000000000"
-zoom = "7.0E905"
+zoom = "7.0E401"
 iterations = 20000000
diff --git a/locations/safari.toml b/locations/safari.toml
@@ -1,4 +1,4 @@
 real = "0.27533764774673799358866712482462788156671406989542628591627436306743751013023030130967197535665363986058288420463735384997362663584446169657773339617717365950286959762265485804783047336923365261060963100721927003791989610861331863571141065592841226995797739723012374298589823921181693139824190379745910243872940870200527"
 imag = "0.006759649405327850670181700456194929502189750234614304846357269137106731032582471677573582008294494705826194131450773107049670717146785957633119244225710271178867840504202402362491296317894835321064971518673775630252745135294700216673815790733343134984120108524001799351076577642283751627469315124883962453013093853471895"
-zoom = "1.06316999999E170"
+zoom = "1.06316999999E307"
 iterations = 6000000
diff --git a/src/math/perturbation.rs b/src/math/perturbation.rs
@@ -3,6 +3,8 @@ use crate::util::{PixelData, FloatExp};
 use rayon::prelude::*;
 use crate::math::reference::Reference;
 
+use crate::util::ComplexExtended;
+
 pub struct Perturbation {}
 
 impl Perturbation {
@@ -120,16 +122,16 @@ impl Perturbation {
                                 pixel.delta_current.exponent = 0;
                                 break;
                             }
-
-                            pixel.derivative_current.mantissa *= 2.0 * z;
-                            pixel.derivative_current.mantissa += scaled_scale_factor_2;
                         }
 
                         if reference_data.extended_precision_required {
                             // If the reference is small, use the slow extended method
-                            pixel.delta_current *= reference_data.z_extended * 2.0 + pixel.delta_current;
+                            pixel.delta_current *= reference_data.z_extended * 2.0;
                             pixel.delta_current += pixel.delta_reference;
 
+                            pixel.derivative_current *= reference_data.z_extended * 2.0;
+                            pixel.derivative_current += ComplexExtended::new2(1.0, 0.0, 0);
+
                             // reset the scaled counter
                             pixel.delta_current.reduce();
                             pixel.derivative_current.reduce();
@@ -147,6 +149,9 @@ impl Perturbation {
                             // 2 additions
                             pixel.delta_current.mantissa += scaled_delta_reference;
 
+                            pixel.derivative_current.mantissa *= 2.0 * z;
+                            pixel.derivative_current.mantissa += scaled_scale_factor_2;
+
                             scaled_iterations += 1;
 
                             // check the counter, if it is > 250, do a normalisation
diff --git a/src/math/series_approximation.rs b/src/math/series_approximation.rs
@@ -435,6 +435,7 @@ impl SeriesApproximation {
         // println!("{:?}", approximation);
 
         // approximation *= point_delta;
+        approximation.reduce();
         approximation
     }
 }
diff --git a/src/renderer.rs b/src/renderer.rs
@@ -6,6 +6,8 @@ use std::io::Write;
 use std::cmp::max;
 
 use rand::seq::SliceRandom;
+use rand::Rng;
+
 use rayon::prelude::*;
 use config::Config;
 
@@ -27,6 +29,7 @@ pub struct FractalRenderer {
     render_indices: Vec<usize>,
     remove_centre: bool,
     analytic_derivative: bool,
+    jitter: bool,
     experimental: bool,
 }
 
@@ -55,7 +58,7 @@ impl FractalRenderer {
         let glitch_tolerance = settings.get_float("glitch_tolerance").unwrap_or(1.4e-6) as f64;
         let data_storage_interval = settings.get_int("data_storage_interval").unwrap_or(10) as usize;
         let analytic_derivative = settings.get_bool("analytic_derivative").unwrap_or(false);
-
+        let jitter = settings.get_bool("jitter").unwrap_or(false);
         
         let data_type = match settings.get_str("export").unwrap_or(String::from("COLOUR")).to_ascii_uppercase().as_ref() {
             "RAW" | "EXR" => DataType::RAW,
@@ -135,6 +138,7 @@ impl FractalRenderer {
             render_indices,
             remove_centre,
             analytic_derivative,
+            jitter,
             experimental
         }
     }
@@ -207,20 +211,32 @@ impl FractalRenderer {
             self.remove_centre = false;
         }
 
+
+
         let mut pixel_data = (&self.render_indices).into_par_iter()
             .map(|index| {
-                let i = index % self.image_width;
-                let j = index / self.image_width;
+                let image_x = index % self.image_width;
+                let image_y = index / self.image_width;
+
+                let mut i = image_x as f64;
+                let mut j = image_y as f64;
+
+                if self.jitter {
+                    let mut rng = rand::thread_rng();
+
+                    i += rng.gen_range(-0.2, 0.2);
+                    j += rng.gen_range(-0.2, 0.2);
+                }
 
                 // This could be changed to account for jittering if needed
                 let element = ComplexFixed::new(
-                    i as f64 * delta_pixel * cos_rotate - j as f64 * delta_pixel * sin_rotate + delta_top_left.re, 
-                    i as f64 * delta_pixel * sin_rotate + j as f64 * delta_pixel * cos_rotate + delta_top_left.im
+                    i * delta_pixel * cos_rotate - j * delta_pixel * sin_rotate + delta_top_left.re, 
+                    i * delta_pixel * sin_rotate + j * delta_pixel * cos_rotate + delta_top_left.im
                 );
 
                 let chosen_iteration = if self.experimental {
-                    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 test1 = ((self.series_approximation.probe_sampling - 1) as f64 * i / self.image_width as f64).floor() as usize;
+                    let test2 = ((self.series_approximation.probe_sampling - 1) as f64 * j / self.image_height as f64).floor() as usize;
 
                     let index = test2 * (self.series_approximation.probe_sampling - 1) + test1;
 
@@ -239,8 +255,8 @@ impl FractalRenderer {
                 };
 
                 PixelData {
-                    image_x: i,
-                    image_y: j,
+                    image_x,
+                    image_y,
                     iteration: chosen_iteration,
                     delta_centre: point_delta,
                     delta_reference: point_delta,
@@ -285,48 +301,26 @@ impl FractalRenderer {
             correction_references += 1;
             glitch_reference.run();
 
-            // Experimental but does not work very well. There are quite a few glitches that still happen with this
-            if false {
+            let delta_current_reference = self.series_approximation.evaluate(glitch_reference_pixel.delta_centre, glitch_reference.start_iteration);
+
+            if self.analytic_derivative {
                 pixel_data.par_iter_mut()
                     .for_each(|pixel| {
-                        let chosen_iteration = {
-                            let test1 = ((self.series_approximation.probe_sampling - 1) as f64 * pixel.image_x as f64 / self.image_width as f64).floor() as usize;
-                            let test2 = ((self.series_approximation.probe_sampling - 1) as f64 * pixel.image_y as f64 / self.image_height as f64).floor() as usize;
-
-                            let index = test2 * (self.series_approximation.probe_sampling - 1) + test1;
-
-                            self.series_approximation.valid_interpolation[index]
-                        };
-
-                        let delta_current_reference = self.series_approximation.evaluate(glitch_reference_pixel.delta_centre, chosen_iteration);
-
-                        pixel.iteration = chosen_iteration;
+                        pixel.iteration = glitch_reference.start_iteration;
                         pixel.glitched = false;
-                        pixel.delta_current = self.series_approximation.evaluate( pixel.delta_centre, chosen_iteration) - delta_current_reference;
+                        pixel.delta_current = self.series_approximation.evaluate( pixel.delta_centre, glitch_reference.start_iteration) - delta_current_reference;
                         pixel.delta_reference = pixel.delta_centre - glitch_reference_pixel.delta_centre;
+                        pixel.derivative_current = self.series_approximation.evaluate_derivative(pixel.delta_centre, glitch_reference.start_iteration);
                 });
             } else {
-                let delta_current_reference = self.series_approximation.evaluate(glitch_reference_pixel.delta_centre, glitch_reference.start_iteration);
-
-                if self.analytic_derivative {
-                    pixel_data.par_iter_mut()
-                        .for_each(|pixel| {
-                            pixel.iteration = glitch_reference.start_iteration;
-                            pixel.glitched = false;
-                            pixel.delta_current = self.series_approximation.evaluate( pixel.delta_centre, glitch_reference.start_iteration) - delta_current_reference;
-                            pixel.delta_reference = pixel.delta_centre - glitch_reference_pixel.delta_centre;
-                            pixel.derivative_current = self.series_approximation.evaluate_derivative(pixel.delta_centre, glitch_reference.start_iteration);
-                    });
-                } else {
-                    pixel_data.par_iter_mut()
-                        .for_each(|pixel| {
-                            pixel.iteration = glitch_reference.start_iteration;
-                            pixel.glitched = false;
-                            pixel.delta_current = self.series_approximation.evaluate( pixel.delta_centre, glitch_reference.start_iteration) - delta_current_reference;
-                            pixel.delta_reference = pixel.delta_centre - glitch_reference_pixel.delta_centre;
-                    });
-                }
-            };
+                pixel_data.par_iter_mut()
+                    .for_each(|pixel| {
+                        pixel.iteration = glitch_reference.start_iteration;
+                        pixel.glitched = false;
+                        pixel.delta_current = self.series_approximation.evaluate( pixel.delta_centre, glitch_reference.start_iteration) - delta_current_reference;
+                        pixel.delta_reference = pixel.delta_centre - glitch_reference_pixel.delta_centre;
+                });
+            }
             
             if self.analytic_derivative {
                 Perturbation::iterate_normal_plus_derivative(&mut pixel_data, &glitch_reference);
diff --git a/src/util/data_export.rs b/src/util/data_export.rs
@@ -120,7 +120,20 @@ impl DataExport {
                             self.rgb[k] = out; 
                             self.rgb[k + 1] = out; 
                             self.rgb[k + 2] = out;
+
+                            // if pixel.image_x == 960 && pixel.image_y > 540 && pixel.image_y < 740 {
+                            //     println!("{:?} {:?} {:?} {:?} {:?} {:?}", 
+                            //         reference.reference_data[pixel.iteration - reference.start_iteration].z_extended,
+                            //         pixel.delta_current,
+                            //         pixel.derivative_current,
+                            //         temp,
+                            //         de,
+                            //         out,
+                            //     );
+                            // }
                         }
+
+                        
                     };
 
                     // self.iterations[k / 3] = pixel.iteration as u32;
@@ -142,20 +155,43 @@ impl DataExport {
                     self.smooth_f16[k] = f16::from_f32(1.0 - (z_norm.ln() / escape_radius_ln).log2());
 
                     if self.analytic_derivative && pixel.iteration < maximum_iteration {
-                        let temp = (reference.reference_data[pixel.iteration - reference.start_iteration].z_extended + pixel.delta_current).norm();
+                        let temp1 = reference.reference_data[pixel.iteration - reference.start_iteration].z_extended + pixel.delta_current;
+                        let temp2 = temp1.norm();
+
+                        // let de = 2.0 * temp * (temp.mantissa.ln() + temp.exponent as f64 * 2.0f64.ln()) / pixel.derivative_current.norm();
+
+                        // let temp2 = pixel.derivative_current.mantissa.norm();
+
+                        // let temp_x = pixel.derivative_current.mantissa.re / temp2;
+                        // let temp_y = pixel.derivative_current.mantissa.im / temp2;
+
+                        // // println!("{}", f16::from_f64((de / delta_pixel).to_float().tanh()));
+                        // let value = (de / delta_pixel).to_float().tanh();
+
+                        // u/v is temp
+                        // J is [deri_x, deri_y, -deri_y, deri_x]
+
+                        let mut deri = pixel.derivative_current;
+                        deri.mantissa *= delta_pixel.mantissa;
+                        deri.exponent += delta_pixel.exponent;
+
+                        let deri = deri.to_float();
 
-                        let de = 2.0 * temp * (temp.mantissa.ln() + temp.exponent as f64 * 2.0f64.ln()) / pixel.derivative_current.norm();
+                        let num = 2.0 * temp2 * (temp2.mantissa.ln() + temp2.exponent as f64 * 2.0f64.ln());
 
-                        let temp2 = pixel.derivative_current.mantissa.norm();
+                        let mut norm_u = temp1;
+                        let temp3 = temp1.norm();
+                        norm_u.mantissa /= temp3.mantissa;
+                        norm_u.exponent -= temp3.exponent;
 
-                        let temp_x = pixel.derivative_current.mantissa.re / temp2;
-                        let temp_y = pixel.derivative_current.mantissa.im / temp2;
+                        let norm_u = norm_u.to_float();
 
-                        // println!("{}", f16::from_f64((de / delta_pixel).to_float().tanh()));
-                        let value = (de / delta_pixel).to_float().tanh();
+                        let mut den = deri;
+                        den.re = norm_u.re * deri.re + norm_u.im * deri.im;
+                        den.im = -norm_u.re * deri.im + norm_u.im * deri.re;
 
-                        self.distance_x[k] = f16::from_f64(temp_x * value);
-                        self.distance_y[k] = f16::from_f64(temp_y * value);
+                        self.distance_x[k] = f16::from_f64(num.to_float() / den.re);
+                        self.distance_y[k] = f16::from_f64(num.to_float() / den.im);
 
                         // println!("{} {} {} {}", temp_x * value, temp_y * value, value, ((temp_x * value).powi(2) + (temp_y * value).powi(2)).sqrt());
                     }

Original file line number	Diff line number	Diff line change
`@@ -435,6 +435,7 @@ impl SeriesApproximation {`
`435`	`435`	`// println!("{:?}", approximation);`
`436`	`436`
`437`	`437`	`// approximation *= point_delta;`
	`438`	`+ approximation.reduce();`
`438`	`439`	`approximation`
`439`	`440`	`}`
`440`	`441`	`}`