Skip to content

Commit 3852cec

Browse files
committed
more changes to algorithm
1 parent a0103cd commit 3852cec

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

high.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ image_height = 1080
33
rotate = 0
44
approximation_order = 64
55
glitch_percentage = 0.001
6-
frames = 1
6+
frames = 99
77
frame_offset = 0
88
zoom_scale = 2.0
9-
display_glitches = false
9+
display_glitches = true
1010
auto_adjust_iterations = true
1111
remove_centre = false
1212
export = "png"

src/math/series_approximation.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,11 @@ impl SeriesApproximation {
7070
let add_value = ComplexExtended::new2(1.0, 0.0, 0);
7171

7272
let mut previous_coefficients = self.coefficients[0].clone();
73+
let mut next_coefficients = vec![ComplexExtended::new2(0.0, 0.0, 0); self.order as usize + 1];
7374

7475
// Can be changed later into a better loop - this function could also return some more information
7576
// Go through all remaining iterations
7677
for i in 1..self.maximum_iteration {
77-
let mut next_coefficients = vec![ComplexExtended::new2(0.0, 0.0, 0); self.order as usize + 1];
78-
7978
// This is checking if the approximation can step forward so takes the next iteration
8079
next_coefficients[0] = center_reference.reference_data[i].z_extended;
8180
next_coefficients[1] = previous_coefficients[0] * previous_coefficients[1] * 2.0 + add_value;
@@ -112,7 +111,7 @@ impl SeriesApproximation {
112111
// only every 100th iteration (101, 201 etc)
113112
// This is 0, 100, 200 -> 1, 101, 201
114113
if i % self.data_storage_interval == 0 {
115-
self.coefficients.push(next_coefficients);
114+
self.coefficients.push(next_coefficients.clone());
116115
}
117116

118117
// self.coefficients.push(next_coefficients);

src/renderer.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,9 +254,9 @@ impl FractalRenderer {
254254

255255
// println!("{} {} {}", thread_counter_1.get(), thread_counter_2.get(), thread_counter_3.get());
256256

257-
percentage_complete += 40.0 * thread_counter_1.get() as f64 / thread_counter_3.get() as f64;
258-
percentage_complete += 40.0 * thread_counter_2.get() as f64 / thread_counter_3.get() as f64;
259-
percentage_complete += 20.0 * thread_counter_4.get() as f64 / 2.0;
257+
percentage_complete += 45.0 * thread_counter_1.get() as f64 / thread_counter_3.get() as f64;
258+
percentage_complete += 45.0 * thread_counter_2.get() as f64 / thread_counter_3.get() as f64;
259+
percentage_complete += 10.0 * thread_counter_4.get() as f64 / 2.0;
260260

261261
print!("\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08{:^14}", format!("{:.2}%", percentage_complete));
262262
std::io::stdout().flush().unwrap();

0 commit comments

Comments
 (0)