-
Notifications
You must be signed in to change notification settings - Fork 695
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
[SEDONA-655] DBSCAN #1589
Merged
Merged
[SEDONA-655] DBSCAN #1589
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
97769e3
add dbscan scala
8e89ad6
add dbscan python
3005f7c
add dbscan tests, pom file changes, pip changes
5f176ea
disable broadcast joins for all dbscan tests
8aeaee1
disable non-sedona broadcast joins for all dbscan tests
8e54015
unpersist dbscan result assuming that graphframes PR will eventually …
b0ebf24
revisions from Paweł
6efed7e
add documentation
20601a9
Merge branch 'master' into dbscan
james-willis 8788144
styling in docs
james-willis 5796b69
reword stats documentation
james-willis 4203753
clean up
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
## Overview | ||
The stats module of Sedona implements Scala and Python functions that can be called on dataframes with spatial columns to perform geospatial statistical analysis. The stats module is built on top of the core module and provides a set of functions that can be used to perform spatial analysis on dataframes. The stats module is designed to be used with the core module and the viz module to provide a complete set of geospatial analysis tools. | ||
james-willis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
## Using DBSCAN | ||
The DBSCAN function is provided at `org.apache.sedona.stats.DBSCAN.dbscan` in scala/java and `sedona.stats.dbscan.dbscan` in python. | ||
|
||
The function annotates a dataframe with a cluster label for each data record using the DBSCAN algorithm. | ||
The dataframe should contain at least one GeometryType column. Rows must be unique. If one | ||
james-willis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
geometry column is present it will be used automatically. If two are present, the one named | ||
'geometry' will be used. If more than one are present and none are named 'geometry', the | ||
column name must be provided. The new column will be named 'cluster'. | ||
|
||
#### Parameters | ||
names in parentheses are python variable names | ||
- dataframe - dataframe to cluster. Must contain at least one GeometryType column | ||
- epsilon - minimum distance parameter of DBSCAN algorithm | ||
- minPts (min_pts) - minimum number of points parameter of DBSCAN algorithm | ||
- geometry - name of the geometry column | ||
- includeOutliers (include_outliers) - whether to include outliers in the output. Default is false | ||
- useSpheroid (use_spheroid) - whether to use a cartesian or spheroidal distance calculation. Default is false | ||
|
||
|
||
The output is the input DataFrame with the cluster label added to each row. Outlier will have a cluster value of -1 if included. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,6 +10,8 @@ jupyter="*" | |
mkdocs="*" | ||
pytest-cov = "*" | ||
|
||
scikit-learn = "*" | ||
|
||
[packages] | ||
pandas="<=1.5.3" | ||
numpy="<2" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
# Licensed to the Apache Software Foundation (ASF) under one | ||
# or more contributor license agreements. See the NOTICE file | ||
# distributed with this work for additional information | ||
# regarding copyright ownership. The ASF licenses this file | ||
# to you under the Apache License, Version 2.0 (the | ||
# "License"); you may not use this file except in compliance | ||
# with the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, | ||
# software distributed under the License is distributed on an | ||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
# KIND, either express or implied. See the License for the | ||
# specific language governing permissions and limitations | ||
# under the License. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
# Licensed to the Apache Software Foundation (ASF) under one | ||
# or more contributor license agreements. See the NOTICE file | ||
# distributed with this work for additional information | ||
# regarding copyright ownership. The ASF licenses this file | ||
# to you under the Apache License, Version 2.0 (the | ||
# "License"); you may not use this file except in compliance | ||
# with the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, | ||
# software distributed under the License is distributed on an | ||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
# KIND, either express or implied. See the License for the | ||
# specific language governing permissions and limitations | ||
# under the License. | ||
|
||
"""The clustering module contains spark based implementations of popular geospatial clustering algorithms. | ||
|
||
These implementations are designed to scale to larger datasets and support various geometric feature types. | ||
""" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
# Licensed to the Apache Software Foundation (ASF) under one | ||
# or more contributor license agreements. See the NOTICE file | ||
# distributed with this work for additional information | ||
# regarding copyright ownership. The ASF licenses this file | ||
# to you under the Apache License, Version 2.0 (the | ||
# "License"); you may not use this file except in compliance | ||
# with the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, | ||
# software distributed under the License is distributed on an | ||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
# KIND, either express or implied. See the License for the | ||
# specific language governing permissions and limitations | ||
# under the License. | ||
|
||
"""DBSCAN is a popular clustering algorithm for spatial data. | ||
|
||
It identifies groups of data where enough records are close enough to each other. This implementation leverages spark, | ||
sedona and graphframes to support large scale datasets and various, heterogeneous geometric feature types. | ||
""" | ||
from typing import Optional | ||
|
||
from pyspark.sql import DataFrame, SparkSession | ||
|
||
ID_COLUMN_NAME = "__id" | ||
DEFAULT_MAX_SAMPLE_SIZE = 1000000 # 1 million | ||
|
||
|
||
def dbscan( | ||
dataframe: DataFrame, | ||
epsilon: float, | ||
min_pts: int, | ||
geometry: Optional[str] = None, | ||
include_outliers: bool = True, | ||
use_spheroid=False, | ||
): | ||
"""Annotates a dataframe with a cluster label for each data record using the DBSCAN algorithm. | ||
|
||
The dataframe should contain at least one GeometryType column. Rows must be unique. If one geometry column is | ||
present it will be used automatically. If two are present, the one named 'geometry' will be used. If more than one | ||
are present and neither is named 'geometry', the column name must be provided. | ||
|
||
Args: | ||
dataframe: spark dataframe containing the geometries | ||
epsilon: minimum distance parameter of DBSCAN algorithm | ||
min_pts: minimum number of points parameter of DBSCAN algorithm | ||
geometry: name of the geometry column | ||
include_outliers: whether to return outlier points. If True, outliers are returned with a cluster value of -1. | ||
Default is False | ||
use_spheroid: whether to use a cartesian or spheroidal distance calculation. Default is false | ||
|
||
Returns: | ||
A PySpark DataFrame containing the cluster label for each row | ||
""" | ||
sedona = SparkSession.getActiveSession() | ||
|
||
result_df = sedona._jvm.org.apache.sedona.stats.clustering.DBSCAN.dbscan( | ||
dataframe._jdf, | ||
float(epsilon), | ||
min_pts, | ||
geometry, | ||
include_outliers, | ||
use_spheroid, | ||
) | ||
|
||
return DataFrame(result_df, sedona) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
# Licensed to the Apache Software Foundation (ASF) under one | ||
# or more contributor license agreements. See the NOTICE file | ||
# distributed with this work for additional information | ||
# regarding copyright ownership. The ASF licenses this file | ||
# to you under the Apache License, Version 2.0 (the | ||
# "License"); you may not use this file except in compliance | ||
# with the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, | ||
# software distributed under the License is distributed on an | ||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
# KIND, either express or implied. See the License for the | ||
# specific language governing permissions and limitations | ||
# under the License. | ||
|
||
from pyspark.sql import DataFrame, Column, SparkSession | ||
from sedona.sql.types import GeometryType | ||
|
||
|
||
def get_geometry_column_name(df: DataFrame) -> Column: | ||
james-willis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
geom_fields = [ | ||
field.name for field in df.schema.fields if field.dataType == GeometryType() | ||
] | ||
|
||
if len(geom_fields) == 0: | ||
raise ValueError("No GeometryType column found. Provide a dataframe containing a geometry column.") | ||
|
||
if len(geom_fields) == 1: | ||
return geom_fields[0] | ||
|
||
if len(geom_fields) > 1 and "geometry" not in geom_fields: | ||
raise ValueError("Multiple GeometryType columns found. Provide the column name as an argument.") | ||
|
||
return "geometry" |
Empty file.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file is not put in the
mkdocs.yml
hence it will show up on the website navigation bar.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
on it. and fixing test failures.