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

Trip mode choice #55

Merged
merged 12 commits into from
Apr 8, 2016
Merged

Trip mode choice #55

merged 12 commits into from
Apr 8, 2016

Commits on May 11, 2015

  1. reformatting trip mode choice spec into standard csv 

    a bit easier this time since I'm basically just repeating the process that I applied to tour mode choice.  The outcome is a straightforward csv spec file.
    @fscottfoti
    fscottfoti committed May 11, 2015
    Configuration menu
    Copy the full SHA
    6b1e425 View commit details
    Browse the repository at this point in the history

  2. adding the basic structure of the trip mode choice model

    @fscottfoti
    fscottfoti committed May 11, 2015
    Configuration menu
    Copy the full SHA
    8703507 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2015

  1. got through about half of the spec 

    Things are getting really tedious with the inbound and outbound skims with the trive to transit options.  That's tomorrow's task I guess.
    @fscottfoti
    fscottfoti committed May 13, 2015
    Configuration menu
    Copy the full SHA
    2fb1cf5 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2015

  1. spec is fairly complete for trip mode choice

    @fscottfoti
    fscottfoti committed May 14, 2015
    Configuration menu
    Copy the full SHA
    1cd4ab1 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2015

  1. name of the model was incorrect in the test

    @fscottfoti
    fscottfoti committed May 15, 2015
    Configuration menu
    Copy the full SHA
    d36fb95 View commit details
    Browse the repository at this point in the history

  2. Make reference empty DFs match the test dtypes 

    For some reason empty DataFrames created via
DataFrame({'x': []}) and DataFrame(columns=['x']) will have different
dtypes for the 'x' column, so need to explicitly make them match.
    @jiffyclub
    jiffyclub committed May 15, 2015
    Configuration menu
    Copy the full SHA
    ff0c8e0 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2015

  1. name the indexes 

    Pandas testing functions now compare index names so we need to name them to get the tests to pass.
    @fscottfoti
    fscottfoti committed May 18, 2015
    Configuration menu
    Copy the full SHA
    a238459 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2016

  1. Resolve conflicts in trip-mode-choice 

    Conflicts:
	activitysim/cdap/tests/test_cdap.py
	activitysim/defaults/test/test_defaults.py
    @bstabler
    bstabler committed Apr 7, 2016
    Configuration menu
    Copy the full SHA
    eb635c1 View commit details
    Browse the repository at this point in the history

  2. correct conflict resolution

    @bstabler
    bstabler committed Apr 7, 2016
    Configuration menu
    Copy the full SHA
    0a3925d View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2016

  1. merge in master

    @bstabler
    bstabler committed Apr 8, 2016
    Configuration menu
    Copy the full SHA
    0fc36ff View commit details
    Browse the repository at this point in the history

  2. removed trailing whitespace

    @bstabler
    bstabler committed Apr 8, 2016
    Configuration menu
    Copy the full SHA
    532d986 View commit details
    Browse the repository at this point in the history

  3. revisions from trip-mode-choice before master merge

    @bstabler
    bstabler committed Apr 8, 2016
    Configuration menu
    Copy the full SHA
    5d8bedb View commit details
    Browse the repository at this point in the history