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.

Sign up for GitHub

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

Jump to bottom

ENH: Implement Hilbert distance #70

Merged
merged 38 commits into from
Jul 22, 2021
Merged

ENH: Implement Hilbert distance #70

merged 38 commits into from
Jul 22, 2021

Commits on Jul 7, 2021

  1. calculate hilbert distances for geopandas

    @tastatham
    tastatham committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    78403c0 View commit details
    Browse the repository at this point in the history

  2. calculate hilbert distances for dask-geopandas

    @tastatham
    tastatham committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    825e31e View commit details
    Browse the repository at this point in the history

  3. add test to check whether calculated hilbert distances match between … 

    …geopandas as dask-geopandas
    @tastatham
    tastatham committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    cb173d6 View commit details
    Browse the repository at this point in the history

  4. reformatted previous commits using black

    @tastatham
    tastatham committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    f5d5d52 View commit details
    Browse the repository at this point in the history

  5. updated _hilbert_distance with no for loops

    @tastatham
    tastatham committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    bc6fd49 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2021

  1. drop test_hilbert_distance tmp

    @tastatham
    tastatham committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    d0f8802 View commit details
    Browse the repository at this point in the history

  2. add numba acceleration

    @tastatham
    tastatham committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    bc9b632 View commit details
    Browse the repository at this point in the history

  3. update hilbert_distance.py docstring

    @tastatham
    tastatham committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    ce52794 View commit details
    Browse the repository at this point in the history

  4. updated black to avoid failing

    @tastatham
    tastatham committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    92849da View commit details
    Browse the repository at this point in the history

  5. add numba to continuous env yml files

    @tastatham
    tastatham committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    fc898fa View commit details
    Browse the repository at this point in the history

  6. updated hilbert_distance to lazily evaluate total_bounds

    @tastatham
    tastatham committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    0fba9a8 View commit details
    Browse the repository at this point in the history

  7. updated core.py docstring for hilbert_distance

    @tastatham
    tastatham committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    9cdb098 View commit details
    Browse the repository at this point in the history

  8. reformat calculating hilbert distance for numba & cleaner syntax

    @tastatham
    tastatham committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    251ae60 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2021

  1. remove bounds_to_numpy

    @tastatham
    tastatham committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    4511b94 View commit details
    Browse the repository at this point in the history

  2. change x_width to width

    @tastatham
    tastatham committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    1266357 View commit details
    Browse the repository at this point in the history

  3. update docstring for _continuous_to_discrete

    @tastatham
    tastatham committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    8971210 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2021

  1. split _hilbert_distance for testing/debugging

    @tastatham
    tastatham committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    f7eb6d5 View commit details
    Browse the repository at this point in the history

  2. output pd.series instead of array

    @tastatham
    tastatham committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    91465f3 View commit details
    Browse the repository at this point in the history

  3. add test for calc hilbert_distance

    @tastatham
    tastatham committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    8737e55 View commit details
    Browse the repository at this point in the history

  4. add hilbert_curve to CI env & fix test error

    @tastatham
    tastatham committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    b86b5d2 View commit details
    Browse the repository at this point in the history

  5. Update continuous_integration/envs/38-latest.yaml 

    Co-authored-by: Martin Fleischmann <martin@martinfleischmann.net>
    @tastatham @martinfleis
    tastatham and martinfleis committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    947bf77 View commit details
    Browse the repository at this point in the history

  6. update hilbert test & ci env

    @tastatham
    tastatham committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    c8fbd7f View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2021

  1. Preserve original gdf index using hilbert_distance 

    Co-authored-by: Joris Van den Bossche <jorisvandenbossche@gmail.com>
    @tastatham @jorisvandenbossche
    tastatham and jorisvandenbossche committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    3fa1d01 View commit details
    Browse the repository at this point in the history

  2. Update hilbert curve dependency in 39-dev.yaml 

    Co-authored-by: Martin Fleischmann <martin@martinfleischmann.net>
    @tastatham @martinfleis
    tastatham and martinfleis committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    d8a2d46 View commit details
    Browse the repository at this point in the history

  3. Use latest version of numba 

    Co-authored-by: Joris Van den Bossche <jorisvandenbossche@gmail.com>
    @tastatham @jorisvandenbossche
    tastatham and jorisvandenbossche committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    dbfd011 View commit details
    Browse the repository at this point in the history

  4. Use latest version of numba 

    Co-authored-by: Joris Van den Bossche <jorisvandenbossche@gmail.com>
    @tastatham @jorisvandenbossche
    tastatham and jorisvandenbossche committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    7d750a2 View commit details
    Browse the repository at this point in the history

  5. Use latest version of numba 

    Co-authored-by: Joris Van den Bossche <jorisvandenbossche@gmail.com>
    @tastatham @jorisvandenbossche
    tastatham and jorisvandenbossche committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    a9cf761 View commit details
    Browse the repository at this point in the history

  6. Explicitly call x & y mids in _continuous_to_discrete_coords 

    Co-authored-by: Joris Van den Bossche <jorisvandenbossche@gmail.com>
    @tastatham @jorisvandenbossche
    tastatham and jorisvandenbossche committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    922addd View commit details
    Browse the repository at this point in the history

  7. Update dask_geopandas/hilbert_distance.py 

    Explicitly call total_bounds in _continuous_to_discrete_coords

Co-authored-by: Joris Van den Bossche <jorisvandenbossche@gmail.com>
    @tastatham @jorisvandenbossche
    tastatham and jorisvandenbossche committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    e193f87 View commit details
    Browse the repository at this point in the history

  8. Drop unnecessary () from pytest.fixture in test_core.py

    @tastatham
    tastatham committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    aa47fdd View commit details
    Browse the repository at this point in the history

  9. call total bounds and x&y mids in _continuous_discrete

    @tastatham
    tastatham committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    cdf9458 View commit details
    Browse the repository at this point in the history

  10. merge _hilbert_distance and _calculate_hilbert_distance

    @tastatham
    tastatham committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    98780cd View commit details
    Browse the repository at this point in the history

  11. Use latest version of numba

    @tastatham
    tastatham committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    1e1c196 View commit details
    Browse the repository at this point in the history

  12. add assert statement to check whether gdf indexes are equal

    @tastatham
    tastatham committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    8a8b114 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2021

  1. Merge remote-tracking branch 'origin/master' into hilbert_distance

    @tastatham
    tastatham committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    7c19310 View commit details
    Browse the repository at this point in the history

  2. add numba to requirements

    @tastatham
    tastatham committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    7ae61ca View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2021

  1. update docstring

    @tastatham
    tastatham committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    bc41634 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2021

  1. Update setup.py

    @martinfleis
    martinfleis committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    e88f940 View commit details
    Browse the repository at this point in the history