update polyline-in-polygon, reuse FastCrossing (#17)

* update * should be ready * update docs * update * fix * update * update * update headers * fix * update headers --------- Co-authored-by: TANG ZHIXIONG <zhixiong.tang@momenta.ai>
cubao · Jul 2, 2023 · 8a4b93d · 8a4b93d
1 parent 874d6a8
commit 8a4b93d
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ _generate/
 *env*
 wheelhouse
 !test.py
+site
diff --git a/docs/point-in-polygon.md b/docs/point-in-polygon.md
@@ -93,5 +93,5 @@ python3 benchmarks/benchmark_point_in_polygon.py cubao \
 | implementation | time (seconds) | speed up |
 | :-- | :-- | :-- |
 | shapely | 0.114556074 | |
-| matplotlib | 0.001869917 | x61 |
-| cubao | 0.001556635 | x73 |
+| matplotlib | 0.001869917 | 61x |
+| cubao | 0.001556635 | 73x |
diff --git a/docs/polyline-in-polygon.md b/docs/polyline-in-polygon.md
@@ -0,0 +1,17 @@
+# polyline-in-polygon
+
+code:
+
+-   <https://github.com/cubao/fast-crossing/blob/master/scripts/debug_polyline_in_polygon.py>
+
+video:
+
+-   <https://www.bilibili.com/video/BV1D24y1u7uB>
+-   <https://www.youtube.com/watch?v=1dPJ3P84FxE>
+
+```python
+{%
+   include-markdown "../scripts/debug_polyline_in_polygon.py"
+   comments=false
+%}
+```
diff --git a/headers b/headers
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -12,6 +12,7 @@ nav:
     - Usage: usage.md
     - MISC:
       - point-in-polygon-test: point-in-polygon.md
+      - polyline-in-polygon-clipping: polyline-in-polygon.md
     - About:
         - Release Notes: about/release-notes.md
         - License: about/license.md

diff --git a/src/main.cpp b/src/main.cpp
@@ -53,7 +53,16 @@ PYBIND11_MODULE(_pybind11_fast_crossing, m)
     m.def("densify_polyline", &cubao::densify_polyline, //
           "polyline"_a, py::kw_only(), "max_gap"_a,
           "densify polyline, interpolate to satisfy max_gap");
-    m.def("polyline_in_polygon", &cubao::polyline_in_polygon, //
+    m.def("polyline_in_polygon",
+          py::overload_cast<const cubao::RowVectors &, //
+                            const Eigen::Ref<const cubao::RowVectorsNx2> &,
+                            const cubao::FastCrossing &>(
+              &cubao::polyline_in_polygon), //
+          "polyline"_a, "polygon"_a, py::kw_only(), "fc"_a);
+    m.def("polyline_in_polygon",
+          py::overload_cast<const cubao::RowVectors &, //
+                            const Eigen::Ref<const cubao::RowVectorsNx2> &,
+                            bool>(&cubao::polyline_in_polygon), //
           "polyline"_a, "polygon"_a, py::kw_only(), "is_wgs84"_a = false);
 
 #ifdef VERSION_INFO

diff --git a/src/polyline_in_polygon.hpp b/src/polyline_in_polygon.hpp
@@ -23,13 +23,11 @@ using PolylineChunks = std::map<std::tuple<int,    // seg_idx
 inline PolylineChunks
 polyline_in_polygon(const RowVectors &polyline, //
                     const Eigen::Ref<const RowVectorsNx2> &polygon,
-                    bool is_wgs84 = false)
+                    const FastCrossing &fc)
 {
-    auto fc = FastCrossing(is_wgs84);
-    fc.add_polyline(polygon);
     auto intersections = fc.intersections(polyline);
     // pt, (t, s), cur_label=(poly1, seg1), tree_label=(poly2, seg2)
-    auto ruler = PolylineRuler(polyline, is_wgs84);
+    auto ruler = PolylineRuler(polyline, fc.is_wgs84());
     // 0.0, [r1, r2, ..., length]
     const int N = intersections.size() + 1;
     Eigen::VectorXd ranges(N);
@@ -71,6 +69,17 @@ polyline_in_polygon(const RowVectors &polyline, //
     return ret;
 }
 
+inline PolylineChunks
+polyline_in_polygon(const RowVectors &polyline, //
+                    const Eigen::Ref<const RowVectorsNx2> &polygon,
+                    bool is_wgs84 = false)
+{
+    auto fc = FastCrossing(is_wgs84);
+    fc.add_polyline(polygon);
+    fc.finish();
+    return polyline_in_polygon(polyline, polygon, fc);
+}
+
 } // namespace cubao
 
 #endif
diff --git a/tests/test_basic.py b/tests/test_basic.py
@@ -1,5 +1,6 @@
 import os
 import sys
+import time
 
 import numpy as np
 import pytest
@@ -796,6 +797,23 @@ def test_polyline_in_polygon():
     expected_ranges = [2.72883, 14.4676666, 7.01783]
     np.testing.assert_allclose(ranges, expected_ranges, atol=1e-4)
 
+    # test fc
+    fc = FastCrossing()
+    fc.add_polyline(polygon_ABCD)
+    chunks2 = polyline_in_polygon(polyline_12345, polygon_ABCD, fc=fc)
+    assert list(chunks.keys()) == list(chunks2.keys())
+    N = 1000
+    tick = time.time()
+    for _ in range(N):
+        polyline_in_polygon(polyline_12345, polygon_ABCD)
+    delta1 = time.time() - tick
+    tick = time.time()
+    for _ in range(N):
+        polyline_in_polygon(polyline_12345, polygon_ABCD, fc=fc)
+    delta2 = time.time() - tick
+    print(delta1, delta2)
+    # assert delta2 < delta1
+
     anchor_lla = [123.4, 56.7, 8.9]
     chunks = polyline_in_polygon(
         tf.enu2lla(polyline_12345, anchor_lla=anchor_lla),