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

Merge fasttrips branch into master #35

Open
wants to merge 164 commits into
base: master
Choose a base branch
from
Open

Merge fasttrips branch into master #35

wants to merge 164 commits into from

Conversation

sdrewc
Copy link
Member

@sdrewc sdrewc commented Jun 15, 2018

No description provided.

@sdrewc
Optionally store generic x and y in a Node.
24ad5c8 
Signed-off-by: Drew <[email protected]>
@sdrewc
let Wrangler import modules in _static
cb1b98f 
Signed-off-by: Drew <[email protected]>
@sdrewc
fix links -> link.csv, nodes -> nodes.csv
8ba5007 
Signed-off-by: Drew <[email protected]>
@sdrewc
this is taken care of in Wrangler itself now.
8388ac0 
Signed-off-by: Drew <[email protected]>
@sdrewc
so _static is treated as a module and can be imported.
1a1acf5 
Signed-off-by: Drew <[email protected]>
@sdrewc
Add functionality to:
71673ee 
1. attach (x,y) coordinates to Nodes contained in TransitNetworks' TransitLines
2. read transit travel times from loaded hwy networks and store them in TransitLines
3. write fast-trips style shapes.txt and stop_times.txt

Signed-off-by: Drew <[email protected]>
@sdrewc
script (in progress) to convert CHAMP-style Cube network to fast-trip…
76d75a8 
…s-style network

Signed-off-by: Drew <[email protected]>
@sdrewc
in writeFastTrips_Shape, only write the last node when it is actually…
8673dc3 
… the last node.

in writeFastTrips_StopTimes, several bug/logical fixes.

Signed-off-by: Drew <[email protected]>
@sdrewc
fix typos of 'link' where should be 'line'. Fix argument order when p…
b26be3c 
…assing args to writeFastTrips_StopTimes.

Signed-off-by: Drew <[email protected]>
@sdrewc
rename writeFastTrips_StopTimes -> writeFastTrips_Trips,
8d94c9d 
and have it write both `trips` file and `stop_times` file
because both use the same trip_id.

Signed-off-by: Drew <[email protected]>
@sdrewc
Update conversion script to write out shapes.txt, trips.txt, and stop…
ffda858 
…_times.txt

Signed-off-by: Drew <[email protected]>
@sdrewc
FareParser and Fare class initial commit. Work-in-progress.
e3ddca5 
Signed-off-by: Drew <[email protected]>
@sdrewc
Commit working FareParser and Fares with ODFare, XFFare and FarelinkF…
c1cbd50 
…are classes to correspond with CHAMP fare types.

Also includes script to test fares.

Signed-off-by: Drew <[email protected]>
@sdrewc
Add Fares to TransitParser
14d83f2 
Signed-off-by: Drew <[email protected]>
@sdrewc
Updates to Fares to support fast-trips
3a88680 
Signed-off-by: Drew <[email protected]>
@sdrewc
add function to get index of a node in the node sequence
ee3341e 
Signed-off-by: Drew <[email protected]>
@sdrewc
Move generic functions to HelperFunctions. may rename in the future.
4e8a458 
First stab at logic to build zones... working version.

Signed-off-by: Drew <[email protected]>
@sdrewc
Add boolean type functions.
27191cf 
Signed-off-by: Drew <[email protected]>
@sdrewc
Fix bug in boilDown to include crosses with right_split. Add function
ad8e9b8 
to test whether one list is a subset of another list.

Signed-off-by: Drew <[email protected]>
@sdrewc
Function to create non-overlapping zones based on Farelinks
43e4355 
Signed-off-by: Drew <[email protected]>
@sdrewc
Move lookups to WranglerLookups.
1c86634 
Revise logic to set fare_id.
Added class fastTripsFare.

Signed-off-by: Drew <[email protected]>
@sdrewc
added linename_pattern to match champ-style transit line names
11bfa0f 
Signed-off-by: Drew <[email protected]>
@sdrewc
Add logic to roll fares into lines and calculate stop-to-stop fares
08671ab 
Signed-off-by: Drew <[email protected]>
@sdrewc
fix typos.
b49589f 
Signed-off-by: Drew <[email protected]>
@sdrewc
Add zone creation to conversion script
c74d6cc 
Revert to old __cmp__ method.

Signed-off-by: Drew <[email protected]>
@sdrewc
Updates to lookups
5f39974 
Signed-off-by: Drew <[email protected]>
@sdrewc
Updates to fare structures and bug fixes
d36fc8f 
Signed-off-by: Drew <[email protected]>
@sdrewc
Bug fixes to FastTripsFare creation and minor reorg.
57c4f0a 
Signed-off-by: Drew <[email protected]>
@sdrewc
Update script with newly added functions
87ec7d7 
Signed-off-by: Drew <[email protected]>
@sdrewc
minor cleanup
96237c3 
Signed-off-by: Drew <[email protected]>
sdrewc and others added 26 commits April 26, 2017 14:22
@sdrewc
Creates FastTripsPNRNode subclass
bbcc598 
Signed-off-by: Drew <[email protected]>
@sdrewc
pull in lot capacities and costs from a dataframe, and add KNRs to ra…
59b0b75 
…il stops that don't have PNRs

Signed-off-by: Drew <[email protected]>
@sdrewc
read a PNR file in as a dataframe to get PNR attributes
5704594 
Signed-off-by: Drew <[email protected]>
@sdrewc
add lot_lat and lot_lon because they're GTFS-Plus attributes. ispnr n…
6a6208e 
…o longer needed.

Signed-off-by: Drew <[email protected]>
@sdrewc
use nodeToTaz when pnrNodeToTaz fails, for knrs that were added where…
2a1333c 
… "hard" pnrs don't exist

Signed-off-by: Drew <[email protected]>
@sdrewc
gives PNR/KNR node different number than its station, and adds drive …
98b1b2e 
…access and drive funnel

Signed-off-by: Drew <[email protected]>
@sdrewc
Get zone_id from kwargs
6118719 
Signed-off-by: Drew <[email protected]>
@sdrewc
bug fix: use node_to_zone if no zone_id in kwargs. Also default zone_…
093325b 
…id to None and capacity to 100

Signed-off-by: Drew <[email protected]>
@sdrewc
set a zone_id with a function. Use zone_id to get skims if present, l…
dbdf544 
…ot_id otherwise.

Signed-off-by: Drew <[email protected]>
@sdrewc
pass a dictionary to set pnr attributes. Create KNRs with access supp…
ed17fd1 
…links from each SFTAZ to each KNR for each time period.

Signed-off-by: Drew <[email protected]>
@sdrewc
get node_to_taz before creating PNRs
24600a6 
Signed-off-by: Drew <[email protected]>
@sdrewc
Merge pull request #26 from sdrewc/fasttrips
0946d89 
Fasttrips v0.3 and beyond
@sdrewc
"headers" should be "header"
81a03d8 
Signed-off-by: Drew <[email protected]>
@sdrewc
Specify a random seed
9a1502d 
Signed-off-by: Drew <[email protected]>
@sdrewc
Merge pull request #30 from sdrewc/fasttrips
6111c42 
Minor updates
Add readme.txt
6628d18 
Signed-off-by: Drew Cooper <[email protected]>
@sdrewc
Merge pull request #31 from sdrewc/fasttrips
0d7af41 
Add readme.txt
Move readme to root, and update
a5cc6a0 
Signed-off-by: Drew Cooper <[email protected]>
@sdrewc
Merge pull request #32 from sdrewc/fasttrips
90286f5 
Move readme to root, and update
Move license into main level
5d4309e 
Signed-off-by: Drew Cooper <[email protected]>
update README to be comprehensive of entire project
63f2405 
Signed-off-by: Drew Cooper <[email protected]>
markdown fixes
f1459bd 
Signed-off-by: Drew Cooper <[email protected]>
@sdrewc
Merge pull request #33 from sdrewc/fasttrips
43de0e4 
Some documentation updates to the fasttrips branch
@ddorinson
Adjust links to other parts of SHRP2 project
00c7343
@sdrewc
Merge pull request #34 from ddorinson/patch-1
d02bd19 
Adjust links to other parts of SHRP2 project
@sdrewc
Merge branch 'master' into fasttrips
404e189
@ddorinson
Copy link

@sdrewc -- Is this PR actually ready to go? (It's not assigned to anyone for review.) I know @e-lo is too busy with other things right now, but if @bhargavasana has time to check the changes, we could try to close-out this loose end after all. Thoughts?

@sdrewc
Copy link
Member Author

sdrewc commented Jun 22, 2018

@ddorinson it is not, yet. I am doing some QC to ensure that the core functions of NetworkWrangler work with this PR. So far so good, but not quite done yet.

@ddorinson
Copy link

Okay, that's what I thought. I just refreshed page and saw a bunch of new work I had missed earlier in the week, so just wanted to be sure. Thx.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sdrewc @ddorinson @bhargavasana @e-lo