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

CI TEST - DO NOT MERGE #510

Closed
wants to merge 99 commits into from
Closed

CI TEST - DO NOT MERGE #510

wants to merge 99 commits into from

Commits on Jan 9, 2024

  1. Removed reached_first from A* 

    The current method of skimming for A* produces out of bound accesses for A*.
This occurs when it reconsiders more nodes than are in the network. The
`reached_view` array is primarily for skimming, as such I've disabled skimming
for A*.

Skimming for early exit Dijkstra's should also be reconsidered.
    @Jake-Moss
    Jake-Moss committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    3a3488f View commit details
    Browse the repository at this point in the history

  2. Add preliminary route choice

    @Jake-Moss
    Jake-Moss committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    c32e91a View commit details
    Browse the repository at this point in the history

  3. Return noexcepts

    @Jake-Moss
    Jake-Moss committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    7bf8b4e View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. Working RouteChoice generation

    @Jake-Moss
    Jake-Moss committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    b80b6ea View commit details
    Browse the repository at this point in the history

  2. Removed unused variables and junk

    @Jake-Moss
    Jake-Moss committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    3e37811 View commit details
    Browse the repository at this point in the history

  3. Notes

    @Jake-Moss
    Jake-Moss committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    1a864c5 View commit details
    Browse the repository at this point in the history

  4. fixup! Removed unused variables and junk

    @Jake-Moss
    Jake-Moss committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    291bdc0 View commit details
    Browse the repository at this point in the history

  5. fixup! fixup! Removed unused variables and junk

    @Jake-Moss
    Jake-Moss committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    93526c0 View commit details
    Browse the repository at this point in the history

  6. Rename files

    @Jake-Moss
    Jake-Moss committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    1c449df View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2024

  1. Minor fixes

    @Jake-Moss
    Jake-Moss committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    08de182 View commit details
    Browse the repository at this point in the history

  2. Use comrpessed graph

    @Jake-Moss
    Jake-Moss committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    a8b0c54 View commit details
    Browse the repository at this point in the history

  3. Avoid unnessacary work when we may fill the route set this iteration

    @Jake-Moss
    Jake-Moss committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    a08ecc0 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2024

  1. Fix pointer issues, move custom imports

    @Jake-Moss
    Jake-Moss committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    4f46026 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. Spelling

    @Jake-Moss
    Jake-Moss committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    c74179b View commit details
    Browse the repository at this point in the history

  2. Prevent memory leak when destination is unreachable

    @Jake-Moss
    Jake-Moss committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    62b058d View commit details
    Browse the repository at this point in the history

  3. Remove print out

    @Jake-Moss
    Jake-Moss committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    5ddf8f4 View commit details
    Browse the repository at this point in the history

  4. Prevent infinite loop when depth is unlimited

    @Jake-Moss
    Jake-Moss committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    5e9aa21 View commit details
    Browse the repository at this point in the history

  5. Prevent oob access and incredible memory consumption (2gb/s) from A*

    @Jake-Moss
    Jake-Moss committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    8d5cdc6 View commit details
    Browse the repository at this point in the history

  6. Scratch testing on Arkansas

    @Jake-Moss
    Jake-Moss committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    614b77b View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. Remove working_set, PO1 makes this redundant, reduce memory usage 

    Graphs should also been marked as seen regardless of if the destination is reachable
    @Jake-Moss
    Jake-Moss committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    e14809c View commit details
    Browse the repository at this point in the history

  2. Remove prints

    @Jake-Moss
    Jake-Moss committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    129360c View commit details
    Browse the repository at this point in the history

  3. Add parallelised batched method for running a list of od pairs

    @Jake-Moss
    Jake-Moss committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    dc95778 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. Remove dead code and fix A* test now that skimming is disabled

    @Jake-Moss
    Jake-Moss committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    82204ba View commit details
    Browse the repository at this point in the history

  2. Move RouteChoice.run to be wrapper around RouteChoice.batched 

    No need for both methods
    @Jake-Moss
    Jake-Moss committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    1313f3c View commit details
    Browse the repository at this point in the history

  3. Fix infinite loop in the case that all possible paths are exhausted

    @Jake-Moss
    Jake-Moss committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    bacc76c View commit details
    Browse the repository at this point in the history

  4. Add comprehensive testing

    @Jake-Moss
    Jake-Moss committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    4d6536f View commit details
    Browse the repository at this point in the history

  5. Warning clean up

    @Jake-Moss
    Jake-Moss committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    e55a433 View commit details
    Browse the repository at this point in the history

  6. Update commentary and fix memory leak

    @Jake-Moss
    Jake-Moss committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    e7647b9 View commit details
    Browse the repository at this point in the history

  7. Typos

    @Jake-Moss
    Jake-Moss committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    80bd7f7 View commit details
    Browse the repository at this point in the history

  8. Rename and remove imports

    @Jake-Moss
    Jake-Moss committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    b45fc9f View commit details
    Browse the repository at this point in the history

  9. Disable initialisation and bounds checking

    @Jake-Moss
    Jake-Moss committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    4e442f1 View commit details
    Browse the repository at this point in the history

  10. Add docs and support blocking centroid flow with tests

    @Jake-Moss
    Jake-Moss committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    4b65f66 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2024

  1. Merge branch 'develop' into route_choice

    @Jake-Moss
    Jake-Moss committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    f0b5cbd View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2024

  1. Remove debug method and fix small typos

    @Jake-Moss
    Jake-Moss committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    9552907 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2024

  1. Merge branch 'develop' of github.com:AequilibraE/aequilibrae into rou… 

    …te_choice

# Conflicts:
#	setup.py
    pveigadecamargo committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    5253500 View commit details
    Browse the repository at this point in the history

  2. typo

    pveigadecamargo committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    9089fea View commit details
    Browse the repository at this point in the history

  3. Allow switching path finding method

    @Jake-Moss
    Jake-Moss committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    92edd72 View commit details
    Browse the repository at this point in the history

  4. Add debug method for display in tests

    @Jake-Moss
    Jake-Moss committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    007e934 View commit details
    Browse the repository at this point in the history

  5. Linting

    @Jake-Moss
    Jake-Moss committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    488006f View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2024

  1. Scratch parquet work

    @Jake-Moss
    Jake-Moss committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    0e668a9 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2024

  1. Better structuring for the table

    @Jake-Moss
    Jake-Moss committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    85fdb12 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2024

  1. Add optional immediately disk saving

    @Jake-Moss
    Jake-Moss committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    eecaaa3 View commit details
    Browse the repository at this point in the history

  2. Test fixes

    @Jake-Moss
    Jake-Moss committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    945e8a9 View commit details
    Browse the repository at this point in the history

  3. Update CI workflows 

    In what I consider a bad move, the PyPi wheel installation of pyarrow requires modifying the installation environment to
create symlinks for the linker.
    @Jake-Moss
    Jake-Moss committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    e3ea0c6 View commit details
    Browse the repository at this point in the history

  4. Move pyarrow to a hard dependency for now

    @Jake-Moss
    Jake-Moss committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    4c39a8b View commit details
    Browse the repository at this point in the history

  5. Linting

    @Jake-Moss
    Jake-Moss committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    f18d13c View commit details
    Browse the repository at this point in the history

  6. CI again

    @Jake-Moss
    Jake-Moss committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    9ad188b View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2024

  1. Warn about duplicate OD pairs, fix memory corruption, disable A*

    @Jake-Moss
    Jake-Moss committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    6c79a17 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. Fix path order

    @Jake-Moss
    Jake-Moss committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    d3677b6 View commit details
    Browse the repository at this point in the history

  2. Add link penalisation

    @Jake-Moss
    Jake-Moss committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    b5ed6a4 View commit details
    Browse the repository at this point in the history

  3. Linting

    @Jake-Moss
    Jake-Moss committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    738a657 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. Add parallelised sparse frequency implementation and test 

    Code is unprofiled, I'm not sure if this is the best approach but it works well.

It works by stacking all the paths in a route set into a big vector, then sorting it. By sorting it all the links become
grouped and we can just count their occurrences. This has the added benefit of the resulting frequency arrays being
sorted so we can bisect then later. Generally this has really simple memory accesses and is easy to read.

Another possible implementation might be to sort each path individually, then walk and merge them all (not adding
duplicates). This is trickier, requires a lot of book keeping to walk n arrays correctly, upside is lower memory usage
provided we sort inplace, if not then it should be the same.
    @Jake-Moss
    Jake-Moss committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    7d15ef0 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2024

  1. Remove debug test

    @Jake-Moss
    Jake-Moss committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    1543549 View commit details
    Browse the repository at this point in the history

  2. Add route cost computation and test

    @Jake-Moss
    Jake-Moss committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    31aaaad View commit details
    Browse the repository at this point in the history

  3. Add psl gamma computation, not sure what to test against

    @Jake-Moss
    Jake-Moss committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    71257eb View commit details
    Browse the repository at this point in the history

  4. Add scratch probability implementation

    @Jake-Moss
    Jake-Moss committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    7688d75 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2024

  1. Fix probability calculations

    @Jake-Moss
    Jake-Moss committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    b0627e4 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2024

  1. The great refactor, batch probability computations to dump to disk 

    Moves the computation of the path sized logit inside the main multithreaded loop, this lets us batch them as well and
dump them to disk along with the reset of the tables. Enable multithreading by default. Catch a handle of memory leaks.
    @Jake-Moss
    Jake-Moss committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    8c46115 View commit details
    Browse the repository at this point in the history

  2. Revert "Update CI workflows" 

    This reverts commit e3ea0c6.
    @Jake-Moss
    Jake-Moss committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    1f195b8 View commit details
    Browse the repository at this point in the history

  3. Move the pyarrow symlink creation to setup.py

    @Jake-Moss
    Jake-Moss committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    b44721e View commit details
    Browse the repository at this point in the history

  4. tests cibuildwheels

    pveigadecamargo committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    0ebce09 View commit details
    Browse the repository at this point in the history

  5. tests cibuildwheels

    pveigadecamargo committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    06b6a44 View commit details
    Browse the repository at this point in the history

  6. tests cibuildwheels

    pveigadecamargo committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    293457a View commit details
    Browse the repository at this point in the history

  7. tests cibuildwheels

    pveigadecamargo committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    bae7d0d View commit details
    Browse the repository at this point in the history

  8. Add ARM architectures for Linux and mac

    pveigadecamargo committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    f112262 View commit details
    Browse the repository at this point in the history

  9. adds emulation

    pveigadecamargo committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    e9e660b View commit details
    Browse the repository at this point in the history

  10. adds emulation

    pveigadecamargo committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    2458f9a View commit details
    Browse the repository at this point in the history

  11. adds emulation

    pveigadecamargo committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    b2d5d3d View commit details
    Browse the repository at this point in the history

  12. adds emulation

    pveigadecamargo committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    c9f2aaa View commit details
    Browse the repository at this point in the history

  13. CI

    @pedrocamargo
    pedrocamargo committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    ab37eaf View commit details
    Browse the repository at this point in the history

  14. .

    @pedrocamargo
    pedrocamargo committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    0df7565 View commit details
    Browse the repository at this point in the history

  15. .

    @pedrocamargo
    pedrocamargo committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    ccb9cfa View commit details
    Browse the repository at this point in the history

  16. adds emulation

    pveigadecamargo committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    9448e76 View commit details
    Browse the repository at this point in the history

  17. .

    pveigadecamargo committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    3df73da View commit details
    Browse the repository at this point in the history

  18. .

    pveigadecamargo committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    daf48a5 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'develop' of github.com:AequilibraE/aequilibrae into ped… 

    …ro/ci_test
    pveigadecamargo committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    9f4413e View commit details
    Browse the repository at this point in the history

  20. .

    pveigadecamargo committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    ebe3a19 View commit details
    Browse the repository at this point in the history

  21. .

    pveigadecamargo committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    3dafd88 View commit details
    Browse the repository at this point in the history

  22. .

    pveigadecamargo committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    0f954e4 View commit details
    Browse the repository at this point in the history

  23. .

    pveigadecamargo committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    f7ae37e View commit details
    Browse the repository at this point in the history

  24. .

    pveigadecamargo committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    dd6723f View commit details
    Browse the repository at this point in the history

  25. Update pyproject.toml

    @pedrocamargo
    pedrocamargo authored Feb 20, 2024
    Configuration menu
    Copy the full SHA
    d58e7cc View commit details
    Browse the repository at this point in the history

  26. Update pyproject.toml

    @pedrocamargo
    pedrocamargo authored Feb 20, 2024
    Configuration menu
    Copy the full SHA
    315cbce View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. .

    pveigadecamargo committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    ba0d882 View commit details
    Browse the repository at this point in the history

  2. .

    pveigadecamargo committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    9f2ca20 View commit details
    Browse the repository at this point in the history

  3. .

    pveigadecamargo committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    f934c34 View commit details
    Browse the repository at this point in the history

  4. .

    pveigadecamargo committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    66ffcc3 View commit details
    Browse the repository at this point in the history

  5. Hopefully fix CI

    @Jake-Moss
    Jake-Moss committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    24de8f7 View commit details
    Browse the repository at this point in the history

  6. Maybe MacOS fix

    @Jake-Moss
    Jake-Moss committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    cad0579 View commit details
    Browse the repository at this point in the history

  7. Maybe fix MacOS again

    @Jake-Moss
    Jake-Moss committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    a10c791 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. Macos test

    @Jake-Moss
    Jake-Moss committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    0548be6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into pedro/ci_test

    @Jake-Moss
    Jake-Moss authored Feb 26, 2024
    Configuration menu
    Copy the full SHA
    a6b2a8e View commit details
    Browse the repository at this point in the history

  3. .

    @Jake-Moss
    Jake-Moss committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    d0def11 View commit details
    Browse the repository at this point in the history

  4. .

    @Jake-Moss
    Jake-Moss committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    eedb859 View commit details
    Browse the repository at this point in the history

  5. .

    @Jake-Moss
    Jake-Moss committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    e0c32f2 View commit details
    Browse the repository at this point in the history

  6. .

    @Jake-Moss
    Jake-Moss committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    b4b945c View commit details
    Browse the repository at this point in the history

  7. .

    @Jake-Moss
    Jake-Moss committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    9dc3650 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. .

    @Jake-Moss
    Jake-Moss committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    c77d5e6 View commit details
    Browse the repository at this point in the history

  2. I give up

    @Jake-Moss
    Jake-Moss committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    3f2c01b View commit details
    Browse the repository at this point in the history