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 Morton distance #90

Merged
merged 24 commits into from
Aug 19, 2021
Merged

ENH: Implement Morton distance #90

merged 24 commits into from
Aug 19, 2021

Commits on Aug 4, 2021

  1. reformat morton_distance

    @tastatham
    tastatham committed Aug 4, 2021
    Configuration menu
    Copy the full SHA
    f257271 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2021

  1. use pip instead of conda for pymorton

    @tastatham
    tastatham committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    937bbbf View commit details
    Browse the repository at this point in the history

  2. resolve pymorton package not being found in dev env

    @tastatham
    tastatham committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    2c90399 View commit details
    Browse the repository at this point in the history

  3. remove pymorton as conda dependency in dev env

    @tastatham
    tastatham committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    72bb05d View commit details
    Browse the repository at this point in the history

  4. Drop for loop for vectorization 

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

Commits on Aug 6, 2021

  1. Remove hilbert distance from morton distance docstring 

    Co-authored-by: Brendan Ward <bcward@astutespruce.com>
    @tastatham @brendan-ward
    tastatham and brendan-ward committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    60c64c3 View commit details
    Browse the repository at this point in the history

  2. update docstring using numpy & drop encode_morton

    @tastatham
    tastatham committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    703b5b4 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'morton_distance' of github.com:tastatham/dask-geopandas… 

    … into morton_distance
    @tastatham
    tastatham committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    3117348 View commit details
    Browse the repository at this point in the history

  4. drop master from pymorton

    @tastatham
    tastatham committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    9756156 View commit details
    Browse the repository at this point in the history

  5. change comment about what this script is based on

    @tastatham
    tastatham committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    ba96592 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2021

  1. update style & drop unnecessary parts

    @tastatham
    tastatham committed Aug 8, 2021
    Configuration menu
    Copy the full SHA
    27ca9e7 View commit details
    Browse the repository at this point in the history

  2. update docstring

    @tastatham
    tastatham committed Aug 8, 2021
    Configuration menu
    Copy the full SHA
    2c539e0 View commit details
    Browse the repository at this point in the history

  3. add pip as conda dependency

    @tastatham
    tastatham committed Aug 8, 2021
    Configuration menu
    Copy the full SHA
    07fdecc View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2021

  1. Update 38-latest.yaml with pip dep 

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

  2. Update 37-latest.yaml with pip dep 

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

  3. Update 39-latest.yaml with pip dep 

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

  4. Merge branch 'geopandas:master' into morton_distance

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

  5. update docstring to reflect output is a dask.Series, not pandas.Series

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

Commits on Aug 17, 2021

  1. Update morton_distance docstring 

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

  2. Update docstring for morton_distance 

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

  3. Update morton docstring in core.py 

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

  4. update docstring to drop whitespace

    @tastatham
    tastatham committed Aug 17, 2021
    Configuration menu
    Copy the full SHA
    ef62162 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2021

  1. update docstring of morton_distance 

    Co-authored-by: Brendan Ward <bcward@astutespruce.com>
    @tastatham @brendan-ward
    tastatham and brendan-ward committed Aug 18, 2021
    Configuration menu
    Copy the full SHA
    40ca74d View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2021

  1. add back first bitwise and operator

    @jorisvandenbossche
    jorisvandenbossche committed Aug 19, 2021
    Configuration menu
    Copy the full SHA
    b9c282a View commit details
    Browse the repository at this point in the history