Merge pull request #33 from jackyarndley/development

jackyarndley · web-flow · commit ab18544ddef0 · 2020-10-17T13:44:58.000+13:00
Development
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.10.0"
+version = "0.11.0"
 authors = ["jackyarndley <34801340+jackyarndley@users.noreply.github.com>"]
 description = "Fast, efficient mandelbrot set renderer."
 edition = "2018"
diff --git a/high.toml b/high.toml
@@ -15,9 +15,9 @@ glitch_tolerance = 1.4e-6
 
 probe_sampling = 15
 
-data_storage_interval = 10
+data_storage_interval = 100
 
-valid_iteration_frame_multiplier = 0.05
-valid_iteration_probe_multiplier = 0.005
+valid_iteration_frame_multiplier = 0.10
+valid_iteration_probe_multiplier = 0.01
 
-experimental = false 
+experimental = true  
diff --git a/locations/hard.toml b/locations/hard.toml
@@ -0,0 +1,4 @@
+real = "-1.9997740601362903593126807559602500475710416233856384007148508574291012335984591928248364190215796259575718318799960175396106897245889581254834492701372949636783094955897931317174101259095891469501748126725148714587333938548443819033709904187344921523413310221887295870857771431011674873342592895504186325482220668710775749899926429101099841583206278295793058921625817004481783699245865364627140554117737774937789463895102748671351750212506004241754983473339789940659968568850689353099462034492524909310777724611601104714214019347435268544619054369865904944457792527241696528695821059623303046651934176389789308453627525109367436309636375268231073110318555064708363221007235298404379856922536028913291478442839193381367508575286692330907891402483843152933153748354825108021776358693600801782904774626935265722056455978643513448489091026679036353407968495795003386248005939867069799946547181378474054113117046900560609110812439442002663909295191705374444149326937073460052706389967886211172676612720028299452788285465688867116337489531157494508508315428488520037968118008255840569742557333862639124341116894229885253643651920014148109308402199399127712572209466874971603743536096235390414412927589954662603878558182262865151900604451937214289079939337905846647369517138325441736853526711818853134657265043099539402286244220638999824999819000131999789999857999958"
+imag = "0.0000000032900403214794350534969786759266805967852946505878410088326046927853549452991056352681196631150325234171525664335353457621247922992470898021063583060218954321140472066153878996044171428801408137278072521468882260382336298800961530905692393992277070012433445706657829475924367459793505729004118759963065667029896464160298608486277109065108339157276150465318584383757554775431988245033409975361804443001325241206485033571912765723551757793318752425925728969073157628495924710926832527350298951594826689051400340011140584507852761857568007670527511272585460136585523090533629795012272916453744029579624949223464015705500594059847850617137983380334184205468184810116554041390142120676993959768153409797953194054452153167317775439590270326683890021272963306430827680201998682699627962109145863135950941097962048870017412568065614566213639455841624790306469846132055305041523313740204187090956921716703959797752042569621665723251356946610646735381744551743865516477084313729738832141633286400726001116308041460406558452004662264165125100793429491308397667995852591271957435535504083325331161340230101590756539955554407081416407239097101967362512942992702550533040602039494984081681370518238283847808934080198642728761205332894028474812918370467949299531287492728394399650466260849557177609714181271299409118059191938687461000000000000000000000000000000000000"
+zoom = "7.0E405"
+iterations = 1000000
diff --git a/locations/opus.toml b/locations/opus.toml
@@ -1,5 +1,5 @@
 real = "-1.4797962709017600244252799347704115256455510544325995179098076328242862544039075945268884660999628050229751964725497716818312344916955598525839552049861977622938727694748069039955642590406675685997700941126379378570821987561050974456193507569667937931144674320329377993465740144619572026488907382726758104299281925571396606196002960095648852803940011013602573467404942350378153725402938676297434487740893628746489527148378347572616696479155070553056741269846567113187869309530709506083704618952199193376646174337372933529682317495830617582584225996626047220980000003146661160274360111758949932113090681591627736792074508141555030836148272902213632440890171948598870366036119178098168002124472931199675575978515630666649298127196398018688410935222010983880806908352014011077759074249160660588531969863434518905762067484478748868928548778376772438405496400757729996218309016311245625992087187905884917840497006166276051816501705665425555290511990241"
 imag = "0.0011994439528134477462819732333744684445603141141325383620375692056574222167395645214711191076264533309963650679870881466636399967159398318191522486180422558246522689182996308975253866380294287064739208983585061954947980921751709470565080051258981884554765133419312569632099457685179999650016670762993336446844236778034215257672625848788694460282069039665644332180750510211229167948001409358429457822408318525728674579307646027308487673214350326307950188279884353995019301464652536433246988196260720509486592586535111295053754256454877702698366854337740431376220361692073855167521762312416027439765959720756033204080063897947492796559163545415397827454620231617310642320676741985492863616183030871530459422071478512538948407624933074421814042111671749281862544244133767582340846778717570291171721347943794724343146961916816182641403228394362447643718567728423739369698615777094087260365474691300114179641910688342217153247665225738231917222640683"
-zoom = "1.0E943"
+zoom = "0.95E943"
 iterations = 400000
 rotate = -10.0
diff --git a/locations/opus2.toml b/locations/opus2.toml
@@ -1,4 +1,5 @@
 real = "-0.749999987350877481864108888020013802837969258626230419972587823828734338471228477079750588709551510361714463695461745528645748607681279674273355384334270208362211787387351792878073779449767291526542817531261340190806632565918259326812453945339010150589328574149762103412720468461829229717752036030894096315543168284825591829523451459881790177201252306571105765519675248512352116833573251629567483327363311905069239003032701051529457481196547434321797050981253335937568089213120462566208183651115805653397293307377258559233202903277271676210602323914213229679532680425641573037323936099296977383315509031245712699863469264931916441084524494037606498168268686721923874005066873080025308977190880377994951387503602088911332670208047338589057179189242986041326869049326695151373694471831244401593898610875755534119908741965159514391743447026006739832349691851901398357322220"
 imag = "0.001000038688236832013124581230049849132759425863378894883003211011278068229551274712347955044740933397589760194545872789087012331273586364914484522575986336846199522726507205442204060303594955245291999525338163887733776425296885360624117754790016039295518748100994374326514266548379714091150515954338609920973073364107748619320475410623673220046896479022827825993708176842163391900758089808211644753443666550081714232493619984139688643050056804682336073778593187461493553160679031928537192970767012461077854087872615079724603280623855121742482968568427025472006277692061641900496152974606824700919966353741349586737424130832293811657136609787251540732986491711380483513615806577672347051574909062756851877529226144646342697709731384260107991407404869126271382608377517199011953183918273014546327019813569447081536980717484300757693838699772312217708489638932599104037840"
-zoom = "8.1339E864"
-iterations = 80000000
+zoom = "3.86831E863"
+iterations = 80000000
+rotate = 45
diff --git a/locations/threads_colour.toml b/locations/threads_colour.toml
@@ -1,4 +1,4 @@
 real = "-1.47414176240993896848662071528158693194984033295350953280086668957218887059547144798782958583693228230313082538417736408312283756916583038548770140907148842507795182301203312327678867411139743734088820831422587016737770172651132123623347543560592366451320269312832570538759109480956462838749508907791843703924365245276567942898938125705618894029328612293147151908041951365498962465718017136637923540348122292958335790053092495783869799482899842041593944847198560523459306518247398734178583094840989359335916427349271969694638813455484795519139180535389178899499218726674005407958574308338167164971091115429523451479626131276956228048957227740597867681604973361307242906518836130901630810235591139999999999999999999"
 imag = "1.837028624819189477865631515035097395323927302572629030865933104000355714583818892052507681177756076074900340375874325858424795164505875785998449146862924507042300051932135130891413370393327740037629084197582966724720858559206941967648864807892583328760554952794324657809197148266317196316651597885791947076110274629246850125745470256068262793065499915106947670845209696879646797896797942904780372999446765698282800418563469062689909330151614815763561772821921612271912492631000218876452296900861545848888915227426092699498959036990046882718777435775562966053647880616647866656164419540502287729221470963175939777275863084020159079375481684880087569411323863960416637609668567855099418820244664E-94"
-zoom = "8.6e630"
+zoom = "8.6e652"
 iterations = 1544151
diff --git a/palette_monochrome.toml b/palette_monochrome.toml
@@ -0,0 +1,4 @@
+palette = [
+    0, 0, 0, 255, 255, 255
+]
+iteration_division = 20.0
diff --git a/run_tests.sh b/run_tests.sh
@@ -1,4 +1,4 @@
-./target/release/main -o high.toml locations/glitch_test_1.toml
+#./target/release/main -o high.toml locations/glitch_test_1.toml
 ./target/release/main -o high.toml locations/glitch_test_2.toml
 ./target/release/main -o high.toml locations/glitch_test_3.toml
 ./target/release/main -o high.toml locations/glitch_test_4.toml
diff --git a/src/math/series_approximation.rs b/src/math/series_approximation.rs
@@ -135,8 +135,8 @@ impl SeriesApproximation {
                 let imag = pos_x * delta_pixel * sin_rotate + pos_y * delta_pixel * cos_rotate + delta_top_left_mantissa.im;
 
                 self.add_probe(ComplexExtended::new2(
-                    cos_rotate * real - sin_rotate * imag, 
-                    sin_rotate * real + cos_rotate * imag, delta_top_left_exponent));
+                    real, 
+                    imag, delta_top_left_exponent));
             }
         }
 
@@ -341,6 +341,8 @@ impl SeriesApproximation {
             }
         }
 
+        // println!("{:?}", self.valid_interpolation);
+
         if !self.experimental {
             self.valid_interpolation = vec![self.min_valid_iteration; (self.probe_sampling - 1) * (self.probe_sampling - 1)];
         }
diff --git a/src/renderer.rs b/src/renderer.rs
@@ -154,7 +154,11 @@ impl FractalRenderer {
         let delta_top_left = get_delta_top_left(delta_pixel, self.image_width, self.image_height, cos_rotate, sin_rotate);
         let delta_pixel_extended = FloatExtended::new(delta_pixel, -self.zoom.exponent);
 
-        self.series_approximation.delta_pixel_square = delta_pixel_extended * delta_pixel_extended;
+        self.series_approximation.delta_pixel_square = if self.experimental {
+            delta_pixel_extended * delta_pixel_extended
+        } else {
+            delta_pixel_extended * delta_pixel_extended
+        };
 
         // Used for placing the probe points
         self.series_approximation.check_approximation(

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-./target/release/main -o high.toml locations/glitch_test_1.toml`
	`1`	`+#./target/release/main -o high.toml locations/glitch_test_1.toml`
`2`	`2`	`./target/release/main -o high.toml locations/glitch_test_2.toml`
`3`	`3`	`./target/release/main -o high.toml locations/glitch_test_3.toml`
`4`	`4`	`./target/release/main -o high.toml locations/glitch_test_4.toml`
Original file line number	Diff line number	Diff line change
`@@ -135,8 +135,8 @@ impl SeriesApproximation {`
`135`	`135`	`let imag = pos_x * delta_pixel * sin_rotate + pos_y * delta_pixel * cos_rotate + delta_top_left_mantissa.im;`
`136`	`136`
`137`	`137`	`self.add_probe(ComplexExtended::new2(`
`138`		`- cos_rotate * real - sin_rotate * imag,`
`139`		`- sin_rotate * real + cos_rotate * imag, delta_top_left_exponent));`
	`138`	`+ real,`
	`139`	`+ imag, delta_top_left_exponent));`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`
`@@ -341,6 +341,8 @@ impl SeriesApproximation {`
`341`	`341`	`}`
`342`	`342`	`}`
`343`	`343`
	`344`	`+ // println!("{:?}", self.valid_interpolation);`
	`345`	`+`
`344`	`346`	`if !self.experimental {`
`345`	`347`	`self.valid_interpolation = vec![self.min_valid_iteration; (self.probe_sampling - 1) * (self.probe_sampling - 1)];`
`346`	`348`	`}`