diff --git a/nblast-js/src/lib.rs b/nblast-js/src/lib.rs index 579d758..ac0e9c7 100644 --- a/nblast-js/src/lib.rs +++ b/nblast-js/src/lib.rs @@ -170,9 +170,8 @@ pub fn make_flat_tangents_alphas(flat_points: &[f64], k: usize) -> JsResult(e))?; + .map_err(PyErr::new::)?; Ok(self.arena.add_neuron(neuron)) } @@ -114,7 +114,7 @@ impl ArenaWrapper { .collect(), tangents_alphas, ) - .map_err(|e| PyErr::new::(e))?; + .map_err(PyErr::new::)?; Ok(self.arena.add_neuron(neuron)) } diff --git a/nblast-rs/Cargo.toml b/nblast-rs/Cargo.toml index 6e645ec..4e4e3f2 100644 --- a/nblast-rs/Cargo.toml +++ b/nblast-rs/Cargo.toml @@ -47,7 +47,7 @@ parallel = ["rayon"] name = "bench" harness = false -required-features = ["parallel"] +required-features = ["parallel", "bosque", "kiddo", "nabo", "rstar"] [package.metadata.release] publish = false diff --git a/nblast-rs/src/neurons/bosque.rs b/nblast-rs/src/neurons/bosque.rs index d971ef5..677cd7e 100644 --- a/nblast-rs/src/neurons/bosque.rs +++ b/nblast-rs/src/neurons/bosque.rs @@ -83,7 +83,7 @@ impl QueryNeuron for BosqueTangentsAlphas { .zip(self.tangents_alphas.iter()) .map(move |(p, ta)| { let alpha = if use_alpha { Some(ta.alpha) } else { None }; - target.nearest_match_dist_dot(&p, &ta.tangent, alpha) + target.nearest_match_dist_dot(p, &ta.tangent, alpha) }) } @@ -133,7 +133,7 @@ impl TargetNeuron for BosqueTangentsAlphas { Some(a) => raw_dot * geometric_mean(a, ta.alpha), None => raw_dot, }; - DistDot { dist: dist, dot } + DistDot { dist, dot } } } diff --git a/spatial_bench/benches/spatial.rs b/spatial_bench/benches/spatial.rs index 16cc191..2428f19 100644 --- a/spatial_bench/benches/spatial.rs +++ b/spatial_bench/benches/spatial.rs @@ -61,17 +61,29 @@ pub fn bench_queries(c: &mut Criterion) { let ar = make_arena::(points.clone()); group.bench_function("bosque", |b| { - b.iter(|| black_box(pair_queries(&ar, &pairs))) + b.iter(|| { + pair_queries(&ar, &pairs); + black_box(()) + }) }); let ar = make_arena::(points.clone()); - group.bench_function("kiddo", |b| b.iter(|| black_box(pair_queries(&ar, &pairs)))); + group.bench_function("kiddo", |b| b.iter(|| { + pair_queries(&ar, &pairs); + black_box(()) + })); let ar = make_arena::(points.clone()); - group.bench_function("nabo", |b| b.iter(|| black_box(pair_queries(&ar, &pairs)))); + group.bench_function("nabo", |b| b.iter(|| { + pair_queries(&ar, &pairs); + black_box(()) + })); let ar = make_arena::(points.clone()); - group.bench_function("rstar", |b| b.iter(|| black_box(pair_queries(&ar, &pairs)))); + group.bench_function("rstar", |b| b.iter(|| { + pair_queries(&ar, &pairs); + black_box(()) + })); } criterion_group!(benches, bench_construction, bench_queries);