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.

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

For latest release #470

Merged
merged 30 commits into from
Nov 25, 2023
Merged

For latest release #470

merged 30 commits into from
Nov 25, 2023

Commits on May 26, 2023

  1. fixes errors on qgis (#417)

    r-akemii committed May 26, 2023
    Configuration menu
    Copy the full SHA
    44525c3 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2023

  1. runs examples (#422)

    Co-authored-by: pveigadecamargo <pveigadecamargo@anl.gov>
    pedrocamargo and pveigadecamargo committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    a2a709b View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. Configuration menu
    Copy the full SHA
    b3d4e37 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2023

  1. fix matrix indices for memory-only matrices (#425)

    * fix matrix indices for memory-only matrices
    
    * run black
    
    ---------
    
    Co-authored-by: Pelle Koster <pelle.koster@nginfra.nl>
    elfjes and Pelle Koster committed Jul 2, 2023
    Configuration menu
    Copy the full SHA
    79bf127 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2023

  1. Pedro/cores skimming (#426)

    * Moves the setting of number of cores to the right place
    
    * Moves documentation to the right place
    
    ---------
    
    Co-authored-by: pveigadecamargo <pveigadecamargo@anl.gov>
    pedrocamargo and pveigadecamargo committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    6a21f02 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2023

  1. Updates assignment logging (#423)

    * assignment logging
    
    * Updates logging
    
    * Adds __config log
    
    * Adds test and docs
    
    * Update aequilibrae/paths/traffic_assignment.py
    
    * Fixes tests
    
    * fixes coverage testing
    
    * merges testing changes
    
    * style
    
    * style
    
    * style
    
    * style
    
    * narrows coverage test
    
    * Update test_traffic_assignment.py
    
    * Apply suggestions from code review
    
    * Fixes test_traffic_assignment
    
    ---------
    
    Co-authored-by: pveigadecamargo <pveigadecamargo@anl.gov>
    Co-authored-by: Pedro Camargo <c@margo.co>
    3 people committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    0807224 View commit details
    Browse the repository at this point in the history
  2. narrows coverage test (#429)

    Co-authored-by: pveigadecamargo <pveigadecamargo@anl.gov>
    pedrocamargo and pveigadecamargo committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    6a2088c View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. moves openmatrix to a primary dependency (#431)

    * moves openmatrix to a primary dependency
    
    * QGIS moved to Numpy 1.24 before moving to Python 3.10
    
    ---------
    
    Co-authored-by: pveigadecamargo <pveigadecamargo@anl.gov>
    pedrocamargo and pveigadecamargo committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    9580ec6 View commit details
    Browse the repository at this point in the history
  2. Updates software version for release

    * Bumps up version
    
    * Bumps up documentation version
    
    ---------
    
    Co-authored-by: pveigadecamargo <pveigadecamargo@anl.gov>
    pedrocamargo and pveigadecamargo committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    e5a21f1 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2023

  1. minor change to test CI

    jamiecook committed Jul 23, 2023
    Configuration menu
    Copy the full SHA
    91fd936 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. Fix multiple classes not being presented in the returned d (#438)

    * Prevent invalid attribute names on AequilibraE data fields
    
    This previously would have resulted in syntax error when accessing but
    its best we don't accept them anyway.
    
    * Fix multiple classes not being presented in the returned df
    
    Bug report: https://groups.google.com/g/aequilibrae/c/y_q9nLNs6-Y/m/yWXNpey9AAAJ
    
    * Style
    
    * Skip if network fails
    
    * Rounding
    
    * fixes test
    
    * Revert "Rounding"
    
    Vatican City really did move huh
    
    This reverts commit d9d0a5d.
    
    ---------
    
    Co-authored-by: pveigadecamargo <pveigadecamargo@anl.gov>
    Jake-Moss and pveigadecamargo committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    3575b5b View commit details
    Browse the repository at this point in the history
  2. Update README.md (#439)

    jamiecook committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    8a7a9ee View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2023

  1. Add implicit noexcept from Cython<3.0.0 (#440)

    With the release of Cython 3.0.0 there are a few changes of note to use. Particularly the performance impact of the
    removal of the implicit noexcept.
    
    Now all cdefs allow exceptions by default meaning every cdef must require the gil at the end of the function regardless
    of whether it was nogil or not. Adding the noexcept clause reverts to the old behaviour.
    
    There is a compiler directive to result this old behaviour but better be be explicit when the solution is one regex away:
    `^(cp?def(?:.|\n).*?)(nogil|):$`
    
    https://cython.readthedocs.io/en/latest/src/userguide/migrating_to_cy30.html#exception-values-and-noexcept
    Jake-Moss committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    3f6d2ed View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2023

  1. Disable select link (#443)

    Jake-Moss committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    0cd3d48 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2023

  1. Fix empty matrices not being saved (#444)

    Introduced in 7c2beb6
    Jake-Moss committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    b7c0775 View commit details
    Browse the repository at this point in the history
  2. Matrix exports and deprecation warning (#435)

    * Bumps up version
    
    * Bumps up documentation version
    
    * fixes matrix export
    
    * fixes deprecations
    
    * addresses SciPy versions
    
    * addresses SciPy versions
    
    * addresses SciPy versions
    
    * addresses SciPy versions
    
    * addresses SciPy versions
    
    * fixes test
    
    * fixes test
    
    ---------
    
    Co-authored-by: pveigadecamargo <pveigadecamargo@anl.gov>
    pedrocamargo and pveigadecamargo committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    039fee7 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2023

  1. Select link correctness fix (#447)

    * Revert "Disable select link (#443)"
    
    This reverts commit 0cd3d48.
    
    * Add Kai Tang's test and data
    
    * Potential select link fix
    
    * Test formatting
    
    * Fix tests imports
    
    * Add select link test
    
    This test asserts that the results of the select link on the links 7, and 13 are the same as the results of the
    assignment. These links were chosen for this particular network to cover all paths used.
    
    * Prevent data races in select link results
    
    Memory for the multi-threaded runs are now allocated in MuliThreadedAoN along side the rest of the multi-threaded memory.
    
    * Installs package to run documentation pipeline
    
    * installing
    
    * Install pandoc
    
    ---------
    
    Co-authored-by: Pedro Camargo <c@margo.co>
    Jake-Moss and pedrocamargo committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    477f397 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2023

  1. bumps up the version (#451)

    Co-authored-by: pveigadecamargo <pveigadecamargo@anl.gov>
    pedrocamargo and pveigadecamargo committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    a169b61 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' of github.com:AequilibraE/aequilibrae into develop

    # Conflicts:
    #	__version__.py
    #	docs/source/_static/switcher.json
    pveigadecamargo committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    b51235b View commit details
    Browse the repository at this point in the history
  3. new version

    pveigadecamargo committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    5d80d20 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2023

  1. Fix documentation bugs on latest (#456)

    * Update requirements-docs.txt
    
    modifies pydata theme version
    
    * Update requirements-docs.txt
    r-akemii committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    4bfaede View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2023

  1. PathResults.compute_path fix stale variables (#457)

    Previously if a path that exists was computed, and then a path that does not exist was attempted, the old path variables
    were not cleared.
    Jake-Moss committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    a22cb49 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2023

  1. Replaces triggers with check statements (#455)

    * replaces triggers with check statements
    
    * Guarantees that links can be created without adding information on nodes
    
    ---------
    
    Co-authored-by: pveigadecamargo <pveigadecamargo@anl.gov>
    pedrocamargo and pveigadecamargo committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    783eac9 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2023

  1. Configuration menu
    Copy the full SHA
    1bf9c1b View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2023

  1. Better import from OSM and description of bicycle & bus data in netwo…

    …rk (#464)
    
    Parameters file is a bit hidden/tricky to use for qaequilibrae users, this should help them for a better default OSM import which keep data for bus and bicycle
    Have keep the same structure as OSM but this result in 3 fields for each one (3 for bicycle and 3 for bus).
    
    Maybe we can think of a way to achieve only one field for bicycle and one for bus ? Might not so easy because of the number of combinations available in OSM, example : https://wiki.openstreetmap.org/wiki/Key:cycleway
    
    Co-authored-by: Arthur Evrard <83211842+Art-Ev@users.noreply.github.com>
    jamiecook and Art-Ev committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    4bb2435 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2023

  1. Early exit Dijsktra's with path reuse (#466)

    * Early exit Dijsktra's with path reuse
    
    * Remove early exit arg from update_trace, add private state
    
    Add a private variable which tracks the status of the tree from the
    previous call to `compute_path`. Setting the `PathResults.early_exit`
    be used to modify the behaviour of the `compute_path` call in
    `update_trace`.
    Jake-Moss committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    4073c67 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. Adds support for Python 3.12 (#453)

    * Adds support for Python 3.12
    
    * Update build_mac.yml
    
    * Move from depreciated `license_file` as its now a build error
    
    * `assertEquals` is a deprecated alias for `assertEqual`
    
    ---------
    
    Co-authored-by: pveigadecamargo <pveigadecamargo@anl.gov>
    Co-authored-by: Jake-Moss <jake.moss@uqconnect.edu.au>
    3 people committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    e0d1c5d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3d7f017 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2023

  1. Initial A* implementation (#467)

    * Initial A* implementation
    
    This implementation uses a haversine distance heuristic, in theory
    this a consistent heuristic [1] that would give us "an optimal path
    without processing any node more than once" when the graph cost is set
    to distance, however, in testing I've found that the distance
    calculations based and lon/lat done by myself and QGIS do not align
    with those in the project. Unfortunately this makes the heuristic not
    admissible [2] meaning A* will not always find the least-cost path,
    and may not do the minimum amount of work.
    
    From some basic instrumenting I found A* is consistently an order of
    magnitude better than the existing Dijkstra's implementation when it
    comes to heap operation counts. Time wise I haven't performed real
    benchmarks.
    
    Currently there is only one heuristic implemented for distance, if the
    graph cost field is set to `free_flow_time` the heuristic, while not
    useless is theory, it is practically as the magnitudes of the distances
    dominates any graph cost meaning A* will explore the whole network,
    just like Dijkstra's.
    
    [1] https://en.wikipedia.org/wiki/Consistent_heuristic
    [2] https://en.wikipedia.org/wiki/Admissible_heuristic
    
    * Indexing fixes found on Arkansas network
    
    * Updates graph types
    
    * A* improvements and corrections, equirectangular heuristic added
    
    * Update "without a model" example
    
    * fixup! A* improvements and corrections, equirectangular heuristic added
    
    * Set lon/lat index manually instead of passing to prepare_graph
    
    * fixup! Set lon/lat index manually instead of passing to prepare_graph
    
    * Split path computation and skimming example, use Coquimbo over Sioux
    
    * Add note about skimming with A*
    
    * General clean up
    
    * Extend existing test to include A* via subtests
    
    * Style
    
    * Add runtime heuristic switching
    
    * Document heuristic switching
    
    * Heuristic swithcing tests
    
    * Python 3.7 compatibility
    
    * Missed changes
    
    * Add note for A* non-distance metrics
    
    * Bumps up version for release
    
    ---------
    
    Co-authored-by: pveigadecamargo <pveigadecamargo@anl.gov>
    Jake-Moss and pveigadecamargo committed Nov 25, 2023
    Configuration menu
    Copy the full SHA
    df559bf View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    edc5453 View commit details
    Browse the repository at this point in the history