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.

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

Tour mode deep dive #3598

Closed
wants to merge 46 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
c40970f
currentTripMode vs currentTourMode
dimaopen Feb 25, 2022
4d2e375
Provide personal vehicle only when agent is at home
dimaopen Feb 25, 2022
7cfbc79
Merge remote-tracking branch 'origin/develop' into do/#3441-current-t…
dimaopen Mar 22, 2022
a58eef5
Introduced personalVehicleModes
dimaopen Mar 23, 2022
93566b6
Better handling of situation when we do the second mode choice
dimaopen Mar 23, 2022
691456f
Using currentTripMode to request available vehicles
dimaopen Mar 23, 2022
6d063a9
Using correctedCurrentTripMode when getting available vehicles. Corre…
dimaopen Mar 24, 2022
de1684a
Fixed not using current tour personal vehicle. Fixed trip/tour field.
dimaopen Mar 25, 2022
449ffc3
Merge remote-tracking branch 'origin/develop' into do/#3441-mode-choi…
dimaopen Mar 28, 2022
8a0dacd
Keep track of current tour/trip mode in _experiencedBeamPlan. Moved m…
dimaopen Mar 28, 2022
eb4fafb
Removed unused parameter from an example in inputs.rst
dimaopen Mar 28, 2022
103a0c3
Moved trip mode calculation to ModeChoiceStrategy
dimaopen Mar 29, 2022
c05b00f
Save current trip/tour mode to ModeChoiceEvent. Finding correct tour …
dimaopen Apr 5, 2022
2059ebf
Warehouse activity name changed to Home in order to get Beam works co…
dimaopen Apr 7, 2022
12f5346
Fixed freight
dimaopen Apr 7, 2022
4d3e22d
Fixed availableVehicles disappearing when the person is not at home.
dimaopen Apr 14, 2022
dc714ea
Merge remote-tracking branch 'origin/develop' into do/#3441-mode-choi…
dimaopen Apr 18, 2022
0d8510d
Set chargingType column to chargingPointType to fix parking.csv
dimaopen Apr 19, 2022
be4bd40
Merge remote-tracking branch 'origin/develop' into do/#3441-mode-choi…
dimaopen Apr 19, 2022
f25a4be
Merge remote-tracking branch 'origin/develop' into do/#3441-mode-choi…
zneedell May 31, 2022
fc221f5
tour mode choice, initial commit
zneedell Jun 2, 2022
9aaf8d3
fix
zneedell Jun 2, 2022
17f5414
Do tour mode choice in ChoosesMode
zneedell Jun 3, 2022
6bfde39
get correct tour for initial trip
zneedell Jun 3, 2022
e435a3b
fixes for weird tour structure, int conversion
zneedell Jun 3, 2022
8c98c0c
limit trip mode alternatives based on chosen tour mode, bookkeep in P…
zneedell Jun 3, 2022
d92ff28
clarify mobilityStatusInquiry logic
zneedell Jun 3, 2022
fee87ad
Fix mobility status request
zneedell Jun 4, 2022
57edf10
Bugfix, limit modes in mode choice, rename tour mode -> trip mode in …
zneedell Jun 6, 2022
a11f3e1
fix sign error in utility calcs
zneedell Jun 6, 2022
6a16471
typo correction
Xuan-1998 Aug 24, 2022
cb51f2c
define the function to check vehicle shared or not
Xuan-1998 Aug 24, 2022
b8d35c0
adding shared deny into shared bike
Xuan-1998 Aug 24, 2022
7d3b6ca
fix
Xuan-1998 Aug 24, 2022
c045f26
checks whether the vehicles are shared or not before returning the al…
Xuan-1998 Aug 24, 2022
f2f1d78
fix bugs
Xuan-1998 Aug 24, 2022
0a7b740
testing on the changes
Xuan-1998 Aug 24, 2022
59041d1
only not reaturning BIKE when all are just bikes
Xuan-1998 Aug 24, 2022
87ac571
creating available vehicles filter
Xuan-1998 Aug 24, 2022
895a822
creating helper for isShared
Xuan-1998 Aug 24, 2022
aa1f7b4
create available vehicle filter
Xuan-1998 Aug 24, 2022
a6c50b7
merge develop and update gradle
Xuan-1998 Aug 25, 2022
d0df8e5
addressing peer advice
Xuan-1998 Aug 25, 2022
e2540a6
fix compilation
Xuan-1998 Aug 25, 2022
73476d7
fix compilation
Xuan-1998 Aug 25, 2022
e38c00f
deleting useless
Xuan-1998 Aug 26, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions aws/src/main/python/beam_lambda/lambda_function.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@
fi
exit 0;
path: /home/ubuntu/check_simulation_result.sh

runcmd:
- sudo chmod +x /home/ubuntu/install-and-run-helics-scripts.sh
- sudo chmod +x /home/ubuntu/write-cpu-ram-usage.sh
Expand All @@ -192,7 +191,6 @@
- RESOLVED_COMMIT=$COMMIT
- fi
- echo "Resolved commit is $RESOLVED_COMMIT"

- 'echo "sudo git fetch"'
- sudo git fetch
- 'echo "GIT_LFS_SKIP_SMUDGE=1 sudo git checkout $BRANCH $(date)"'
Expand All @@ -203,7 +201,6 @@
- sudo git lfs pull
- echo "sudo git checkout -qf ..."
- GIT_LFS_SKIP_SMUDGE=1 sudo git checkout -qf $COMMIT

- production_data_submodules=$(git submodule | awk '{ print $2 }')
- for i in $production_data_submodules
- do
Expand All @@ -227,19 +224,17 @@
- esac
- done
- done

- if [ "$RUN_JUPYTER" = "True" ]
- then
- echo "Starting Jupyter"
- sudo ./gradlew jupyterStart -Puser=root -PjupyterToken=$JUPYTER_TOKEN
- fi

- if [ "$RUN_BEAM" = "True" ]
- then

- echo "-------------------Starting Beam Sim----------------------"
- echo $(date +%s) > /tmp/.starttime
- rm -rf /home/ubuntu/git/beam/test/input/sf-light/r5/network.dat
- rm -rf /home/ubuntu/git/beam/test/input/sf-light/r5/network.dat
- hello_msg=$(printf "Run Started \\n Run Name** $TITLED** \\n Instance ID %s \\n Instance type **%s** \\n Host name **%s** \\n Web browser ** http://%s:8000 ** \\n Region $REGION \\n Batch $UID \\n Branch **$BRANCH** \\n Commit $COMMIT" $(ec2metadata --instance-id) $(ec2metadata --instance-type) $(ec2metadata --public-hostname) $(ec2metadata --public-hostname))
- start_json=$(printf "{
\\"command\\":\\"add\\",
Expand Down Expand Up @@ -274,7 +269,6 @@
- crontab /tmp/cron_jobs
- crontab -l
- echo "notification scheduled..."

- 'echo "gradlew assemble: $(date)"'
- ./gradlew assemble
- 'echo "sudo chown -R ubuntu:ubuntu ."'
Expand All @@ -286,7 +280,6 @@
- export GOOGLE_API_KEY="$GOOGLE_API_KEY"
- echo $MAXRAM
- /tmp/slack.sh "$hello_msg"

- s3p=""
- for cf in $CONFIG
- do
Expand All @@ -299,7 +292,7 @@
- do
- export $metric=$count
- done < RunHealthAnalysis.txt

- curl -H "Authorization:Bearer $SLACK_TOKEN" -F [email protected] -F initial_comment="Beam Health Analysis" -F channels="$SLACK_CHANNEL" "https://slack.com/api/files.upload"
- s3glip=""
- if [ "$S3_PUBLISH" = "True" ]
Expand Down Expand Up @@ -956,4 +949,4 @@ def lambda_handler(event, context):
if command_id in instance_operations:
return instance_handler(event)

return "Operation {command} not supported, please specify one of the supported operations (deploy | start | stop | terminate | log). ".format(command=command_id)
return "Operation {command} not supported, please specify one of the supported operations (deploy | start | stop | terminate | log). ".format(command=command_id)
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -720,4 +720,4 @@ jmh {
jvmArgs = ['-Djmh.separateClasspathJAR=true', '-Dbeam.home=' + project.projectDir]
duplicateClassesStrategy = 'exclude'
zip64 = true
}
}
22 changes: 11 additions & 11 deletions docs/inputs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -238,17 +238,17 @@ Routing Configuration
departureWindow = "double | 15.0"
numberOfSamples = "int | 1"
osmMapdbFile = ${beam.routing.r5.directory}"/osm.mapdb"
mNetBuilder.fromCRS = "EPSG:4326" # WGS84
mNetBuilder.toCRS = "EPSG:26910" # UTM10N
travelTimeNoiseFraction = 0.0
maxDistanceLimitByModeInMeters {
bike = 40000
}
bikeLaneScaleFactor = 1.0
bikeLaneLinkIdsFilePath = ""
}
startingIterationForTravelTimesMSA = 0
overrideNetworkTravelTimesUsingSkims = false
mNetBuilder.fromCRS = "EPSG:4326" # WGS84
mNetBuilder.toCRS = "EPSG:26910" # UTM10N
travelTimeNoiseFraction = 0.0
maxDistanceLimitByModeInMeters {
bike = 40000
}
bikeLaneScaleFactor = 1.0
bikeLaneLinkIdsFilePath = ""
}
startingIterationForTravelTimesMSA = 0
overrideNetworkTravelTimesUsingSkims = false

# Set a lower bound on travel times that can possibly be used to override the network-based
# travel time in the route.This is used to prevent unrealistically fast trips or negative
Expand Down
2 changes: 1 addition & 1 deletion production/sfbay
Submodule sfbay updated 64 files
+ activitysim/.DS_Store
+3 −0 activitysim/2010-718k-oakland-4k/blocks.csv.gz
+3 −0 activitysim/2010-718k-oakland-4k/households.csv.gz
+3 −0 activitysim/2010-718k-oakland-4k/persons.csv.gz
+3 −0 activitysim/2010-718k-oakland-4k/plans.csv.gz
+3 −0 activitysim/2010-718k-oakland-4k/trips.csv.gz
+3 −0 activitysim/2018/warmstart_data.zip
+3 −3 freight/freight-base-2018-60k-hgv1.conf
+3 −3 freight/freight-base-2018-60k-hgv2.conf
+3 −3 freight/freight-base-2018-60k-hgv3.conf
+3 −3 freight/freight-base-2018-60k-hgv4.conf
+14 −0 freight/freight-base-2018-60k-sample.conf
+1 −0 freight/freight-base-2018.conf
+10 −0 freight/freight-base.conf
+3 −0 freight/frism-plans-base/sample/freight-merged-carriers.csv
+3 −0 freight/frism-plans-base/sample/freight-merged-payload-plans.csv
+3 −0 freight/frism-plans-base/sample/freight-merged-tours.csv
+30 −39 gemini/gemini-default.conf
+23 −0 gemini/gemini-scenario-0-base-oakland-4k.conf
+38 −0 gemini/gemini-scenario-0-base-unconstrained-alameda-helics.conf
+0 −75 gemini/gemini-scenario-4-Base.conf
+0 −4 gemini/gemini-scenario-4a-Base.conf
+0 −4 gemini/gemini-scenario-4b-Base.conf
+25 −0 gemini/gemini-scenario-5-Base.conf
+0 −17 gemini/gemini-scenario-5a-Base-120k.conf
+0 −15 gemini/gemini-scenario-5a-Base-240k.conf
+0 −15 gemini/gemini-scenario-5a-Base-601k.conf
+0 −15 gemini/gemini-scenario-5a-Base-6k.conf
+0 −12 gemini/gemini-scenario-5a-Base-withInfra-10p-120m.conf
+0 −12 gemini/gemini-scenario-5a-Base-withInfra-10p-40m.conf
+0 −12 gemini/gemini-scenario-5a-Base-withInfra-10p-80m.conf
+6 −5 gemini/gemini-scenario-5a-Base-withInfra-10p.conf
+3 −12 gemini/gemini-scenario-5a-Base-withInfra.conf
+4 −0 gemini/gemini-scenario-5a-Base.conf
+20 −0 gemini/gemini-scenario-5b-Base-withInfra-05p.conf
+7 −8 gemini/gemini-scenario-5b-Base-withInfra-10p.conf
+1 −20 gemini/gemini-scenario-5b-Base-withInfra.conf
+4 −0 gemini/gemini-scenario-5b-Base.conf
+0 −19 gemini/gemini-scenario-5b-calibrate-151.conf
+0 −20 gemini/gemini-scenario-5b-calibrate-152.conf
+0 −19 gemini/gemini-scenario-5b-calibrate-153.conf
+0 −19 gemini/gemini-scenario-5b-calibrate-154.conf
+0 −19 gemini/gemini-scenario-5b-calibrate-155.conf
+0 −15 gemini/gemini-scenario-5b-calibrate-156.conf
+0 −15 gemini/gemini-scenario-5b-calibrate-157.conf
+6 −7 gemini/gemini-scenario-6-HighEV-withInfra-10p.conf
+0 −20 gemini/gemini-scenario-6-HighEV-withInfra.conf
+6 −9 gemini/gemini-scenario-6-HighEV.conf
+20 −0 gemini/gemini-scenario-7-Advanced-05p.conf
+6 −0 gemini/gemini-scenario-7-Advanced-10p-temp.conf
+6 −5 gemini/gemini-scenario-7-Advanced-10p.conf
+6 −9 gemini/gemini-scenario-7-Advanced.conf
+15 −0 gemini/gemini-scenario-8-MaxEV-05p-noScaleUp.conf
+6 −0 gemini/gemini-scenario-8-MaxEV-05p-test0.conf
+5 −0 gemini/gemini-scenario-8-MaxEV-05p-test1.conf
+5 −0 gemini/gemini-scenario-8-MaxEV-05p-test2.conf
+5 −0 gemini/gemini-scenario-8-MaxEV-05p-test3.conf
+20 −0 gemini/gemini-scenario-8-MaxEV-05p.conf
+5 −0 gemini/gemini-scenario-8-MaxEV-10p-temp.conf
+6 −5 gemini/gemini-scenario-8-MaxEV-10p.conf
+6 −9 gemini/gemini-scenario-8-MaxEV.conf
+3 −0 gemini/vehicle-tech/vehicletypes-Advanced2040_2021620_temp.csv
+3 −0 gemini/vehicle-tech/vehicletypes-MaxEV2050_2021620_temp.csv
+3 −0 parking/sfbay_taz_unlimited_depots_temp.csv
Loading