Merge pull request #30 from jackyarndley/development

jackyarndley · web-flow · commit 47f2308d8bd9 · 2020-10-02T14:54:54.000+13:00
Development
diff --git a/default.toml b/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
diff --git a/high.toml b/high.toml
@@ -2,13 +2,15 @@ image_width = 1920
 image_height = 1080
 rotate = 0
 approximation_order = 48
-glitch_tolerance = 0.001
-frames = 20
+glitch_percentage = 0.001
+frames = 5
 frame_offset = 0
 zoom_scale = 2.0
 display_glitches = false
 auto_adjust_iterations = true
 probe_sampling = 3
 remove_centre = true
-export = "exr"
-experimental = true 
+export = "png"
+
+# By default this is squared tolerance. 1e-6 works normally, 1.4e-6 is low tolerance.
+glitch_tolerance = 1.4e-6
diff --git a/high_experimental.toml b/high_experimental.toml
@@ -0,0 +1,25 @@
+image_width = 1920
+image_height = 1080
+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 = true
+export = "png"
+
+# By default this is squared tolerance. 1e-6 works normally, 1.4e-6 is low tolerance.
+glitch_tolerance = 1.4e-6
+
+probe_sampling = 15
+
+# These are experimental options following
+experimental = true 
+
+# If this is set higher than the maximum iteration value this will cause any additional glitches to be perturbed without series approximation
+high_precision_data_interval = 100
+valid_iteration_frame_multiplier = 0.05
+valid_iteration_probe_multiplier = 0.005
diff --git a/locations/dragon.toml b/locations/dragon.toml
@@ -0,0 +1,4 @@
+real = "-0.749999987350877481864108888020013802837969258626230419972587823828734338471228477079750588709551510361714463695461745528645748607681279674273355384334270208362211787387351792878073779449767292692440"
+imag = "0.001000038688236832013124581230049849132759425863378894883003211011278068229551274712347955044740933397589760194545872789087012331273586364914484522575986336846199522726507205442204060303594956029930"
+zoom = "3.7E191"
+iterations = 5000000
diff --git a/locations/floral_fantasy.toml b/locations/floral_fantasy.toml
@@ -0,0 +1,4 @@
+real = "-1.9990959962659111838532086240451464723873699879106041072875027138225861729613819461216022699999999999999999999999"
+imag = "0.0000002758071979815309980117897130508770848629719975198765589767776483289612775591171197799999999999999999999999"
+zoom = "1.55413511378E85"
+iterations = 12000
diff --git a/locations/glitch_test_1.toml b/locations/glitch_test_1.toml
diff --git a/locations/glitch_test_2.toml b/locations/glitch_test_2.toml
@@ -0,0 +1,4 @@
+real = "-1.7685304554715107439359975226423287998937254896566074423088827415719065562223946222490318219590860313620613389226996388e+00"
+imag = "5.9445386042946892550190097831583153039526746987365071641624831873576346016435037438597231970921541448697901394734283301e-03"
+zoom = "5.9680811401822433E112"
+iterations = 250000
diff --git a/locations/glitch_test_3.toml b/locations/glitch_test_3.toml
@@ -0,0 +1,4 @@
+real = "-1.9999661944503703041843468850635057967553124154072485151176192294480158424234268438137612977886891381228704640656094986435381057574477216648567249609280392009786904752451867828831e+00"
+imag = "-3.0013824367909383240724973039775924987346831190773335270174257280120474975614823581185647299288414075519224186504978181625478073632495599211589676451216600697186599581586109427363e-34"
+zoom = "4.09925E158"
+iterations = 60000
diff --git a/locations/glitch_test_4.toml b/locations/glitch_test_4.toml
@@ -0,0 +1,4 @@
+real = "-1.999095996265911183853208624045146472387369987910604107287502713822586172961381946121551866831936458883511e+00"
+imag = "2.758071979815309980117897130508770848629719975198765589767776483289612775591171065536367492835368050791947e-07"
+zoom = "3.10827E85"
+iterations = 12000
diff --git a/locations/glitch_test_5.toml b/locations/glitch_test_5.toml
@@ -0,0 +1,4 @@
+real = "-1.9990959962659111838532086240451464723873699879106041072875027138225861729613819461166949317647071457645e+00 "
+imag = "2.7580719798153099801178971305087708486297199751987655897677764832896127755911699395081447967040433240946e-07 "
+zoom = "9.71334E83"
+iterations = 12000
diff --git a/locations/glitch_test_6.toml b/locations/glitch_test_6.toml
@@ -0,0 +1,4 @@
+real = "-1.7693831791955150182138472860854737829057472636547514374655282165278881912647564588361634463895296673044858257818203031574874912384217194031282461951137475212550848062085787454772803303225167998662391124184542743017129214423639793169296754394181656831301342622793541423768572435783910849972056869527305207508191441734781061794290699753174911133714351734166117456520272756159178932042908932465102671790878414664628213755990650460738372283470777870306458882898202604001744348908388844962887074505853707095832039410323454920540534378406083202543002080240776000604510883136400112955848408048692373051275999457470473671317598770623174665886582323619043055508383245744667325990917947929662025877792679499645660786033978548337553694613673529685268652251959453874971983533677423356377699336623705491817104771909424891461757868378026419765129606526769522898056684520572284028039883286225342392455089357242793475261134567912757009627599451744942893765395578578179137375672787942139328379364197492987307203001409779081030965660422490200242892023288520510396495370720268688377880981691988243756770625044756604957687314689241825216171368155083773536285069411856763404065046728379696513318216144607821920824027797857625921782413101273331959639628043420017995090636222818019324038366814798438238540927811909247543259203596399903790614916969910733455656494065224399357601105072841234072044886928478250600986666987837467585182504661923879353345164721140166670708133939341595205900643816399988710049682525423837465035288755437535332464750001934325685009025423642056347757530380946799290663403877442547063918905505118152350633031870270153292586262005851702999524577716844595335385805548908126325397736860678083754587744508953038826602270140731059161305854135393230132058326419325267890909463907657787245924319849651660028931472549400310808097453589135197164989941931054546261747594558823583006437970585216728326439804654662779987947232731036794099604937358361568561860539962449610052967074013449293876425609214167615079422980743121960127425155223407999875999884"
+imag = "0.00423684791873677221492650717136799707668267091740375727945943565011234400080554515730243099502363650631353268335965257182300494805538736306127524814939292355930892834392050796724887904921986666045576626946900666103494014904714323725586979789908520656683202658064024115300378826789786394641622035341055102900456305723718684527210377325846307917512628774672005693326232806953822796755832517188873479124361430989485495501124096329421682827330693532171505367455526637382706988583456915684673202462211937384523487065290004627037270912806345336469007546411109669407622004367957958476890043040953462048335322273359167297049252960438077167010004209439515213189081508634843224000870136889065895088138204552309352430462782158649681507477960551795646930149740918234645225076516652086716320503880420325704104486903747569874284714830068830518642293591138468762031036739665945023607640585036218668993884533558262144356760232561099772965480869237201581493393664645179292489229735815054564819560512372223360478737722905493126886183195223860999679112529868068569066269441982065315045621648665342365985555395338571505660132833205426100878993922388367450899066133115360740011553934369094891871075717765803345451791394082587084902236263067329239601457074910340800624575627557843183429032397590197231701822237810014080715216554518295907984283453243435079846068568753674073705720148851912173075170531293303461334037951893251390031841730968751744420455098473808572196768667200405919237414872570568499964117282073597147065847005207507464373602310697663458722994227826891841411512573589860255142210602837087031792012000966856067648730369466249241454455795058209627003734747970517231654418272974375968391462696901395430614200747446035851467531667672250261488790789606038203516466311672579186528473826173569678887596534006782882871835938615860588356076208162301201143845805878804278970005959539875585918686455482194364808816650829446335905975254727342258614604501418057192598810476108766922935775177687770187001388743012888530139038318783958771247007926690"
+zoom = "2.5E161"
+iterations = 15000000
diff --git a/locations/peanuts.toml b/locations/peanuts.toml
@@ -0,0 +1,4 @@
+real = "-1.94027658588345321091739528561871158285329803755715228746270703125"
+imag = "-0.00015063432290237573328275931307447270339596507504722367456943365"
+zoom = "1.36112946768E39"
+iterations = 9450
diff --git a/locations/super_dense.toml b/locations/super_dense.toml
@@ -0,0 +1,4 @@
+real = "-1.94151209635203446394399999999999999999995"
+imag = "0.00663498740113024706519999999999999999995"
+zoom = "1.53916775627E16"
+iterations = 10000000
diff --git a/locations/triangle.toml b/locations/triangle.toml
@@ -0,0 +1,4 @@
+real = "-1.25539673868026755865583057881474899884324965805338977974834931161909270753708598428507955786132265725790787341032505996383790425294770009682926760678760038756350899655215102205878644724210739492794886576603695584822056326228944405322883876128043521419784068398650048082189903328094223666928063926518382846840131859485476315478235880711721658003833441256818569046853194430529350784682119536773108833463488393163697761402192429756097387714961858678744874458199522006130576804388906748570341814504336685457587167749548288322872130218471448274839817042698717905831296282896184572296128713908967449798472116056514881888801683939223851000287431323336894442496881378705777070710371054440806027399735639396692322947494320719306470574708085702346217592836955660079971867889777798610664668864742574634950499717744718773283207042687948226229603847906214983193112664398233916204454147724975238550562547821344963081493668638526943588769755260131804899721402074907287731519191451163524738558324798559761025301908168987100951527274712280617758661403864423907751426459851506821125537839398255354437258208725148760906354197699944849968108933608465947163436828331417300771517124475934726602173762300539357803205221245585415774897112143250119426714150301309801319608451015128386035191726911921409455877878074524972060731613571786401216370540706975177651621092906520896665796647089230257511709648826321414635400998938455772429223454925573977621930697636796075847672588969185212087053053108181349608410897392328263641074037370638422842713171865370885525752501270851054922936215247758843441612554173733605068983133288967390278512576317125435856073016415738023888947607111601785315411777998870973224588870831157000745915650340811818424894326691568333333287310663932565094814901141779668577091589977159231317802556812362499811007994432885830314171973035269633162611613719150560321254470550921982493890373265712289506368372242619429278367534066301408804736183112417208921239690694152920285716471700108933703166679275908879135641167270283866791874989692797333223912642355592898942261239801754647548769348903336461818747933068920743148283632266306881018573511463953740275679828863365826198203134232482131820640409927700991821156544305676637683125693206284943518734414060423813465798754462992799430697523597233"
+imag = "0.38224857379114731727780160618658277870068837021245609010295408004674654682792434651526067447152075016911712054055366594385153982530268591629940094738282878381005830478368034558265856542451001686964767561086991338229754750137888164432857760503555842214222748025269569910342171779788637618093216751365225088244974732240931656948930320932483314069560030252947914416671414075723933875670577050947611642505633422489719007040329288770428757402243349059412605593643265949963772513244211135482494958912615966962376348986136117109044491259528402746005899258602303394927333974607538059934632921409448592026483942987894561898331313170398847213274560540208498080978196884537151786484867735486753128144430866094488699815209010954095152294908726663605582313599516699642043260982989596201950521373657665888156922245012034452507667911384714233976586046957767863867279164854686440895021022140335576849458186739533079907091119760435026551937347806292204466683044092574239012840186428481524219398943802887008041935819677278927676704522741056396257948015133645827160792737869947636479090032335098323726897300010931435172681809140933116797070843783091397880472133475422388098864490610439426060149139216159026208588057288395717243484806167182597013551312010188295824752786932984887460712578604990706454971450496155631761424072659784071238345487466805278971489867754392033632748812447312563394897601361535407192856390587221545771654081274649187234430101177287585350211747493805773283204901741582650483692607104969109485572537275107060195960439335093314127023513241367490068166620554906791774001717991666159176505400523230151821683091826328729376557926320188766146883076918559315535454082956773400405689949643379087530045232955917580766583998251709877442400316338096059478353544725752163596160773833593059946203114921949849385337925897088224267096835539727189957953695650604725670584459478345615025117820704668603117497969156810146795706772328220444509536691189407404386319819509366133216601247025480866130704549612899154869401996166840596106974136261677011932709383792444954406525867356896445713414748391884204484183065722694821005218717482082087096172332556051444206891571881664322252754694587273228380586639882319729340727003245417557444363395896390486793186299739084951434426861761486920154278237706587"
+zoom = "1.4903550178318449484728738200504E2276"
+iterations = 15000000
diff --git a/low.toml b/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
diff --git a/run_tests.sh b/run_tests.sh
@@ -0,0 +1,19 @@
+./target/release/main -o high_experimental.toml locations/glitch_test_1.toml
+./target/release/main -o high_experimental.toml locations/glitch_test_2.toml
+./target/release/main -o high_experimental.toml locations/glitch_test_3.toml
+./target/release/main -o high_experimental.toml locations/glitch_test_4.toml
+./target/release/main -o high_experimental.toml locations/glitch_test_5.toml
+./target/release/main -o high_experimental.toml locations/glitch_test_6.toml
+
+./target/release/main -o high_experimental.toml locations/1e14.toml
+./target/release/main -o high_experimental.toml locations/11_dimensions.toml
+./target/release/main -o high_experimental.toml locations/e10000.toml
+./target/release/main -o high_experimental.toml locations/flake.toml
+./target/release/main -o high_experimental.toml locations/floral_fantasy.toml
+./target/release/main -o high_experimental.toml locations/golden_spider.toml
+./target/release/main -o high_experimental.toml locations/long.toml
+./target/release/main -o high_experimental.toml locations/lya.toml
+./target/release/main -o high_experimental.toml locations/opus.toml
+./target/release/main -o high_experimental.toml locations/peanuts.toml
+./target/release/main -o high_experimental.toml locations/wfs.toml
+./target/release/main -o high_experimental.toml locations/x.toml
diff --git a/src/math/reference.rs b/src/math/reference.rs
@@ -10,7 +10,9 @@ 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 high_precision_data: Vec<ComplexArbitrary>
+    pub high_precision_data_interval: usize,
+    pub high_precision_data: Vec<ComplexArbitrary>,
+    pub glitch_tolerance: f64,
 }
 
 #[derive(Clone)]
@@ -22,15 +24,17 @@ pub struct ReferenceIteration {
 }
 
 impl Reference {
-    pub fn new(z: ComplexArbitrary, c: ComplexArbitrary, current_iteration: usize, maximum_iteration: usize) -> Reference {
+    pub fn new(z: ComplexArbitrary, c: ComplexArbitrary, current_iteration: usize, maximum_iteration: usize, high_precision_data_interval: usize, glitch_tolerance: f64) -> Reference {
         Reference {
             start_iteration: current_iteration,
             current_iteration,
             maximum_iteration,
             z,
             c,
             reference_data: Vec::with_capacity(1000),
-            high_precision_data: Vec::with_capacity(1000)
+            high_precision_data_interval,
+            high_precision_data: Vec::with_capacity(1000),
+            glitch_tolerance
         }
     }
 
@@ -40,7 +44,7 @@ impl Reference {
         self.current_iteration += 1;
 
         let z_fixed = to_fixed(&self.z);
-        let z_tolerance = 1e-6 * z_fixed.norm_sqr();
+        let z_tolerance = self.glitch_tolerance * z_fixed.norm_sqr();
 
         let mut z_extended = to_extended(&self.z);
         z_extended.reduce();
@@ -65,7 +69,7 @@ impl Reference {
 
     pub fn run(&mut self) {
         let z_fixed = to_fixed(&self.z);
-        let z_tolerance = 1e-6 * z_fixed.norm_sqr();
+        let z_tolerance = self.glitch_tolerance * z_fixed.norm_sqr();
 
         let mut z_extended = to_extended(&self.z);
         z_extended.reduce();
@@ -84,7 +88,7 @@ impl Reference {
         );
 
         while self.current_iteration < self.maximum_iteration {
-            if self.start_iteration == 1 && self.current_iteration % 100 == 1 {
+            if self.start_iteration == 1 && self.current_iteration % self.high_precision_data_interval == 1 {
                 self.high_precision_data.push(self.z.clone());
             };
 
diff --git a/src/math/series_approximation.rs b/src/math/series_approximation.rs
diff --git a/src/renderer.rs b/src/renderer.rs
