Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ numpy = "0.23"
nalgebra = "0.33"
thiserror = "2"
rustc-hash = "2"
smallvec = "1"

[profile.release]
lto = true
Expand Down
13 changes: 5 additions & 8 deletions benches/bench_triangulation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ fn generate_points(dim: usize, count: usize, seed: u64) -> Vec<Vec<f64>> {

fn first_simplex(triangulation: &Triangulation) -> Simplex {
triangulation
.simplices
.iter()
.simplices()
.next()
.cloned()
.expect("triangulation should not be empty")
Expand Down Expand Up @@ -72,9 +71,7 @@ fn outside_point(triangulation: &Triangulation) -> Vec<f64> {
}

fn insert_pending_vertex(triangulation: &mut Triangulation, point: Vec<f64>) -> usize {
triangulation.vertex_to_simplices.push(Default::default());
triangulation.vertices.push(point);
triangulation.vertices.len() - 1
triangulation.add_vertex(point)
}

fn constructor_benches(c: &mut Criterion) {
Expand All @@ -101,7 +98,7 @@ fn constructor_benches(c: &mut Criterion) {
let coords = points.clone();
let start = Instant::now();
let triangulation = Triangulation::new(coords).unwrap();
black_box(triangulation.simplices.len());
black_box(triangulation.num_simplices());
total += start.elapsed();
}
total
Expand Down Expand Up @@ -130,7 +127,7 @@ fn add_point_bench(c: &mut Criterion) {
for point in &to_insert {
triangulation.add_point(point.clone(), None, None).unwrap();
}
black_box(triangulation.simplices.len());
black_box(triangulation.num_simplices());
total += start.elapsed();
}
total
Expand Down Expand Up @@ -191,7 +188,7 @@ fn locate_and_containing_benches(c: &mut Criterion) {
group.measurement_time(Duration::from_secs(8));

let triangulation = Triangulation::new(generate_points(2, 2048, 0xFACE)).unwrap();
let simplices: Vec<Simplex> = triangulation.simplices.iter().take(256).cloned().collect();
let simplices: Vec<Simplex> = triangulation.simplices().take(256).cloned().collect();
let queries: Vec<Vec<f64>> = simplices
.iter()
.map(|simplex| simplex_centroid(&triangulation, simplex))
Expand Down
3 changes: 2 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
//! documented in [`tolerances`].

pub mod geometry;
pub mod py;
pub mod tolerances;
pub mod triangulation;

Expand All @@ -12,7 +13,7 @@ use pyo3::prelude::*;
use pyo3::types::{PyAny, PyModule, PyTuple};

use crate::geometry as geom;
use crate::triangulation::{
use crate::py::{
numpy_linalg_error, parse_point, parse_points_sized, point_tuple, PyFacesIter,
PySimplicesProxy, PyTriangulation, PyVertexToSimplicesIter, PyVertexToSimplicesProxy,
PyVerticesIter, PyVerticesProxy,
Expand Down
Loading
Loading