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

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

Commits on Sep 8, 2016

  1. Merge pull request #31 from MetropolitanTransportationCommission/develop 

    Update fares with develop branch
    @lmz
    lmz committed Sep 8, 2016
    Configuration menu
    Copy the full SHA
    6021058 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2016

  1. Initial fare implementation 

    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.
    Lisa Zorn committed Sep 10, 2016
    Configuration menu
    Copy the full SHA
    1cb8f4d View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2016

  1. Fare lookup bug fix

    Lisa Zorn committed Sep 12, 2016
    Configuration menu
    Copy the full SHA
    1c82f3e View commit details
    Browse the repository at this point in the history

  2. Output fare and include it in python calculate_cost

    Lisa Zorn committed Sep 12, 2016
    Configuration menu
    Copy the full SHA
    4249653 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2016

  1. Start implementing stop zones 

    Passing them to c++ extension
    Lisa Zorn committed Sep 13, 2016
    Configuration menu
    Copy the full SHA
    083758e View commit details
    Browse the repository at this point in the history

  2. Addendum to last commit

    Lisa Zorn committed Sep 13, 2016
    Configuration menu
    Copy the full SHA
    fcb4dcd View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2016

  1. Zone-based fares in c++ extension 

    todo: implement on python side
    Lisa Zorn committed Sep 14, 2016
    Configuration menu
    Copy the full SHA
    7e8ecd2 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2016

  1. Add zone-based fares to python

    Lisa Zorn committed Sep 20, 2016
    Configuration menu
    Copy the full SHA
    416bfdd View commit details
    Browse the repository at this point in the history

  2. Add fare_class to pathset links as well 

    And add fares before the weight-splitting
    Lisa Zorn committed Sep 20, 2016
    Configuration menu
    Copy the full SHA
    24073fb View commit details
    Browse the repository at this point in the history

  3. Doc fix

    Lisa Zorn committed Sep 20, 2016
    Configuration menu
    Copy the full SHA
    3e5e9d0 View commit details
    Browse the repository at this point in the history

  4. Bug fix: fare_rules suffix so we don't lose route_id

    Lisa Zorn committed Sep 20, 2016
    Configuration menu
    Copy the full SHA
    74a42e7 View commit details
    Browse the repository at this point in the history

  5. Split transit links: fare/fare period only on first

    Lisa Zorn committed Sep 20, 2016
    Configuration menu
    Copy the full SHA
    101aed5 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2016

  1. Merge branch 'develop' into fares

    Lisa Zorn committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    3fed8d7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into fares 

    Conflicts:
	fasttrips/Assignment.py
	fasttrips/Passenger.py
	fasttrips/PathSet.py
	fasttrips/Route.py
    Lisa Zorn committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    ff7ec9d View commit details
    Browse the repository at this point in the history

  3. Fix fare bug -- set stop zone ids once

    Lisa Zorn committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    943032b View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2016

  1. Apply fare transfers in python

    Lisa Zorn committed Oct 13, 2016
    Configuration menu
    Copy the full SHA
    bd1e1bb View commit details
    Browse the repository at this point in the history

  2. Update fare transfer col names, values

    Lisa Zorn committed Oct 13, 2016
    Configuration menu
    Copy the full SHA
    b7af997 View commit details
    Browse the repository at this point in the history

  3. Add fare to StopState and return to python 

    Also read fare transfer rules on c++ side
    Lisa Zorn committed Oct 13, 2016
    Configuration menu
    Copy the full SHA
    11d2743 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2016

  1. Add fare transfer disounts to c++ extension

    Lisa Zorn committed Oct 14, 2016
    Configuration menu
    Copy the full SHA
    bf92f04 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2016

  1. Update example: add a couple more local bus stops 

    (B0 and B4) and a single bus shuttle so we can get a transfer within
bus_local_fare_pm
    Lisa Zorn committed Oct 15, 2016
    Configuration menu
    Copy the full SHA
    5f007dc View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2016

  1. Fares (python): handle transfers, transfer_duration 

    from fare_attributes_ft.txt
    Lisa Zorn committed Oct 18, 2016
    Configuration menu
    Copy the full SHA
    38d9b21 View commit details
    Browse the repository at this point in the history

  2. apply_free_transfers() missed with last commit

    Lisa Zorn committed Oct 18, 2016
    Configuration menu
    Copy the full SHA
    3ffe289 View commit details
    Browse the repository at this point in the history

  3. Handle free transfer/transfer_duration in c++ ext

    Lisa Zorn committed Oct 18, 2016
    Configuration menu
    Copy the full SHA
    14751ae View commit details
    Browse the repository at this point in the history

  4. Fix walk_access error and make fasttrips complain 

    taz/stop pair should be unique in this file
    Lisa Zorn committed Oct 18, 2016
    Configuration menu
    Copy the full SHA
    f4a080f View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2016

  1. Merged develop and addressed conflicts

    Lisa Zorn committed Oct 19, 2016
    Configuration menu
    Copy the full SHA
    c333a24 View commit details
    Browse the repository at this point in the history

  2. Finish merging develop into fares

    Lisa Zorn committed Oct 19, 2016
    Configuration menu
    Copy the full SHA
    b36e382 View commit details
    Browse the repository at this point in the history

  3. Bug fix: somehow this got dropped

    Lisa Zorn committed Oct 19, 2016
    Configuration menu
    Copy the full SHA
    f92d7ac View commit details
    Browse the repository at this point in the history

  4. Bump wait needs trip id num

    Lisa Zorn committed Oct 19, 2016
    Configuration menu
    Copy the full SHA
    22089b4 View commit details
    Browse the repository at this point in the history

  5. Keep fare transfer rules columns in output

    Lisa Zorn committed Oct 19, 2016
    Configuration menu
    Copy the full SHA
    aee87c8 View commit details
    Browse the repository at this point in the history

  6. Update doc, comment

    Lisa Zorn committed Oct 19, 2016
    Configuration menu
    Copy the full SHA
    03e9d8f View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2016

  1. Bug fix: shape_dist_traveled is cumulative

    Lisa Zorn committed Oct 20, 2016
    Configuration menu
    Copy the full SHA
    cdcb005 View commit details
    Browse the repository at this point in the history

  2. Add probability to StopState 

    Fares will need it to figure the probability of fare periods
    Lisa Zorn committed Oct 20, 2016
    Configuration menu
    Copy the full SHA
    75852ab View commit details
    Browse the repository at this point in the history

  3. Warn and enforce a minimum value of time 

    Otherwise any fares make transit trips infeasible
    Lisa Zorn committed Oct 20, 2016
    Configuration menu
    Copy the full SHA
    028f3fd View commit details
    Browse the repository at this point in the history

  4. Links with cost>max_cost are invalid for choosing

    Lisa Zorn committed Oct 20, 2016
    Configuration menu
    Copy the full SHA
    aac6ae6 View commit details
    Browse the repository at this point in the history

  5. In StopState, add a pointer to the FarePeriod 

    Since it doesn't change
    Lisa Zorn committed Oct 20, 2016
    Configuration menu
    Copy the full SHA
    3a78924 View commit details
    Browse the repository at this point in the history

  6. Don't send lot/stop transfers to c++ extension 

    They're only used for drive access links and not actual transfers
between stops.
    Lisa Zorn committed Oct 20, 2016
    Configuration menu
    Copy the full SHA
    9e02040 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2016

  1. Shorten some fare period names

    Lisa Zorn committed Oct 21, 2016
    Configuration menu
    Copy the full SHA
    2702faa View commit details
    Browse the repository at this point in the history

  2. Add fare transfer logic to pathfinding

    Lisa Zorn committed Oct 21, 2016
    Configuration menu
    Copy the full SHA
    7f77cbb View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2016

  1. Implement option to transfer_fare_ignore

    Lisa Zorn committed Oct 22, 2016
    Configuration menu
    Copy the full SHA
    c260af0 View commit details
    Browse the repository at this point in the history

  2. Pass initial cost/fare back to python 

    So we can see how well we are guessing fares
    Lisa Zorn committed Oct 22, 2016
    Configuration menu
    Copy the full SHA
    b07131f View commit details
    Browse the repository at this point in the history

  3. Updated doc notes

    Lisa Zorn committed Oct 22, 2016
    Configuration menu
    Copy the full SHA
    cc92111 View commit details
    Browse the repository at this point in the history

  4. One more doc update

    Lisa Zorn committed Oct 22, 2016
    Configuration menu
    Copy the full SHA
    9119a53 View commit details
    Browse the repository at this point in the history

  5. I can count

    Lisa Zorn committed Oct 22, 2016
    Configuration menu
    Copy the full SHA
    8ea4cc6 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2016

  1. Merge develop into fares

    Lisa Zorn committed Nov 9, 2016
    Configuration menu
    Copy the full SHA
    22a61f7 View commit details
    Browse the repository at this point in the history

  2. Fix merge error

    Lisa Zorn committed Nov 9, 2016
    Configuration menu
    Copy the full SHA
    9b26033 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2016

  1. Assess fare attribute-based free transfers in pathfinding

    Lisa Zorn committed Nov 10, 2016
    Configuration menu
    Copy the full SHA
    2b0bc35 View commit details
    Browse the repository at this point in the history

  2. Hyperlink::setupProbabilities() gets path so far

    Lisa Zorn committed Nov 10, 2016
    Configuration menu
    Copy the full SHA
    933d964 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2016

  1. Implemented fare transfers for path enumeration 

    Also renamed fare_class to fare_period for GTFS-plus v0.3
    Lisa Zorn committed Nov 14, 2016
    Configuration menu
    Copy the full SHA
    77eca46 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2016

  1. Fix crashing bugs

    Lisa Zorn committed Nov 15, 2016
    Configuration menu
    Copy the full SHA
    5aded05 View commit details
    Browse the repository at this point in the history

  2. Rename column according to spec (transfer_fare)

    Lisa Zorn committed Nov 15, 2016
    Configuration menu
    Copy the full SHA
    1fa664e View commit details
    Browse the repository at this point in the history

  3. Add options to ignore transfer logic for path enum

    Lisa Zorn committed Nov 15, 2016
    Configuration menu
    Copy the full SHA
    451abd8 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #37 from MetropolitanTransportationCommission/develop 

    Fix crashing bug
    @lmz
    lmz committed Nov 15, 2016
    Configuration menu
    Copy the full SHA
    465016c View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2016

  1. Add transfer fare ignore options to runTest.py

    Lisa Zorn committed Nov 16, 2016
    Configuration menu
    Copy the full SHA
    6a7040e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fares' of https://github.com/MetropolitanTransportation… 

    …Commission/fast-trips into fares
    Lisa Zorn committed Nov 16, 2016
    Configuration menu
    Copy the full SHA
    3cbe04f View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2016

  1. Add option to output debug columns

    Lisa Zorn committed Nov 21, 2016
    Configuration menu
    Copy the full SHA
    ef3c67e View commit details
    Browse the repository at this point in the history

  2. Fare test script

    Lisa Zorn authored and Lisa Zorn committed Nov 21, 2016
    Configuration menu
    Copy the full SHA
    5ace663 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2016

  1. Fix develop test in testFares.bat

    Lisa Zorn authored and Lisa Zorn committed Nov 22, 2016
    Configuration menu
    Copy the full SHA
    8db74e9 View commit details
    Browse the repository at this point in the history

  2. testFares.bat bug fix

    Lisa Zorn authored and Lisa Zorn committed Nov 22, 2016
    Configuration menu
    Copy the full SHA
    d8c947b View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2016

  1. Option to assume zone-to-zone fare symmetry

    Lisa Zorn committed Nov 29, 2016
    Configuration menu
    Copy the full SHA
    39ea190 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fares' of https://github.com/MetropolitanTransportation… 

    …Commission/fast-trips into fares
    Lisa Zorn committed Nov 29, 2016
    Configuration menu
    Copy the full SHA
    459515e View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2016

  1. Handle null dist in transfers_ft.txt (assume zero)

    Lisa Zorn committed Dec 3, 2016
    Configuration menu
    Copy the full SHA
    30b2e8e View commit details
    Browse the repository at this point in the history

  2. Direction is now a column in walk_access_ft.txt 

    So don't reverse walk access links
    Lisa Zorn committed Dec 3, 2016
    Configuration menu
    Copy the full SHA
    8d3fac4 View commit details
    Browse the repository at this point in the history

  3. Merge develop into fares

    Lisa Zorn committed Dec 3, 2016
    Configuration menu
    Copy the full SHA
    1cb9b05 View commit details
    Browse the repository at this point in the history

  4. Add direction column to test_network's walk_access_ft.txt

    Lisa Zorn committed Dec 3, 2016
    Configuration menu
    Copy the full SHA
    0079106 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2016

  1. Merge develop into fares

    Lisa Zorn committed Dec 9, 2016
    Configuration menu
    Copy the full SHA
    08f0f72 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2016

  1. Merge branch 'develop' into fares 

    Conflicts:
	fasttrips/Assignment.py
	fasttrips/PathSet.py
    Lisa Zorn committed Dec 10, 2016
    Configuration menu
    Copy the full SHA
    7131be1 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2016

  1. Bug fix: handle single large cost valid link

    Lisa Zorn committed Dec 13, 2016
    Configuration menu
    Copy the full SHA
    214064d View commit details
    Browse the repository at this point in the history

  2. Debug: widen mode field in debug trace log

    Lisa Zorn committed Dec 13, 2016
    Configuration menu
    Copy the full SHA
    0174f18 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2016

  1. Merge pull request #41 from MetropolitanTransportationCommission/develop 

    Fixed bug in write_paths() call
    @lmz
    lmz committed Dec 15, 2016
    Configuration menu
    Copy the full SHA
    967b698 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2017

  1. Create overlap example test

    Lisa Zorn committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    5da4048 View commit details
    Browse the repository at this point in the history

  2. Fix trace so it triggers

    Lisa Zorn committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    b4242be View commit details
    Browse the repository at this point in the history

  3. Handle allowed missing network fields

    Lisa Zorn committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    1118dd9 View commit details
    Browse the repository at this point in the history

  4. Bug fix: split links have fare on first only 

    Otherwise we assess too much fare, oops
    Lisa Zorn committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    d953b13 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2017

  1. Bug fix: overlap penalty 

    (todo: verify)
    Lisa Zorn committed Jan 6, 2017
    Configuration menu
    Copy the full SHA
    fd058d2 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2017

  1. Update fare test for network 1.10

    Lisa Zorn committed Jan 13, 2017
    Configuration menu
    Copy the full SHA
    7461fa1 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2017

  1. create_tableau_path_map.py: Handle no trip_ids

    Lisa Zorn committed Feb 7, 2017
    Configuration menu
    Copy the full SHA
    457a7cd View commit details
    Browse the repository at this point in the history