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

Adding fares functionality #51

Merged
merged 76 commits into from
Feb 9, 2017
Merged

Adding fares functionality #51

merged 76 commits into from
Feb 9, 2017

Conversation

lmz
Copy link
Member

@lmz lmz commented Feb 3, 2017

No description provided.

lmz and others added 30 commits September 8, 2016 13:51
Passes flat fares (no transfer logic) and vot to c++ extension, which
incorporates fares.
Still todo: incorporate into python cost calcs and transfer stuff of
course.
Also test that python and c++ are consistent and get the time-of-day
stuff correct.
Passing them to c++ extension
todo: implement on python side
And add fares before the weight-splitting
Conflicts:
	fasttrips/Assignment.py
	fasttrips/Passenger.py
	fasttrips/PathSet.py
	fasttrips/Route.py
Also read fare transfer rules on c++ side
(B0 and B4) and a single bus shuttle so we can get a transfer within
bus_local_fare_pm
taz/stop pair should be unique in this file
Lisa Zorn and others added 24 commits November 16, 2016 13:15
So don't reverse walk access links
Conflicts:
	fasttrips/Assignment.py
	fasttrips/PathSet.py
Otherwise we assess too much fare, oops
(todo: verify)
`pf_probability` float64 the probability of the path
`pf_initcost` float64 the initial cost of the entire path
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"INIT" something in this case is sort of like "FINAL" before "FINAL FINAL". It might be good at some point to change this { and its siblings } to be named after their stage. I.e. "Cost for Pathfinding" rather than "initial cost".

@@ -509,7 +509,10 @@ def setup_passenger_pathsets(self, iteration, stops, trip_id_df, trips_df, modes
`pf_iteration` int64 iteration in which these paths were found
`pathnum` int64 the path number for the path within the pathset
`pf_cost` float64 the cost of the entire path
`pf_fare` float64 the fare of the entire path
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The difference of "cost" and "fare" is not initially obvious.
Perhaps we should use Util instead of cost? Other thoughts?

@e-lo
Copy link
Member

e-lo commented Feb 9, 2017

LGTM at a very high-level view.

@e-lo
Copy link
Member

e-lo commented Feb 9, 2017

Note that adding fares adds significant (4X) processing time.

@e-lo e-lo merged commit fb38017 into develop Feb 9, 2017
@lmz lmz deleted the fares branch May 3, 2017 01:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants