wball/Circle-Packings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed?

Browse source
This commit is contained in:
William Ball 2021-07-07 15:42:51 -04:00
parent 64f491907f
commit cf70869da0
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fractal_dimension/circle_counting_new/src/lib.rs
View file

@ -12,7 +12,7 @@ pub fn fractal_dimension(
generations: usize generations: usize
) -> Result<f64, linregress::Error> { ) -> Result<f64, linregress::Error> {
let mut totals = vec![root.len(); n]; let mut totals = vec![root.len(); n];
let mut current = vec![(root, std::usize::MAX)]; let mut current = vec![(root, std::usize::MAX, false)];
let mut next = vec![]; let mut next = vec![];
let xs: Vec<f64> = (1..=n) let xs: Vec<f64> = (1..=n)
@ -23,7 +23,7 @@ pub fn fractal_dimension(
loop { loop {
next.clear(); next.clear();
for (tuple, previous_generator) in &current { for (tuple, previous_generator, bad) in &current {
for (i, generator) in generators.iter().enumerate() { for (i, generator) in generators.iter().enumerate() {
if i != *previous_generator { if i != *previous_generator {
let new_tuple = generator * tuple; let new_tuple = generator * tuple;
@ -41,15 +41,17 @@ pub fn fractal_dimension(
} }
for (k, max) in xs.iter().enumerate() { for (k, max) in xs.iter().enumerate() {
if curvature <= max { if curvature <= max {
if k == n - 1 {
add = true; add = true;
}
totals[k] += 1; totals[k] += 1;
} }
} }
} }
if add { if add {
next.push((new_tuple, i)); next.push((new_tuple, i, false));
} else {
if !bad {
next.push((new_tuple, i, true));
}
} }
} }
} }