Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Column API for linestring-polygon distance #1030

Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
7022c1d
initial
isVoid Mar 24, 2023
5686be3
add segment iterator and tests
isVoid Mar 28, 2023
a74af14
WIP
isVoid Mar 28, 2023
1c28faa
making progress towards getting the right index
isVoid Mar 29, 2023
243d2d9
commiting progress
isVoid Mar 29, 2023
0da0afc
able to get the right segment combinations from within the kernel, ne…
isVoid Mar 31, 2023
49e43aa
[skip-ci] initial port from feature/linestring_polygon_distance_header
isVoid Mar 31, 2023
e8e45d0
Apply suggestions from code review
isVoid Mar 31, 2023
fadf5c8
Update cpp/include/cuspatial/experimental/detail/functors.cuh
isVoid Mar 31, 2023
fe31542
address review comments
isVoid Mar 31, 2023
af0c35e
address review comments
isVoid Mar 31, 2023
05bf7ff
[skip-ci] address review coments
isVoid Mar 31, 2023
2435126
Add docstrings for functors
isVoid Mar 31, 2023
98a4a0f
[skip-ci] adds linestring_count test
isVoid Apr 1, 2023
9b72723
[skip-ci] revert removed code
isVoid Apr 1, 2023
6971200
style
isVoid Apr 1, 2023
6f7a226
update unexpected changes
isVoid Apr 1, 2023
641934f
license
isVoid Apr 1, 2023
c580876
Merge branch 'feature/segment_iterators' into feature/linestring_poly…
isVoid Apr 1, 2023
890e95b
Update cpp/include/cuspatial/experimental/detail/ranges/multilinestri…
isVoid Apr 1, 2023
040e432
making a bit of progress
isVoid Apr 2, 2023
7c3603c
fix broken multilinestring->multipoint constructor
isVoid Apr 2, 2023
5966ad0
Merge branch 'feature/segment_iterators' of github.com:isVoid/cuspati…
isVoid Apr 2, 2023
70ca1b6
fix broken multilinestring->multipoint constructor
isVoid Apr 2, 2023
9205533
passing existing tests
isVoid Apr 3, 2023
4bb3ca3
fix wrong test setup and update docs
isVoid Apr 3, 2023
9f34700
Merge branch 'feature/segment_iterators' into feature/linestring_poly…
isVoid Apr 3, 2023
8f20feb
style
isVoid Apr 3, 2023
3ffe5ee
Delete point_in_multipolygon.cuh
isVoid Apr 3, 2023
894f870
Delete linestring_polygon_distance.hpp
isVoid Apr 3, 2023
2b99555
cleanup - first round
isVoid Apr 3, 2023
656d093
Merge branch 'feature/linestring_polygon_distance_header' of github.c…
isVoid Apr 3, 2023
62d821f
merge duplicate code
isVoid Apr 3, 2023
76e5b7e
initial
isVoid Apr 3, 2023
7d22749
add missing header
isVoid Apr 3, 2023
9051944
style
isVoid Apr 3, 2023
075d12a
Merge branch 'feature/linestring_polygon_distance_header' into featur…
isVoid Apr 3, 2023
5ed7616
add tests
isVoid Apr 3, 2023
a160f71
style
isVoid Apr 3, 2023
1d52bb0
Merge branch 'branch-23.06' of https://github.com/rapidsai/cuspatial …
isVoid Apr 7, 2023
471be4c
Update cpp/include/cuspatial/distance/linestring_polygon_distance.hpp
isVoid Apr 18, 2023
3a95d60
Merge branch 'branch-23.06' into feature/linestring_polygon_distance_…
isVoid Apr 18, 2023
7d95117
remove data tests in cpp
isVoid Apr 18, 2023
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
Prev Previous commit
Next Next commit
Apply suggestions from code review
  • Loading branch information
isVoid authored Mar 31, 2023
commit e8e45d0724cb3f52287f7ba2582f22b2a876d6a0
Original file line number Diff line number Diff line change
Expand Up @@ -205,27 +205,6 @@ multipolygon_range<GeometryIterator, PartIterator, RingIterator, VecIterator>::p
return _point_end;
}

// template <typename GeometryIterator,
// typename PartIterator,
// typename RingIterator,
// typename VecIterator>
// CUSPATIAL_HOST_DEVICE auto
// multipolygon_range<GeometryIterator, PartIterator, RingIterator, VecIterator>::polygon_begin()
// {
// return detail::make_counting_transform_iterator(
// 0, to_polygon_functor{_part_begin, _ring_begin, point_begin, point_end});
// }

// template <typename GeometryIterator,
// typename PartIterator,
// typename RingIterator,
// typename VecIterator>
// CUSPATIAL_HOST_DEVICE auto
// multipolygon_range<GeometryIterator, PartIterator, RingIterator, VecIterator>::polygon_end()
// {
// return polygon_begin() + num_polygons();
// }

template <typename GeometryIterator,
typename PartIterator,
typename RingIterator,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ class multilinestring_range {

/// Casts the multilinestring range into a multipoint range.
/// This treats each multilinestring as simply a collection of points,
/// ignoring all edges of the multilinestring.
/// ignoring all edges in the multilinestring.
CUSPATIAL_HOST_DEVICE auto as_multipoint_range();

protected:
Expand Down
11 changes: 0 additions & 11 deletions cpp/include/cuspatial/experimental/ranges/multipolygon_range.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -184,17 +184,6 @@ class multipolygon_range {
/// Returns an iterator to the end of the segment
CUSPATIAL_HOST_DEVICE auto segment_end();

// /// Returns an infinite iterator to the "repeated" polygons of the multipolygon range.
// /// If the multipolygon range has 2 polygons, an iterator with repeats 3 will iterate on the
// /// 0th, 0th, 0th, 1st, 1st, 1st, 0th, 0th, 0th polygon for the first 9 iterations.
// ///
// /// The name of `repeated` comes from [numpy.repeat](1)
// /// [1] https://numpy.org/doc/stable/reference/generated/numpy.repeat.html
// template <typename IndexType>
// CUSPATIAL_HOST_DEVICE auto polygon_wraparound_repeated_begin(IndexType repeats);

// template <typename IndexType>
// CUSPATIAL_HOST_DEVICE auto segment_wraparound_repeated_begin()

protected:
GeometryIterator _geometry_begin;
Expand Down