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

Pilates cruise merge #3850

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

Pilates cruise merge #3850

wants to merge 178 commits into from

Commits on Feb 23, 2022

  1. add toString method

    @zneedell
    zneedell committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    63453d8 View commit details
    Browse the repository at this point in the history

  2. add toString method

    @zneedell
    zneedell committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    512aeb7 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'zn/stop-merging-old-plans' into zn/PILATES

    @zneedell
    zneedell committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    7f965db View commit details
    Browse the repository at this point in the history

  4. update build.gradle

    @zneedell
    zneedell committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    43623e9 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2022

  1. Merge remote-tracking branch 'origin/develop' into zn/PILATES

    @zneedell
    zneedell committed Feb 25, 2022
    Configuration menu
    Copy the full SHA
    754df32 View commit details
    Browse the repository at this point in the history

  2. update build.gradle

    @zneedell
    zneedell committed Feb 25, 2022
    Configuration menu
    Copy the full SHA
    7a845dd View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2022

  1. Merge remote-tracking branch 'origin/develop' into zn/PILATES

    @zneedell
    zneedell committed Mar 3, 2022
    Configuration menu
    Copy the full SHA
    00d3710 View commit details
    Browse the repository at this point in the history

  2. more logging, remove duplicate vehicle creation

    @zneedell
    zneedell committed Mar 3, 2022
    Configuration menu
    Copy the full SHA
    72bc63c View commit details
    Browse the repository at this point in the history

  3. Force vehicle creation when plans require it

    @zneedell
    zneedell committed Mar 3, 2022
    Configuration menu
    Copy the full SHA
    a50b1ab View commit details
    Browse the repository at this point in the history

  4. Force vehicle creation when plans require it

    @zneedell
    zneedell committed Mar 3, 2022
    Configuration menu
    Copy the full SHA
    6e168c9 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2022

  1. revert change

    @zneedell
    zneedell committed Mar 4, 2022
    Configuration menu
    Copy the full SHA
    5a1bcd7 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2022

  1. update lambda to look at pilates branch on data submodules

    @zneedell
    zneedell committed Mar 5, 2022
    Configuration menu
    Copy the full SHA
    c96e8e3 View commit details
    Browse the repository at this point in the history

  2. add r6i.24xlarge to lambda

    @zneedell
    zneedell committed Mar 5, 2022
    Configuration menu
    Copy the full SHA
    b0d0c1f View commit details
    Browse the repository at this point in the history

  3. add r6i.24xlarge to lambda

    @zneedell
    zneedell committed Mar 5, 2022
    Configuration menu
    Copy the full SHA
    3bed322 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2022

  1. cutoff minimum travel time so it's never zero

    @zneedell
    zneedell committed Mar 8, 2022
    Configuration menu
    Copy the full SHA
    05ed7e8 View commit details
    Browse the repository at this point in the history

  2. more logging, filter outputs before merging

    @zneedell
    zneedell committed Mar 8, 2022
    Configuration menu
    Copy the full SHA
    b21124c View commit details
    Browse the repository at this point in the history

  3. hack: set link travel time floor to 0 just in case

    @zneedell
    zneedell committed Mar 8, 2022
    Configuration menu
    Copy the full SHA
    a0cb70a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'zn/remove-shared-teleportation-vehicles-after-trip' int… 

    …o zn/PILATES
    @zneedell
    zneedell committed Mar 8, 2022
    Configuration menu
    Copy the full SHA
    4d12ef7 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'zn/remove-shared-teleportation-vehicles-after-trip' int… 

    …o zn/PILATES
    @zneedell
    zneedell committed Mar 8, 2022
    Configuration menu
    Copy the full SHA
    036db34 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2022

  1. extra logging

    @zneedell
    zneedell committed Mar 9, 2022
    Configuration menu
    Copy the full SHA
    a6d587b View commit details
    Browse the repository at this point in the history

  2. allow for optional starting linkstats input when using linkStatsFromL… 

    …astRun
    @zneedell
    zneedell committed Mar 9, 2022
    Configuration menu
    Copy the full SHA
    19e16ad View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2022

  1. fix logging

    @zneedell
    zneedell committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    28198c0 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2022

  1. check for negative durations

    @zneedell
    zneedell committed Mar 11, 2022
    Configuration menu
    Copy the full SHA
    74a01b0 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2022

  1. Merge remote-tracking branch 'origin/develop' into zn/PILATES

    @zneedell
    zneedell committed Mar 12, 2022
    Configuration menu
    Copy the full SHA
    24dfe37 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2022

  1. only send to chargingNetworkManager if duration is longer than parall… 

    …elismwindow
    @zneedell
    zneedell committed Mar 13, 2022
    Configuration menu
    Copy the full SHA
    2574a17 View commit details
    Browse the repository at this point in the history

  2. only send to chargingNetworkManager if duration is longer than parall… 

    …elismwindow
    @zneedell
    zneedell committed Mar 13, 2022
    Configuration menu
    Copy the full SHA
    b34db4f View commit details
    Browse the repository at this point in the history

  3. use tick rather than end time to get parking duration

    @zneedell
    zneedell committed Mar 13, 2022
    Configuration menu
    Copy the full SHA
    7a4044c View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2022

  1. only send chargingPlugRequest if next departure is out of parallelism… 

    … window
    @zneedell
    zneedell committed Mar 14, 2022
    Configuration menu
    Copy the full SHA
    7d0e42b View commit details
    Browse the repository at this point in the history

  2. get next activity from personData

    @zneedell
    zneedell committed Mar 14, 2022
    Configuration menu
    Copy the full SHA
    bf138c3 View commit details
    Browse the repository at this point in the history

  3. fix compilation

    @zneedell
    zneedell committed Mar 14, 2022
    Configuration menu
    Copy the full SHA
    874b890 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2022

  1. delay next leg departure to after parallelism window

    @zneedell
    zneedell committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    7790160 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2022

  1. don't fail on missing linkId

    @zneedell
    zneedell committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    9d18508 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2022

  1. Merge remote-tracking branch 'origin/develop' into zn/PILATES 

    # Conflicts:
#	src/main/scala/beam/sim/config/BeamConfig.scala
    @zneedell
    zneedell committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    4d82242 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2022

  1. update build.gradle

    @zneedell
    zneedell committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    150d393 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2022

  1. get tripId from trip not activity

    @zneedell
    zneedell committed Mar 24, 2022
    Configuration menu
    Copy the full SHA
    3270d47 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into zn/PILATES

    @zneedell
    zneedell committed Mar 24, 2022
    Configuration menu
    Copy the full SHA
    973f925 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'zn/#3494-concurrent-hashmap-physsim' into zn/PILATES

    @zneedell
    zneedell committed Mar 24, 2022
    Configuration menu
    Copy the full SHA
    a92daf4 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2022

  1. fix tripId

    @zneedell
    zneedell committed Mar 26, 2022
    Configuration menu
    Copy the full SHA
    08e532b View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2022

  1. Merge remote-tracking branch 'origin/develop' into zn/PILATES

    @zneedell
    zneedell committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    1920117 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2022

  1. Merge remote-tracking branch 'origin/develop' into zn/PILATES-relaxation 

    # Conflicts:
#	src/main/scala/beam/agentsim/agents/household/HouseholdActor.scala
#	src/main/scala/beam/agentsim/agents/household/HouseholdFleetManager.scala
    @zneedell
    zneedell committed Jun 14, 2022
    Configuration menu
    Copy the full SHA
    575ac66 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/alex-vv/#3407-relaxation-network… 

    …-scenario' into zn/PILATES-relaxation
    @zneedell
    zneedell committed Jun 14, 2022
    Configuration menu
    Copy the full SHA
    8385de0 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'zn/new-r5-options' into zn/PILATES-relaxation

    @zneedell
    zneedell committed Jun 14, 2022
    Configuration menu
    Copy the full SHA
    932fc1e View commit details
    Browse the repository at this point in the history

  4. hack to let trip_id work

    @zneedell
    zneedell committed Jun 14, 2022
    Configuration menu
    Copy the full SHA
    b8555ee View commit details
    Browse the repository at this point in the history

  5. give up on trip_id

    @zneedell
    zneedell committed Jun 14, 2022
    Configuration menu
    Copy the full SHA
    6f761e5 View commit details
    Browse the repository at this point in the history

  6. fix fuel type error

    @zneedell
    zneedell committed Jun 14, 2022
    Configuration menu
    Copy the full SHA
    6631a08 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2022

  1. record skim for all returned routes

    @zneedell
    zneedell committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    58d69ac View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/zn/PILATES-relaxation' into zn/P… 

    …ILATES-more-skimmer-events
    @zneedell
    zneedell committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    b5d578c View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2022

  1. Merge remote-tracking branch 'origin/develop' into zn/PILATES-more-sk… 

    …immer-events

# Conflicts:
#	src/main/scala/beam/agentsim/agents/PersonAgent.scala
    @zneedell
    zneedell committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    a7855bd View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2022

  1. update gradle

    @zneedell
    zneedell committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    f679c04 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2022

  1. Merge pull request #3562 from LBNL-UCB-STI/zn/PILATES-more-skimmer-ev… 

    …ents

Update main pilates branch
    @zneedell
    zneedell authored Jul 20, 2022
    Configuration menu
    Copy the full SHA
    4163135 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/do/fix-kill-beam-script' into zn… 

    …/PILATES
    @zneedell
    zneedell committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    6a2d8eb View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2022

  1. record correct (non-generalized) times and costs in asim skims

    @zneedell
    zneedell committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    c3bf5b7 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2022

  1. record correct (non-generalized) times and costs in asim skims

    @zneedell
    zneedell committed Jul 30, 2022
    Configuration menu
    Copy the full SHA
    4f8e96f View commit details
    Browse the repository at this point in the history

  2. fix tick for skimdata to get correct travel time in skims

    @zneedell
    zneedell committed Jul 30, 2022
    Configuration menu
    Copy the full SHA
    0f54585 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2022

  1. Merge branch 'zn/use-taz-geometries-for-skims' into zn/PILATES 

    # Conflicts:
#	src/main/scala/beam/sim/config/BeamConfig.scala
    @zneedell
    zneedell committed Aug 2, 2022
    Configuration menu
    Copy the full SHA
    9269744 View commit details
    Browse the repository at this point in the history

  2. fixes

    @zneedell
    zneedell committed Aug 2, 2022
    Configuration menu
    Copy the full SHA
    f0bfc8d View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2022

  1. Merge branch 'zn/use-taz-geometries-for-skims' into zn/PILATES 

    # Conflicts:
#	src/main/scala/beam/sim/config/BeamConfig.scala
    @zneedell
    zneedell committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    17360b7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'zn/skimmer-events-for-non-chosen-modes' into zn/PILATES 

    # Conflicts:
#	src/main/scala/beam/agentsim/agents/PersonAgent.scala
    @zneedell
    zneedell committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    65d377a View commit details
    Browse the repository at this point in the history

  3. fix compilation

    @zneedell
    zneedell committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    9f61e21 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2022

  1. Merge remote-tracking branch 'origin/develop' into zn/PILATES

    @zneedell
    zneedell committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    b1d6344 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'zn/drive-transit-buffer-time' into zn/PILATES

    @zneedell
    zneedell committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    ec6e1f3 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2022

  1. Merge branch 'zn/drive-transit-buffer-time' into zn/PILATES

    @zneedell
    zneedell committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    25d7516 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into zn/PILATES 

    # Conflicts:
#	build.gradle
    @zneedell
    zneedell committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    cfa76ba View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2022

  1. bugfix, handle exceptions better

    @zneedell
    zneedell committed Aug 9, 2022
    Configuration menu
    Copy the full SHA
    e868a48 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'zn/drive-transit-buffer-time' into zn/PILATES 

    # Conflicts:
#	src/main/scala/beam/agentsim/agents/PersonAgent.scala
#	src/main/scala/beam/router/r5/R5Wrapper.scala
    @zneedell
    zneedell committed Aug 9, 2022
    Configuration menu
    Copy the full SHA
    765f8d6 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2022

  1. Merge remote-tracking branch 'origin/develop' into zn/PILATES 

    # Conflicts:
#	build.gradle
#	src/main/scala/beam/agentsim/agents/household/HouseholdActor.scala
#	src/main/scala/beam/agentsim/agents/modalbehaviors/DrivesVehicle.scala
    @zneedell
    zneedell committed Aug 11, 2022
    Configuration menu
    Copy the full SHA
    b87443d View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2022

  1. update directories to find renamed ones

    @zneedell
    zneedell committed Aug 12, 2022
    Configuration menu
    Copy the full SHA
    6c1ac8d View commit details
    Browse the repository at this point in the history

  2. fixes

    @zneedell
    zneedell committed Aug 12, 2022
    Configuration menu
    Copy the full SHA
    9613f47 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2022

  1. hopefully finally fix trip id

    @zneedell
    zneedell committed Aug 13, 2022
    Configuration menu
    Copy the full SHA
    a1c3c8b View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2022

  1. fix location of input plans

    @zneedell
    zneedell committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    8ad1318 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2022

  1. Merge remote-tracking branch 'origin/develop' into zn/PILATES-merge 

    # Conflicts:
#	aws/src/main/python/beam_lambda/lambda_function.py
#	src/main/scala/beam/agentsim/agents/PersonAgent.scala
#	src/main/scala/beam/agentsim/agents/modalbehaviors/DrivesVehicle.scala
    @zneedell
    zneedell committed Oct 27, 2022
    Configuration menu
    Copy the full SHA
    fdedf36 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2022

  1. Merge remote-tracking branch 'origin/develop' into zn/PILATES-merge 

    # Conflicts:
#	src/main/scala/beam/agentsim/agents/modalbehaviors/ChoosesMode.scala
    @zneedell
    zneedell committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    ddb622f View commit details
    Browse the repository at this point in the history

  2. fix writing error on null link

    @zneedell
    zneedell committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    1cb71a9 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3679 from LBNL-UCB-STI/zn/PILATES-merge 

    merge updates into PILATES branch
    @zneedell
    zneedell authored Nov 18, 2022
    Configuration menu
    Copy the full SHA
    98eb829 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2022

  1. enforce planSelected in merging asim plans, drop lowest scoring plans… 

    … from agent memory
    @zneedell
    zneedell committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    b0e63fe View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2022

  1. Update parquet lib to support running on Apple M1

    @alex-vv
    alex-vv committed Dec 3, 2022
    Configuration menu
    Copy the full SHA
    a955652 View commit details
    Browse the repository at this point in the history

  2. Use native Google ORTools library loader since it is now available in… 

    … maven
    @alex-vv
    alex-vv committed Dec 3, 2022
    Configuration menu
    Copy the full SHA
    6b65656 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2022

  1. Merge branch 'develop' into zn/PILATES

    @zneedell
    zneedell committed Dec 6, 2022
    Configuration menu
    Copy the full SHA
    a72e769 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'zn/fixes-to-previous-plan-merging' into zn/PILATES

    @zneedell
    zneedell committed Dec 6, 2022
    Configuration menu
    Copy the full SHA
    8137dcd View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/alex-vv/#3634-arm-arch-support' … 

    …into zn/PILATES
    @zneedell
    zneedell committed Dec 6, 2022
    Configuration menu
    Copy the full SHA
    17e7b5e View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2022

  1. update docker app in gradle

    @zneedell
    zneedell committed Dec 8, 2022
    Configuration menu
    Copy the full SHA
    9751a50 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2023

  1. Merge remote-tracking branch 'origin/develop' into zn/PILATES 

    # Conflicts:
#	src/main/scala/beam/agentsim/infrastructure/taz/TAZTreeMap.scala
    @zneedell
    zneedell committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    ed2e3ac View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2023

  1. read experienced plans from past BEAM runs

    @zneedell
    zneedell committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    65f37ca View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2023

  1. Merge branch 'do/#3232-activitysim-skims-omx-format' into zn/PILATES

    @zneedell
    zneedell committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    59f2a63 View commit details
    Browse the repository at this point in the history

  2. update skim fields

    @zneedell
    zneedell committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    0b51307 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/do/#3652-execute-beam-on-google-… 

    …cloud-compute' into zn/PILATES
    @zneedell
    zneedell committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    3ddf1e4 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2023

  1. collect tripid in experienced plans by creating new BeamPersonDepartu… 

    …reEvent
    @zneedell
    zneedell committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    5ce28d7 View commit details
    Browse the repository at this point in the history

  2. merge experienced and input plans if they both exist

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

Commits on Jan 27, 2023

  1. increment plan index on loading so plans don't get smushed

    @zneedell
    zneedell committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    88c2959 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2023

  1. record score for all plans during loading

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

Commits on Feb 2, 2023

  1. Merge branch 'zn/generate-stall-on-link' into zn/PILATES

    @zneedell
    zneedell committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    4f8fea6 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2023

  1. also create emergency vehicles for HOV

    @zneedell
    zneedell committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    ecb4975 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2023

  1. Merge branch 'do/#3232-activitysim-skims-omx-format' into zn/PILATES 

    # Conflicts:
#	src/main/scala/beam/agentsim/agents/modalbehaviors/ChoosesMode.scala
    @zneedell
    zneedell committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    cd768cf View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2023

  1. fixes to create parking stalls along links closer to destinations

    @zneedell
    zneedell committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    56d308c View commit details
    Browse the repository at this point in the history

  2. fix some errors

    @zneedell
    zneedell committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    852ccf0 View commit details
    Browse the repository at this point in the history

  3. more robust snapping to link

    @zneedell
    zneedell committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    a019abc View commit details
    Browse the repository at this point in the history

  4. Merge branch 'do/#3232-activitysim-skims-omx-format' into zn/PILATES

    @zneedell
    zneedell committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    466b9af View commit details
    Browse the repository at this point in the history

  5. better skims aggregation

    @zneedell
    zneedell committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    866bad2 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2023

  1. correctly gather destination from failed trips b/c endLink hasn't bee… 

    …n updated
    @zneedell
    zneedell committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    e5706eb View commit details
    Browse the repository at this point in the history

  2. fmt

    @zneedell
    zneedell committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    7811633 View commit details
    Browse the repository at this point in the history

  3. Correctly grab taz for skimmer when activity links aren't defined

    @zneedell
    zneedell committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    89a6086 View commit details
    Browse the repository at this point in the history

  4. add bike trips to skims, preliminary work on identifying express buses

    @zneedell
    zneedell committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    b0f992a View commit details
    Browse the repository at this point in the history

  5. give up on express buses for now

    @zneedell
    zneedell committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    5e21202 View commit details
    Browse the repository at this point in the history

  6. small changes to skim fields

    @zneedell
    zneedell committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    8941f8a View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2023

  1. default to link endpoint

    @zneedell
    zneedell committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    579f27f View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2023

  1. fix for parallel parking manager

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

  2. fall back on availabilityAwareSampling for TAZs with no mapped links

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

Commits on Apr 24, 2023

  1. merge errors

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

Commits on May 12, 2023

  1. Merge remote-tracking branch 'origin/do/ridehail-stops' into develop 

    # Conflicts:
#	src/main/scala/beam/agentsim/agents/PersonAgent.scala
#	src/main/scala/beam/agentsim/agents/modalbehaviors/ChoosesMode.scala
    @jlaz
    jlaz committed May 12, 2023
    Configuration menu
    Copy the full SHA
    f8aeb8c View commit details
    Browse the repository at this point in the history

Commits on May 15, 2023

  1. Merge branch 'do/#3232-activitysim-skims-omx-format' into zn/PILATES 

    # Conflicts:
#	src/main/scala/beam/agentsim/infrastructure/ParkingFunctions.scala
#	src/main/scala/beam/agentsim/infrastructure/parking/ParkingStallSampling.scala
#	src/main/scala/beam/agentsim/infrastructure/taz/TAZTreeMap.scala
#	src/main/scala/beam/router/skim/ActivitySimPathType.scala
#	src/test/scala/beam/router/skim/urbansim/ActivitySimOmxWriterSpec.scala
    @zneedell
    zneedell committed May 15, 2023
    Configuration menu
    Copy the full SHA
    4d03f25 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'do/#3232-activitysim-skims-omx-format' into zn/PILATES

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

  3. update beam version

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

Commits on May 24, 2023

  1. Read ordering of TAZs directly from input shapefile

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

Commits on Jun 5, 2023

  1. Don't count parking access/egress distance/time towards skims (there … 

    …will be another skim for those)
    @zneedell
    zneedell committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    62900fc View commit details
    Browse the repository at this point in the history

  2. fmt

    @zneedell
    zneedell committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    599efa4 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2023

  1. convert to minutes!!!!

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

Commits on Jun 8, 2023

  1. add coefficient for SAV preference to ridehail cost

    @jlaz
    jlaz committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    89339f1 View commit details
    Browse the repository at this point in the history

  2. fmt

    @jlaz
    jlaz committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    0850b14 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/zn/PILATES' into jl/SAV_ASC 

    # Conflicts:
#	src/main/scala/beam/agentsim/agents/modalbehaviors/ChoosesMode.scala
    @jlaz
    jlaz committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    22487c0 View commit details
    Browse the repository at this point in the history

  4. update beam version & merge with zn/pilates

    @jlaz
    jlaz committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    6a4fed2 View commit details
    Browse the repository at this point in the history

  5. updated RideHailRequest

    @jlaz
    jlaz committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    23628aa View commit details
    Browse the repository at this point in the history

  6. don't allow transit skims with 0 IVT

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

  7. Merge branch 'zn/PILATES' into jl/SAV_ASC

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

  8. minor bug

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

Commits on Jun 19, 2023

  1. remove defaults for number of asim skim observations

    @zneedell
    zneedell committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    0173390 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. Merge branch 'zn/PILATES' into jl/SAV_ASC

    @zneedell
    zneedell committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    f2715d6 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/do/ridehailmanager-parking-fix' … 

    …into jl/SAV_ASC

# Conflicts:
#	build.gradle
    @zneedell
    zneedell committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    3a9bed8 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/develop' into zn/PILATES 

    # Conflicts:
#	build.gradle
    @zneedell
    zneedell committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    a43712b View commit details
    Browse the repository at this point in the history

  4. update build.gradle

    @zneedell
    zneedell committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    fd29b1f View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. Merge remote-tracking branch 'origin/rw/#3752-specify-allowed-ridehai… 

    …l-modes' into jl/SAV_ASC

# Conflicts:
#	src/main/scala/beam/agentsim/agents/ridehail/RideHailManager.scala
#	src/main/scala/beam/sim/config/BeamConfig.scala
    @zneedell
    zneedell committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    625c7c6 View commit details
    Browse the repository at this point in the history

  2. update build.gradle

    @zneedell
    zneedell committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    ad9d15c View commit details
    Browse the repository at this point in the history

  3. throw RideHailSkimmerEvent from ridehailMaster

    @zneedell
    zneedell committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    d846188 View commit details
    Browse the repository at this point in the history

  4. bugfix

    @zneedell
    zneedell committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    038d97e View commit details
    Browse the repository at this point in the history

  5. revert unused default

    @zneedell
    zneedell committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    4da5103 View commit details
    Browse the repository at this point in the history

  6. switch to UnmatchedRideHailRequestSkimmerEvent for unmatched quote

    @zneedell
    zneedell committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    f3a31a3 View commit details
    Browse the repository at this point in the history

  7. fixes to aggregation logic

    @zneedell
    zneedell committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    68650fa View commit details
    Browse the repository at this point in the history

  8. more fixes to aggregation logic

    @zneedell
    zneedell committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    1530c8c View commit details
    Browse the repository at this point in the history

  9. tweaks

    @zneedell
    zneedell committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    e9865a5 View commit details
    Browse the repository at this point in the history

  10. tweaks

    @zneedell
    zneedell committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    0c06b8d View commit details
    Browse the repository at this point in the history

  11. tweaks

    @zneedell
    zneedell committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    01fd98c View commit details
    Browse the repository at this point in the history

  12. tweaks

    @zneedell
    zneedell committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    070a84e View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. fix logic for quotes

    @zneedell
    zneedell committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    39395b9 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Merge branch 'zn/PILATES' into rw/#3752-specify-allowed-ridehail-modes

    @zneedell
    zneedell committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    4b950ab View commit details
    Browse the repository at this point in the history

  2. Merge branch 'jl/SAV_ASC' into rw/#3752-specify-allowed-ridehail-modes 

    # Conflicts:
#	build.gradle
    @zneedell
    zneedell committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    8dd616d View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. Merge branch 'zn/cruise-with-extra-rh-events' into rw/#3752-specify-a… 

    …llowed-ridehail-modes
    @zneedell
    zneedell committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    21d564b View commit details
    Browse the repository at this point in the history

  2. fix build.gradle

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

Commits on Jun 30, 2023

  1. Merge remote-tracking branch 'origin/rw/#3752-specify-allowed-ridehai… 

    …l-modes' into PILATES-cruise

# Conflicts:
#	src/main/scala/beam/agentsim/agents/modalbehaviors/ChoosesMode.scala
    @zneedell
    zneedell committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    c0c1806 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. include error in unmatched RH response

    @zneedell
    zneedell committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    740b522 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. Merge remote-tracking branch 'origin/do/ridehail-stops' into rw/dev-w… 

    …ith-ridehail-stops

# Conflicts:
#	src/main/scala/beam/agentsim/agents/PersonAgent.scala
#	src/main/scala/beam/agentsim/agents/modalbehaviors/ChoosesMode.scala
    @dimaopen
    dimaopen committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    60e7eec View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. Merge remote-tracking branch 'origin/rw/dev-with-ridehail-stops' into… 

    … PILATES-cruise-0.9.7

# Conflicts:
#	src/main/scala/beam/agentsim/agents/PersonAgent.scala
#	src/main/scala/beam/agentsim/agents/modalbehaviors/ChoosesMode.scala
    @zneedell
    zneedell committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    6d9e53d View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. Fixed wrong merging: we need to add Walk legs to RH trips only if the… 

    …y are not there yet. Or person get forced to park their bodies at the end of the first leg.
    @dimaopen
    dimaopen committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    3844235 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2023

  1. sort and downselect remembered plans

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

  2. Merge branch 'zn/select-exp-beta-in-plans' into PILATES-cruise-0.9.7 

    # Conflicts:
#	src/main/scala/beam/utils/scenario/PreviousRunPlanMerger.scala
    @zneedell
    zneedell committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    351928e View commit details
    Browse the repository at this point in the history

  3. fix config

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

  4. Merge branch 'zn/select-exp-beta-in-plans' into PILATES-cruise-0.9.7

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

Commits on Sep 21, 2023

  1. Merge remote-tracking branch 'origin/develop' into PILATES-cruise-0.9… 

    ….7-speedlimit
    @zneedell
    zneedell committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    4a110a4 View commit details
    Browse the repository at this point in the history

  2. Add optional map to config limiting speeds as % of freespeed by vehic… 

    …le type
    @zneedell
    zneedell committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    3104ad2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'PILATES-cruise-0.9.7' into PILATES-cruise-0.9.8 

    # Conflicts:
#	build.gradle
#	src/main/scala/beam/agentsim/agents/modalbehaviors/ChoosesMode.scala
#	src/main/scala/beam/router/skim/core/RideHailSkimmer.scala
    @zneedell
    zneedell committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    8169a0c View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2023

  1. add extra optional field for RH fleet name in ActivitySimSkimmer. Add… 

    … a test.
    @zneedell
    zneedell committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    a80b881 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2023

  1. also keep track of DDIST in RH skims

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

  2. update OMX test

    @zneedell
    zneedell committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    87b7df7 View commit details
    Browse the repository at this point in the history

  3. additional logging

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

  4. Merge branch 'zn/include-rh-fleet-in-asim-skims' into PILATES-cruise-… 

    …0.9.9

# Conflicts:
#	src/main/scala/beam/agentsim/agents/modalbehaviors/ChoosesMode.scala
#	src/main/scala/beam/agentsim/agents/ridehail/RideHailMaster.scala
#	src/main/scala/beam/router/skim/ActivitySimPathType.scala
#	src/main/scala/beam/sim/config/BeamConfig.scala
    @zneedell
    zneedell committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    96d7a6b View commit details
    Browse the repository at this point in the history

  5. fix compilation

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

Commits on Oct 27, 2023

  1. fix docker

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

Commits on Jan 23, 2024

  1. Merge remote-tracking branch 'origin/develop' into PILATES-cruise-0.9.9 

    # Conflicts:
#	src/main/scala/beam/agentsim/agents/modalbehaviors/ChoosesMode.scala
#	src/main/scala/beam/router/skim/ActivitySimSkimmer.scala
#	src/test/scala/beam/router/skim/urbansim/ActivitySimOmxWriterSpec.scala
    @zneedell
    zneedell committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    ac48ab3 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2024

  1. merge fix

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

  2. more merge fixes

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

  3. Merge remote-tracking branch 'origin/develop' into PILATES-cruise-0.9.9

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

Commits on Feb 29, 2024

  1. count CABLE_CAR to LRF

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

  2. Also write TNC_TRANSIT to omx skims

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

Commits on Mar 4, 2024

  1. also overwrite with osmId

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

  2. also overwrite with osmId, bugfix

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

Commits on Mar 5, 2024

  1. Ridehail_transit in omx skims

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

Commits on Mar 13, 2024

  1. tweaks for rh_transit asim skims

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

  2. account for initial rh waiit in rh_transit itineraries

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

Commits on Mar 20, 2024

  1. Merge remote-tracking branch 'origin/develop' into PILATES-cruise-merge 

    # Conflicts:
#	build.gradle
#	src/main/resources/beam-template.conf
#	src/main/scala/beam/agentsim/agents/household/HouseholdFleetManager.scala
#	src/main/scala/beam/agentsim/agents/parking/ChoosesParking.scala
#	src/main/scala/beam/agentsim/infrastructure/taz/TAZTreeMap.scala
#	src/main/scala/beam/physsim/jdeqsim/JDEQSimRunner.scala
#	src/main/scala/beam/router/r5/NetworkCoordinator.scala
#	src/main/scala/beam/router/skim/ActivitySimPathType.scala
#	src/main/scala/beam/sim/config/BeamConfig.scala
#	src/main/scala/beam/utils/scenario/PreviousRunPlanMerger.scala
#	src/main/scala/beam/utils/scenario/generic/readers/PlanElementReader.scala
    @zneedell
    zneedell committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    65bf97d View commit details
    Browse the repository at this point in the history

  2. Merge fixes

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