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

Merging stop_order into develop branch #22

Merged
merged 21 commits into from
Mar 18, 2016
Merged

Merging stop_order into develop branch #22

merged 21 commits into from
Mar 18, 2016

Conversation

lmz
Copy link
Member

@lmz lmz commented Mar 18, 2016

Major changes are:

  1. Add the latest-departure-trip to the stop state and don't allow the same trip in labeling the next stop. Since the latest-departure (and its trip) define the time window, during the labeling, we don't want to assume we can use the same trip again for the next link label, because if we choose it, we'll be forced to choose it again.
  2. When we update the stop state for a stop that's already been processed, it may affect other reachable stops, so mark it to reprocess (by putting it back on the label queue).
  3. Make the label queue smarter: if we add a stop1, labelX then stop1, labelY, only the lower label is valid. So a stop can only be in the queue once at any given point in time.
  4. Make the maximum number of times a stop can be processed a configurable number. (So setting it to one is similar to the previous version of this code.)
  5. Return and write basic performance measures: milliseconds spent doing labeling, milliseconds spent doing enumeration, number of labeling iterations executed, maximum number of times a stop was processed.

lmz and others added 21 commits February 19, 2016 17:18
…y for reprocessing

Also don't recalc window since we store it.
Including:
- simplify path def
- fix prepend_route_id_to_trip_id config requirement
- output path set
I was finding that if the latest_dep_earliest_arr trip was also the best
one, then I could get a problem because it would get chosen with high
probability, and then if it was the only one that was good in the
previous link, then that was a problem because it wasn't allowed.
MIN_XFER_TIME_ addressed this but only because stops are typically
defined with a vehicle arriving and then departing at the same time, so
it would prevent this in labeling, but it was a hack, because if the
arrival != departure then it's still a problem.  This is a more lasting
soln: keep that trip id as defining.
As well as transfer-penalty links in path-finding
lmz added a commit that referenced this pull request Mar 18, 2016
…_order

Merging stop_order into develop branch
@lmz lmz merged commit 16e78f9 into develop Mar 18, 2016
@lmz lmz deleted the stop_order branch March 22, 2016 18:15
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

1 participant