Skip to content

Commit

Permalink
PERF: TriangulateSpade uses Iter, not Vec
Browse files Browse the repository at this point in the history
This is an internal API, so we can safely break the API.

Bench output:
```
TriangulateSpade (unconstrained) - small polys
                        time:   [8.7534 ms 8.7641 ms 8.7777 ms]
                        change: [-2.6587% -2.1965% -1.7360%] (p = 0.00 < 0.05)
                        Performance has improved.
Found 5 outliers among 100 measurements (5.00%)
  3 (3.00%) high mild
  2 (2.00%) high severe

Benchmarking TriangulateSpade (constrained) - small polys: Warming up for 3.0000 s
Warning: Unable to complete 100 samples in 5.0s. You may wish to increase target time to 98.7s, or reduce sample count to 10.
TriangulateSpade (constrained) - small polys
                        time:   [986.61 ms 987.03 ms 987.51 ms]
                        change: [-5.2413% -5.0808% -4.9190%] (p = 0.00 < 0.05)
                        Performance has improved.
Found 17 outliers among 100 measurements (17.00%)
  7 (7.00%) high mild
  10 (10.00%) high severe

TriangulateEarcut - small polys
                        time:   [6.9938 ms 6.9993 ms 7.0041 ms]
                        change: [-1.3566% -0.9176% -0.5312%] (p = 0.00 < 0.05)
                        Change within noise threshold.
Found 12 outliers among 100 measurements (12.00%)
  5 (5.00%) low severe
  5 (5.00%) low mild
  2 (2.00%) high mild

TriangulateSpade (unconstrained) - large_poly
                        time:   [3.4280 ms 3.4390 ms 3.4521 ms]
                        change: [+0.2922% +0.7947% +1.3032%] (p = 0.00 < 0.05)
                        Change within noise threshold.
Found 13 outliers among 100 measurements (13.00%)
  7 (7.00%) high mild
  6 (6.00%) high severe

Benchmarking TriangulateSpade (constrained) - large_poly: Warming up for 3.0000 s
Warning: Unable to complete 100 samples in 5.0s. You may wish to increase target time to 178.3s, or reduce sample count to 10.
TriangulateSpade (constrained) - large_poly
                        time:   [1.7869 s 1.8005 s 1.8178 s]
                        change: [-7.9992% -5.8498% -4.2765%] (p = 0.00 < 0.05)
                        Performance has improved.
Found 14 outliers among 100 measurements (14.00%)
  5 (5.00%) high mild
  9 (9.00%) high severe

TriangulateEarcut - large_poly
                        time:   [2.2287 ms 2.2346 ms 2.2413 ms]
                        change: [+1.0859% +1.4903% +1.9614%] (p = 0.00 < 0.05)
                        Performance has regressed.
Found 14 outliers among 100 measurements (14.00%)
  10 (10.00%) high mild
  4 (4.00%) high severe
```
  • Loading branch information
michaelkirk committed Dec 7, 2023
1 parent 58d6bac commit aa71ffd
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
2 changes: 2 additions & 0 deletions geo/CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
* <https://github.com/georust/geo/pull/1107>
* Make `SpadeTriangulationConfig` actually configurable
* <https://github.com/georust/geo/pull/1123>
* PERF: small improvements to TriangulateSpade trait
* <https://github.com/georust/geo/pull/1122>

## 0.27.0

Expand Down
21 changes: 12 additions & 9 deletions geo/src/algorithm/triangulate_spade.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ pub type Triangles<T> = Vec<Triangle<T>>;
// so that we don't leak these weird methods on the public interface.
mod private {
use super::*;

pub(crate) type CoordsIter<'a, T> = Box<dyn Iterator<Item = Coord<T>> + 'a>;

pub trait TriangulationRequirementTrait<'a, T>
where
T: SpadeTriangulationFloat,
Expand All @@ -76,7 +79,7 @@ mod private {
fn lines(&'a self) -> Vec<Line<T>>;
/// collect all the coords that are relevant for triangulations from the geometric object that
/// should be triangulated
fn coords(&'a self) -> Vec<Coord<T>>;
fn coords(&'a self) -> CoordsIter<T>;
/// define a predicate that decides if a point is inside of the object (used for constrained triangulation)
fn contains_point(&'a self, p: Point<T>) -> bool;

Expand Down Expand Up @@ -315,8 +318,8 @@ where
T: SpadeTriangulationFloat,
G: LinesIter<'l, Scalar = T> + CoordsIter<Scalar = T> + Contains<Point<T>>,
{
fn coords(&'a self) -> Vec<Coord<T>> {
self.coords_iter().collect::<Vec<_>>()
fn coords(&'a self) -> private::CoordsIter<T> {
Box::new(self.coords_iter())
}

fn lines(&'a self) -> Vec<Line<T>> {
Expand All @@ -333,11 +336,11 @@ where

impl<'a, T, G> private::TriangulationRequirementTrait<'a, T> for Vec<G>
where
T: SpadeTriangulationFloat,
T: SpadeTriangulationFloat + 'a,
G: TriangulateSpade<'a, T>,
{
fn coords(&'a self) -> Vec<Coord<T>> {
self.iter().flat_map(|g| g.coords()).collect::<Vec<_>>()
fn coords(&'a self) -> private::CoordsIter<T> {
Box::new(self.iter().flat_map(|g| g.coords()))
}

fn lines(&'a self) -> Vec<Line<T>> {
Expand All @@ -351,11 +354,11 @@ where

impl<'a, T, G> private::TriangulationRequirementTrait<'a, T> for &[G]
where
T: SpadeTriangulationFloat,
T: SpadeTriangulationFloat + 'a,
G: TriangulateSpade<'a, T>,
{
fn coords(&'a self) -> Vec<Coord<T>> {
self.iter().flat_map(|g| g.coords()).collect::<Vec<_>>()
fn coords(&'a self) -> private::CoordsIter<T> {
Box::new(self.iter().flat_map(|g| g.coords()))
}

fn lines(&'a self) -> Vec<Line<T>> {
Expand Down

0 comments on commit aa71ffd

Please sign in to comment.