Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit fec0e499bae184a92030b607eaa57a36b9739fd0
Author: Zach Needell <[email protected]>
Date:   Wed Dec 22 13:41:18 2021 -0800

    typos

commit 43a8a9ccf1ebe5f245157722dcc0805860680a73
Author: Zach Needell <[email protected]>
Date:   Wed Dec 22 13:32:27 2021 -0800

    fix case when parking manager is empty

commit 98a4362cbb29197dc27be453bcb06c9d8b6a7c74
Author: Zach Needell <[email protected]>
Date:   Mon Dec 20 13:10:53 2021 -0800

    fmt

commit 4ef395c97d11878a873f131794636cd8ade12518
Author: Zach Needell <[email protected]>
Date:   Mon Dec 20 13:03:06 2021 -0800

    better documentation

commit 17743715aed12c03cc0b9bfaaba4ec29d0926a81
Merge: 052b1d4b0 d57b0e014
Author: Zach Needell <[email protected]>
Date:   Mon Dec 20 12:53:30 2021 -0800

    Merge remote-tracking branch 'origin/develop' into zn/#3404-stall-in-closest-taz

commit d57b0e01466013832e8b2bebd804f413e4f83366
Merge: 32d8b0bb6 2d4dffc16
Author: Nikolay Ilyin <[email protected]>
Date:   Sun Dec 19 16:47:15 2021 +0300

    Merge pull request #3419 from LBNL-UCB-STI/jp/log4j-fix

    force 2.15 log4j

commit 32d8b0bb69794e88b1719d8b83764cd305d91c7d
Merge: f7a2a2ff4 651844a14
Author: Nikolay Ilyin <[email protected]>
Date:   Sat Dec 18 17:14:51 2021 +0300

    Merge pull request #3394 from LBNL-UCB-STI/inm/activities-with-fixed-duration

    Fixed activity duration based on the activity name

commit 651844a14efed6ea6057f6dc0d41ec88a2528d7f
Merge: 3963fb961 f7a2a2ff4
Author: Nikolay Ilyin <[email protected]>
Date:   Sat Dec 18 16:45:35 2021 +0300

    Merge remote-tracking branch 'origin/develop' into inm/activities-with-fixed-duration

commit 3963fb96166bac189108a71765efc206f8bd5acf
Author: Nikolay Ilyin <[email protected]>
Date:   Sat Dec 18 16:45:14 2021 +0300

    added documentation

commit 2d4dffc161e4a05aff633f20c939617ffb494c5b
Author: Justin Pihony <[email protected]>
Date:   Sat Dec 18 02:27:29 2021 -0500

    force 2.15 log4j

commit f7a2a2ff414ed568b363de514c923daf52d36bd8
Author: Justin Pihony <[email protected]>
Date:   Sat Dec 18 01:56:56 2021 -0500

    simple change (#3418)

commit 8995c653abee02d572a000c170d401c7c05ffce6
Author: Nikolay Ilyin <[email protected]>
Date:   Fri Dec 17 19:40:56 2021 +0300

    typo

commit 7466f224bf3d9000f7b68dc12c1554b321efde6a
Merge: 0169afcc4 fc619d489
Author: Xuan-1998 <[email protected]>
Date:   Thu Dec 16 08:15:36 2021 -0800

    Merge pull request #3393 from LBNL-UCB-STI/xj/Include_activitysim_trip_id_as_attribute_in_BEAM_plans_#3368

    Xj/include urbansim trip_id as attribute in beam plans #3368

commit fc619d48977f2ae82cb285e48b26d1eddb4638e8
Author: Xuan-1998 <[email protected]>
Date:   Thu Dec 16 07:47:15 2021 -0800

    delete-useless

commit 13782737d888798020945cb6b6906a0c0e5e4603
Author: Xuan-1998 <[email protected]>
Date:   Thu Dec 16 07:46:14 2021 -0800

    fix-skim-loader

commit cc5a427dbb3af65e11cb8d17b795407be227a62d
Author: Xuan-1998 <[email protected]>
Date:   Thu Dec 16 07:07:17 2021 -0800

    fix-test

commit e13f778436365814596bd08ce1e4de9ec71d5d8a
Author: Xuan-1998 <[email protected]>
Date:   Thu Dec 16 04:03:17 2021 -0800

    fix-null:

commit 00ddb47d4204db817b7f361f1ca7066e8fcff188
Author: Xuan-1998 <[email protected]>
Date:   Wed Dec 15 14:53:19 2021 -0800

    fix-        mavenCentral().content {
                excludeModule(javax.media, jai_core)

commit c345e07c81d0f0b4da40c3c7e8721686c3a3c885
Author: Xuan-1998 <[email protected]>
Date:   Wed Dec 15 12:35:58 2021 -0800

    fix-peer-review

commit 0169afcc469601e039d55867945e0ed2b2f78253
Merge: 58cd67752 ad2ae3015
Author: Xuan-1998 <[email protected]>
Date:   Tue Dec 14 22:09:40 2021 -0800

    Merge pull request #3415 from LBNL-UCB-STI/alex-vv/#3413-log4j-missing

    fix log4j issue

commit ad2ae3015337c9447c847cc4687a20bde70c885b
Author: Alexander Vykhodtsev <[email protected]>
Date:   Tue Dec 14 23:06:04 2021 +0600

    Fix missing log4j dependency by trying Maven Central first

commit 58cd677527497daa6d9e0ce0c8eb55fc26c70aa2
Merge: 99a9fcf58 a440f92af
Author: Nikolay Ilyin <[email protected]>
Date:   Tue Dec 14 16:34:34 2021 +0300

    Merge pull request #3406 from LBNL-UCB-STI/rajnikantsh/#3389-change-health-metrics-location

    add health metrics analysis in beam output directory

commit 99a9fcf5801e56d7b606289fe58603e13a16dbca
Merge: b9c8900b1 7118cdceb
Author: Nikolay Ilyin <[email protected]>
Date:   Mon Dec 13 17:02:11 2021 +0300

    Merge pull request #3411 from LBNL-UCB-STI/jp/fix-publishing

    add publishing config to avoid up-to-date

commit 7118cdceb63feb83da17e1116668b7b0d44815f8
Author: Justin Pihony <[email protected]>
Date:   Sun Dec 12 22:34:06 2021 -0500

    add publishing config to avoid up-to-date

commit 5164d23a831beecc276e7ef7f2a206a0f9f61385
Merge: 17f3273dd b9c8900b1
Author: Xuan-1998 <[email protected]>
Date:   Fri Dec 10 18:32:03 2021 -0800

    Merge branch 'develop' into xj/Include_activitysim_trip_id_as_attribute_in_BEAM_plans_#3368

commit 17f3273dd665eb64a12d371e260d802bd0baae66
Author: Xuan-1998 <[email protected]>
Date:   Fri Dec 10 17:04:57 2021 -0800

    fix-compilation

commit e5e53b23479748cbea8a3a7c599d0df35e364cdd
Author: Xuan-1998 <[email protected]>
Date:   Fri Dec 10 16:56:26 2021 -0800

    fix-test

commit 7fa7c42a4e8344c5b7f1f9a9186f0ed8501423cb
Author: Xuan-1998 <[email protected]>
Date:   Fri Dec 10 16:43:42 2021 -0800

    scalafmtAll

commit a62aea17be64eac6ea4e33aa49ee46c55a4fce5c
Author: Xuan-1998 <[email protected]>
Date:   Fri Dec 10 16:24:05 2021 -0800

    fix-Some(Some(12345))-problem

commit adaa52df4d5c231471bb902222f20f534648ef5c
Author: Xuan-1998 <[email protected]>
Date:   Fri Dec 10 13:56:55 2021 -0800

    neweser-id

commit b9c8900b11070bcf5665eb2eda3d205e93699cd4
Merge: b20e280c6 1503c9c40
Author: Nikolay Ilyin <[email protected]>
Date:   Fri Dec 10 17:09:45 2021 +0300

    Merge pull request #3157 from LBNL-UCB-STI/dogurtsov/gh-alt-route

    GH alternative route

commit b7fd87511d1a822840d2a97cb644d459eceae383
Author: Nikolay Ilyin <[email protected]>
Date:   Fri Dec 10 17:06:02 2021 +0300

    unnecessary commit removed because test is working now

commit 82d20b3e35ab3ba0af879ce829576ec69c19abe3
Merge: 2e583a27c b20e280c6
Author: Nikolay Ilyin <[email protected]>
Date:   Fri Dec 10 17:01:33 2021 +0300

    Merge branch 'develop' into inm/activities-with-fixed-duration

commit b20e280c68fc4450036f05de31d04a8dff953c44
Merge: 147029951 5e53e4471
Author: Nikolay Ilyin <[email protected]>
Date:   Fri Dec 10 16:40:43 2021 +0300

    Merge pull request #3410 from LBNL-UCB-STI/inm/fix-for-tests

    Possible fix for flaky tests

commit 1503c9c40b221c5760f07ec2d3b69a9a29c1f4f7
Author: Alexander Vykhodtsev <[email protected]>
Date:   Fri Dec 10 19:12:02 2021 +0600

    Change to Bushwhacking

commit 76b2f6e1ab63b809282615530ada0375bb1920bf
Merge: 5b8993d9c 147029951
Author: Alexander Vykhodtsev <[email protected]>
Date:   Fri Dec 10 18:57:07 2021 +0600

    Merge branch 'develop' into dogurtsov/gh-alt-route

commit 5b8993d9c1a74e78ebc94e1cc73e86a78a891e22
Author: Alexander Vykhodtsev <[email protected]>
Date:   Fri Dec 10 18:52:18 2021 +0600

    Add docs about GraphHopper router and alternative routes

commit 0016c4f624d3cc347fd1ae963cb58717411a5157
Author: Alexander Vykhodtsev <[email protected]>
Date:   Fri Dec 10 17:19:10 2021 +0600

    Fix test case for alt routes

commit 2e583a27c3018de261f8820c2a82d1eca9b351c0
Author: Nikolay Ilyin <[email protected]>
Date:   Thu Dec 9 19:30:09 2021 +0300

    skipping physsim

commit a74ed73135740e7fc1b9ec4a11e7a07a6ea6086c
Merge: 2a9c56e48 5e53e4471
Author: Nikolay Ilyin <[email protected]>
Date:   Thu Dec 9 19:29:45 2021 +0300

    Merge branch 'inm/fix-for-tests' into inm/activities-with-fixed-duration

commit 5e53e4471f1e68d6b4df4e71ba63abe8a65fefbf
Author: Nikolay Ilyin <[email protected]>
Date:   Thu Dec 9 19:27:56 2021 +0300

    possible fix for flaky tests

commit 2a9c56e480088a4fcf755761551f57a5a74709e6
Author: Nikolay Ilyin <[email protected]>
Date:   Thu Dec 9 13:59:46 2021 +0300

    not using system properties to store configFileLocation

commit d248a1975809494fc96173a4ad5efec1049a9013
Author: Xuan-1998 <[email protected]>
Date:   Wed Dec 8 13:27:58 2021 -0800

    fix-test

commit fb72f24e54ba024c068b1b9b61081ed885629a67
Author: Xuan-1998 <[email protected]>
Date:   Wed Dec 8 12:59:58 2021 -0800

    fix-tripId-null

commit 6a07b2eb1abf0c386c7eca278da59a695a5a28f6
Author: Xuan-1998 <[email protected]>
Date:   Wed Dec 8 12:56:54 2021 -0800

    further-fix

commit e6d5abdd3af62934def74809a5e52e4d4239b563
Author: Nikolay Ilyin <[email protected]>
Date:   Wed Dec 8 23:53:46 2021 +0300

    bugfix for debugging

commit 3c78f8c667553b8522a992549671ad0f8755a67c
Author: Xuan-1998 <[email protected]>
Date:   Wed Dec 8 12:51:27 2021 -0800

    switch-tripId-tobe-optional

commit 2ee13f7fde2f82a6f8c4fb2e73faa47d8ea2455a
Author: Nikolay Ilyin <[email protected]>
Date:   Wed Dec 8 23:01:47 2021 +0300

    debugging test

commit 29b39de0b109b8498ccb817b0d8c6a24d0b6845d
Author: Nikolay Ilyin <[email protected]>
Date:   Wed Dec 8 22:22:22 2021 +0300

    debugging of test

commit 7c57b223183aa47999a34de7729b75c391bd4a54
Author: Nikolay Ilyin <[email protected]>
Date:   Wed Dec 8 18:33:12 2021 +0300

    debugging strange test behaviour

commit a440f92afb87e735ad12affb4c2c6928e5e9e6dd
Author: rajnikant <[email protected]>
Date:   Tue Dec 7 20:59:36 2021 +0530

    add health metrics analysis in beam output directory

commit 124ed7adf3d91de961990b711ea893d4ed51c8fe
Author: Nikolay Ilyin <[email protected]>
Date:   Tue Dec 7 17:57:21 2021 +0300

    lower expected duration

commit ce0c532738faa6b5fefe31a18b6cf3019320054a
Author: Alexander Vykhodtsev <[email protected]>
Date:   Tue Dec 7 19:44:52 2021 +0600

    Add `router` field to RouteDumper

commit 052b1d4b0635f0e936e4609a5278b903d4f64a8a
Author: Zach Needell <[email protected]>
Date:   Mon Dec 6 16:18:25 2021 -0800

    typo!

commit 12758c740ad4bff29761e5ff03048cd6244d3f85
Author: Zach Needell <[email protected]>
Date:   Mon Dec 6 16:00:12 2021 -0800

    logic tweaks

commit c806dfbbb51d49c754c8aaa576252a3df60fceee
Author: Zach Needell <[email protected]>
Date:   Mon Dec 6 15:49:14 2021 -0800

    Put a hard cap on access (aka offset) distance

commit 7b33c6e08d77031f27d79d96d784e73b87f3b8ac
Author: Zach Needell <[email protected]>
Date:   Mon Dec 6 15:39:33 2021 -0800

    fix tests, additional logic fixes

commit b9b7060431265cf8f20e6cf570ceddad445ee590
Author: Zach Needell <[email protected]>
Date:   Mon Dec 6 15:13:08 2021 -0800

    pass 'closestZone' param to parking sample to ensure that at least one zone samples near request

commit 147029951f903d16b55052558295aaa8b7f4e9e0
Merge: a7f4c2316 9fc198caf
Author: Grigory Derzhavets <[email protected]>
Date:   Mon Dec 6 21:48:16 2021 +0300

    Merge pull request #3403 from LBNL-UCB-STI/rajnikantsh/fix-auto-configure-memory

    Remove default max from auto configuration

commit 9fc198caf42b3db0a653153780e04db3f636251c
Author: rajnikant <[email protected]>
Date:   Mon Dec 6 22:22:25 2021 +0530

    formatting

commit 2952a751851e93c54c87ee91bb158f11bc3c0753
Author: rajnikant <[email protected]>
Date:   Mon Dec 6 22:17:02 2021 +0530

    Remove default max from auto configuration

commit a7f4c2316f8bb92350abdfa9e3e1434513d4b133
Author: Grigory Derzhavets <[email protected]>
Date:   Mon Dec 6 05:57:16 2021 +0300

    fix data branch parameter aws deploy (#3398)

commit 90e8eaf7f6e57deb9233f23d0640214a814feed8
Author: Xuan-1998 <[email protected]>
Date:   Sun Dec 5 18:51:44 2021 -0800

    fix-tripId-null-input-issues

commit bd6b9df9a071336b9a6d97640a7292d10f981d56
Author: Xuan-1998 <[email protected]>
Date:   Sun Dec 5 18:17:54 2021 -0800

    scalafmtall

commit 34eae08cbbf55c630f90edb752a0ffe0985cd82b
Author: Xuan-1998 <[email protected]>
Date:   Sun Dec 5 18:17:12 2021 -0800

    delete-unused-import

commit 53da17a885ee069ede159ed2eb1b48f2c77644bf
Author: Xuan-1998 <[email protected]>
Date:   Sun Dec 5 18:08:48 2021 -0800

    fix build.gradle

commit 798f1c7b21f71ed32bc6c37938a26a44d4d01b1c
Merge: 355c05036 945ff889f
Author: Xuan-1998 <[email protected]>
Date:   Sun Dec 5 16:07:31 2021 -0800

    Merge branch 'develop' into xj/Include_activitysim_trip_id_as_attribute_in_BEAM_plans_#3368

commit 355c05036e355a22a32865237de50e0dec46a82b
Author: Xuan-1998 <[email protected]>
Date:   Sun Dec 5 15:46:34 2021 -0800

    more-fix-for-plantelement-test

commit 616cf780862db235d97a890c107f0da420a45da2
Author: Xuan-1998 <[email protected]>
Date:   Sun Dec 5 15:44:36 2021 -0800

    fix-test

commit 68598d68a1590d12827d878da0d16bf1ad36a645
Author: rajnikant <[email protected]>
Date:   Mon Dec 6 01:18:13 2021 +0530

    autoconfigure max ram (#3381)

    * autoconfigure max ram

    * revert HELICS changes

    * add data branch

    * remove max ram from lambda   function

    * rename method name

    * change max ram calculation

commit 01bfbf24afd6e524b3d77f20febda15364318ecd
Author: Nikolay Ilyin <[email protected]>
Date:   Sun Dec 5 16:53:43 2021 +0300

    less iterations for test

commit 0af4195bb53884f72604997642106c4736373239
Author: Xuan-1998 <[email protected]>
Date:   Sat Dec 4 23:38:52 2021 -0800

    beam-output-plnas-have-tripId-now

commit 659ecbe102e6e60e2ae0fa741b57c8e5db997613
Author: Xuan-1998 <[email protected]>
Date:   Fri Dec 3 20:48:43 2021 -0800

    fix-test

commit 1dee565a3b19daedd404807c1dfda0302415ebc8
Author: Xuan-1998 <[email protected]>
Date:   Fri Dec 3 18:32:13 2021 -0800

    scalafmt

commit 9110e7085a282daaa793639017939fa41723a61d
Author: Xuan-1998 <[email protected]>
Date:   Fri Dec 3 18:31:09 2021 -0800

    fix-peer-advice

commit 39ae37add7c81e03dfc90f6cb086eb970f619a84
Author: Xuan-1998 <[email protected]>
Date:   Fri Dec 3 17:34:25 2021 -0800

    trip_id_for_ModeChoice_event

commit 644ffdb5bc977b7bb073f2ca6fbea62c14d1de1e
Author: Xuan-1998 <[email protected]>
Date:   Fri Dec 3 17:31:33 2021 -0800

    more-fix-for-further-iters-and-Option

commit dee811a777f60976ebeb2c77eab2b776aafbf43b
Author: Xuan-1998 <[email protected]>
Date:   Fri Dec 3 16:52:57 2021 -0800

    more-Option-fix

commit beeb4d125cc359c28f5546300cba0203cb896b04
Author: Xuan-1998 <[email protected]>
Date:   Fri Dec 3 16:43:54 2021 -0800

    scalafmt

commit 3e10ec0ce925768f0077bb1a565d3586bc949314
Author: Xuan-1998 <[email protected]>
Date:   Fri Dec 3 16:42:55 2021 -0800

    all-Option-fix

commit 5c6d776a411c85029cc50d63409aabd768e56ce3
Author: Xuan-1998 <[email protected]>
Date:   Fri Dec 3 16:39:38 2021 -0800

    more-fix-planswriter

commit eef4e5296c1f6305861b6d45f31cda9241171528
Author: Xuan-1998 <[email protected]>
Date:   Fri Dec 3 16:38:33 2021 -0800

    plansCsvWriter

commit 643c35f1df48c62db9c51cfb245584ec5a637bdd
Author: Xuan-1998 <[email protected]>
Date:   Fri Dec 3 16:38:15 2021 -0800

    switch_tripId_Option

commit b5ddd183b3274dcc938109765cf2134c3dd86db3
Author: Xuan-1998 <[email protected]>
Date:   Fri Dec 3 10:54:22 2021 -0800

    change-PlansCsvWriter

commit a9533e1094e9f185883eab133a458640b4ae7b3b
Author: Xuan-1998 <[email protected]>
Date:   Fri Dec 3 10:39:19 2021 -0800

    put-value-into-leg

commit bd7078eaf65b9aa0bc581c34ed9423ac1d7e5eb1
Author: Xuan-1998 <[email protected]>
Date:   Fri Dec 3 08:20:54 2021 -0800

    solve-inputelement

commit 477a1e2b67d0b99065657a5f711a127bc887fd1d
Author: Xuan-1998 <[email protected]>
Date:   Fri Dec 3 08:19:55 2021 -0800

    fix-null-value

commit ac0c15d48b4a310a0effd7e5d07b6e2de61d8247
Author: Xuan-1998 <[email protected]>
Date:   Fri Dec 3 08:16:33 2021 -0800

    fix-null-value

commit cd7297baf27c836886d9c690448d558b7104c3f7
Author: Xuan-1998 <[email protected]>
Date:   Fri Dec 3 08:13:40 2021 -0800

    fix-name-in-modechoice

commit f50677c2e528332a10bcb7c8ad52a512c0bb2eb7
Author: Nikolay Ilyin <[email protected]>
Date:   Fri Dec 3 17:50:31 2021 +0300

    fixed activity duration based on the activity name

commit eb115e0e9889a6ee4102f92820002c94709e17e1
Author: Xuan-1998 <[email protected]>
Date:   Thu Dec 2 22:10:16 2021 -0800

    was-trying-to-put-tripid-into-Leg

commit da3dd797b922d06cf12cad2b853e76b404850353
Author: Xuan-1998 <[email protected]>
Date:   Thu Dec 2 21:09:50 2021 -0800

    bac-format

commit 2b1e2ba49d948ba7cfba5fd15d64837f8188a55f
Author: Xuan-1998 <[email protected]>
Date:   Thu Dec 2 21:08:21 2021 -0800

    back-format

commit d27e9d0b24ba3b7e4467c0938059bab031b201ac
Author: Xuan-1998 <[email protected]>
Date:   Thu Dec 2 20:49:04 2021 -0800

    try-this-format

commit 6e2344a1a2ef9d5a87fe1568a3def7e5c387b2ea
Author: Xuan-1998 <[email protected]>
Date:   Thu Dec 2 20:45:57 2021 -0800

    scalafmt

commit 9b467cb36aa88d62d073d0e2e3b06686b98cfe49
Author: Xuan-1998 <[email protected]>
Date:   Thu Dec 2 20:38:40 2021 -0800

    trip_id_for_plan_works

commit 42cfdb00e1df74f7d9cddfbd065a596df2f91ae5
Author: Xuan-1998 <[email protected]>
Date:   Thu Dec 2 20:29:41 2021 -0800

    fix-for-outputting-plans

commit 2d9af5f653ae37e7b8babc200357f89938363a68
Author: Xuan-1998 <[email protected]>
Date:   Thu Dec 2 20:10:02 2021 -0800

    need-a-place-to-putAttribute

commit 6289cf5ed5ba49aaa9aad92c7965eddca5ec4946
Author: Xuan-1998 <[email protected]>
Date:   Thu Dec 2 20:00:49 2021 -0800

    fix-trip-id

commit 7ce6f64bad5167257ddaf8bfa721ec02ac79fa3a
Author: Xuan-1998 <[email protected]>
Date:   Thu Dec 2 19:28:36 2021 -0800

    tripID

commit 4fa80defacc0cbc1bb7a492f07d2a986ff0169a4
Author: Xuan-1998 <[email protected]>
Date:   Thu Dec 2 18:50:27 2021 -0800

    more-trip-id

commit bf6f0d7f2b16f76782b124b90bbf795788892bbf
Author: Xuan-1998 <[email protected]>
Date:   Thu Dec 2 17:02:35 2021 -0800

    scalafmt

commit 9213e40c827b1c4a26446a3cf1b23ad892b0cbfc
Author: Xuan-1998 <[email protected]>
Date:   Thu Dec 2 15:15:17 2021 -0800

    except-for-those-need-to-fix

commit d44f0e916c9bd696798f69c79e1df07bdd2a68c9
Author: Xuan-1998 <[email protected]>
Date:   Thu Dec 2 15:01:32 2021 -0800

    still lacking a way to get trip_id

commit 13ade82018a04fdf30209f9d3ad233f12a513b5d
Author: Jiang Xuan <[email protected]>
Date:   Thu Nov 18 00:20:22 2021 -0800

    lacking-a-way-to get trip_id

commit 2292cad8a2208859ff9c36c60d5363cc12e5efc9
Author: Jiang Xuan <[email protected]>
Date:   Thu Nov 18 00:04:12 2021 -0800

    filterPointsInShapeFile

commit 6f5148e5869acc24501e9190ed407809dfb7b2b3
Author: Jiang Xuan <[email protected]>
Date:   Wed Nov 17 23:59:08 2021 -0800

    adding-tripId-into-elements

commit 945ff889f161940d420d3f981791dbf19b6bc25a
Merge: 3d2ea187c 8e988c3e9
Author: Xuan-1998 <[email protected]>
Date:   Thu Dec 2 14:02:05 2021 -0800

    Merge pull request #3377 from LBNL-UCB-STI/Xuan/Enable-Carusage-for-scenarios

    Xuan/enable carusage for scenarios

commit 8e988c3e98aaf78147a58c532d5ae22b5c2f5587
Author: Justin Pihony <[email protected]>
Date:   Thu Dec 2 14:51:31 2021 -0500

    handle null

commit 3d2ea187c0f11aa233b745a96010d6c0ecb8e522
Merge: 3115c70b8 1c76d0c98
Author: Xuan-1998 <[email protected]>
Date:   Wed Dec 1 22:58:38 2021 -0800

    Merge pull request #3382 from LBNL-UCB-STI/Xuan/#3330_additional_parameters_for_links_2

    Xuan/#3330 additional parameters for links -- R5MnetBuilder

commit 59b62fd8d02d90765ee62c863463c3c9c0199607
Author: Alexander Vykhodtsev <[email protected]>
Date:   Wed Dec 1 19:02:06 2021 +0600

    Add test case for alt routes

commit ae30c007d47824c12d0b2b07898d1176107265da
Author: Alexander Vykhodtsev <[email protected]>
Date:   Wed Dec 1 16:47:19 2021 +0600

    Add alternativeRoutes option to configs

commit 1c76d0c98c28ee0419122e4391028a0e27acd518
Author: Xuan-1998 <[email protected]>
Date:   Tue Nov 30 23:55:33 2021 -0800

    upgrade-version

commit a52a83316f138a2554f5391ac0aaa93be92d51db
Author: Xuan-1998 <[email protected]>
Date:   Tue Nov 30 23:39:38 2021 -0800

    0.2.13-released

commit 81b5eafa4c0d854337ac17e86f7a18d56a0ae908
Author: Xuan-1998 <[email protected]>
Date:   Tue Nov 30 23:15:38 2021 -0800

    fix-version-issues

commit 33fecdf753c08c92130285a00f82c89de190d259
Author: Xuan-1998 <[email protected]>
Date:   Tue Nov 30 22:36:46 2021 -0800

    publish-new-release-for-beam-utilities

commit 6c5d2806ea6589b74367fa1ca599a2cec5ff1580
Author: Xuan-1998 <[email protected]>
Date:   Tue Nov 30 22:08:03 2021 -0800

    move-OsmToMATSim-to-beam-utilities

commit f3e58c6b37bb1d7f66c47a368c97d057e17ea184
Author: Justin Pihony <[email protected]>
Date:   Tue Nov 30 23:19:47 2021 -0500

    fix tests

commit 3115c70b822d1a555586853a626f8259830db25b
Merge: 458f1c00d 9bb6b8773
Author: Haitam Laarabi <[email protected]>
Date:   Mon Nov 29 23:29:01 2021 -0800

    Merge pull request #3340 from LBNL-UCB-STI/hl/inSimulation-charging-scaleUp

    In-simulation charging scale up

commit 9bb6b8773a1a9bbb4d2755d216bfb07d7ad86cc0
Author: Haitam Laarabi <[email protected]>
Date:   Mon Nov 29 22:10:17 2021 -0800

    addressing @JustinPihony

commit f76984e41065a9cc0b4723ff7c9d80760ee3a2f0
Author: Xuan-1998 <[email protected]>
Date:   Thu Nov 25 11:03:12 2021 -0800

    adding-alpha-beta-to-OsmToMATSim

commit ee8c8033e122a5f4e879166f29c4199d384c43a6
Author: Xuan-1998 <[email protected]>
Date:   Thu Nov 25 10:57:54 2021 -0800

    give-value-to-R5MnetBuilder

commit b5c2c6e28ee597c768fdb439869ffeac8ec45d83
Author: Xuan-1998 <[email protected]>
Date:   Wed Nov 24 17:09:19 2021 -0800

    scalafmt

commit c1d7cdbe96b972c7e0b73c4fd5e484fb7f4bf374
Author: Xuan-1998 <[email protected]>
Date:   Wed Nov 24 17:00:44 2021 -0800

    beamconfig

commit dfda1b986a2a80b93671b34fcedd9afbd17d9c83
Author: Xuan-1998 <[email protected]>
Date:   Wed Nov 24 16:58:10 2021 -0800

    beamscenarios

commit da66bd7efe8c846ea046ad68bad7e261d07cfe7f
Author: Xuan-1998 <[email protected]>
Date:   Wed Nov 24 10:07:08 2021 -0800

    BeamHelper-modification

commit db8a835112beca8bae6c0109a4e5b8185031951e
Author: Xuan-1998 <[email protected]>
Date:   Wed Nov 24 10:05:30 2021 -0800

    adding-GTFSUtils

commit 1f87c693672b36f163aad27f83020c664faeb13d
Author: Xuan-1998 <[email protected]>
Date:   Wed Nov 24 10:04:38 2021 -0800

    persenAgent-modification

commit 81876ed5ec69802e0ba9d0843ef3689eea21b1af
Author: Xuan-1998 <[email protected]>
Date:   Wed Nov 24 09:57:37 2021 -0800

    adding beam-template

commit 458f1c00d42bd97edfff07ce6162508c1f1771a8
Merge: dc33f85d8 c5d52eb6e
Author: Xuan-1998 <[email protected]>
Date:   Wed Nov 24 17:10:31 2021 -0800

    Merge pull request #3367 from LBNL-UCB-STI/Xuan/#3330_Additional_parameters_for_links

    Xuan/#3330 additional parameters for links

commit dc33f85d83b0246560f5cc258367bd56eaf0fbe0
Merge: bfcf519f5 9600d5f7c
Author: Dmitrii Openkov <[email protected]>
Date:   Tue Nov 23 15:46:01 2021 +0300

    Merge pull request #3371 from LBNL-UCB-STI/do/#3361-no-itiniraries-r5-fix

    Fix r5 issue: No valid itineraries found for path computed in RaptorWorker

commit 9600d5f7c07a6766d8dbb2ca3157afd2b9129f8e
Author: Dmitry Openkov <[email protected]>
Date:   Tue Nov 23 14:54:24 2021 +0300

    Return the numbers of path types in order to fix tests after putting back .ceil

commit 60a7d93f91a36ac626fe8b2f1bf1f91c7350d582
Author: Dmitry Openkov <[email protected]>
Date:   Tue Nov 23 13:54:34 2021 +0300

    Fixing tests after putting back ceil into R5 travel time calculator

commit bfcf519f5d602d84dc36f3dd6f0228e3e7467c24
Merge: 71206f9ed d98dbbd65
Author: Nikolay Ilyin <[email protected]>
Date:   Tue Nov 23 13:02:58 2021 +0300

    Merge pull request #3372 from LBNL-UCB-STI/inm/fix-for-geometry-performance

    Fix for changed signature in GeometryPerformance

commit d98dbbd65f968d65e9255319fd7c2cef94b395b7
Author: Nikolay Ilyin <[email protected]>
Date:   Mon Nov 22 22:53:27 2021 +0300

    fix for changed signature

commit cc8fb6981bf13389caf7a9998c478d7a60a66193
Author: Dmitry Openkov <[email protected]>
Date:   Mon Nov 22 16:52:02 2021 +0300

    Fixed an R5 issue No valid itineraries found; when no travel time rounding

commit 71206f9ed3e76f7bc0ddb0ae19248d5691bf450a
Merge: ccae107f1 d2141ae9b
Author: Zach Needell <[email protected]>
Date:   Fri Nov 19 09:51:16 2021 -0800

    Merge pull request #3366 from LBNL-UCB-STI/zn/#3365-import-new-households

    merge new households too

commit ccae107f177c2065b5d3a3222697afc337a732ba
Merge: f54e10dd0 e1b9ae963
Author: Dmitrii Openkov <[email protected]>
Date:   Thu Nov 18 12:31:31 2021 +0300

    Merge pull request #3345 from LBNL-UCB-STI/do/unit-test-round-uniformly

    Unit test for round uniformly

commit c5d52eb6e8419333a4fd4e5a7e609e96080401ef
Author: Jiang Xuan <[email protected]>
Date:   Thu Nov 18 00:27:42 2021 -0800

    get values from config files

commit ff7d4ca119f37fb939a58feac8eeb05c45854f99
Author: Jiang Xuan <[email protected]>
Date:   Wed Nov 17 23:36:02 2021 -0800

    delete useless alphas and betas

commit e71a45ad60899e23a57632b6f8872dc60bb92f32
Author: Jiang Xuan <[email protected]>
Date:   Wed Nov 17 23:33:23 2021 -0800

    instead of formatting a Double and parsing it back.

commit 9157d4eff39f50655fabbd26226354054aae618d
Author: Jiang Xuan <[email protected]>
Date:   Wed Nov 17 14:29:22 2021 -0800

    revert unnecessary changes

commit 19a18d5240a9919cbb61de623ed05ed8cbf297fd
Author: Jiang Xuan <[email protected]>
Date:   Wed Nov 17 14:27:37 2021 -0800

    fix-comments

commit dd1416805cfca240b027621913bcce22b353edce
Author: Jiang Xuan <[email protected]>
Date:   Wed Nov 17 13:48:43 2021 -0800

    add-test-scalafmt

commit fece94f5127f8f48beb2c98f64d9b5c25337e7a4
Author: Jiang Xuan <[email protected]>
Date:   Wed Nov 17 13:42:54 2021 -0800

    fix-small-bugs-scalafmt

commit 44a1df235160ae4be31af2fdf83896d0f0a6c0ba
Author: Jiang Xuan <[email protected]>
Date:   Wed Nov 17 13:36:50 2021 -0800

    scalafmtAll

commit 8805536ab9717b7080586ac2d76580f62b2aaa3e
Author: Jiang Xuan <[email protected]>
Date:   Wed Nov 17 13:36:07 2021 -0800

    delete-parameters-for-all

commit f4f6d3736295aac6ab14baa9102816a8d0a452d1
Author: Jiang Xuan <[email protected]>
Date:   Wed Nov 17 13:34:31 2021 -0800

    delete-alpha-beta-for-all

commit 2f2827234bc06aa6c93c51371aaeceddd3b6e0f9
Author: Jiang Xuan <[email protected]>
Date:   Wed Nov 17 13:32:30 2021 -0800

    scalafmtAll

commit 50838eff3fdc3c1c5454e8170712801d93f6d67e
Author: Jiang Xuan <[email protected]>
Date:   Wed Nov 17 13:31:49 2021 -0800

    parameters for different categories

commit f48de88406794f073172b303c4a8b095c3636896
Author: Jiang Xuan <[email protected]>
Date:   Wed Nov 17 13:18:25 2021 -0800

    beamconfig+fmt

commit f68e7b0917a78493a86829e28cb757cf81bac5a1
Author: Jiang Xuan <[email protected]>
Date:   Wed Nov 17 12:56:41 2021 -0800

    fix-bugs

commit 59ee826556f38bbd860ac67d58526cfa1d3f703c
Author: Jiang Xuan <[email protected]>
Date:   Wed Nov 17 08:10:59 2021 -0800

    config-for-category-param

commit b9f76ea71e7965b406ca1bb636d7eb831e87dd5c
Author: Jiang Xuan <[email protected]>
Date:   Wed Nov 17 06:19:31 2021 -0800

    some-fix-more-todo

commit 7d09431ee69d888454210a1f4ea9afb9c8efcb0d
Author: Jiang Xuan <[email protected]>
Date:   Wed Nov 17 06:11:25 2021 -0800

    while-caccsettings

commit 9ec1bc5cc682acfa09cbf5b6a059637401a72683
Author: Jiang Xuan <[email protected]>
Date:   Wed Nov 17 05:58:49 2021 -0800

    fmtscala

commit 97a6dd9a2480c8794356e280b4cb234a68d5fcc9
Author: Jiang Xuan <[email protected]>
Date:   Wed Nov 17 05:48:46 2021 -0800

    adding parameters comments

commit f54e10dd0ee31c5c0183ccffd6dd8449abf03cf8
Merge: d18fa64b6 cd00f1b30
Author: Nikolay Ilyin <[email protected]>
Date:   Wed Nov 17 14:10:45 2021 +0300

    Merge pull request #3364 from LBNL-UCB-STI/do/#3363-DefaultVehicleType-not-found

    Fix key not found: DefaultVehicleType

commit d18fa64b6bf0b5f2e5e8ea5abde6e9cfabe5d3e4
Merge: 1e21e3525 77a880a42
Author: Dmitrii Openkov <[email protected]>
Date:   Wed Nov 17 12:43:12 2021 +0300

    Merge pull request #3362 from LBNL-UCB-STI/do/#3361-remove-rounding-travel-time

    Remove rounding of link travel times

commit b7b9b45a97faa9eb278a9421a24cfa1d1dcb5ee9
Author: Haitam Laarabi <[email protected]>
Date:   Tue Nov 16 22:01:46 2021 -0800

    merge2

commit 35e6eb5951ec86cae2629dd1e3f348dbfad1a44c
Author: Haitam Laarabi <[email protected]>
Date:   Tue Nov 16 21:54:11 2021 -0800

    merge

commit 56238be20c3e7129856de2f6fad121e6aa609c70
Author: Jiang Xuan <[email protected]>
Date:   Tue Nov 16 19:59:13 2021 -0800

    adding-parameters-for-links

commit 120e0022e3a8b5f1115e6547cbb62a7fb1ebd4db
Merge: cc9486a28 1e21e3525
Author: Haitam Laarabi <[email protected]>
Date:   Tue Nov 16 19:50:28 2021 -0800

    Merge remote-tracking branch 'origin/develop' into hl/inSimulation-charging-scaleUp

commit edc6981d4a809ec4a0f6ddd209ce03af3c3b22b9
Author: Jiang Xuan <[email protected]>
Date:   Tue Nov 16 19:41:30 2021 -0800

    adding config parameters

commit d2141ae9b21ee28d9883743ed6842b96c192c3b9
Author: Zach Needell <[email protected]>
Date:   Tue Nov 16 11:59:48 2021 -0800

    scalafmt in tests

commit b7b69ee40020fc85756279f635fdc4e01ceaa4c4
Author: Zach Needell <[email protected]>
Date:   Tue Nov 16 10:56:30 2021 -0800

    merge new households too

commit 77a880a424229ac358eef30bce58fec993e6a46a
Author: Dmitry Openkov <[email protected]>
Date:   Tue Nov 16 14:12:49 2021 +0300

    Fixing tests after removal of link travel time rounding

commit cd00f1b30ec7a659d962b35d4db35a2e8d1207f3
Author: Dmitry Openkov <[email protected]>
Date:   Tue Nov 16 11:25:14 2021 +0300

    Put the missed vehicle type to vehicleTypes map with the corresponding vehicle type id

commit 1e21e35252f8385c8e3e04ead89280b24824c457
Merge: 54ab6135c 2e7070d56
Author: Nikolay Ilyin <[email protected]>
Date:   Mon Nov 15 17:26:52 2021 +0300

    Merge pull request #3359 from LBNL-UCB-STI/JustinPihony-patch-1

    Fix AMI cleanup bug

commit 02d72fb50a413724b14daffd7dd9900959506d9d
Author: Dmitry Openkov <[email protected]>
Date:   Mon Nov 15 15:10:14 2021 +0300

    Removed rounding of travel time in order to get link travel time more precise in Activity Sim

commit 2e7070d5657382fca10ce15a301119909df04bcb
Author: Justin Pihony <[email protected]>
Date:   Sun Nov 14 21:52:21 2021 -0500

    Fix AMI cleanup bug

commit d727dfc34b2ef932d5d111f0ee0048bc972fc696
Author: Alexander Vykhodtsev <[email protected]>
Date:   Thu Nov 11 21:47:56 2021 +0600

    formatting

commit 54ab6135c8a3b1e3118d7607ab1a5414927fb1f0
Merge: 4f668cd7a 8e708585b
Author: Nikolay Ilyin <[email protected]>
Date:   Thu Nov 11 15:11:55 2021 +0300

    Merge pull request #3356 from LBNL-UCB-STI/configuration-fix

    Add missing akka-router.conf for New York and Detroit

commit 8e708585bcb5d35e5eebff32fbf1d7e719edf692
Author: Alexander Vykhodtsev <[email protected]>
Date:   Thu Nov 11 16:53:56 2021 +0600

    Add missing akka-router.conf for New York and Detroit

commit 4f668cd7ab3e525147a995907c5425fe79af4b95
Merge: eba24d6c4 d63c9bd35
Author: Nikolay Ilyin <[email protected]>
Date:   Wed Nov 10 14:38:48 2021 +0300

    Merge pull request #3339 from LBNL-UCB-STI/rajnikantsh/#3328-prevent-termination-by-inputconsistency-4ci

    Remove throwing error from input consistency

commit eba24d6c46bc9f7d34122f74a615d502fcbf0f14
Merge: 8bb5ec290 2b3a0592e
Author: Nikolay Ilyin <[email protected]>
Date:   Wed Nov 10 14:32:29 2021 +0300

    Merge pull request #3354 from LBNL-UCB-STI/gd/update_helics_wrapper_to_2.6.2

    Update helics-wrapper to 2.6.2

commit 59012022b6a2a631a4204e2e369779735eb5d6d5
Merge: 6c6684d61 8bb5ec290
Author: Alexander Vykhodtsev <[email protected]>
Date:   Wed Nov 10 16:07:50 2021 +0600

    Merge branch 'develop' into dogurtsov/gh-alt-route

commit 8bb5ec290feb37eec83832162c27fbee24b2cdc9
Merge: 1da3a0efe 767180101
Author: Alexander Vykhodtsev <[email protected]>
Date:   Wed Nov 10 15:30:52 2021 +0600

    Merge pull request #3272 from LBNL-UCB-STI/alex-vv/#3254-separate-data-repos

    Production data in separate repos

commit 7671801018b26baa2cc07c4f9941bef6b8d0b87e
Author: Alexander Vykhodtsev <[email protected]>
Date:   Wed Nov 10 14:53:30 2021 +0600

    Doc update

commit 4c8802749ee5ff30a0fda4379aef422d8834a1ea
Author: Alexander Vykhodtsev <[email protected]>
Date:   Wed Nov 10 11:25:13 2021 +0600

    Update sfbay pointer

commit 2b3a0592ea4585b2c2e51cd59632737a8b6d7e84
Author: Grigory <[email protected]>
Date:   Tue Nov 9 10:27:47 2021 +0300

    update helics-wrapper to 2.6.2

commit cc9486a28fe3a45e3dd6fb210f2dc7d753f46719
Author: Haitam Laarabi <[email protected]>
Date:   Mon Nov 8 16:31:43 2021 -0800

    sampling activity type

commit 6c6684d61c66166af2486461dd641533d5020c40
Author: Alexander Vykhodtsev <[email protected]>
Date:   Fri Nov 5 19:50:22 2021 +0600

    Add config option for alternative routes

commit 04c94089f9ff85cd1819fb3f98abd552856d7794
Author: Alexander Vykhodtsev <[email protected]>
Date:   Thu Nov 4 18:56:45 2021 +0600

    Log data branch explicitly

commit cd75234307c1f415539348eae3bcb41a566f94e1
Merge: 30adb7ff1 1da3a0efe
Author: Alexander Vykhodtsev <[email protected]>
Date:   Thu Nov 4 18:32:29 2021 +0600

    Merge branch 'develop' into alex-vv/#3254-separate-data-repos

    # Conflicts:
    #	aws/src/main/python/beam_lambda/lambda_function.py

commit 1da3a0efe2dbd0c53090ec6f68463f6767c1e46f
Merge: aedcb3e2e a869fe4a5
Author: Alexander Vykhodtsev <[email protected]>
Date:   Thu Nov 4 18:29:57 2021 +0600

    Merge pull request #3352 from LBNL-UCB-STI/rajnikantsh/synch-beam-deploy-lambda

    sync beam deploy lambda

commit a869fe4a58644faf55ea673c9055428ed3dbd8fe
Merge: 426a1f8f3 aedcb3e2e
Author: Alexander Vykhodtsev <[email protected]>
Date:   Thu Nov 4 17:17:47 2021 +0600

    Merge branch 'develop' into rajnikantsh/synch-beam-deploy-lambda

commit 30adb7ff10f6cbb6948beb752da4ee1320cee3e8
Merge: 1c6c5a6bc aedcb3e2e
Author: Alexander Vykhodtsev <[email protected]>
Date:   Thu Nov 4 17:03:05 2021 +0600

    Merge branch 'develop' into alex-vv/#3254-separate-data-repos

commit d63c9bd357788ecb6a2f5ce9a06f4e8287251cdb
Author: rajnikant <[email protected]>
Date:   Wed Nov 3 00:58:39 2021 +0530

    remove private modifier

commit f234ace8e15a5893bcab6787c4d0488195e53f1d
Merge: 59dfae6f4 027c06c37
Author: rajnikant <[email protected]>
Date:   Wed Nov 3 00:55:57 2021 +0530

    Merge remote-tracking branch 'origin/rajnikantsh/#3328-prevent-termination-by-inputconsistency-4ci' into rajnikantsh/#3328-prevent-termination-by-inputconsistency-4ci

commit 59dfae6f4cfe03eeb15d36c689597c09087fb1a8
Author: rajnikant <[email protected]>
Date:   Wed Nov 3 00:55:36 2021 +0530

    fix test due to method visibility

commit aedcb3e2eb9d5982c3adcb4431bb21a82f6557d7
Merge: bdf148b9e d4b885dd7
Author: Nikolay Ilyin <[email protected]>
Date:   Tue Nov 2 21:39:45 2021 +0300

    Merge pull request #3353 from LBNL-UCB-STI/inm/fix-for-Network2ShapeFileTest

    fix for Network2ShapeFileTest

commit d4b885dd7e4db05a405d700830d4dfbd9c9dc6ba
Author: Nikolay Ilyin <[email protected]>
Date:   Tue Nov 2 20:31:56 2021 +0300

    fmt

commit 1c924e2c8882466cf85c9d006d4707fac10fd73b
Author: Nikolay Ilyin <[email protected]>
Date:   Tue Nov 2 19:08:14 2021 +0300

    fix

commit 027c06c374e5c9a42f7e581ef7601579e9ae4c8a
Author: Nikolay Ilyin <[email protected]>
Date:   Tue Nov 2 16:47:25 2021 +0300

    Update BeamVehicleUtils.scala

commit 426a1f8f3b3ba1fd13e3829aedc177f8934f2ebb
Author: rajnikant <[email protected]>
Date:   Tue Nov 2 11:09:07 2021 +0530

    Fix ec2 init command

commit 5dccce103151dd523ac8ecda5edc54bd47ca1208
Author: rajnikant <[email protected]>
Date:   Tue Nov 2 01:07:05 2021 +0530

    explicit convert int to string

commit 67a23e8c2dc1934b486c531be7ef60b84865fd2d
Author: rajnikant <[email protected]>
Date:   Tue Nov 2 00:36:55 2021 +0530

    fix python script

commit c720315719b443d2c0dc892598981a0f5028b5e7
Author: rajnikant <[email protected]>
Date:   Mon Nov 1 00:48:05 2021 +0530

    sync beam deploy lambda

commit bdf148b9ef7b23b3377ac628d42c82719380423b
Author: rajnikant <[email protected]>
Date:   Mon Nov 1 00:39:43 2021 +0530

    change slack notification from python script to lambda (#3334)

commit 94e1ddf6e02085043518dedf67b4d6d1a53930d1
Author: rajnikant <[email protected]>
Date:   Sun Oct 31 22:37:08 2021 +0530

    set default vehicle type as hardcoded vehicle type

commit d5e039280bd7a7433f1b6d80363e4cffc2cca5ea
Author: rajnikant <[email protected]>
Date:   Fri Oct 29 00:24:12 2021 +0530

    add default vehicle type if ridehailId and sharedCarId is not available

commit 40faabda8d7c015e28c273edd281814549976eea
Merge: a4c916e73 9fb9e055b
Author: Nikolay Ilyin <[email protected]>
Date:   Tue Oct 26 12:41:32 2021 +0300

    Merge pull request #3173 from LBNL-UCB-STI/inm/network-to-shape-refactoring

    matsim network to shape file converter

commit 1da14bc1141365edbbef1fcedbaa47b0049ea47c
Author: Haitam Laarabi <[email protected]>
Date:   Mon Oct 25 20:34:41 2021 -0700

    turning off scaleUp for tests classes

commit c3f92d5e445c85c2b901ee32689b74fb940ade5b
Author: Haitam Laarabi <[email protected]>
Date:   Mon Oct 25 15:00:50 2021 -0700

    fix critical progress

commit 531707dcd6aeca78feb98d1e8514cf4102984ec3
Author: Haitam Laarabi <[email protected]>
Date:   Mon Oct 25 14:39:02 2021 -0700

    addressing @JustinPihony comments

commit 9fb9e055b9e6df6dbc4ff9b494f19d05fe7520ea
Author: Nikolay Ilyin <[email protected]>
Date:   Mon Oct 25 18:33:41 2021 +0300

    fixes for review

commit e1b9ae9633c3af7f0d72f0db5f3c3626dad83114
Author: Dmitry Openkov <[email protected]>
Date:   Mon Oct 25 16:53:54 2021 +0300

    Enable ActivitySimSkimmer to use block groups as geo units for produced AS skim file.

commit a4c916e73d84117f46cdec44948271d42900dd7e
Merge: a46bfb8ef 18bfcd078
Author: Dmitrii Openkov <[email protected]>
Date:   Mon Oct 25 16:24:12 2021 +0300

    Merge pull request #3337 from LBNL-UCB-STI/do/#3335-adding-plans-not-replacing

    Merging ActivitySim plans with the plans from the previous iteration by adding them

commit a46bfb8efb8719f15d55d37f884f6492d97216bf
Merge: f763c20b1 08c90d649
Author: Dmitrii Openkov <[email protected]>
Date:   Thu Oct 21 18:05:24 2021 +0300

    Merge pull request #3320 from LBNL-UCB-STI/do/return_searched_modes

    Add searched modes to GH and native CCH result

commit 2932f033b6e3181ab163cfe135e2a627de1d1018
Author: Haitam Laarabi <[email protected]>
Date:   Wed Oct 20 18:45:51 2021 -0700

    adding scaling to test function

commit c437d853f54f3bdab4d53bdeae83713bc2e760be
Author: Haitam Laarabi <[email protected]>
Date:   Wed Oct 20 16:54:53 2021 -0700

    fmt

commit 1e5844e252f91f2ce36f1cf34445b7be86758e49
Merge: 067a20cdc f763c20b1
Author: Haitam Laarabi <[email protected]>
Date:   Wed Oct 20 14:33:10 2021 -0700

    Merge remote-tracking branch 'origin/develop' into hl/inSimulation-charging-scaleUp

commit c8a598ddafb80553b216166d74e3af13077927c9
Merge: b5e4f62df f763c20b1
Author: Alexander Vykhodtsev <[email protected]>
Date:   Mon Oct 18 16:24:06 2021 +0600

    Merge branch 'develop' into dogurtsov/gh-alt-route

commit f763c20b1506764f8bfeb972114b138562f7af61
Merge: 0e8d92cf8 21fbdc35e
Author: Alexander Vykhodtsev <[email protected]>
Date:   Mon Oct 18 16:23:23 2021 +0600

    Merge pull request #3336 from LBNL-UCB-STI/alex-vv/fix-route-dumper

    fix RouteDumper

commit 067a20cdca1cefc5e3524cc384687c9153336532
Author: Haitam Laarabi <[email protected]>
Date:   Sun Oct 17 20:47:38 2021 -0700

    fmt

commit 578f6949ba3bb832c2f1316e3ad9270e667a5e0c
Author: Haitam Laarabi <[email protected]>
Date:   Sun Oct 17 20:06:45 2021 -0700

    merging latest insimulations caling change

commit a10bc3403f348407cd3b5f4bb3992e9f663c4802
Merge: 3384012fb 0e8d92cf8
Author: Haitam Laarabi <[email protected]>
Date:   Sun Oct 17 19:51:36 2021 -0700

    Merge remote-tracking branch 'origin/develop' into hl/inSimulation-charging-scaleUp

commit a6a09e1305e8607f923fb88b5fd3807f8ac27bca
Author: rajnikant <[email protected]>
Date:   Sun Oct 17 23:50:14 2021 +0530

    Remove throwing error from input consistency

commit 08c90d64944f74643450f5ffb3c069cadde474a7
Author: Dmitry Openkov <[email protected]>
Date:   Fri Oct 15 14:59:36 2021 +0300

    Addressed peer review: improved readability

commit 18bfcd07811d83b3aa76b1a361db9dac85370459
Author: Dmitry Openkov <[email protected]>
Date:   Fri Oct 15 14:45:47 2021 +0300

    Adding external plans instead of replacing during Urbansim scenario loading

commit 21fbdc35e72ac54472ce421e35c84f582086e749
Author: Alexander Vykhodtsev <[email protected]>
Date:   Fri Oct 15 16:52:23 2021 +0600

    Fix test

commit c946ba222a4ce5f808a76705143c64874439b426
Author: Alexander Vykhodtsev <[email protected]>
Date:   Fri Oct 15 15:28:02 2021 +0600

    fix RouteDumper

commit 0e8d92cf8fedfbb41b71d540d5f1af0ab66cc1b1
Author: rajnikant <[email protected]>
Date:   Tue Oct 12 20:51:40 2021 +0530

    Beam Health Analysis script (#3314)

    * Beam Health Analysis script

commit 78f6437166bada6d0d6fc161f8b0ca0ba398553b
Merge: e608f7cb7 0538ccc24
Author: Nikolay Ilyin <[email protected]>
Date:   Mon Oct 11 12:11:35 2021 +0300

    Merge pull request #3325 from LBNL-UCB-STI/do/removed_trips_from_urbansim_scenario_reader

    Get leg mode directly from Urbansim plans

commit 3384012fbcdbbf599a1bb0d81f38dacedb49b747
Author: Haitam Laarabi <[email protected]>
Date:   Fri Oct 8 00:15:37 2021 -0700

    this fix seesm to be working

commit c1f6accf437b7fbe00ebde1404c21679013c5c6e
Author: Haitam Laarabi <[email protected]>
Date:   Wed Oct 6 23:59:06 2021 -0700

    deleting CHargingDataInquiry

commit 50ff13eec1cfd427ae9824934ee74a993c241f2f
Author: Haitam Laarabi <[email protected]>
Date:   Wed Oct 6 23:55:11 2021 -0700

    keeping only parking inquiry

commit 1de5963f4837cd9e27f2b96781d6263a8838fd4b
Merge: df7131be1 e608f7cb7
Author: Haitam Laarabi <[email protected]>
Date:   Wed Oct 6 17:50:11 2021 -0700

    develop merge

commit df7131be1756eb8b51e51da77900466f13e8e7f9
Author: Haitam Laarabi <[email protected]>
Date:   Wed Oct 6 17:48:23 2021 -0700

    fixing simulateEvent

commit 647fa7018d62efe8f69e1aeaa6d6870ac14afdfc
Author: Haitam Laarabi <[email protected]>
Date:   Wed Oct 6 16:57:55 2021 -0700

    making SOC double not in

commit ce72d2c65fcbdcde144d8a0567d848f4bd876018
Author: Haitam Laarabi <[email protected]>
Date:   Wed Oct 6 16:52:55 2021 -0700

    moving from zoneId to tazId,chargingType

commit e608f7cb7e99dd1719849b68d62a800cfb5d3220
Merge: e0dffb87c 73630ca12
Author: Haitam Laarabi <[email protected]>
Date:   Tue Oct 5 19:16:37 2021 -0700

    Merge pull request #3319 from LBNL-UCB-STI/hl/parking-zones-at-link-level

    Parking zones at link level

commit 73630ca125ab1918cfe797e19444b6f69f964319
Merge: 977622622 e0dffb87c
Author: Haitam Laarabi <[email protected]>
Date:   Tue Oct 5 16:26:48 2021 -0700

    Merge remote-tracking branch 'origin/develop' into hl/parking-zones-at-link-level

commit d7d073f06a9db0e0f933351d8990283e5060c484
Author: Haitam Laarabi <[email protected]>
Date:   Tue Oct 5 16:23:53 2021 -0700

    switch from ParkingZoneId to tazid,chargingType

commit e0dffb87c1b195c40b5f47fd209f3bf4fb6ce3b8
Merge: 0201a1fb5 c7bbef42e
Author: Grigory Derzhavets <[email protected]>
Date:   Tue Oct 5 17:54:45 2021 +0300

    Merge pull request #3321 from LBNL-UCB-STI/gd/fix_check_docker_is_running_for_CCHRoutingAssignment

    fix check docker is running for CCHRoutingAssignment

commit 0538ccc24fe31f628f065733f46a27eccdf78cce
Author: Dmitry Openkov <[email protected]>
Date:   Tue Oct 5 11:39:55 2021 +0300

    fmt

commit 3cf82dfdc71bb84b7bbf4d9e875357f68924481c
Merge: 59ac5a1e4 0201a1fb5
Author: Dmitry Openkov <[email protected]>
Date:   Tue Oct 5 11:37:42 2021 +0300

    Merge branch 'develop' into do/removed_trips_from_urbansim_scenario_reader

commit 0201a1fb5bf2984286aa115e14b4272d34fc578c
Merge: 066aafe16 49a29ec78
Author: Dmitrii Openkov <[email protected]>
Date:   Tue Oct 5 11:35:13 2021 +0300

    Merge pull request #3323 from LBNL-UCB-STI/rrp/3322-insulate-mutation-calls

    #3322 fixes mutation issue

commit eb01ef63533cb38935cc7845f2f2d1735ca4be1e
Author: Haitam Laarabi <[email protected]>
Date:   Tue Oct 5 00:48:23 2021 -0700

    a potential fix

commit be0b92734bd84e8fb18917dcdd663756c8f087bc
Author: Haitam Laarabi <[email protected]>
Date:   Mon Oct 4 20:35:00 2021 -0700

    fmt

commit fdfdb584218548488bb838b5b49d72e410c875cd
Author: Haitam Laarabi <[email protected]>
Date:   Mon Oct 4 20:34:00 2021 -0700

    separating parking file from charging file while backward compatibility

commit b146653505e3b84bb2e92a4aae6d2c9ea4a16923
Author: Haitam Laarabi <[email protected]>
Date:   Mon Oct 4 18:27:47 2021 -0700

    removing tick + parallelism window. it doesn't serve the purpose

commit 10619fcc1395e6f33dd9ecf968ed6f23c92491b8
Author: Haitam Laarabi <[email protected]>
Date:   Mon Oct 4 17:52:17 2021 -0700

    adding ChargingNetworkHelper

commit 0d5c9a360979dcafd8dac1c481dc5a4fe2d56abb
Author: Haitam Laarabi <[email protected]>
Date:   Mon Oct 4 17:22:11 2021 -0700

    breaking down CNM to CNM, CNMHelper and ScaleUpCharging

commit c7bbef42e0601d600c2e62ccf6481536d45fdfac
Merge: 43a467071 066aafe16
Author: Grigory Derzhavets <[email protected]>
Date:   Mon Oct 4 21:50:39 2021 +0300

    Merge branch 'develop' into gd/fix_check_docker_is_running_for_CCHRoutingAssignment

commit 49a29ec786fb22699ae4748993149a44813be5a8
Merge: 5a7230aa0 066aafe16
Author: Rutvik Patel <[email protected]>
Date:   Mon Oct 4 18:39:24 2021 +0530

    Merge branch 'develop' into rrp/3322-insulate-mutation-calls

commit 066aafe164018be0465f47560274fb17f364a072
Merge: fde62b01a 1ed331527
Author: Alexander Vykhodtsev <[email protected]>
Date:   Mon Oct 4 16:49:27 2021 +0600

    Merge pull request #3318 from LBNL-UCB-STI/alex-vv/3306-input-consistency-check

    Add Input Consistency Check

commit 5a7230aa0a0c5801d94cc6313380b03c0bcaf57e
Author: Rutvik Patel <[email protected]>
Date:   Mon Oct 4 15:42:55 2021 +0530

    fixes mutation issue

commit b5e4f62dfbb55d922d0c10405d1fc0bfd5941769
Merge: 926cc9117 fde62b01a
Author: Alexander Vykhodtsev <[email protected]>
Date:   Mon Oct 4 15:29:24 2021 +0600

    Merge branch 'develop' into dogurtsov/gh-alt-route

commit 43a467071ea986a1026ebaf3536ba4cc49c1214f
Author: Nikolay Ilyin <[email protected]>
Date:   Sun Oct 3 18:42:13 2021 +0300

    Update BeamHelper.scala

commit efc8b3f4922fa0859a8620169bcfc5a424514b82
Author: Nikolay Ilyin <[email protected]>
Date:   Sun Oct 3 18:35:34 2021 +0300

    Update BeamHelper.scala

    this is an error in config

commit e7d1f152b414150beaebad95eb159e937061bf73
Author: Grigory Derzhavets <[email protected]>
Date:   Sun Oct 3 16:34:09 2021 +0300

    log when beam.physsim.name is not set in config

commit 00da0d9b5d2240657b9dbcc8f5ebede4dcf7a6be
Author: Grigory Derzhavets <[email protected]>
Date:   Sun Oct 3 13:58:17 2021 +0300

    rename variable

commit d45f647f82ab6607e4a5a01cd2ab4ee6ea8a3973
Author: Grigory Derzhavets <[email protected]>
Date:   Sun Oct 3 13:54:47 2021 +0300

    fix check docker is running for CCHRoutingAssignment

commit 38f73a0e45281ef0f27c71771a51fc3c9b7309e2
Author: Haitam Laarabi <[email protected]>
Date:   Fri Oct 1 22:53:21 2021 -0700

    initial setup of scaling up

commit 97762262201d8ab99e4bca6d61e3a9a0b944078c
Merge: 8a64c1d31 fde62b01a
Author: Haitam Laarabi <[email protected]>
Date:   Fri Oct 1 12:27:09 2021 -0700

    Merge remote-tracking branch 'origin/develop' into hl/parking-zones-at-link-level

commit 8a64c1d3177204a1f08e1a60f2016d92e1df802d
Author: Haitam Laarabi <[email protected]>
Date:   Fri Oct 1 11:29:32 2021 -0700

    parenthesis before match

commit eef484978a948845069b918caea13b1ec09f4ebd
Author: Haitam Laarabi <[email protected]>
Date:   Fri Oct 1 09:54:36 2021 -0700

    fmt

commit 13fcdb05cc3c0f0e77beef9ee29fd041deff827e
Author: Haitam Laarabi <[email protected]>
Date:   Fri Oct 1 09:50:34 2021 -0700

    addressing @dimaopen comments

commit 1ed331527e126bd4b5a8f75107c8551c71b4e03c
Author: Alexander Vykhodtsev <[email protected]>
Date:   Thu Sep 30 21:34:14 2021 +0600

    fix UrbanSimRunSpec

commit 58cf9200c3f0b52d4fdd3b998efc4e8206b366cf
Author: Alexander Vykhodtsev <[email protected]>
Date:   Thu Sep 30 21:14:13 2021 +0600

    Fix shared car for sf-light

commit 4a37d1195433ecef0c77a7e28c4935da8260557c
Author: Alexander Vykhodtsev <[email protected]>
Date:   Thu Sep 30 20:57:36 2021 +0600

    Fix vehicle types for tests

commit 4f9e8c0f60df52caf27302816c7cf03ca63561e2
Merge: fde62b01a d5dbae633
Author: Haitam Laarabi <[email protected]>
Date:   Wed Sep 29 21:02:30 2021 -0700

    Merge remote-tracking branch 'origin/hl/parking-zones-at-link-level' into hl/inSimulation-charging-scaleUp

commit d5dbae6337bb608405f1003285b9eb26d97df933
Author: Haitam Laarabi <[email protected]>
Date:   Wed Sep 29 20:30:08 2021 -0700

    renaming to howManyVehiclesAreInGracePeriodAfterCharging

commit 2b3e3b611b7f94f0b41cd8dd20cd278538144aa5
Author: Haitam Laarabi <[email protected]>
Date:   Wed Sep 29 19:28:35 2021 -0700

    fix compilation time

commit 1206948bbc5d213ef8e0c55175288eae406ab4e5
Author: Haitam Laarabi <[email protected]>
Date:   Wed Sep 29 19:04:41 2021 -0700

    addressing comments from @JustinPihony @dimaopen @zneedell

commit 47d1362a0f19cefd7d6f6e643c1f957b2a2a1e50
Author: Alexander Vykhodtsev <[email protected]>
Date:   Wed Sep 29 20:24:26 2021 +0600

    Exit in case of failed check

commit e3ec5b50f1ba250e78aaa0a74a3b6472a2ecfac1
Author: Alexander Vykhodtsev <[email protected]>
Date:   Wed Sep 29 18:40:47 2021 +0600

    Add more detailed log messages

commit fde62b01abaad26a49349b8abba032bec80778e4
Merge: a4b019ff4 b700bd634
Author: Nikolay Ilyin <[email protected]>
Date:   Mon Sep 27 18:45:08 2021 +0300

    Merge pull request #3077 from LBNL-UCB-STI/inm/collect-pickups-dropoffs

    pickups and dropoffs are affecting link travel time

commit b87552c790144729c566e4a8c2a281ce98cea346
Author: Dmitry Openkov <[email protected]>
Date:   Mon Sep 27 17:53:21 2021 +0300

    Added information about searched modes in CraphHopper and NativeCCH routers.

commit b700bd634df11f579006bde738de6dfca2bc6000
Author: Nikolay Ilyin <[email protected]>
Date:   Mon Sep 27 16:25:55 2021 +0300

    NPE fix

commit 1a8b1847e47e8c96475f59c724bda67273ea2b28
Author: Nikolay Ilyin <[email protected]>
Date:   Mon Sep 27 14:48:33 2021 +0300

    better names and using an Optional instead of empty class

commit db7853dbe47c3a002ea043027aa837ab0624890f
Merge: d24ddfb28 a4b019ff4
Author: Haitam Laarabi <[email protected]>
Date:   Fri Sep 24 22:07:16 2021 -0700

    pulling develop & fmt

commit d24ddfb28ce23ab7bc62b375fecc09882c1614a6
Author: Haitam Laarabi <[email protected]>
Date:   Fri Sep 24 22:03:38 2021 -0700

    additional changes + scaling problem for household stalls

commit f739ee41c20fde2e72e78ce285b7c3777c137fad
Author: Alexander Vykhodtsev <[email protected]>
Date:   Fri Sep 24 21:17:57 2021 +0600

    fix import

commit 622b74ddc53a7f99bf413cc2ad0bc070c6e9a9cc
Author: Alexander Vykhodtsev <[email protected]>
Date:   Fri Sep 24 21:13:01 2021 +0600

    scalafmt

commit a4b019ff43a5e96f6c4a6ed96e94765d70594022
Merge: 241b0280a 2c8752a19
Author: Dmitrii Openkov <[email protected]>
Date:   Fri Sep 24 17:49:01 2021 +0300

    Merge pull request #3311 from LBNL-UCB-STI/do/fix-not-closing-writer

    Fixed RoutingStatistic

commit bf9a453ba50df662b49d500bea23dad7b927c9d8
Author: Alexander Vykhodtsev <[email protected]>
Date:   Fri Sep 24 20:43:37 2021 +0600

    Add Input Consistency Check

commit 2c8752a1934b97f9aba2c785ea6a9284c9c629e0
Author: Dmitry Openkov <[email protected]>
Date:   Fri Sep 24 16:58:06 2021 +0300

    Simplifying code

commit 241b0280a48318ddeaa5cf1242a7cf69a809eaf0
Merge: 2f848b13f 88adfa152
Author: Nikolay Ilyin <[email protected]>
Date:   Fri Sep 24 11:08:21 2021 +0300

    Merge pull request #3316 from LBNL-UCB-STI/jp/fix-error-listener

    Fix the ErrorListener to actually handle a missed interrupt

commit 59ac5a1e491455cdc993d7fde24dcfe2fb370bc0
Author: Dmitry Openkov <[email protected]>
Date:   Thu Sep 23 19:06:19 2021 +0300

    Fix compilation issue

commit 4714a2983e901108891ab04557c05615cb91969d
Author: Dmitry Openkov <[email protected]>
Date:   Thu Sep 23 18:53:20 2021 +0300

    Removed trips from UrbansimReaderV2

commit 2f848b13f4397349609394a75b9f3de4ba931976
Merge: 059bd3329 0a4435cf6
Author: Dmitrii Openkov <[email protected]>
Date:   Thu Sep 23 17:10:24 2021 +0300

    Merge pull request #3312 from LBNL-UCB-STI/do/fix-deploy-to-nersc

    Fix file not found error when do deployToNersc

commit 88adfa15226112e1e5597c2bcebeae910fbb36e4
Author: Justin Pihony <[email protected]>
Date:   Wed Sep 22 22:36:24 2021 -0400

    Oops fix

commit 89e86204ec78b49db538568146846a724b5428d7
Author: Justin Pihony <[email protected]>
Date:   Wed Sep 22 22:31:30 2021 -0400

    fmt

commit 059bd3329c99a71279b57806f05b48f978f97fa4
Author: Justin Pihony <[email protected]>
Date:   Wed Sep 22 22:26:06 2021 -0400

    doc change (#3315)

commit bac9bf1a9009c04df6cd13bf895899263d55dded
Author: Justin Pihony <[email protected]>
Date:   Wed Sep 22 22:24:34 2021 -0400

    Fix the ErrorListener to actually handle a missed interrupt

commit b740b772c7f321826b1e3769e309bac1d685252f
Merge: 82cb0ab1e dd8b4b84d
Author: Dmitry Openkov <[email protected]>
Date:   Wed Sep 22 09:58:38 2021 +0300

    Merge remote-tracking branch 'origin/develop' into do/fix-not-closing-writer

commit 0a4435cf68c6c576f06e0da929e86049fed9d6e0
Merge: e91648aad dd8b4b84d
Author: Dmitry Openkov <[email protected]>
Date:   Wed Sep 22 09:53:08 2021 +0300

    Merge remote-tracking branch 'origin/develop' into do/fix-deploy-to-nersc

commit dd8b4b84d711fe9e9ac5e2c3465661860753f011
Merge: 134d4c0bc 6b674dc00
Author: Dmitrii Openkov <[email protected]>
Date:   Tue Sep 21 21:39:32 2021 +0300

    Merge pull request #3313 from LBNL-UCB-STI/rajnikantsh/fix-develop-compilation-error-4ci

    fix develop compilation error 4ci

commit 6b674dc00a28974fef788cb983379c3c783a089e
Author: rajnikant <[email protected]>
Date:   Tue Sep 21 23:17:16 2021 +0530

    Apply scala fmt

commit 0f37cb1ee3bf45e815b7b4a7d2ebf48d79a4cc5c
Author: rajnikant <[email protected]>
Date:   Tue Sep 21 22:43:26 2021 +0530

    fix develop compilation error

commit b0565717b05444ce8327d447263ca99e0a695ea9
Author: rajnikant <[email protected]>
Date:   Tue Sep 21 22:36:41 2021 +0530

    fix develop compilation error

commit 82cb0ab1e8d08dc0e65c153c7255cd27cb39abb2
Author: Dmitry Openkov <[email protected]>
Date:   Tue Sep 21 11:59:09 2021 +0300

    fmt

commit e91648aadce7ab5f568a4ca4c630add440573ed0
Author: Dmitry Openkov <[email protected]>
Date:   Tue Sep 21 11:59:09 2021 +0300

    fmt

commit 9a86d0d4dc08f8156baac6cd90e218a06996490a
Author: Dmitry Openkov <[email protected]>
Date:   Tue Sep 21 11:36:56 2021 +0300

    using ${project.root} property in front of file paths in order to get deployment more consistent

commit 134d4c0bcca3b4351978a01ce4deca87df13c986
Merge: ef18c2258 c24f9fd39
Author: Dmitrii Openkov <[email protected]>
Date:   Tue Sep 21 11:07:44 2021 +0300

    Merge pull request #3307 from LBNL-UCB-STI/do/native-cch-reverted

    Introduced Native CCH router

commit 73ec64aed8928c926b16f5c5ec1c4079bf9686e3
Author: Dmitry Openkov <[email protected]>
Date:   Tue Sep 21 11:06:50 2021 +0300

    Fix RoutingStatistic, waiting until writer is closed, create a new writer for each iteration

commit 1c6c5a6bc17dd38422c74eedae3813341b196474
Author: Alexander Vykhodtsev <[email protected]>
Date:   Tue Sep 21 10:55:53 2021 +0600

    scalafmt

commit b11d4c8126bf4405254567563e33bca850cb5adc
Merge: eaabcfffb ef18c2258
Author: Alexander Vykhodtsev <[email protected]>
Date:   Tue Sep 21 10:54:14 2021 +0600

    Merge branch 'develop' into alex-vv/#3254-separate-data-repos

commit 5f659f165f6c2eaea144a572730143414e6b3b5f
Author: Alexander Vykhodtsev <[email protected]>
Date:   Tue Sep 21 08:43:05 2021 +0600

    scalafmt

commit c24f9fd39cb7d7dd6b70cb0c3e42424c66080a40
Author: Dmitry Openkov <[email protected]>
Date:   Mon Sep 20 17:52:21 2021 +0300

    Added parsing command line args to ParquetRequester

commit ef18c22582d5424b9424b459331dd0548103db0f
Merge: f7302ea0e 30d0de217
Author: Dmitrii Openkov <[email protected]>
Date:   Fri Sep 17 18:13:39 2021 +0300

    Merge pull request #3305 from LBNL-UCB-STI/do/#3274-route_not_found_metric

    Not found routes metric

commit eaabcfffbe1d047d42a1cecab98ba71b6a7c50bb
Merge: ad693d243 f7302ea0e
Author: Alexander Vykhodtsev <[email protected]>
Date:   Fri Sep 17 20:52:03 2021 +0600

    Merge branch 'develop' into alex-vv/#3254-separate-data-repos

    # Conflicts:
    #	gradle.deploy.properties

commit ad693d243b265a0865b8c2c391a9e1e50749023d
Author: Alexander Vykhodtsev <[email protected]>
Date:   Fri Sep 17 20:50:20 2021 +0600

    Update PILATES deployment

commit 71bd76106ee32c5d70b57b2d8701fc38a846f55b
Merge: 1a38cc6cf f7302ea0e
Author: Alexander Vykhodtsev <[email protected]>
Date:   Thu Sep 16 19:04:25 2021 +0600

    Merge branch 'develop' into inm/collect-pickups-dropoffs

    # Conflicts:
    #	gradle.deploy.properties

commit 4b4607e1774506b74f8930c06d471e938e0209b1
Author: Alexander Vykhodtsev <[email protected]>
Date:   Wed Sep 15 20:53:33 2021 +0600

    Update NERSC deployment scripts with production data submodules and data branch

commit ce4ea65193673cfb128a7f757f9c77df195f56e7
Author: Dmitry Openkov <[email protected]>
Date:   Wed Sep 15 17:49:47 2021 +0300

    Simplified code

commit 30d0de217804e38738f2697250779000cd8aaffc
Author: Dmitry Openkov <[email protected]>
Date:   Wed Sep 15 16:44:04 2021 +0300

    fmt

commit c3d67dc9b5709537134954cb14ad20c0a780e09b
Author: Alexander Vykhodtsev <[email protected]>
Date:   Tue Sep 14 19:36:49 2021 +0600

    Add an option to specify a data branch

commit d180127d499682952f0686e1eacfe8c3b563d7c0
Author: Dmitry Openkov <[email protected]>
Date:   Tue Sep 14 11:05:04 2021 +0300

    Fix compilation

commit 215a5368958a1a78f08964c9fdceccfd1e8db580
Author: Dmitry Openkov <[email protected]>
Date:   Mon Sep 13 12:30:00 2021 +0300

    routing statistic: all transit modes except RIDE_HAIL_TRANSIT go into a single TRANSIT mode.

commit ac9d1cce7296e51e8f9e9fb8d0c3cf081e8ab131
Author: Dmitry Openkov <[email protected]>
Date:   Mon Sep 13 11:59:40 2021 +0300

    Added routing statistic

commit 27878bcb1a346764d4a5ce133cf82de8f33e99de
Author: Haitam Laarabi <[email protected]>
Date:   Fri Sep 10 18:09:18 2021 -0700

    fixing coordinate conversion

commit 0b6119ed1ddccaa20d53bc01f1646670c1564cd4
Author: Haitam Laarabi <[email protected]>
Date:   Fri Sep 10 16:48:10 2021 -0700

    adding locationX and locationY to parking taz

commit 1a4c10e5486bba8b2279313d18b6cd3450344736
Merge: 101297dd7 b5efaa64f
Author: Haitam Laarabi <[email protected]>
Date:   Fri Sep 10 15:23:20 2021 -0700

    Merge branch 'hl/upgrade-end-refuel-session-protocols' into hl/parking-zones-at-link-level

commit 101297dd7606e6b4a76e112f20245f3be18ab8a7
Author: Haitam Laarabi <[email protected]>
Date:   Fri Sep 10 15:20:37 2021 -0700

    deleting ChargingInquiry.scala

commit b5efaa64f6a6321fafa063ba1aba4addd4ef6bd9
Author: Haitam Laarabi <[email protected]>
Date:   Thu Sep 9 17:13:27 2021 -0700

    potential fix to exceptions

commit f7302ea0e887853d19dcb622aaedd48ac58a151e
Merge: 3e662b29d 8ffb0ff7d
Author: Grigory Derzhavets <[email protected]>
Date:   Thu Sep 9 19:05:31 2021 +0300

    Merge pull request #3293 from LBNL-UCB-STI/gd/issue3268_fix_config_values_pointing_to_the_map-4ci

    3268 - fix config values pointing to the map

commit 8ffb0ff7def1d5d72299b3662587fc0568e09550
Author: Grigory Derzhavets <[email protected]>
Date:   Thu Sep 9 18:22:54 2021 +0300

    fix matsim.modules.network.inputNetworkFile + add check for osmFile osmMapdbFile and matsimInputNetworkFile

commit 8e1fa2816c7d8ca99b36c431197d72d7078c23dc
Author: Haitam Laarabi <[email protected]>
Date:   Wed Sep 8 18:23:51 2021 -0700

    fix compilation errors

commit 8d80fee6eae9b7c0f001e7d28a6e095cdae26f36
Merge: 1caa9f27b 3e662b29d
Author: Haitam Laarabi <[email protected]>
Date:   Wed Sep 8 17:43:34 2021 -0700

    merge & fmt

commit 8ac63a6bfcc4248db4906d4557811b55a0a2a61b
Author: Grigory Derzhavets <[email protected]>
Date:   Wed Sep 8 23:02:15 2021 +0300

    up CI test 2

commit 183ff43dadd441b723bd801d1f793caca6473133
Author: Grigory Derzhavets <[email protected]>
Date:   Wed Sep 8 22:38:08 2021 +0300

    up CI test

commit 53720d137de6c3af03a5f13cb7958e77686b68b1
Author: Grigory Derzhavets <[email protected]>
Date:   Wed Sep 8 22:12:41 2021 +0300

    better exception text

commit 31ef73bd9f4e7ca10357c124ca6c8f0342f29461
Author: Grigory Derzhavets <[email protected]>
Date:   Wed Sep 8 22:05:52 2021 +0300

    add checkMapFilesDirectoriesConsistency + correct beam.physsim.inputNetworkFilePath in beamville/beam.conf

commit 3a1b7de28ced2d35c1543d955d4315213864f738
Author: Grigory Derzhavets <[email protected]>
Date:   Wed Sep 8 20:07:58 2021 +0300

    change inputNetworkFilePath to point into beam.routing.r5.directory

commit 3e662b29dfe5ed0005dda894ca10ccad1ee0d9b6
Merge: 804516e65 4b6028a36
Author: Haitam Laarabi <[email protected]>
Date:   Wed Sep 8 09:40:04 2021 -0700

    Merge pull request #3294 from LBNL-UCB-STI/hl/assign-parking-stalls-to-households

    Assign parking stalls to households

commit e218894b78f3e67ff06390b0d5a45bbb50a60361
Merge: 3e3b27d59 804516e65
Author: Grigory Derzhavets <[email protected]>
Date:   Wed Sep 8 18:14:52 2021 +0300

    Merge branch 'develop' into gd/issue3268_fix_config_values_pointing_to_the_map-4ci

commit 8e020d16cc5abb4f1dee2b8b77858fc0e48bf21c
Author: Dmitry Openkov <[email protected]>
Date:   Wed Sep 8 14:55:10 2021 +0300

    Fixing compile errors after merge

commit b0a2ca126239a1ecba061e2508ca3786273fb02d
Merge: 40dd10e13 804516e65
Author: Dmitry Openkov <[email protected]>
Date:   Wed Sep 8 12:32:12 2021 +0300

    Merge remote-tracking branch 'origin/develop' into do/native-cch-reverted

    # Conflicts:
    #	src/main/scala/beam/router/R5RoutingApp.scala
    #	src/main/scala/beam/router/RoutingWorker.scala

commit 40dd10e1333c74dce4a2c0a7ffdc1bea10050b08
Author: Dmitry Ogurtsov <[email protected]>
Date:   Mon Mar 29 22:56:44 2021 +0700

    review fix

commit 780284d605c4fdb01359f42b3693e81a7bd458f9
Author: Dmitry Ogurtsov <[email protected]>
Date:   Tue Mar 23 21:46:05 2021 +0700

    review fix

commit 7c7f32ea255b5a8a59d24f55477443b2d298ec81
Author: Dmitry Ogurtsov <[email protected]>
Date:   Mon Mar 15 22:15:39 2021 +0700

    add route requester

commit 4b6028a365213be69aa8fdb5f643617e1d8e5bc6
Author: Haitam Laarabi <[email protected]>
Date:   Tue Sep 7 23:59:14 2021 -0700

    fmt and potential fix to compilation error

commit 1caa9f27bcfc527a6f52fa13ae9f2fa28d5c1c5b
Merge:…
  • Loading branch information
@jawadmhoque
jawadmhoque committed Dec 31, 2021
1 parent b3b3f24 commit 5b20b89
Show file tree
Hide file tree
Showing 136 changed files with 2,872 additions and 1,333 deletions.
2 changes: 1 addition & 1 deletion AMI_Cleanup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def backup_and_retrieve_config_and_delete_old_backup():

def get_tagged_amis_along_with_most_recent(region):
ec2 = get_ec2_for(region)
amis = ec2.describe_images(Owners=['self'])
amis = ec2.describe_images(Owners=['self'],Filters=[{'Name':'name','Values':['beam-automation-*']}])
allAMIs = []
newestAMI = None
for ami in amis['Images']:
Expand Down
12 changes: 9 additions & 3 deletions aws/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,19 +79,21 @@ task deploy(type: AWSLambdaInvokeTask) {

def tempInstanceType = "${ext.getParameterValue('instanceType') ?: (project.hasProperty('defaultInstanceType') ? defaultInstanceType : '')}"
def finalInstanceType = tempInstanceType != "" ? tempInstanceType : null
def dataBranch = "${ext.getParameterValue('dataBranch') ?: 'develop'}"

def pload = """{
"title": "${ext.getParameterValue('runName') + '_' + getCurrentGitUserEmail()}",
"git_user_email": "${getCurrentGitUserEmail()}",
"deploy_type_tag": "${ext.getParameterValue('deployTypeTag')}",
"branch": "${ext.getParameterValue('beamBranch') ?: getCurrentGitBranch()}",
"data_branch": "$dataBranch",
"commit": "${ext.getParameterValue('beamCommit') ?: 'HEAD'}",
"deploy_mode": "${ext.getParameterValue('deployMode')}",
"configs": "${ext.getParameterValue('beamConfigs') ?: ext.getParameterValue(getCurrentGitBranch() + '.configs')}",
"experiments": "${ext.getParameterValue('beamExperiments') ?: ext.getParameterValue(getCurrentGitBranch() + '.experiments')}",
"execute_class": "${ext.getParameterValue('executeClass')}",
"execute_args": "${ext.getParameterValue('executeArgs')}",
"max_ram": "${ext.getParameterValue('maxRAM') ?: '140g'}",
"forced_max_ram": "${ext.getParameterValue('forcedMaxRAM')}",
"storage_size": ${ext.getParameterValue('storageSize')},
"batch": ${ext.getParameterValue('beamBatch')},
"s3_publish": ${ext.getParameterValue('s3Backup') ?: true},
Expand All @@ -110,6 +112,7 @@ task deploy(type: AWSLambdaInvokeTask) {
"max_memory": ${ext.getParameterValue('maxMemory') ?: 0}
}"""
payload = pload
println "Using data branch $dataBranch"
println payload
println "Please note that if you set isSpot to true then it could take an excessive time period. In fact it could time out at 15 minutes and still complete later on. ALSO! volumes using spot instances must be MANUALLY deleted. This is done so you do not lose data in the case of a premature shutdown."
functionName = "simulateBeam"
Expand Down Expand Up @@ -144,19 +147,20 @@ task deployPilates(type: AWSLambdaInvokeTask) {
defaultParamVals['region'] = defRegion
defaultParamVals['dataRegion'] = defRegion
defaultParamVals['beamBranch'] = getCurrentGitBranch()
defaultParamVals['dataBranch'] = 'develop'

def paramMap = [:]
def missing = []

// all possible parameters
['runName', 'pilatesScenarioName',
'beamBranch', 'beamCommit',
'beamBranch', 'dataBranch', 'beamCommit',
'beamConfig',
'startYear', 'countOfYears', 'beamItLen', 'urbansimItLen',
'initialS3UrbansimInput', 'initialS3UrbansimOutput', 'initialSkimPath',
'pilatesImageVersion', 'pilatesImageName',
's3OutputBucket', 's3OutputBasePath',
'inYearOutput', 'maxRAM', 'profiler_type',
'inYearOutput', 'forcedMaxRAM', 'profiler_type',
'storageSize', 'instanceType', 'dataRegion', 'region',
'shutdownWait', 'shutdownBehaviour'].each {
def pval = ext.getParameterValue(it)
Expand All @@ -173,6 +177,8 @@ task deployPilates(type: AWSLambdaInvokeTask) {

println("parameters wasn't specified: " + missing.join(', '))

println "Using data branch ${paramMap['dataBranch']}"

// create a string with json object which contains all parameters
def pload = "{\n" + paramMap.collect { key, val -> " \"$key\": \"$val\"" }.join(",\n") + "\n}"

Expand Down
60 changes: 54 additions & 6 deletions aws/src/main/python/beam_lambda/lambda_function.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,17 +265,52 @@
'z1d.large', 'z1d.xlarge', 'z1d.2xlarge', 'z1d.3xlarge', 'z1d.6xlarge', 'z1d.12xlarge',
'x2gd.metal', 'x2gd.16xlarge']

instance_type_to_memory = {
't2.nano': 0.5, 't2.micro': 1, 't2.small': 2, 't2.medium': 4, 't2.large': 8, 't2.xlarge': 16, 't2.2xlarge': 32,
'm4.large': 8, 'm4.xlarge': 16, 'm4.2xlarge': 32, 'm4.4xlarge': 64, 'm4.10xlarge': 160, 'm4.16xlarge': 256,
'm5.large': 8, 'm5.xlarge': 16, 'm5.2xlarge': 32, 'm5.4xlarge': 64, 'm5.12xlarge': 192, 'm5.24xlarge': 384,
'c4.large': 3.75, 'c4.xlarge': 7.5, 'c4.2xlarge': 15, 'c4.4xlarge': 30, 'c4.8xlarge': 60,
'f1.2xlarge': 122, 'f1.16xlarge': 976,
'g2.2xlarge': 15.25, 'g2.8xlarge': 61,
'g3.4xlarge': 122, 'g3.8xlarge': 244, 'g3.16xlarge': 488,
'p2.xlarge': 61, 'p2.8xlarge': 488, 'p2.16xlarge': 732,
'p3.2xlarge': 61, 'p3.8xlarge': 244, 'p3.16xlarge': 488,
'r4.large': 15.25, 'r4.xlarge': 30.5, 'r4.2xlarge': 61, 'r4.4xlarge': 122, 'r4.8xlarge': 244, 'r4.16xlarge': 488,
'r3.large': 15, 'r3.xlarge': 30.5, 'r3.2xlarge': 61, 'r3.4xlarge': 122, 'r3.8xlarge': 244,
'x1.16xlarge': 976, 'x1.32xlarge': 1952,
'x1e.xlarge': 122, 'x1e.2xlarge': 244, 'x1e.4xlarge': 488, 'x1e.8xlarge': 976, 'x1e.16xlarge': 1952, 'x1e.32xlarge': 3904,
'd2.xlarge': 30.5, 'd2.2xlarge': 61, 'd2.4xlarge': 122, 'd2.8xlarge': 244,
'i2.xlarge': 30.5, 'i2.2xlarge': 61, 'i2.4xlarge': 122, 'i2.8xlarge': 244,
'h1.2xlarge': 32, 'h1.4xlarge': 64, 'h1.8xlarge': 128, 'h1.16xlarge': 256,
'i3.large': 15.25, 'i3.xlarge': 30.5, 'i3.2xlarge': 61, 'i3.4xlarge': 122, 'i3.8xlarge': 244, 'i3.16xlarge': 488, 'i3.metal': 512,
'c5.large': 4, 'c5.xlarge': 8, 'c5.2xlarge': 16, 'c5.4xlarge': 32, 'c5.9xlarge': 72, 'c5.18xlarge': 96,
'c5d.large': 4, 'c5d.xlarge': 8, 'c5d.2xlarge': 16, 'c5d.4xlarge': 32, 'c5d.9xlarge': 72, 'c5d.18xlarge': 144, 'c5d.24xlarge': 192,
'r5.large': 16, 'r5.xlarge': 32, 'r5.2xlarge': 64, 'r5.4xlarge': 128, 'r5.8xlarge': 256, 'r5.12xlarge': 384, 'r5.24xlarge': 768,
'r5d.large': 16, 'r5d.xlarge': 32, 'r5d.2xlarge': 64, 'r5d.4xlarge': 128, 'r5d.12xlarge': 384, 'r5d.24xlarge': 768,
'm5d.large': 8, 'm5d.xlarge': 16, 'm5d.2xlarge': 32, 'm5d.4xlarge': 64, 'm5d.12xlarge': 192, 'm5d.24xlarge': 384,
'z1d.large': 2, 'z1d.xlarge': 4, 'z1d.2xlarge': 8, 'z1d.3xlarge': 12, 'z1d.6xlarge': 24, 'z1d.12xlarge': 48
}


regions = ['us-east-1', 'us-east-2', 'us-west-2']
shutdown_behaviours = ['stop', 'terminate']
instance_operations = ['start', 'stop', 'terminate']

s3 = boto3.client('s3')
ec2 = None
max_system_ram = 15
percent_towards_system_ram = .25


def init_ec2(region):
global ec2
ec2 = boto3.client('ec2',region_name=region)

def calculate_max_ram(instance_type):
ram = instance_type_to_memory[instance_type]
return ram - min(ram * percent_towards_system_ram, max_system_ram)


def check_resource(bucket, key):
try:
s3.head_object(Bucket=bucket, Key=key)
Expand Down Expand Up @@ -629,7 +664,6 @@ def get_param(param_name):
execute_class = event.get('execute_class', EXECUTE_CLASS_DEFAULT)
execute_args = event.get('execute_args', EXECUTE_ARGS_DEFAULT)
batch = event.get('batch', True)
max_ram = event.get('max_ram', MAXRAM_DEFAULT)
s3_publish = event.get('s3_publish', True)
volume_size = event.get('storage_size', 64)
shutdown_wait = event.get('shutdown_wait', SHUTDOWN_DEFAULT)
Expand Down Expand Up @@ -658,6 +692,10 @@ def get_param(param_name):
if not is_spot and instance_type not in instance_types:
return "Unable to start run, {instance_type} instance type not supported.".format(instance_type=instance_type)

max_ram = event.get('forced_max_ram')
if parameter_wasnt_specified(max_ram):
max_ram = calculate_max_ram(instance_type)

if shutdown_behaviour not in shutdown_behaviours:
return "Unable to start run, {shutdown_behaviour} shutdown behaviour not supported.".format(shutdown_behaviour=shutdown_behaviour)

Expand Down Expand Up @@ -705,11 +743,21 @@ def get_param(param_name):
runName = titled
if len(params) > 1:
runName += "-" + `runNum`
script = initscript.replace('$RUN_SCRIPT',selected_script).replace('$REGION',region).replace('$S3_REGION', os.environ['REGION']) \
.replace('$BRANCH', branch).replace('$DATA_BRANCH', data_branch).replace('$COMMIT', commit_id).replace('$CONFIG', arg) \
.replace('$MAIN_CLASS', execute_class).replace('$UID', uid).replace('$SHUTDOWN_WAIT', shutdown_wait) \
.replace('$TITLED', runName).replace('$MAX_RAM', max_ram).replace('$S3_PUBLISH', str(s3_publish)) \
.replace('$SIGOPT_CLIENT_ID', sigopt_client_id).replace('$SIGOPT_DEV_ID', sigopt_dev_id) \
script = initscript.replace('$RUN_SCRIPT',selected_script)\
.replace('$REGION',region)\
.replace('$S3_REGION', os.environ['REGION']) \
.replace('$BRANCH', branch)\
.replace('$DATA_BRANCH', data_branch)\
.replace('$COMMIT', commit_id)\
.replace('$CONFIG', arg) \
.replace('$MAIN_CLASS', execute_class)\
.replace('$UID', uid)\
.replace('$SHUTDOWN_WAIT', shutdown_wait) \
.replace('$TITLED', runName)\
.replace('$MAX_RAM', str(max_ram))\
.replace('$S3_PUBLISH', str(s3_publish)) \
.replace('$SIGOPT_CLIENT_ID', sigopt_client_id)\
.replace('$SIGOPT_DEV_ID', sigopt_dev_id) \
.replace('$GOOGLE_API_KEY', google_api_key) \
.replace('$PROFILER', profiler_type) \
.replace('$END_SCRIPT', end_script) \
Expand Down
39 changes: 36 additions & 3 deletions aws/src/main/python/runPilates/lambda_function.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,8 @@

s3 = boto3.client('s3')
ec2 = None
max_system_ram = 15
percent_towards_system_ram = .25


def init_ec2(region):
Expand Down Expand Up @@ -306,7 +308,35 @@ def get_dns(instance_id):

return host


instance_type_to_memory = {
't2.nano': 0.5, 't2.micro': 1, 't2.small': 2, 't2.medium': 4, 't2.large': 8, 't2.xlarge': 16, 't2.2xlarge': 32,
'm4.large': 8, 'm4.xlarge': 16, 'm4.2xlarge': 32, 'm4.4xlarge': 64, 'm4.10xlarge': 160, 'm4.16xlarge': 256,
'm5.large': 8, 'm5.xlarge': 16, 'm5.2xlarge': 32, 'm5.4xlarge': 64, 'm5.12xlarge': 192, 'm5.24xlarge': 384,
'c4.large': 3.75, 'c4.xlarge': 7.5, 'c4.2xlarge': 15, 'c4.4xlarge': 30, 'c4.8xlarge': 60,
'f1.2xlarge': 122, 'f1.16xlarge': 976,
'g2.2xlarge': 15.25, 'g2.8xlarge': 61,
'g3.4xlarge': 122, 'g3.8xlarge': 244, 'g3.16xlarge': 488,
'p2.xlarge': 61, 'p2.8xlarge': 488, 'p2.16xlarge': 732,
'p3.2xlarge': 61, 'p3.8xlarge': 244, 'p3.16xlarge': 488,
'r4.large': 15.25, 'r4.xlarge': 30.5, 'r4.2xlarge': 61, 'r4.4xlarge': 122, 'r4.8xlarge': 244, 'r4.16xlarge': 488,
'r3.large': 15, 'r3.xlarge': 30.5, 'r3.2xlarge': 61, 'r3.4xlarge': 122, 'r3.8xlarge': 244,
'x1.16xlarge': 976, 'x1.32xlarge': 1952,
'x1e.xlarge': 122, 'x1e.2xlarge': 244, 'x1e.4xlarge': 488, 'x1e.8xlarge': 976, 'x1e.16xlarge': 1952, 'x1e.32xlarge': 3904,
'd2.xlarge': 30.5, 'd2.2xlarge': 61, 'd2.4xlarge': 122, 'd2.8xlarge': 244,
'i2.xlarge': 30.5, 'i2.2xlarge': 61, 'i2.4xlarge': 122, 'i2.8xlarge': 244,
'h1.2xlarge': 32, 'h1.4xlarge': 64, 'h1.8xlarge': 128, 'h1.16xlarge': 256,
'i3.large': 15.25, 'i3.xlarge': 30.5, 'i3.2xlarge': 61, 'i3.4xlarge': 122, 'i3.8xlarge': 244, 'i3.16xlarge': 488, 'i3.metal': 512,
'c5.large': 4, 'c5.xlarge': 8, 'c5.2xlarge': 16, 'c5.4xlarge': 32, 'c5.9xlarge': 72, 'c5.18xlarge': 96,
'c5d.large': 4, 'c5d.xlarge': 8, 'c5d.2xlarge': 16, 'c5d.4xlarge': 32, 'c5d.9xlarge': 72, 'c5d.18xlarge': 144, 'c5d.24xlarge': 192,
'r5.large': 16, 'r5.xlarge': 32, 'r5.2xlarge': 64, 'r5.4xlarge': 128, 'r5.8xlarge': 256, 'r5.12xlarge': 384, 'r5.24xlarge': 768,
'r5d.large': 16, 'r5d.xlarge': 32, 'r5d.2xlarge': 64, 'r5d.4xlarge': 128, 'r5d.12xlarge': 384, 'r5d.24xlarge': 768,
'm5d.large': 8, 'm5d.xlarge': 16, 'm5d.2xlarge': 32, 'm5d.4xlarge': 64, 'm5d.12xlarge': 192, 'm5d.24xlarge': 384,
'z1d.large': 2, 'z1d.xlarge': 4, 'z1d.2xlarge': 8, 'z1d.3xlarge': 12, 'z1d.6xlarge': 24, 'z1d.12xlarge': 48
}

def calculate_max_ram(instance_type):
ram = instance_type_to_memory[instance_type]
return ram - min(ram * percent_towards_system_ram, max_system_ram)

def lambda_handler(event, context):
all_run_params_comma = ''
Expand Down Expand Up @@ -350,7 +380,6 @@ def get_param(param_name):
s3_data_region = get_param('dataRegion')

config = get_param('beamConfig')
max_ram = get_param('maxRAM')
shutdown_wait = get_param('shutdownWait')

instance_type = get_param('instanceType')
Expand Down Expand Up @@ -383,6 +412,10 @@ def get_param(param_name):
if region not in regions:
return "Unable to start, {region} region not supported.".format(region=region)

max_ram = event.get('forced_max_ram')
if parameter_wasnt_specified(max_ram):
max_ram = calculate_max_ram(instance_type)

if volume_size < 64:
volume_size = 64
if volume_size > 256:
Expand Down Expand Up @@ -430,7 +463,7 @@ def get_param(param_name):
.replace('$S3_OUTPUT_BUCKET', s3_output_bucket) \
.replace('$S3_OUTPUT_BASE_PATH', s3_output_base_path) \
.replace('$PILATES_SCENARIO_NAME', pilates_scenario_name) \
.replace('$TITLED', run_name).replace('$MAX_RAM', max_ram) \
.replace('$TITLED', run_name).replace('$MAX_RAM', str(max_ram)) \
.replace('$SIGOPT_CLIENT_ID', sigopt_client_id).replace('$SIGOPT_DEV_ID', sigopt_dev_id) \
.replace('$GOOGLE_API_KEY', google_api_key) \
.replace('$SLACK_HOOK_WITH_TOKEN', os.environ['SLACK_HOOK_WITH_TOKEN']) \
Expand Down
Loading

0 comments on commit 5b20b89

Please sign in to comment.