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

Route choice additions #508

Merged
merged 36 commits into from
Feb 28, 2024
Merged

Route choice additions #508

merged 36 commits into from
Feb 28, 2024

Commits on Feb 5, 2024

  1. Fix minor typos (AequilibraE#505) 

    * Update graph.py

* .
    @jamiecook
    jamiecook authored Feb 5, 2024
    Configuration menu
    Copy the full SHA
    2efc8ef View commit details
    Browse the repository at this point in the history

  2. Processing with chunking

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

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

    …ro/improves_dependencies
    pveigadecamargo committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    ccc0d68 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2024

  1. .

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

  2. .

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

  3. .

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

  4. 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

  5. Merge pull request AequilibraE#507 from AequilibraE/pedro/improves_de… 

    …pendencies

Improves dependencies
    @janzill
    janzill authored Feb 6, 2024
    Configuration menu
    Copy the full SHA
    2e3c234 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. 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

  5. .

    @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

  6. .

    @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

Commits on Feb 23, 2024

  1. OSM importer speedup (AequilibraE#506) 

    * OSM Geo-processing using GeoPandas

* OSM Geo-processing using GeoPandas

* OSM Geo-processing using GeoPandas

* OSM Geo-processing using GeoPandas

* Processing with chunking

* Processing with chunking

* Processing with chunking

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* pandas deprecations

* improves griding function

* adds network cleaning

* adds network cleaning

* Allows for use of polygons with rings inside

* Allows for use of polygons with rings inside

* adjusts types

* Update pyproject.toml

Co-authored-by: Jake Moss <[email protected]>

* .

* .

---------

Co-authored-by: pveigadecamargo <[email protected]>
Co-authored-by: Jake Moss <[email protected]>
    @pedrocamargo @Jake-Moss
    3 people authored Feb 23, 2024
    Configuration menu
    Copy the full SHA
    9fe62b8 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2024

  1. Simply bumping up the version for the next release (AequilibraE#512) 

    * Removes legacy code

* updates versions

---------

Co-authored-by: pveigadecamargo <[email protected]>
    @pedrocamargo
    pedrocamargo and pveigadecamargo authored Feb 25, 2024
    Configuration menu
    Copy the full SHA
    77edeae View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. Merge remote-tracking branch 'origin/develop' into route_choice_saving

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

  2. Squashed commit of the following: 

    commit 9337fb611463606b0ca89d1270210fa7fdf46714
Author: Jake-Moss <[email protected]>
Date:   Tue Feb 27 11:22:48 2024 +1000

    .

commit 3f2c01b
Author: Jake-Moss <[email protected]>
Date:   Tue Feb 27 10:09:51 2024 +1000

    I give up

commit c77d5e6
Author: Jake-Moss <[email protected]>
Date:   Tue Feb 27 10:03:52 2024 +1000

    .

commit 9dc3650
Author: Jake-Moss <[email protected]>
Date:   Tue Feb 27 09:58:40 2024 +1000

    .

commit b4b945c
Author: Jake-Moss <[email protected]>
Date:   Tue Feb 27 09:53:10 2024 +1000

    .

commit e0c32f2
Author: Jake-Moss <[email protected]>
Date:   Tue Feb 27 09:38:29 2024 +1000

    .

commit eedb859
Author: Jake-Moss <[email protected]>
Date:   Tue Feb 27 09:30:20 2024 +1000

    .

commit d0def11
Author: Jake-Moss <[email protected]>
Date:   Tue Feb 27 09:27:33 2024 +1000

    .

commit a6b2a8e
Merge: 0548be6 77edeae
Author: Jake Moss <[email protected]>
Date:   Tue Feb 27 09:19:30 2024 +1000

    Merge branch 'develop' into pedro/ci_test

commit 0548be6
Author: Jake-Moss <[email protected]>
Date:   Tue Feb 27 09:13:07 2024 +1000

    Macos test

commit a10c791
Author: Jake-Moss <[email protected]>
Date:   Wed Feb 21 20:00:01 2024 +1000

    Maybe fix MacOS again

commit cad0579
Author: Jake-Moss <[email protected]>
Date:   Wed Feb 21 19:43:00 2024 +1000

    Maybe MacOS fix

commit 24de8f7
Author: Jake-Moss <[email protected]>
Date:   Wed Feb 21 19:31:08 2024 +1000

    Hopefully fix CI

commit 66ffcc3
Author: pveigadecamargo <[email protected]>
Date:   Wed Feb 21 17:01:57 2024 +1000

    .

commit f934c34
Author: pveigadecamargo <[email protected]>
Date:   Wed Feb 21 16:41:36 2024 +1000

    .

commit 9f2ca20
Author: pveigadecamargo <[email protected]>
Date:   Wed Feb 21 16:30:59 2024 +1000

    .

commit ba0d882
Author: pveigadecamargo <[email protected]>
Date:   Wed Feb 21 16:27:14 2024 +1000

    .

commit 315cbce
Author: Pedro Camargo <[email protected]>
Date:   Wed Feb 21 01:01:23 2024 +1000

    Update pyproject.toml

commit d58e7cc
Author: Pedro Camargo <[email protected]>
Date:   Wed Feb 21 00:58:54 2024 +1000

    Update pyproject.toml

commit dd6723f
Author: pveigadecamargo <[email protected]>
Date:   Tue Feb 20 23:02:05 2024 +1000

    .

commit f7ae37e
Author: pveigadecamargo <[email protected]>
Date:   Tue Feb 20 22:58:19 2024 +1000

    .

commit 0f954e4
Author: pveigadecamargo <[email protected]>
Date:   Tue Feb 20 22:54:21 2024 +1000

    .

commit 3dafd88
Author: pveigadecamargo <[email protected]>
Date:   Tue Feb 20 22:27:05 2024 +1000

    .

commit ebe3a19
Author: pveigadecamargo <[email protected]>
Date:   Tue Feb 20 22:12:39 2024 +1000

    .

commit 9f4413e
Merge: daf48a5 2e3c234
Author: pveigadecamargo <[email protected]>
Date:   Tue Feb 20 22:11:22 2024 +1000

    Merge branch 'develop' of github.com:AequilibraE/aequilibrae into pedro/ci_test

commit daf48a5
Merge: 3df73da ccb9cfa
Author: pveigadecamargo <[email protected]>
Date:   Tue Feb 20 22:11:13 2024 +1000

    .

commit 3df73da
Author: pveigadecamargo <[email protected]>
Date:   Tue Feb 20 22:10:13 2024 +1000

    .

commit 9448e76
Author: pveigadecamargo <[email protected]>
Date:   Tue Feb 20 22:10:05 2024 +1000

    adds emulation

commit c9f2aaa
Author: pveigadecamargo <[email protected]>
Date:   Tue Feb 20 21:20:12 2024 +1000

    adds emulation

commit b2d5d3d
Author: pveigadecamargo <[email protected]>
Date:   Tue Feb 20 21:16:51 2024 +1000

    adds emulation

commit 2458f9a
Author: pveigadecamargo <[email protected]>
Date:   Tue Feb 20 21:02:26 2024 +1000

    adds emulation

commit e9e660b
Author: pveigadecamargo <[email protected]>
Date:   Tue Feb 20 20:54:57 2024 +1000

    adds emulation

commit f112262
Author: pveigadecamargo <[email protected]>
Date:   Tue Feb 20 20:42:13 2024 +1000

    Add ARM architectures for Linux and mac

commit bae7d0d
Author: pveigadecamargo <[email protected]>
Date:   Tue Feb 20 20:28:15 2024 +1000

    tests cibuildwheels

commit 293457a
Author: pveigadecamargo <[email protected]>
Date:   Tue Feb 20 20:09:43 2024 +1000

    tests cibuildwheels

commit 06b6a44
Author: pveigadecamargo <[email protected]>
Date:   Tue Feb 20 19:31:21 2024 +1000

    tests cibuildwheels

commit 0ebce09
Author: pveigadecamargo <[email protected]>
Date:   Tue Feb 20 19:23:39 2024 +1000

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

  3. Re-enable CI

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