Code

Feature pu t assignment#486

Code

Merged

pedrocamargo merged 192 commits intodevelopAequilibraE/aequilibrae:developfrom feature_PuT_assignmentAequilibraE/aequilibrae:feature_PuT_assignmentCopy head branch name to clipboardDec 16, 2023

+6,518-340

Commits

Commits on May 9, 2023

• file transfer from the edsger package: shortest hyperpath algorithm

  djfrancesco

  committed
  e64aae2

Commits on May 10, 2023

• first try on compiling the public transport module

  djfrancesco

  committed
  276c7ae

• added the COO to CSC sparse format converter

  djfrancesco

  committed
  16772d4

• Python interface to the Cythonized Spiess & Florian algorithm

  djfrancesco

  committed
  2e3ea70

Commits on May 19, 2023

• Merge branch 'develop' of github.com:AequilibraE/aequilibrae into feature_PuT_assignment

  djfrancesco

  committed
  d35879f

• assignment loop

  djfrancesco

  committed
  8b4a53c

• just making sure zero entries are removed from the demand matrix

  djfrancesco

  committed
  333bdfa

Commits on May 26, 2023

• Merge branch 'master' of github.com:AequilibraE/aequilibrae into develop

  djfrancesco

  committed
  e5aa17c

• Merge branch 'develop' into feature_PuT_assignment

  djfrancesco

  committed
  35cd3f4

• Spiess & Florian test case

  djfrancesco

  committed
  42bc84b

• assign method S&F test

  djfrancesco

  committed
  3e509a7

• added some compiler directives

  djfrancesco

  committed
  222aa7b

• combined cdefs

  djfrancesco

  committed
  982af4a

• moved the allocation of f_i_vec outside of compute_SF_in

  djfrancesco

  committed
  fab06bc

• cleanup

  djfrancesco

  committed
  dd4a728

• moved the allocation of u_j_c_a_vec outside of compute_SF_in

  djfrancesco

  committed
  98069be

• cleanup

  djfrancesco

  committed
  574ae24

Commits on May 27, 2023

• removed np.sum()

  djfrancesco

  committed
  a466492

• moved the allocation of u_i_vec outside of compute_SF_in

  djfrancesco

  committed
  66f0095

• added a wrapper of the C function nqsort, in order to replace np.argsort

  djfrancesco

  committed
  20564ae

• moved the allocation of edges_indices outside of compute_SF_in

  djfrancesco

  committed
  28f587c

• released the gil in compute_SF_in

  djfrancesco

  committed
  303f5f5

• comment fix

  djfrancesco

  committed
  f5ea819

Commits on May 29, 2023

• added the initialization of the edge volume vector

  djfrancesco

  committed
  7be459c

Commits on May 31, 2023

• Attempt parallelising PuT assignment

  Jake-Moss

  committed
  1163d18

Commits on Jun 2, 2023

• Further progress towards parallelisation

  Jake-Moss

  committed
  ab5b0c2

• initialized the module for the S&F transit graph creation

  djfrancesco

  committed
  daa19cd

Commits on Jun 12, 2023

• handle the case of int data given as a float string

  djfrancesco

  committed
  01711bb

Commits on Jun 13, 2023

• renaming

  djfrancesco

  committed
  45ee946

Commits on Jun 14, 2023

• Complete parallelisation of PuT assignment over destinations

  Jake-Moss

  committed
  2df3511

• u_j_c_a_vec was being initialised to an incorrect size

  Jake-Moss

  committed
  abb3aba

• Move parallelised call to compute_SF_in to separate function

  Show description for 45e8840
  Jake-Moss

  committed
  45e8840

• Use numpy asserts for nicer error messages

  Show description for 22421f8
  Jake-Moss

  committed
  22421f8

• Restore HyperpathGenerating.run() functionality

  Jake-Moss

  committed
  901d73c

• Style

  Jake-Moss

  committed
  3dadd50

• create stop vertices

  djfrancesco

  committed
  ee5b9c3

• renamed a column

  djfrancesco

  committed
  677d836

Commits on Jun 16, 2023

• Fix openmp Windows

  Jake-Moss

  committed
  6a2632b

• Spelling and default to using all available threads

  Jake-Moss

  committed
  8acf7a8

• Merge pull request #419 from Jake-Moss/feature_PuT_assignment

  Show description for 1bb9241
  djfrancesco

  authored
  1bb9241

Commits on Jun 17, 2023

• Fix default thread amount

  Jake-Moss

  committed
  7cb07ca

Commits on Jun 19, 2023

• Move hyperpath testing and adjust testing structure

  Show description for 8fce443
  Jake-Moss

  committed
  8fce443

• Credit Bell's network construction

  Jake-Moss

  committed
  ec77368

• Merge pull request #421 from Jake-Moss/feature_PuT_assignment

  Show description for 6dcab36
  djfrancesco

  authored
  6dcab36

Commits on Jun 21, 2023

• added the class global structure

  djfrancesco

  committed
  097835c

• using nullable Int type

  djfrancesco

  committed
  ca79a7b

• filtering stops on a given time period

  djfrancesco

  committed
  9534ca4

• filtering patterns, routes ans building a line segment dataframe

  djfrancesco

  committed
  8a6726e

• bug fix

  djfrancesco

  committed
  ee32f13

• bug fix + filtering the stops corresponding to the given time range

  djfrancesco

  committed
  7c7ae8f

• removed a comment : segment index are 0-based and not 1-based as specifed before

  djfrancesco

  committed
  22b86da

• created a method for the line segments dataframe + now creating the boarding vertices dataframe

  djfrancesco

  committed
  b7246fe

• creating the amighting vertices dataframe

  djfrancesco

  committed
  9823a40

• concatenating all the vertex dataframe into a single one

  djfrancesco

  committed
  b3facef

• computation the mean travel time for each (pattern, seq) couple

  djfrancesco

  committed
  8a5559b

Commits on Jun 23, 2023

• fixes the segment travel time computation

  djfrancesco

  committed
  4076652

• now creating the on-board edges

  djfrancesco

  committed
  a7f6766

Commits on Jun 26, 2023

• Add create_od_vertices()

  Jake-Moss

  committed
  6756b48

Commits on Jun 28, 2023

• Use sql over shape file, data must be mirgated to sqlite first.

  Jake-Moss

  committed
  95b880b

• Merge pull request #1 from Jake-Moss/transit_graph_building

  Show description for 7f6bc12
  djfrancesco

  authored
  7f6bc12

Commits on Jun 30, 2023

• Add creation of connector edges

  Jake-Moss

  committed
  aafdca7

• Add attempt at dwell and inner transfer edges

  Jake-Moss

  committed
  724d4b3

• Add missing import

  Jake-Moss

  committed
  2ae36ff

• small update

  djfrancesco

  committed
  c56120f

• Merge pull request #2 from Jake-Moss/transit_graph_building

  Show description for 8755b2d
  djfrancesco

  authored
  8755b2d

• temporarily using 2 sqlite connections in the parameters

  djfrancesco

  committed
  06701e7

• renaming within the SQL query

  djfrancesco

  committed
  8fc36dc

• dwell edges creation

  djfrancesco

  committed
  58f32dd

• small code simplifcation

  djfrancesco

  committed
  429d258

• alighting edges creation

  djfrancesco

  committed
  dd80ebf

• cleanup

  djfrancesco

  committed
  c515623

• wip

  djfrancesco

  committed
  5fc25fe

Commits on Jul 4, 2023

• compute the mean headway

  djfrancesco

  committed
  2d807b2

• renaming

  djfrancesco

  committed
  4065d60

Commits on Jul 5, 2023

• filling travel time missing values with travel times computed over all the trips_schedule (now limited to the given time range)

  djfrancesco

  committed
  b0f7f9a

Commits on Jul 6, 2023

• fixed the mean headway computation part

  djfrancesco

  committed
  0969925

• variable renaming

  djfrancesco

  committed
  3d5d90e

• boarding edges creation

  djfrancesco

  committed
  5c9a8f1

• concatenate the edges of different types

  djfrancesco

  committed
  75dc6bc

• added a projected CRS to compute distances

  djfrancesco

  committed
  510ead6

Commits on Jul 7, 2023

• now merging within the SQL

  djfrancesco

  committed
  a9eb7f2

• cleanup

  djfrancesco

  committed
  408198f

• updated the connector edges creation

  djfrancesco

  committed
  19dc59c

• creation of the inner stop transfer edges

  djfrancesco

  committed
  c1c29ac

Commits on Jul 12, 2023

• ability to add spatial noise to boarding and alighting vertex coordinates in order to visualize boarding, aligthing, transfer and collocated on-board edges

  djfrancesco

  committed
  b13cb33

• creation of the outer stop transfer edges

  djfrancesco

  committed
  0f31d39

• cleanup + divided the connector type into 2 types: access and egress

  djfrancesco

  committed
  3d27c30

• added a boolean argument to activate the creation of the outer stop transfer edges

  djfrancesco

  committed
  759e9b2

• creating some walking edges between the stops of a station

  djfrancesco

  committed
  c0b61d0

Commits on Jul 14, 2023

• Add overlapping regions for connectors construction.

  Show description for 07f55f6
  Jake-Moss

  committed
  07f55f6

• Fix missing edges, add max distance

  Jake-Moss

  committed
  76aa75a

Commits on Jul 21, 2023

• Merge branch 'master' of github.com:AequilibraE/aequilibrae into feature_PuT_assignment

  djfrancesco

  committed
  4329016

Commits on Jul 25, 2023

• Fix memory blowout by joining on null and empty strings entries

  Jake-Moss

  committed
  124a670

• Merge pull request #3 from Jake-Moss/transit_graph_building

  Show description for f229394
  djfrancesco

  authored
  f229394

• wip

  djfrancesco

  committed
  ed68cc2

• renaming + merge

  djfrancesco

  committed
  5211e7a

• typo

  djfrancesco

  committed
  1204001

• casting all stop and parent_station ids to text in sql queries

  djfrancesco

  committed
  930a48a

Commits on Jul 27, 2023

• Using consistent data types during graph transit creation

  djfrancesco

  committed
  b5bd4f5

• Merge branch 'AequilibraE:feature_PuT_assignment' into feature_PuT_assignment

  djfrancesco

  authored
  7d60251

Commits on Jul 28, 2023

• fixed the cython compilation : added a noexcept in the declaration of _compare

  djfrancesco

  committed
  2d47ffa

• revert to the sequential assignment algorithm (in order to compile)

  djfrancesco

  committed
  1ebe37a

• comments + initialization

  djfrancesco

  committed
  3db8d46

Commits on Aug 1, 2023

• Add preliminary db saving

  Show description for 1d66e94
  Jake-Moss

  committed
  1d66e94

• Add shifting for duplicated geometry when saving

  Jake-Moss

  committed
  adb695c

Commits on Aug 4, 2023

• IDs should be index from 1

  Show description for 08cb181
  Jake-Moss

  committed
  08cb181

• Rename terms to be more consistent with AequilibraE, use wkb as well

  Show description for 7f2fa86
  Jake-Moss

  committed
  7f2fa86

Commits on Aug 11, 2023

• Copy over SQL specs for move from proj db to transit storage

  Jake-Moss

  committed
  c9b62cc

Commits on Aug 15, 2023

• Mirror more triggers and tables into transit db

  Show description for 8d5b1a4
  Jake-Moss

  committed
  8d5b1a4

Commits on Aug 17, 2023

• renamed some variables

  djfrancesco

  committed
  424bb55

• moved the haversine distance function to the utils submodule

  djfrancesco

  committed
  f76799a

• comments

  djfrancesco

  committed
  5976aa0

Commits on Aug 18, 2023

• Add custom loading of zones to drop dependence on project db

  Jake-Moss

  committed
  f82243c

• Merge branch 'develop' of github.com:djfrancesco/aequilibrae into feature_PuT_assignment

  djfrancesco

  committed
  6f7197e

• revert back to the parallel version

  djfrancesco

  committed
  bbe1723

• added Jake's fix to support Cython 3

  djfrancesco

  committed
  1747a5a

• some code cleaning in the travel time computation

  djfrancesco

  committed
  8b9973f

Commits on Aug 22, 2023

• Style

  Jake-Moss

  committed
  55b935b

Commits on Aug 31, 2023

• cleanup and refactoring

  djfrancesco

  committed
  8ee96f7

Commits on Sep 1, 2023

• Add direction and to aeq graph conversion

  Jake-Moss

  committed
  e650949

• Integrate results saving for hp assignment

  Jake-Moss

  committed
  f4603b6

• Merge branch 'feature_PuT_assignment' into transit_graph_building

  djfrancesco

  authored
  c599124

• Merge pull request #4 from Jake-Moss/transit_graph_building

  Show description for f30093a
  djfrancesco

  authored
  f30093a

• typo

  djfrancesco

  committed
  8074377

• Merge branch 'feature_PuT_assignment' of github.com:djfrancesco/aequilibrae into feature_PuT_assignment

  djfrancesco

  committed
  a1319ea

Commits on Sep 5, 2023

• Misc post merge fixes and formatting

  Jake-Moss

  committed
  732fa32

Commits on Sep 6, 2023

• wip

  djfrancesco

  committed
  dcce68e

• Merge branch 'feature_PuT_assignment' of github.com:djfrancesco/aequilibrae into feature_PuT_assignment

  djfrancesco

  committed
  f68fa1c

• Merge pull request #420 from djfrancesco/feature_PuT_assignment

  Show description for 8b93351
  djfrancesco

  authored
  8b93351

Commits on Sep 7, 2023

• Merge branch 'feature_PuT_assignment' of github.com:AequilibraE/aequilibrae into feature_PuT_assignment

  djfrancesco

  committed
  b812388

• Add missing results.sql

  Jake-Moss

  committed
  59fb322

• Merge branch 'feature_PuT_assignment' of github.com:AequilibraE/aequilibrae into feature_PuT_assignment

  djfrancesco

  committed
  5e42949

Commits on Sep 8, 2023

• Merge branch 'develop' into feature_PuT_assignment

  Jake-Moss

  committed
  4357356

• SQL query update

  djfrancesco

  committed
  b9fb714

• comments

  djfrancesco

  committed
  0391d39

• sql update + public attributes made private

  djfrancesco

  committed
  e578fc7

Commits on Sep 12, 2023

• More consistent datatypes

  Show description for 375d124
  Jake-Moss

  committed
  375d124

• Merge pull request #445 from Jake-Moss/feature_PuT_assignment

  Show description for 94fc331
  djfrancesco

  authored
  94fc331

• fixed a conflict + added a comment

  djfrancesco

  committed
  e0222a5

Commits on Sep 14, 2023

• tried to fix an issue with some inverted tail and head IDs for access and egress connectors

  djfrancesco

  committed
  3b68651

• Merge pull request #446 from AequilibraE/connector_a_b_nodes_fix

  Show description for 0b9cd4b
  Jake-Moss

  authored
  0b9cd4b

Commits on Sep 29, 2023

• set the edge direction attribute to 1 for all edges (all edges are directed)

  djfrancesco

  committed
  82356c0

• quick fix to drop duplicated transfer edges

  djfrancesco

  committed
  beeb31a

• now creating distinct origin and destination nodes

  djfrancesco

  committed
  26a0eec

• now supporting the blocking_centroid_flows mode when creating the transit graph, where the origin and destination nodes are distinct

  djfrancesco

  committed
  2600413

• added a method to convert taz ids to node ids in the demand matrix

  djfrancesco

  committed
  7af200e

• Merge pull request #449 from djfrancesco/feature_PuT_assignment

  Show description for 7adcdab
  djfrancesco

  authored
  7adcdab

• added the max_connectors_per_zone parameter to select at most k connectors per zone with smallest travel time

  djfrancesco

  committed
  6924686

Commits on Oct 17, 2023

• Scipy 1.6 is 2 years old, prefer KDTree over the cKDTree alias

  Jake-Moss

  committed
  473cc2f

• Add initial connect project matching

  Jake-Moss

  committed
  cb7a0f9

• Allow troublesome triggers to be disabled

  Jake-Moss

  committed
  4fb07db

• Improvements on the project line string matching. Not complete

  Jake-Moss

  committed
  d0086c6

• Project matching progress

  Jake-Moss

  committed
  49f773e

• Mimic changes in #455

  Jake-Moss

  committed
  649eee1

• fixup! Allow troublesome triggers to be disabled

  Jake-Moss

  committed
  0c65574

Commits on Oct 20, 2023

• PathResults.compute_path fix stale variables

  Show description for 3de9af2
  Jake-Moss

  committed
  3de9af2

• Working project matching

  Jake-Moss

  committed
  16b7eaf

• Use existing line string data for a better result

  Jake-Moss

  committed
  152c8eb

Commits on Oct 24, 2023

• Refactor project matching into smaller method, add more detailed doc

  Jake-Moss

  committed
  f680b3e

Commits on Oct 31, 2023

• Misc doc changes + include trigger_settings in db creation

  Jake-Moss

  committed
  fa01f80

Commits on Nov 1, 2023

• Merge pull request #448 from Jake-Moss/feature_PuT_assignment

  Show description for a28ebe7
  djfrancesco

  authored
  a28ebe7

Commits on Nov 3, 2023

• Allow supplying zones as shapely objects, by default add zone

  Jake-Moss

  committed
  6604e0c

• Allow specifying the graph to match against

  Jake-Moss

  committed
  9a7a069

• Style

  Jake-Moss

  committed
  60e9c06

• Adjust to_aeq method to reflect other changes

  Jake-Moss

  committed
  365b72c

Commits on Nov 30, 2023

• Merge branch 'develop' into feature_PuT_assignment

  Jake-Moss

  committed
  ea64e79

• Use the constructed RNG generator

  Jake-Moss

  committed
  667730b

• Documentation overhaul

  Show description for 2b83466
  Jake-Moss

  committed
  2b83466

Commits on Dec 1, 2023

• Pandas warning fix

  Jake-Moss

  committed
  12890f4

• Add Coquimbo public transit assignment example

  Jake-Moss

  committed
  27c5d1a

• fixup! Add Coquimbo public transit assignment example

  Jake-Moss

  committed
  e96c646

Commits on Dec 2, 2023

• Merge pull request #473 from Jake-Moss/feature_PuT_assignment

  Show description for 502fe32
  djfrancesco

  authored
  502fe32

• updated the docstrings and default values

  djfrancesco

  committed
  9fae655

• include SF_graph_builder in the API documentation

  djfrancesco

  committed
  70f6d9a

• made many methods protected

  djfrancesco

  committed
  8f53f6b

Commits on Dec 4, 2023

• updated the graph builder docstring

  djfrancesco

  committed
  3723999

• bug fix in the case where there is no transfer edges

  djfrancesco

  committed
  2a0f9cd

• uniform argument naming when calling pd.read_sql

  djfrancesco

  committed
  7e8dab1

• bug fix dealing with the case of creating walking edges without any parent station

  djfrancesco

  committed
  ee8dd3a

Commits on Dec 5, 2023

• used a newer pandas method to remove future warning

  djfrancesco

  committed
  78f3462

Commits on Dec 12, 2023

• new documentation about transit graph creation

  djfrancesco

  committed
  96e2941

• images associated with the transit graph documentation

  djfrancesco

  committed
  5ebf146

• Merge pull request #477 from djfrancesco/feature_PuT_assignment

  Show description for a616220
  djfrancesco

  authored
  a616220

• structure of a new documentation page

  djfrancesco

  committed
  7eefecf

• completed the hyperpath documentation page

  djfrancesco

  committed
  9e393bc

• more documentation (HyperpathGenerating)

  djfrancesco

  committed
  8715d29

• Merge pull request #483 from djfrancesco/feature_PuT_assignment

  Show description for 892b2b1
  djfrancesco

  authored
  892b2b1

Commits on Dec 14, 2023

• fix: added dwell edges

  djfrancesco

  committed
  0c853dc

Commits on Dec 16, 2023

• PT Integration (#476)

  Show description for e0a0b55
  

  3 peopleauthored
  e0a0b55

• Merge branch 'develop' of github.com:AequilibraE/aequilibrae into feature_PuT_assignment

  

  pveigadecamargo

  committed
  02a349f

• Merge remote-tracking branch 'origin/feature_PuT_assignment' into feature_PuT_assignment

  Show description for 89db790
  

  pveigadecamargo

  committed
  89db790

• renaming

  

  pveigadecamargo

  committed
  b027e0a