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

Changes on generic_metric and mode_specific_metrics in relation to Mo… #91

Merged
merged 64 commits into from
Dec 3, 2023
Merged

Changes on generic_metric and mode_specific_metrics in relation to Mo… #91

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
34eae86
Changes on generic_metric and mode_specific_metrics in relation to Mo…
iantei Sep 7, 2023
176655a
Address Review comments.
iantei Sep 11, 2023
f04e596
Update generate_plots.py & scaffolding.py
iantei Sep 12, 2023
3182a0b
Fix merge conflict.
iantei Sep 12, 2023
43d974b
Fix scaffolding, updated mode_specific_metrics.ipynb.
iantei Sep 12, 2023
7343606
Revert version changes to 3.7.12.
iantei Sep 12, 2023
080f4f4
Update initialization of dynamic_labels from { } to json object refer…
iantei Sep 12, 2023
7d8b2d6
Default initialize dynamic_labels to { }.
iantei Sep 14, 2023
1b037c2
Merge with main. Resolve merge conflict.
iantei Sep 14, 2023
fea6365
Add an environment variable in Docker Compose to pass dynamic config.
iantei Sep 17, 2023
b04096b
Chang in docker-compose for STUDY_CONFIG to dev-emulator-study. Rever…
iantei Sep 18, 2023
5a70ecb
Change back docker-compose.dev.yml: STUDY_CONFIG to stage-program.
iantei Sep 19, 2023
6e80c7f
Replace Mode_confirm with Replaced_mode for barplot_mode() in mode_sp…
iantei Sep 22, 2023
30c1dd4
1. Remove extraneous whitespace from generate_plots.py. 2. Revert ref…
iantei Sep 25, 2023
86f8133
Remove extraneous whitespace from line 96 in generate_plots.py
iantei Sep 25, 2023
845dd47
Introduce defaultdic for dic_translations with Other in analogy to di…
iantei Sep 26, 2023
40519ec
Merge branch 'main' into ananta_support_customLabel_from_dynamic_config
iantei Sep 27, 2023
af9d3fc
Handle initialization of mode_count_interest. Introduce try-except bl…
iantei Sep 28, 2023
a868e4c
Move quality_text code into the if block in the above cell.
iantei Sep 28, 2023
54e213b
Update log messages for dynamic_labels_url and label_options unavaila…
iantei Sep 29, 2023
81407fc
Update scaffolding to introduce compute_CO2_impact_kg() computation w…
iantei Oct 5, 2023
d4fb9bc
1. Change the plots.py X-axis to showcase CO2 Impact in kg. 2. In sca…
iantei Oct 5, 2023
42990a2
Move the compute_CO2_impact_kg() call to scaffolding, such that energ…
iantei Oct 5, 2023
2dd360f
Changes to understand difference between default mapping and dynamic …
iantei Oct 6, 2023
0aeb70c
Update scaffolding to create different dictionary mappings for MODE, …
iantei Oct 7, 2023
aae0d2a
Update Trip_purpose to To Work instead of Work whenever dynamic label…
iantei Oct 7, 2023
f2f0a45
Update scaffolding.py CO2_footprint_lb() to utilize the distance whil…
iantei Oct 9, 2023
fecec39
Update changes for generic_timeseries. 1. Inside scaffolding.py intro…
iantei Oct 10, 2023
5cf84bc
Create new metrics_study and metrics_program options html files witho…
iantei Oct 12, 2023
5a8c9d6
Update index.html to use different metrics_ options html when dynamic…
iantei Oct 12, 2023
8fefdea
Remove redundant check for dynamic_labels_urls. Update the message to…
iantei Oct 12, 2023
a2c1910
Remove print statements used to evaluate the difference in energy cal…
iantei Oct 12, 2023
a42b308
Update the mode mapping in accordance to MODE for Daily Mode Share in…
iantei Oct 13, 2023
6f13c03
Refactor the code to load the config and corresponding metrics.html p…
iantei Oct 19, 2023
32864c6
Reinstate the comment for energy_calculations.ipynb. Removed extranne…
iantei Oct 19, 2023
b3a92a1
Update data.label_options to dynamic_labels to make it coherent acros…
iantei Oct 19, 2023
1628f5a
Created a new function inside scaffolding.py, mapping_labels(dynamic_…
iantei Oct 19, 2023
f3edc61
Moving the mapping_labels() call inside the conditional check for eac…
iantei Oct 19, 2023
e7c17a1
Update the purpose mapping for Work to select from scaffolding.mappin…
iantei Oct 19, 2023
c114d38
Update the Timeseries of emissions per miles TO Timeseries of emissio…
iantei Oct 24, 2023
b26207d
Update plots.py CO2_impact to take x and y Labels from the notebook. …
iantei Oct 27, 2023
14a3666
Update generic_timeseries to show the CO2 emissions in Imperial syste…
iantei Oct 27, 2023
4c177d7
Added print statements to understand the difference in CO2 emissions …
iantei Oct 27, 2023
a8f3697
Renamed 1. compute_CO2_impact_kg to compute_CO2_impact_dynamic 2. com…
iantei Oct 27, 2023
e7f804e
Removed the unnecessary file unde frontend/Dockerfile.dev.
iantei Oct 27, 2023
23e5773
Showing Timeseries of emissions per mile for default mapping.
iantei Oct 27, 2023
6c469a5
Remove extranneous whitespaces from energy_calculations and generic_t…
iantei Oct 27, 2023
a18c549
Remove whitespace from generic_timeseries.ipynb
iantei Oct 27, 2023
88b899b
Fixing the scaffolding calculation for computation of conversion to k…
iantei Oct 30, 2023
9134465
Add new function in scaffolding.py to print the computation of CO2 em…
iantei Oct 30, 2023
5229d7e
Added is_debug_mode flag, which by default is set to False. When it i…
iantei Oct 30, 2023
efbd31f
Removed energy_impact computation for Dynamic config case.
iantei Oct 31, 2023
3c8823e
Update distace_miles column in the selected_columns in scaffolding.py…
iantei Oct 31, 2023
adb5258
Setting the default is_debug_mode flag to False. This will disable ca…
iantei Oct 31, 2023
b858b53
Removed redundant if/else case for different label_type inside mappin…
iantei Nov 2, 2023
3ee1bbb
Energy_calculations.ipynb added justification for computation of tota…
iantei Nov 2, 2023
5cbce25
Refactor both energy_calculations and generic_timeseries notebook to …
iantei Nov 7, 2023
dd64513
Stored the returned expanded_ct from compute_CO2_footprint_dynamic().
iantei Nov 7, 2023
a72ac99
Fixed try-catch block to handle case where emissions is not defined. …
iantei Nov 7, 2023
ae3117a
Fixed issue with default mapping - calling the right function. Update…
iantei Nov 7, 2023
8832e79
Remove conversion_kilometer_to_mile and vice versa in scaffolding.py …
iantei Nov 13, 2023
78e4777
Removed f{'distance_unit'} with distance_unit for compute_daily_metri…
iantei Nov 13, 2023
932af13
Update sense keyword in the phrase for dropdown menu for Trip miles b…
iantei Nov 21, 2023
a23ad9f
Updated the comment to explain this is specically used to test with e…
iantei Nov 21, 2023
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
1 change: 1 addition & 0 deletions docker-compose.dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ services:
- WEB_SERVER_HOST=0.0.0.0
- CRON_MODE=
- STUDY_CONFIG=stage-program
- DYNAMIC_CONFIG=dev-emulator-study
iantei marked this conversation as resolved.
Show resolved Hide resolved
ports:
# ipynb in numbers
- "47962:8888"
Expand Down
4 changes: 3 additions & 1 deletion viz_scripts/bin/generate_plots.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
# Full list is at
# https://github.com/e-mission/nrel-openpath-deploy-configs/tree/main/configs
STUDY_CONFIG = os.getenv('STUDY_CONFIG', "stage-program")
DYNAMIC_CONFIG = os.getenv('DYNAMIC_CONFIG', "dev-emulator-study")

parser = argparse.ArgumentParser(prog="generate_metrics")
parser.add_argument("plot_notebook", help="the notebook the generates the plot")
Expand All @@ -24,7 +25,8 @@
args = parser.parse_args()

# Read and use parameters from the unified config file on the e-mission Github page
download_url = "https://raw.githubusercontent.com/e-mission/nrel-openpath-deploy-configs/main/configs/" + STUDY_CONFIG + ".nrel-op.json"
# download_url = "https://raw.githubusercontent.com/e-mission/nrel-openpath-deploy-configs/main/configs/" + STUDY_CONFIG + ".nrel-op.json"
download_url = "https://raw.githubusercontent.com/e-mission/nrel-openpath-deploy-configs/main/configs/" + DYNAMIC_CONFIG + ".nrel-op.json"
iantei marked this conversation as resolved.
Show resolved Hide resolved
print("About to download config from %s" % download_url)
r = requests.get(download_url)
if r.status_code is not 200:
Expand Down