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

Lab 583 support vehicles #58

Merged
merged 61 commits into from
Mar 15, 2021
Merged

Lab 583 support vehicles #58

merged 61 commits into from
Mar 15, 2021

Commits on Feb 2, 2021

  1. tidy up clashing tests

    @KasiaKoz
    KasiaKoz committed Feb 2, 2021
    Configuration menu
    Copy the full SHA
    2c6748d View commit details
    Browse the repository at this point in the history

  2. pass mode to schedule as is

    @KasiaKoz
    KasiaKoz committed Feb 2, 2021
    Configuration menu
    Copy the full SHA
    e8dfba2 View commit details
    Browse the repository at this point in the history

  3. initial changes to underlying schedule structure for wider graph sharing

    @KasiaKoz
    KasiaKoz committed Feb 2, 2021
    Configuration menu
    Copy the full SHA
    5fb248e View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2021

  1. unify schedule elements data structures, failing tests are believed to 

    be due to missing suitable attribute change methods, which are coming
next
    @KasiaKoz
    KasiaKoz committed Feb 4, 2021
    Configuration menu
    Copy the full SHA
    b96582e View commit details
    Browse the repository at this point in the history

  2. get rid of copy methods

    @KasiaKoz
    KasiaKoz committed Feb 4, 2021
    Configuration menu
    Copy the full SHA
    1771744 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2021

  1. add methods to build dataframes from (id, data) iterator and 

    applying functions and dictionary maps to iterator objects of the same
shape
    @KasiaKoz
    KasiaKoz committed Feb 8, 2021
    Configuration menu
    Copy the full SHA
    9d77efa View commit details
    Browse the repository at this point in the history

  2. replace old df building methohds from attributes in network, fix 

    iterating more than once issue
    @KasiaKoz
    KasiaKoz committed Feb 8, 2021
    Configuration menu
    Copy the full SHA
    0cb0e57 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2021

  1. ensure unique indexing, add data access and modification methods

    @KasiaKoz
    KasiaKoz committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    a546c57 View commit details
    Browse the repository at this point in the history

  2. update simplification with new schedule modification methods

    @KasiaKoz
    KasiaKoz committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    5a397be View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2021

  1. generate trips dataframe on schedule level without reinstantiating 

    lower level objects
    @KasiaKoz
    KasiaKoz committed Feb 10, 2021
    Configuration menu
    Copy the full SHA
    1c53209 View commit details
    Browse the repository at this point in the history

  2. remove uniquely indexed checks, all is forced to be uniquely indexed now 

    fix a couple of tests
    @KasiaKoz
    KasiaKoz committed Feb 10, 2021
    Configuration menu
    Copy the full SHA
    f79fc84 View commit details
    Browse the repository at this point in the history

  3. generalise extracting ids satisfying attribute conditions, add specific 

    methods for network
    @KasiaKoz
    KasiaKoz committed Feb 10, 2021
    Configuration menu
    Copy the full SHA
    a20251f View commit details
    Browse the repository at this point in the history

  4. add methods to extract services, routes and stops on conditions

    @KasiaKoz
    KasiaKoz committed Feb 10, 2021
    Configuration menu
    Copy the full SHA
    04eae89 View commit details
    Browse the repository at this point in the history

  5. add extracting stops, routes, services on modal condition convenience 

    methods
    @KasiaKoz
    KasiaKoz committed Feb 10, 2021
    Configuration menu
    Copy the full SHA
    54e4445 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2021

  1. add spatial utils and convenience methods

    @KasiaKoz
    KasiaKoz committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    830191b View commit details
    Browse the repository at this point in the history

  2. add spatial and modal convenience methods for extracting links/nodes 

    of interest
    @KasiaKoz
    KasiaKoz committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    7542a46 View commit details
    Browse the repository at this point in the history

  3. add forgotten not implemented error

    @KasiaKoz
    KasiaKoz committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    c9154bf View commit details
    Browse the repository at this point in the history

  4. add adding methods to schedule

    @KasiaKoz
    KasiaKoz committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    b6d9a75 View commit details
    Browse the repository at this point in the history

  5. add remove methods for schedule

    @KasiaKoz
    KasiaKoz committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    665e218 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2021

  1. clean up changelog updates

    @KasiaKoz
    KasiaKoz committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    e7adc50 View commit details
    Browse the repository at this point in the history

  2. fix test

    @KasiaKoz
    KasiaKoz committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    e57289f View commit details
    Browse the repository at this point in the history

  3. create a shared changelog to enable reindexing modification events

    @KasiaKoz
    KasiaKoz committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    2f395a3 View commit details
    Browse the repository at this point in the history

  4. fix flake8

    @KasiaKoz
    KasiaKoz committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    aad4b06 View commit details
    Browse the repository at this point in the history

  5. update notebooks

    @KasiaKoz
    KasiaKoz committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    1c818fd View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into update-schedule-structure 

    # Conflicts:
#	genet/core.py
#	tests/test_core_schedule_elements.py
    @KasiaKoz
    KasiaKoz committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    cd88f5f View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2021

  1. instantiate route and service objects with additional attributes

    @KasiaKoz
    KasiaKoz committed Feb 15, 2021
    Configuration menu
    Copy the full SHA
    fe2a7ed View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2021

  1. add option to add routes with stop ids only

    @KasiaKoz
    KasiaKoz committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    9787cf7 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2021

  1. add data comparison for stops in schedule and to be added with route 

    or service, test the option to pass schedule.stop('id') for this
purpose too
    @KasiaKoz
    KasiaKoz committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    bf00749 View commit details
    Browse the repository at this point in the history

  2. fix flake8

    @KasiaKoz
    KasiaKoz committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    1782062 View commit details
    Browse the repository at this point in the history

  3. update notebook

    @KasiaKoz
    KasiaKoz committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    1652c36 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2021

  1. move vehicle type definitions to a config, add vehicles to trips 

    changing their schema within routes, methods to write schedule and
vehicles temporarily broken
    @KasiaKoz
    KasiaKoz committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    d276dd8 View commit details
    Browse the repository at this point in the history

  2. add generating vehicles for schedule, fix vehicle write method

    @KasiaKoz
    KasiaKoz committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    4f16dec View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2021

  1. make vehicle type config reading more flexible

    @KasiaKoz
    KasiaKoz committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    160020e View commit details
    Browse the repository at this point in the history

  2. add tests for generating vehicles, add checks for inconsistent modes 

    in shared vehicles
    @KasiaKoz
    KasiaKoz committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    97b5c22 View commit details
    Browse the repository at this point in the history

  3. add validation of vehicle types

    @KasiaKoz
    KasiaKoz committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    5e192a5 View commit details
    Browse the repository at this point in the history

  4. add route trips dataframe generation, updating routes with and without 

    overwriting existing data
    @KasiaKoz
    KasiaKoz committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    2d3cdb1 View commit details
    Browse the repository at this point in the history

  5. move tests

    @KasiaKoz
    KasiaKoz committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    82dcf73 View commit details
    Browse the repository at this point in the history

  6. add methods to find overlap in vehicle ids and types

    @KasiaKoz
    KasiaKoz committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    22dbc9b View commit details
    Browse the repository at this point in the history

  7. fix tests

    @KasiaKoz
    KasiaKoz committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    2a878c1 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2021

  1. update doc strings

    @KasiaKoz
    KasiaKoz committed Feb 22, 2021
    Configuration menu
    Copy the full SHA
    020eb6e View commit details
    Browse the repository at this point in the history

  2. add warnings

    @KasiaKoz
    KasiaKoz committed Feb 22, 2021
    Configuration menu
    Copy the full SHA
    b1936e1 View commit details
    Browse the repository at this point in the history

  3. fix flake8

    @KasiaKoz
    KasiaKoz committed Feb 22, 2021
    Configuration menu
    Copy the full SHA
    99dc7b0 View commit details
    Browse the repository at this point in the history

  4. vehicle types no longer a global variable

    @KasiaKoz
    KasiaKoz committed Feb 22, 2021
    Configuration menu
    Copy the full SHA
    9648330 View commit details
    Browse the repository at this point in the history

  5. add read vehicles xml method

    @KasiaKoz
    KasiaKoz committed Feb 22, 2021
    Configuration menu
    Copy the full SHA
    f2ebf53 View commit details
    Browse the repository at this point in the history

  6. add convenience method to change/set trips details

    @KasiaKoz
    KasiaKoz committed Feb 22, 2021
    Configuration menu
    Copy the full SHA
    ba1d0e0 View commit details
    Browse the repository at this point in the history

  7. doc string and refine the test

    @KasiaKoz
    KasiaKoz committed Feb 22, 2021
    Configuration menu
    Copy the full SHA
    fb37bdc View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2021

  1. fix up vehicle configs read

    @KasiaKoz
    KasiaKoz committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    2d2def9 View commit details
    Browse the repository at this point in the history

  2. 'fix' flake8

    @KasiaKoz
    KasiaKoz committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    2a988cf View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into LAB-583-support-vehicles 

    # Conflicts:
#	genet/exceptions.py
#	genet/outputs_handler/matsim_xml_writer.py
#	genet/schedule_elements.py
#	genet/utils/persistence.py
#	genet/variables.py
#	tests/test_core_components_route.py
#	tests/test_core_components_service.py
#	tests/test_core_schedule.py
#	tests/test_core_schedule_elements.py
#	tests/test_utils_persistence.py
    @KasiaKoz
    KasiaKoz committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    344dd65 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into LAB-583-support-vehicles 

    # Conflicts:
#	genet/exceptions.py
#	genet/outputs_handler/matsim_xml_writer.py
#	genet/schedule_elements.py
#	genet/utils/persistence.py
#	genet/variables.py
#	tests/test_core_components_route.py
#	tests/test_core_components_service.py
#	tests/test_core_schedule.py
#	tests/test_core_schedule_elements.py
#	tests/test_utils_persistence.py
    @KasiaKoz
    KasiaKoz committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    b48da91 View commit details
    Browse the repository at this point in the history

  5. update vehicle generation method

    @KasiaKoz
    KasiaKoz committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    8715a9e View commit details
    Browse the repository at this point in the history

  6. add example vehicles and update notebooks

    @KasiaKoz
    KasiaKoz committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    d58c900 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2021

  1. add vehicles inputs to pre baked scripts

    @KasiaKoz
    KasiaKoz committed Feb 25, 2021
    Configuration menu
    Copy the full SHA
    a5599d5 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2021

  1. enable generation of vehicles from scratch

    @KasiaKoz
    KasiaKoz committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    063d7e0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into LAB-583-support-vehicles 

    # Conflicts:
#	tests/test_core_schedule.py
    @KasiaKoz
    KasiaKoz committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    5aaf687 View commit details
    Browse the repository at this point in the history

  3. fix tests post master merge

    @KasiaKoz
    KasiaKoz committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    c3dd504 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into LAB-583-support-vehicles

    @KasiaKoz
    KasiaKoz committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    68fe517 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2021

  1. initial PR comments changes

    @KasiaKoz
    KasiaKoz committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    e654d17 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2021

  1. Merge branch 'master' into LAB-583-support-vehicles

    @KasiaKoz
    KasiaKoz committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    a227fd8 View commit details
    Browse the repository at this point in the history

  2. update notebooks

    @KasiaKoz
    KasiaKoz committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    297076a View commit details
    Browse the repository at this point in the history

  3. fix tests

    @KasiaKoz
    KasiaKoz committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    4090eed View commit details
    Browse the repository at this point in the history