Merge pull request #36 from jackyarndley/development

jackyarndley · web-flow · commit 4667235e0efd · 2020-11-19T14:04:02.000+13:00
Development
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,5 @@
 /output
 /.vscode
 *.mp4
-segments.txt
+segments.txt
+/benchmarks/output
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rust_fractal"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["jackyarndley <34801340+jackyarndley@users.noreply.github.com>"]
 description = "Fast, efficient mandelbrot set renderer."
 edition = "2018"
diff --git a/benchmarks/1024.toml b/benchmarks/1024.toml
@@ -0,0 +1,28 @@
+image_width = 1024
+image_height = 1024
+rotate = 0
+approximation_order = 64
+glitch_percentage = 0.001
+frames = 1
+frame_offset = 0
+zoom_scale = 2.0
+display_glitches = false
+auto_adjust_iterations = true
+remove_centre = false
+export = "none"
+
+glitch_tolerance = 1.4e-6
+
+probe_sampling = 15
+
+data_storage_interval = 100
+
+valid_iteration_frame_multiplier = 0.10
+valid_iteration_probe_multiplier = 0.01
+
+experimental = true  
+
+analytic_derivative = true
+jitter = false
+
+show_output = false
diff --git a/benchmarks/1e1086.toml b/benchmarks/1e1086.toml
@@ -0,0 +1,8 @@
+real = "-1.7686104930146770745031756532702265202396779075886654948376772575753046409788084752746357073624640442530143702899485385525088774647364158730529584228619327746701659942016434199348075002900561799063929098803742306016616719654366638745060063556841666930591896875443264825263374533263601636397728189937530217406329378401153809577664250929407204399119208123978804432412746162125263808715558465325021564398920263528316195877683367681863458675652518891036222678662230553668727573853224855536063029840116957497302007277402429496617909069814494389239488177959271019808949170815916105624065542446752060997995221864464278843147736269933479298102777908882020190358459738806378323352943682229579313547358789699385343030740322376183971873284367153917580396806678714617881517934122868945658732376104675721741056296534380054333918739586395081248838604269688015372707569985604343355743798536592211824223197634120225305454216647656035003982094445369084321368686489071889392389688538416597466867176175418284171731994483367734476455611028732303886322543173345661703793147185896109100790794361751341489456505534109999999999"
+imag = "0.001266613503868717702066411192242601576193940560471409817185010171762524792588903616691501346028502452530417599269384116816237002586460261272462170615382790262110756215389780859682964779212455295242650488799024701023353984576434859496345393442867544784349509799966996827374525729583822627564832207860235000491856039278975203253540119195661182532106440194050352510825207428197675168479460252154208762204074041030502712772770772439567249008997886131809082319952112293668096363959700371035596685905429248221153089843201890985651976151989928496969024027810874574434857210174914227391125217932725188214796457327981771026544613194033736960542354861910879704489564999937473456191049937984461971508132204319961501958583967780282332682705656745932852354591955251196335374396883193221988201865629549575259395090238463522557833659758739138043696167112257784649600743807944457388512639475417466113111928274012056049434349358618953361438127758918999578120953045365596358997480091072548929426951083179599722132179281125708039705266879359303320165515458347343055671220673027817611220892213570374041225632345999999999999"
+zoom = "1E1086"
+iterations = 600100
+
+
+
+
diff --git a/benchmarks/1e14.toml b/benchmarks/1e14.toml
@@ -0,0 +1,10 @@
+real = "-1.759817130804847813610825010561798238243999999999999999999800"
+imag = "-0.012593310799749865383746631843264858450340000000000000000000"
+zoom = "1.00E14"
+iterations = 4036
+
+
+
+
+
+
diff --git a/benchmarks/1e50.toml b/benchmarks/1e50.toml
@@ -0,0 +1,10 @@
+real = "-0.0494700290631040937516922267273536301187457124882248793181049402326421947726869034279915499747594190000000000000000000"
+imag = "-0.6747875758446753640113920531305976563347707068224034806979997947909941983454845111514208499540310299999999999999999880"
+zoom = "1.00E050"
+iterations = 263010
+
+
+
+
+
+
diff --git a/benchmarks/2048.toml b/benchmarks/2048.toml
@@ -0,0 +1,28 @@
+image_width = 2048
+image_height = 2048
+rotate = 0
+approximation_order = 64
+glitch_percentage = 0.001
+frames = 1
+frame_offset = 0
+zoom_scale = 2.0
+display_glitches = false
+auto_adjust_iterations = true
+remove_centre = false
+export = "none"
+
+glitch_tolerance = 1.4e-6
+
+probe_sampling = 15
+
+data_storage_interval = 100
+
+valid_iteration_frame_multiplier = 0.10
+valid_iteration_probe_multiplier = 0.01
+
+experimental = true  
+
+analytic_derivative = true
+jitter = false
+
+show_output = false
diff --git a/benchmarks/256.toml b/benchmarks/256.toml
@@ -0,0 +1,28 @@
+image_width = 256
+image_height = 256
+rotate = 0
+approximation_order = 64
+glitch_percentage = 0.001
+frames = 1
+frame_offset = 0
+zoom_scale = 2.0
+display_glitches = false
+auto_adjust_iterations = true
+remove_centre = false
+export = "none"
+
+glitch_tolerance = 1.4e-6
+
+probe_sampling = 15
+
+data_storage_interval = 100
+
+valid_iteration_frame_multiplier = 0.10
+valid_iteration_probe_multiplier = 0.01
+
+experimental = true  
+
+analytic_derivative = true
+jitter = false
+
+show_output = false
diff --git a/benchmarks/4096.toml b/benchmarks/4096.toml
@@ -0,0 +1,28 @@
+image_width = 4096
+image_height = 4096
+rotate = 0
+approximation_order = 64
+glitch_percentage = 0.001
+frames = 1
+frame_offset = 0
+zoom_scale = 2.0
+display_glitches = false
+auto_adjust_iterations = true
+remove_centre = false
+export = "png"
+
+glitch_tolerance = 1.4e-6
+
+probe_sampling = 15
+
+data_storage_interval = 100
+
+valid_iteration_frame_multiplier = 0.10
+valid_iteration_probe_multiplier = 0.01
+
+experimental = true  
+
+analytic_derivative = true
+jitter = false
+
+show_output = false
diff --git a/benchmarks/4e533.toml b/benchmarks/4e533.toml
@@ -0,0 +1,8 @@
+real = "-1.76910833040747728089230624355777848356006391186234006507787883404189297159859080844234601990886820204375798539711744042815186207867460953613415842432757944592767829349335811233344529101414256593211862449597012320484442182435300186806636928772790198745922046142684209058217860629186666350353426119156588068800663472823306396040025965062872111452567447461778249159612483961826938045120616222919425540724435314735525341255820663672868054494834304368733487681716181154843412847462148699796875704432080579735378707932099259943340496912407404389999999999999999999998"
+imag = "-0.00902068805707261760036093598494762011230558467412386688972791981712911000027307032573465274857726041164197728426795343558667918574806252145218561840172051237592827928284001732546143539590034733383167886737270960837393773203586137673223357330612418801177955434724672703229251690060990669896274784498860242840497701851849033318045752945025236339275315448898727818174162698044355889583608736485127229946909629832632750839622459160046934443901886226621505107842448159935017841941045354364042323342824193503392819832038805610324279071648713679999999999999999999998"
+zoom = "4.00000000000E533"
+iterations = 120000
+
+
+
+
diff --git a/benchmarks/512.toml b/benchmarks/512.toml
@@ -0,0 +1,28 @@
+image_width = 512
+image_height = 512
+rotate = 0
+approximation_order = 64
+glitch_percentage = 0.001
+frames = 1
+frame_offset = 0
+zoom_scale = 2.0
+display_glitches = false
+auto_adjust_iterations = true
+remove_centre = false
+export = "none"
+
+glitch_tolerance = 1.4e-6
+
+probe_sampling = 15
+
+data_storage_interval = 100
+
+valid_iteration_frame_multiplier = 0.10
+valid_iteration_probe_multiplier = 0.01
+
+experimental = true  
+
+analytic_derivative = true
+jitter = false
+
+show_output = false
diff --git a/benchmarks/5e113.toml b/benchmarks/5e113.toml
@@ -0,0 +1,8 @@
+real = "-1.47981577613247326072298452597877854692240725774045369689878510139864920741002293820250517329282011227363313053159203914640783415609608168660705123082446357179491909705403381200"
+imag = "-0.00063911193261361727152139632255671572957303918943984736047394936471220951961813321928573067036466151147195436388486168819318341208023229522609015461543581599807510715681229605"
+zoom = "5.00E113"
+iterations = 35494
+
+
+
+
diff --git a/benchmarks/5e227.toml b/benchmarks/5e227.toml
@@ -0,0 +1,8 @@
+real = "-0.749624497378761682078626204268361386845295278123640257544815714245582864796728016987502039767791356081486877471965951748581253882975777885730827532104698067397213779012974511726247624509405298147130483778736122972203130169470392874699999999999999989999999999999999999999499999999999999999980"
+imag = "0.034270108740460169451729515457494748680515346724391118531748547383705957729359301718429997787132227942154534366289982005919142082076326747807809784967848438076905104018293013090695421984135743924258851663672311920874163384970654955099999999999999990000000000000000000000000000000000000000000"
+zoom = "5.00E227"
+iterations = 1200000
+
+
+
+
diff --git a/benchmarks/run_tests.sh b/benchmarks/run_tests.sh
@@ -0,0 +1,11 @@
+mkdir -p output
+
+for loc in 1e14 1e50 5e113 5e227 4e533 1e1086
+do
+    echo "${loc}.toml"
+    echo "dim,real,user,sys,mem"
+    for dim in 512 1024 2048 4096
+    do
+        /usr/bin/time --format="${dim},%e,%U,%S,%M" ../target/release/main -o "${dim}".toml "${loc}".toml 
+    done
+done
diff --git a/high.toml b/high.toml
@@ -9,7 +9,7 @@ zoom_scale = 2.0
 display_glitches = false
 auto_adjust_iterations = true
 remove_centre = false
-export = "png"
+export = "exr"
 
 glitch_tolerance = 1.4e-6
 
diff --git a/src/math/reference.rs b/src/math/reference.rs
@@ -1,4 +1,4 @@
-use crate::util::{ComplexArbitrary, ComplexFixed, ComplexExtended, to_fixed, to_extended};
+use crate::util::{ComplexArbitrary, ComplexFixed, ComplexExtended, FloatExtended, to_fixed, to_extended};
 
 #[derive(Clone)]
 pub struct Reference {
@@ -10,6 +10,7 @@ pub struct Reference {
     pub reference_data: Vec<ReferenceIteration>,
     // This is for every 100th iteration, when we do glitch correction the new references will be spawed from these values
     // Storing every iteration is memory intensive.
+    pub zoom: FloatExtended,
     pub data_storage_interval: usize,
     pub high_precision_data: Vec<ComplexArbitrary>,
     pub glitch_tolerance: f64,
@@ -24,14 +25,15 @@ pub struct ReferenceIteration {
 }
 
 impl Reference {
-    pub fn new(z: ComplexArbitrary, c: ComplexArbitrary, current_iteration: usize, maximum_iteration: usize, data_storage_interval: usize, glitch_tolerance: f64) -> Reference {
+    pub fn new(z: ComplexArbitrary, c: ComplexArbitrary, current_iteration: usize, maximum_iteration: usize, data_storage_interval: usize, glitch_tolerance: f64, zoom: FloatExtended) -> Reference {
         Reference {
             start_iteration: current_iteration,
             current_iteration,
             maximum_iteration,
             z,
             c,
             reference_data: Vec::with_capacity(1000),
+            zoom,
             data_storage_interval,
             high_precision_data: Vec::with_capacity(1000),
             glitch_tolerance
diff --git a/src/math/series_approximation.rs b/src/math/series_approximation.rs
@@ -1,7 +1,7 @@
 use crate::util::{to_extended, ComplexFixed};
 use crate::util::complex_extended::ComplexExtended;
 use crate::math::reference::Reference;
-use rug::Float;
+use crate::util::FloatArbitrary;
 use crate::util::float_extended::FloatExtended;
 use rayon::prelude::*;
 
@@ -11,7 +11,7 @@ pub struct SeriesApproximation {
     pub maximum_iteration: usize,
     pub delta_pixel_square: FloatExtended,
     pub order: usize,
-    coefficients: Vec<Vec<ComplexExtended>>,
+    pub coefficients: Vec<Vec<ComplexExtended>>,
     probe_start: Vec<ComplexExtended>,
     approximation_probes: Vec<Vec<ComplexExtended>>,
     approximation_probes_derivative: Vec<Vec<ComplexExtended>>,
@@ -377,9 +377,9 @@ impl SeriesApproximation {
         // let iteration_reference = self.data_storage_interval * ((self.min_valid_iteration - 1) / self.data_storage_interval) + 1;
 
         let mut reference_c = center_reference.c.clone();
-        let temp = Float::with_val(precision, reference_delta.exponent).exp2();
-        let temp2 = Float::with_val(precision, reference_delta.mantissa.re);
-        let temp3 = Float::with_val(precision, reference_delta.mantissa.im);
+        let temp = FloatArbitrary::with_val(precision, reference_delta.exponent).exp2();
+        let temp2 = FloatArbitrary::with_val(precision, reference_delta.mantissa.re);
+        let temp3 = FloatArbitrary::with_val(precision, reference_delta.mantissa.im);
 
         *reference_c.mut_real() += &temp2 * &temp;
         *reference_c.mut_imag() += &temp3 * &temp;
@@ -388,14 +388,14 @@ impl SeriesApproximation {
         let mut reference_z = center_reference.high_precision_data[(self.min_valid_iteration - 1) / self.data_storage_interval].clone();
 
         let temp4 = self.evaluate(reference_delta, self.min_valid_iteration);
-        let temp = Float::with_val(precision, temp4.exponent).exp2();
-        let temp2 = Float::with_val(precision, temp4.mantissa.re);
-        let temp3 = Float::with_val(precision, temp4.mantissa.im);
+        let temp = FloatArbitrary::with_val(precision, temp4.exponent).exp2();
+        let temp2 = FloatArbitrary::with_val(precision, temp4.mantissa.re);
+        let temp3 = FloatArbitrary::with_val(precision, temp4.mantissa.im);
 
         *reference_z.mut_real() += &temp2 * &temp;
         *reference_z.mut_imag() += &temp3 * &temp;
 
-        Reference::new(reference_z, reference_c, self.min_valid_iteration, center_reference.maximum_iteration, self.data_storage_interval, center_reference.glitch_tolerance)
+        Reference::new(reference_z, reference_c, self.min_valid_iteration, center_reference.maximum_iteration, self.data_storage_interval, center_reference.glitch_tolerance, center_reference.zoom)
     }
 
     pub fn evaluate(&self, point_delta: ComplexExtended, iteration: usize) -> ComplexExtended {
diff --git a/src/renderer.rs b/src/renderer.rs
diff --git a/src/util/data_export.rs b/src/util/data_export.rs
diff --git a/src/util/mod.rs b/src/util/mod.rs
