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

copy of Tour Mode Clean Develop 202403 #3904

Draft
wants to merge 90 commits into
base: develop
Choose a base branch
from
Draft

copy of Tour Mode Clean Develop 202403 #3904

wants to merge 90 commits into from

Commits on Apr 26, 2023

  1. tour mode squashed

    @zneedell
    zneedell committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    d3a7d5b View commit details
    Browse the repository at this point in the history

  2. fix tests

    @zneedell
    zneedell committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    73f2c50 View commit details
    Browse the repository at this point in the history

  3. fmt

    @zneedell
    zneedell committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    cb1c68a View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2023

  1. start keeping track of tour_id in beamPlan (NOT WORKING!)

    @zneedell
    zneedell committed Apr 27, 2023
    Configuration menu
    Copy the full SHA
    3ef54ce View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2023

  1. start keeping track of tour_id in beamPlan (fixed)

    @zneedell
    zneedell committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    f232f72 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2023

  1. First successful test

    @zneedell
    zneedell committed May 8, 2023
    Configuration menu
    Copy the full SHA
    b54a937 View commit details
    Browse the repository at this point in the history

  2. second test

    @zneedell
    zneedell committed May 8, 2023
    Configuration menu
    Copy the full SHA
    a4d9741 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2023

  1. third test (failing)

    @zneedell
    zneedell committed May 9, 2023
    Configuration menu
    Copy the full SHA
    5e7009b View commit details
    Browse the repository at this point in the history

  2. fixed test for when car_based tour is input

    @zneedell
    zneedell committed May 9, 2023
    Configuration menu
    Copy the full SHA
    a7261dc View commit details
    Browse the repository at this point in the history

  3. fixed test for when no tour mode exists

    @zneedell
    zneedell committed May 9, 2023
    Configuration menu
    Copy the full SHA
    d4b1f23 View commit details
    Browse the repository at this point in the history

  4. ignore remaining messages after test is passed

    @zneedell
    zneedell committed May 9, 2023
    Configuration menu
    Copy the full SHA
    dbbefef View commit details
    Browse the repository at this point in the history

  5. Add test for using shared car on walk_based tour

    @zneedell
    zneedell committed May 9, 2023
    Configuration menu
    Copy the full SHA
    7ced334 View commit details
    Browse the repository at this point in the history

  6. partial fix for personalVehiclePlanSpec

    @zneedell
    zneedell committed May 9, 2023
    Configuration menu
    Copy the full SHA
    75e8c31 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2023

  1. allow nested subtours

    @zneedell
    zneedell committed May 11, 2023
    Configuration menu
    Copy the full SHA
    6b4493b View commit details
    Browse the repository at this point in the history

  2. minor refactoring in multinomial logit

    @zneedell
    zneedell committed May 11, 2023
    Configuration menu
    Copy the full SHA
    9bdd52c View commit details
    Browse the repository at this point in the history

Commits on May 12, 2023

  1. Allow agent to use vehicle from parent tour in subtour

    @zneedell
    zneedell committed May 12, 2023
    Configuration menu
    Copy the full SHA
    4da073e View commit details
    Browse the repository at this point in the history

  2. Fixes to allow agent to use vehicle from parent tour after completion… 

    … of subtour
    @zneedell
    zneedell committed May 12, 2023
    Configuration menu
    Copy the full SHA
    84f3c59 View commit details
    Browse the repository at this point in the history

  3. fixes to PersonWithPersonalVehiclePlanSpec

    @zneedell
    zneedell committed May 12, 2023
    Configuration menu
    Copy the full SHA
    1992b7f View commit details
    Browse the repository at this point in the history

Commits on May 18, 2023

  1. don't ask shared fleet managers for vehicles if we're already on a ve… 

    …hicle based tour
    @zneedell
    zneedell committed May 18, 2023
    Configuration menu
    Copy the full SHA
    197eb18 View commit details
    Browse the repository at this point in the history

  2. don't choose shared vehicles as tour vehicles

    @zneedell
    zneedell committed May 18, 2023
    Configuration menu
    Copy the full SHA
    74a6ea2 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. Merge branch 'refs/heads/develop' into tour-mode-clean 

    # Conflicts:
#	production/austin
#	production/sfbay
#	src/main/scala/beam/agentsim/agents/PersonAgent.scala
#	src/main/scala/beam/agentsim/agents/household/HouseholdFleetManager.scala
#	src/main/scala/beam/agentsim/agents/modalbehaviors/ChoosesMode.scala
#	src/main/scala/beam/agentsim/infrastructure/taz/TAZTreeMap.scala
#	src/main/scala/beam/router/skim/core/RideHailSkimmer.scala
    @dimaopen
    dimaopen committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    2e04b31 View commit details
    Browse the repository at this point in the history

  2. Fixes after merging develop to tour-mode-clean

    @dimaopen
    dimaopen committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    3eda0f9 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. replanning fixes

    @zneedell
    zneedell committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    e52b989 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Merge remote-tracking branch 'refs/remotes/origin/develop' into tour-… 

    …mode-clean-develop202403

# Conflicts:
#	production/seattle
#	production/sfbay
#	src/main/scala/beam/agentsim/agents/modalbehaviors/ChoosesMode.scala
#	src/main/scala/beam/router/skim/readonly/ODSkims.scala
    @zneedell
    zneedell committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    6e21cf6 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. Merge remote-tracking branch 'origin/develop' into tour-mode-clean-de… 

    …velop202403
    @zneedell
    zneedell committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    da450cc View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. fix test

    @zneedell
    zneedell committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    ef718dd View commit details
    Browse the repository at this point in the history

  2. fix test

    @zneedell
    zneedell committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    bad5728 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. bugfix for including RH vehicles in main routingRequest

    @zneedell
    zneedell committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    54c333b View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'refs/remotes/origin/develop' into tour-… 

    …mode-clean-develop202403
    @zneedell
    zneedell committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    c9eb7e0 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. tricky fix for ActivitiesDurationSpec

    @zneedell
    zneedell committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    e93801b View commit details
    Browse the repository at this point in the history

  2. fix some tests

    @zneedell
    zneedell committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    d71096a View commit details
    Browse the repository at this point in the history

  3. Better handling for vehicles and tour modes during replanning

    @zneedell
    zneedell committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    990addc View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. fixes for tour vehicles with drive_transit

    @zneedell
    zneedell committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    7b31f7f View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. Fixes to emergency stalll generation in test

    @zneedell
    zneedell committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    029a20c View commit details
    Browse the repository at this point in the history

  2. Fixes to emergency stalll generation in test

    @zneedell
    zneedell committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    f8d1393 View commit details
    Browse the repository at this point in the history

  3. fix to account for walk access/egress to vehicles

    @zneedell
    zneedell committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    8c3826c View commit details
    Browse the repository at this point in the history

  4. more test fixes

    @zneedell
    zneedell committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    031c66d View commit details
    Browse the repository at this point in the history

  5. clean up

    @zneedell
    zneedell committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    b4ee47c View commit details
    Browse the repository at this point in the history

  6. fix some mroe tests

    @zneedell
    zneedell committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    5a93f5b View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. fix some mroe tests

    @zneedell
    zneedell committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    a06d88b View commit details
    Browse the repository at this point in the history

  2. fix network relaxation test by making sure (emergency) vehicles appea… 

    …r at household
    @zneedell
    zneedell committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    39a0744 View commit details
    Browse the repository at this point in the history

  3. fix plan writing in tests

    @zneedell
    zneedell committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    af4c9d7 View commit details
    Browse the repository at this point in the history

  4. add freight tour mode

    @zneedell
    zneedell committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    a598f13 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2024

  1. Fixes for freight and for plans that don't make sense

    @zneedell
    zneedell committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    ed39b65 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. Fix test to account for additional replanning event

    @zneedell
    zneedell committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    e859e9d View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. Check for too-short parking durations before deciding to charge

    @zneedell
    zneedell committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    2fef602 View commit details
    Browse the repository at this point in the history

  2. Fix for sending double LeavingParkingEvents with short trips

    @zneedell
    zneedell committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    f057e3d View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. test fix for spurious leaving parking event

    @zneedell
    zneedell committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    9654598 View commit details
    Browse the repository at this point in the history

  2. Fix for parking durations

    @zneedell
    zneedell committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    74bd554 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. Fix for returning vehicles when not used

    @zneedell
    zneedell committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    437487e View commit details
    Browse the repository at this point in the history

  2. update ModeChoiceSpec

    @zneedell
    zneedell committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    cc1761d View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. Small fixes

    @zneedell
    zneedell committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    b1603ab View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. fix for keeping vehicle after replanning during drive-transit trip

    @zneedell
    zneedell committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    9db2006 View commit details
    Browse the repository at this point in the history

  2. test and shared vehicle fixes

    @zneedell
    zneedell committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    6f81722 View commit details
    Browse the repository at this point in the history

  3. Start refactoring by extracting some methods. Goal is to move tour mo… 

    …de choice after initial routing requests so they can be based on actual vehicle availability
    @zneedell
    zneedell committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    341d72e View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. Move tour mode choice after initial routing requests

    @zneedell
    zneedell committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    9de25a6 View commit details
    Browse the repository at this point in the history

  2. partial test fixes

    @zneedell
    zneedell committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    d193dd8 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. fix for retaining vehicle in nested tour

    @zneedell
    zneedell committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    b833395 View commit details
    Browse the repository at this point in the history

  2. debug messages

    @zneedell
    zneedell committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    ba6c093 View commit details
    Browse the repository at this point in the history

  3. Fix for missing teleportation vehicles

    @zneedell
    zneedell committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    93037f3 View commit details
    Browse the repository at this point in the history

  4. minor cleanup

    @zneedell
    zneedell committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    66bee3b View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. Refactor code for consistency and encapsulation 

    Updated method visibility to private where appropriate. Improved variable naming and type annotations. Removed unused imports.
    @zneedell
    zneedell committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    70c3c24 View commit details
    Browse the repository at this point in the history

  2. Address Dima's suggestions, make some methods private

    @zneedell
    zneedell committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    7d99eed View commit details
    Browse the repository at this point in the history

  3. Update mode choice documentation and default ride_hail cost

    @zneedell
    zneedell committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    2a85660 View commit details
    Browse the repository at this point in the history

  4. Refactor orphaned plug-out event handling and logging

    @zneedell
    zneedell committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    9f81735 View commit details
    Browse the repository at this point in the history

  5. Fmt

    @zneedell
    zneedell committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    1e986dd View commit details
    Browse the repository at this point in the history

  6. Fix for freight -- retain freight vehicle as currentTourVehicle

    @zneedell
    zneedell committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    25cd0be View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. fix for building docker image on ARM64

    @zneedell
    zneedell committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    bc2cd40 View commit details
    Browse the repository at this point in the history

  2. fix for building docker image on ARM64

    @zneedell
    zneedell committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    20c413a View commit details
    Browse the repository at this point in the history

  3. keep track of tour_id from urbansim plans

    @zneedell
    zneedell committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    671bd0c View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/develop' into tour-mode-clean-de… 

    …velop202403

# Conflicts:
#	src/main/scala/beam/agentsim/agents/PersonAgent.scala
#	src/main/scala/beam/agentsim/agents/modalbehaviors/DrivesVehicle.scala
#	src/main/scala/beam/agentsim/events/PathTraversalEvent.scala
    @zneedell
    zneedell committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    5cabecd View commit details
    Browse the repository at this point in the history

  5. merge fix

    @zneedell
    zneedell committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    06a3ddf View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2024

  1. Merge remote-tracking branch 'origin/develop' into tour-mode-clean-de… 

    …velop202403

# Conflicts:
#	src/main/scala/beam/agentsim/agents/parking/ChoosesParking.scala
#	src/test/scala/beam/agentsim/infrastructure/ZonalParkingManagerSpec.scala
    @zneedell
    zneedell committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    7dc1fd1 View commit details
    Browse the repository at this point in the history

  2. merge fix

    @zneedell
    zneedell committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    e2dc0e6 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2024

  1. stuckness fixes in PILATES

    @zneedell
    zneedell committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    1ae5c74 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2024

  1. fix for NoSuchElementException in AgentSimToPhysSimPlanConverter

    @zneedell
    zneedell committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    8e89f50 View commit details
    Browse the repository at this point in the history

  2. Fixes for strange and nested plans from ASim

    @zneedell
    zneedell committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    9076e07 View commit details
    Browse the repository at this point in the history

  3. Merge fixes

    @zneedell
    zneedell committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    0c4a3cd View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2024

  1. Fix for missing tour id

    @zneedell
    zneedell committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    35ff592 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. fixes for keeping the correct tour vehicle

    @zneedell
    zneedell committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    0a9a8da View commit details
    Browse the repository at this point in the history

  2. fix tour mode spec

    @zneedell
    zneedell committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    6e34e33 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'refs/remotes/origin/develop' into tour-… 

    …mode-clean-develop202403

# Conflicts:
#	build.gradle
    @zneedell
    zneedell committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    053bcc6 View commit details
    Browse the repository at this point in the history

  4. fix for vehicle sharing spec

    @zneedell
    zneedell committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    0897fff View commit details
    Browse the repository at this point in the history

  5. test fixes

    @zneedell
    zneedell committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    69fcb69 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2024

  1. fix flaky test

    @zneedell
    zneedell committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    1499c2e View commit details
    Browse the repository at this point in the history

  2. fix flaky test

    @zneedell
    zneedell committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    065c047 View commit details
    Browse the repository at this point in the history

  3. update tutorial

    @zneedell
    zneedell committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    3882762 View commit details
    Browse the repository at this point in the history

  4. Let agents see parent tour vehicle if they're going on a car_based su… 

    …btour
    @zneedell
    zneedell committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    2ab2024 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. test fix

    @beambot2
    beambot2 committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    ffde954 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2024

  1. test text fix

    @beambot2
    beambot2 committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    54eb564 View commit details
    Browse the repository at this point in the history