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

Reimplement managed raster class in C++ #1597

Open
wants to merge 84 commits into
base: feature/routing-refactor
Choose a base branch
from
Open

Reimplement managed raster class in C++ #1597

wants to merge 84 commits into from

Commits on May 7, 2024

  1. compare different implementations of upslope neighbors

    @emlys
    emlys committed May 7, 2024
    Configuration menu
    Copy the full SHA
    5e58f60 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2024

  1. improve efficiency of managedraster helper functions

    @emlys
    emlys committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    7c51c08 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. work in progress: rewrite managed raster module in c++

    @emlys
    emlys committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    a55d57c View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. work in progress: managed raster in C++

    @emlys
    emlys committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    068d886 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. C++ managed raster implementation now faster on SDR sample data

    @emlys
    emlys committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    8576088 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/routing-refactor' into feature/routing-refactor… 

    …-compare
    @emlys
    emlys committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    7f2ec80 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. NDR tests passing with new C++ implementation of managedraster

    @emlys
    emlys committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    11ef40f View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. all tests using managedraster passing locally

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    c7486f2 View commit details
    Browse the repository at this point in the history

  2. debugging: find gdal.h

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    048e769 View commit details
    Browse the repository at this point in the history

  3. debugging: add incldue path to compile args for windows

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    cccf0e6 View commit details
    Browse the repository at this point in the history

  4. debugging

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    8d104a4 View commit details
    Browse the repository at this point in the history

  5. debugging'

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    6ca0f78 View commit details
    Browse the repository at this point in the history

  6. debugging

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    61d1f65 View commit details
    Browse the repository at this point in the history

  7. debugging

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    d3aebac View commit details
    Browse the repository at this point in the history

  8. debugging

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    eb15fa1 View commit details
    Browse the repository at this point in the history

  9. debugging

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    93ec4b9 View commit details
    Browse the repository at this point in the history

  10. debugging

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    4506414 View commit details
    Browse the repository at this point in the history

  11. debugging

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    1ff72b6 View commit details
    Browse the repository at this point in the history

  12. debugging

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    6acaea6 View commit details
    Browse the repository at this point in the history

  13. use C++20; no need to compile managed_raster as a separate extension

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    9316d20 View commit details
    Browse the repository at this point in the history

  14. debugging

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    0d4805a View commit details
    Browse the repository at this point in the history

  15. debugging

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    53b15d0 View commit details
    Browse the repository at this point in the history

  16. debugging

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    06c8648 View commit details
    Browse the repository at this point in the history

  17. debugging

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    1749eb9 View commit details
    Browse the repository at this point in the history

  18. debugging

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    e4c234f View commit details
    Browse the repository at this point in the history

  19. debugging

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    bbd7c5a View commit details
    Browse the repository at this point in the history

  20. debugging

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    7bc4b58 View commit details
    Browse the repository at this point in the history

  21. debugging

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    efc5527 View commit details
    Browse the repository at this point in the history

  22. debugging

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    474a89a View commit details
    Browse the repository at this point in the history

  23. debugging

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    a63532f View commit details
    Browse the repository at this point in the history

  24. debugging

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    05aa968 View commit details
    Browse the repository at this point in the history

  25. debugging

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    81af8a3 View commit details
    Browse the repository at this point in the history

  26. debugging

    @emlys
    emlys committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    a0e5810 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. use setuptools library_dirs parameter

    @emlys
    emlys committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    d5bd998 View commit details
    Browse the repository at this point in the history

  2. debugging

    @emlys
    emlys committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    09a6f8e View commit details
    Browse the repository at this point in the history

  3. organizing options in setup.py

    @emlys
    emlys committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    c669180 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. swy core: use libcpp.vector rather than allocating an array

    @emlys
    emlys committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    61883f5 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2024

  1. swy core: use libcpp.vector rather than allocating an array

    @emlys
    emlys committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    d236af1 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. use std::string type to store raster path in ManagedRaster

    @emlys
    emlys committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    7e12302 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2024

  1. Merge branch 'main' into feature/routing-refactor-compare

    @emlys
    emlys committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    c664e43 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. Merge branch 'main' into feature/routing-refactor-compare

    @emlys
    emlys committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    baac039 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/routing-refactor' into feature/routing-refactor… 

    …-compare
    @emlys
    emlys committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    8cf1e6b View commit details
    Browse the repository at this point in the history

  3. remove extra changed files

    @emlys
    emlys committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    5932fdb View commit details
    Browse the repository at this point in the history

  4. clean upg

    @emlys
    emlys committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    8fe87ec View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. now slightly faster than implementation on main

    @emlys
    emlys committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    d7d3b09 View commit details
    Browse the repository at this point in the history

  2. add library dir for gdal to setup.py

    @emlys
    emlys committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    4e5e717 View commit details
    Browse the repository at this point in the history

  3. typo

    @emlys
    emlys committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    5f6a647 View commit details
    Browse the repository at this point in the history

  4. another mistake

    @emlys
    emlys committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    8defb6f View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2024

  1. add C++ errors for invalid arguments to managedraster

    @emlys
    emlys committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    6245b6a View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. Update src/natcap/invest/managed_raster/ManagedRaster.h 

    Co-authored-by: James Douglass <[email protected]>
    @emlys @phargogh
    emlys and phargogh authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    364d7ff View commit details
    Browse the repository at this point in the history

  2. remove unneeded file

    @emlys
    emlys committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    386beb2 View commit details
    Browse the repository at this point in the history

  3. remove unused enumeration

    @emlys
    emlys committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    7b994e2 View commit details
    Browse the repository at this point in the history

  4. inline managedraster set and get functions

    @emlys
    emlys committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    f62a696 View commit details
    Browse the repository at this point in the history

  5. write C++ error messages out to error stream

    @emlys
    emlys committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    8109a60 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2024

  1. clean up lru_cache and actualBlockWidths in managedraster.close

    @emlys
    emlys committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    da23f3e View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2024

  1. inline is_close function

    @emlys
    emlys committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    31565e8 View commit details
    Browse the repository at this point in the history

  2. use gdal-config to get library path on macos

    @emlys
    emlys committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    8c31a12 View commit details
    Browse the repository at this point in the history

  3. separate C++ classes for each variant of neighbor pixel iteration

    @emlys
    emlys committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    b88567c View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2024

  1. drafting a true C++ iterator

    @emlys
    emlys committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    36c26b2 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. implement true C++ iterator for downslope neighbors and use in SDR

    @emlys
    emlys committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    fc8dd38 View commit details
    Browse the repository at this point in the history

  2. using downslope iterators everywhere

    @emlys
    emlys committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    e6a370e View commit details
    Browse the repository at this point in the history

  3. use true iterators for upslope neighbors

    @emlys
    emlys committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    2cf8f5d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/routing-refactor' into feature/routing-refactor… 

    …-compare
    @emlys
    emlys committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    ba37a0a View commit details
    Browse the repository at this point in the history

  5. debugging

    @emlys
    emlys committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    b957881 View commit details
    Browse the repository at this point in the history

  6. debugging

    @emlys
    emlys committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    989a7b6 View commit details
    Browse the repository at this point in the history

  7. cdef flow_dir_sum

    @emlys
    emlys committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    b8e710f View commit details
    Browse the repository at this point in the history

  8. debugging

    @emlys
    emlys committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    b532001 View commit details
    Browse the repository at this point in the history

  9. debugging

    @emlys
    emlys committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    9421e2c View commit details
    Browse the repository at this point in the history

  10. debugging

    @emlys
    emlys committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    9981569 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. debugging

    @emlys
    emlys committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    6d556e2 View commit details
    Browse the repository at this point in the history

  2. debugging

    @emlys
    emlys committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    c7742e8 View commit details
    Browse the repository at this point in the history

  3. debugging

    @emlys
    emlys committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    7b9db1f View commit details
    Browse the repository at this point in the history

  4. debugging

    @emlys
    emlys committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    9071362 View commit details
    Browse the repository at this point in the history

  5. debugging

    @emlys
    emlys committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    ba9cebe View commit details
    Browse the repository at this point in the history

  6. debugging

    @emlys
    emlys committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    13cc0dc View commit details
    Browse the repository at this point in the history

  7. use const reference parameters to equality fns

    @emlys
    emlys committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    7a767f5 View commit details
    Browse the repository at this point in the history

  8. inherit from Neighbors class

    @emlys
    emlys committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    5b8c04e View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2024

  1. inherit operator funcs

    @emlys
    emlys committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    947900c View commit details
    Browse the repository at this point in the history

  2. inherit equality functions from parent class

    @emlys
    emlys committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    f737225 View commit details
    Browse the repository at this point in the history

  3. run all tests

    @emlys
    emlys committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    3a623eb View commit details
    Browse the repository at this point in the history

  4. inherit increment operators from parent class

    @emlys
    emlys committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    420145f View commit details
    Browse the repository at this point in the history

  5. call base class constructors where possible

    @emlys
    emlys committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    dde78df View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2024

  1. setup.py: use same options for linux as for mac

    @emlys
    emlys committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    11cc0ef View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2024

  1. remove extra comments

    @emlys
    emlys committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    25c954a View commit details
    Browse the repository at this point in the history