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

upper half only

Browse source
This commit is contained in:
William Ball 2021-07-15 17:15:05 -04:00
parent b5c6350a05
commit fc9c4fc434
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,9 +15,11 @@ pub fn fractal_dimension(
let mut totals = vec![root.len(); n]; let mut totals = vec![root.len(); n];
let mut current = vec![(root, std::usize::MAX, false)]; let mut current = vec![(root, std::usize::MAX, false)];
let mut next = vec![]; let mut next = vec![];
let mut nodes = 1;
let xs: Vec<f64> = (1..=n) let xs: Vec<f64> = (1..=n)
.map(|x| (x as f64 * upper_bound / (n as f64))) // .map(|x| (x as f64 * upper_bound / (n as f64)))
.map(|x| (x as f64 * upper_bound / (2.0 * n as f64) + upper_bound / 2.0))
.collect(); .collect();
let mut i = 0; let mut i = 0;
@ -62,9 +64,11 @@ pub fn fractal_dimension(
} }
if add { if add {
next.push((new_tuple, i, false)); next.push((new_tuple, i, false));
nodes += 1;
} else { } else {
if !bad { if !bad {
next.push((new_tuple, i, true)); next.push((new_tuple, i, true));
nodes += 1;
} }
} }
} }
@ -98,6 +102,7 @@ pub fn fractal_dimension(
"\nnumber of circles fewer than each of those sample points:\n{:?}", "\nnumber of circles fewer than each of those sample points:\n{:?}",
totals totals
); );
println!("\nTotal number of nodes:\t{}", nodes);
} }
let xs: Vec<f64> = xs.iter().map(|x| x.ln()).collect(); let xs: Vec<f64> = xs.iter().map(|x| x.ln()).collect();