Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ICF Off-model calculator - Refactor 1-3, Feature 1-3 #74

Closed
wants to merge 61 commits into from
Closed

ICF Off-model calculator - Refactor 1-3, Feature 1-3 #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
ed3a52d
refactor: added helper package for common functions and templates to …
Jul 12, 2024
4b82f9d
refactor: improved bike share calculator code structure.
Jul 12, 2024
0f257d6
refactor: created class for common function and subclass for specific…
Jul 15, 2024
14caf82
fix: updated paths in external and mtc templates
Jul 15, 2024
905dc62
docs: updated bikeshare subclass comments
Jul 15, 2024
602d894
fix: modules imports and added variable location
Jul 16, 2024
2dc3db8
feature 1, bikeshare: Added bikeshare reference cells to centralized …
Jul 16, 2024
89888b6
refactor: new architecture folders for models and model data
Jul 16, 2024
975c28c
Merge branch 'BayAreaMetro:master' into icfOffmodelExcelCalc
caroarriaga Jul 17, 2024
31ff7de
refactor: removed templates folder
Jul 29, 2024
917f176
Docs: Used more descriptive names and explicit args
Jul 29, 2024
7da9305
Docs: clarifed name usage in methods
Jul 29, 2024
2e981d0
Refactor: Unified in commons runs.py script
Aug 2, 2024
bf072f1
Refactor: created carshare class
Aug 2, 2024
e963d2b
Refactor: Added missing calculators
Aug 6, 2024
6e54c5c
Merge branch 'icfOffmodelExcelCalc' of github.com:caroarriaga/travel-…
Aug 6, 2024
2b5a967
Merge branch 'BayAreaMetro:master' into icfOffmodelExcelCalc
caroarriaga Aug 6, 2024
ee612ac
Update ModelRuns_Round2.xlsx
anuptapase Aug 8, 2024
e3a9aa5
Merge branch 'master' of https://github.com/BayAreaMetro/travel-model…
anuptapase Aug 8, 2024
4e08374
Feature 2: Automatic open and save of excel workbooks
Aug 8, 2024
481423c
update NGF Round 2 run log with latest runs
FlaviaTsang Aug 9, 2024
d222bc2
add .project to gitignore
FlaviaTsang Aug 9, 2024
9f16274
Feature 3: Calculators can log runs
Aug 9, 2024
ba76fb7
Test: Created testcase for formula update after open/close file
Aug 9, 2024
d2a7be8
Docs: added missing variables from Outputs
Aug 9, 2024
694d5d0
Feature 4: template excel to update multiple calculators at once
Aug 9, 2024
ea35544
Bug fixed: added exception when removing old file in output
Aug 10, 2024
c6e9277
Update ModelRuns_Round2.xlsx
anuptapase Aug 12, 2024
99594a2
Update ModelRuns_Round2.xlsx
anuptapase Aug 12, 2024
805f2ab
Update ModelRuns_Round2.xlsx
anuptapase Aug 12, 2024
dad1744
updated noproject to 06
anuptapase Aug 12, 2024
2149dab
Update ModelRuns_Round2.xlsx
anuptapase Aug 12, 2024
1d6420c
updated with MBUF with transit runs
anuptapase Aug 14, 2024
0e5c49d
Update ModelRuns_Round2.xlsx
anuptapase Aug 14, 2024
f615ea6
added two "post tollclass=0 bug fix" runs to the model run log
FlaviaTsang Aug 15, 2024
092361b
Update to run for PBA50 Amd1
lmz Aug 15, 2024
a43a568
added two AOC-based MBUF runs (for toll cap post-processing) to the m…
FlaviaTsang Aug 16, 2024
4554dec
add NoProject_07 and an alternative P1_12 to the model run log
FlaviaTsang Aug 16, 2024
63baa74
Update ModelRuns_Round2.xlsx
anuptapase Aug 16, 2024
43f3e78
Update ModelRuns_Round2.xlsx
anuptapase Aug 16, 2024
78f9432
Update ModelRuns_Round2.xlsx
anuptapase Aug 19, 2024
12c9219
Updating parallel arterials set to full set
anuptapase Aug 19, 2024
4055639
updated NGF Round 2 model run log (added 6 more runs)
FlaviaTsang Aug 21, 2024
07c9ca8
Update ModelRuns_Round2.xlsx
anuptapase Aug 21, 2024
82a95df
Update ModelRuns_Round2.xlsx
anuptapase Aug 21, 2024
8cf5b2a
Update ModelRuns_Round2.xlsx
anuptapase Aug 21, 2024
0de092f
Update run_NGF_Tableau_scripts.bat
anuptapase Aug 22, 2024
3dedb95
Update ModelRuns_Round2.xlsx
anuptapase Aug 22, 2024
65fa495
Update ModelRuns_Round2.xlsx
anuptapase Aug 22, 2024
f101f04
Update ModelRuns_Round2.xlsx
anuptapase Aug 22, 2024
19806bb
Updated NB/SB to AM/PM for new corridors
anuptapase Aug 22, 2024
db29fd6
Update run_NGF_Tableau_scripts.bat
anuptapase Aug 22, 2024
d1dab58
Update run_NGF_Tableau_scripts.bat
anuptapase Aug 22, 2024
b18724e
Update run_NGF_Tableau_scripts.bat
anuptapase Aug 22, 2024
872d376
Feature 5: Summarize off-model metrics
Sep 10, 2024
07dc954
Added [2015,2023]_TM161_IPA_00
lmz Sep 10, 2024
29ed84c
Update ModelRuns_Round2.xlsx
anuptapase Sep 10, 2024
974205f
Update ModelRuns_Round2.xlsx
anuptapase Sep 13, 2024
ede0ace
Update ngfs_corridor_map_data.py
anuptapase Sep 13, 2024
4f1e9b5
Update ngfs_corridor_map_data.py
anuptapase Sep 13, 2024
7aa3777
Merge branch 'icfOffmodelExcelCalc' of https://github.com/caroarriaga…
lmz Sep 17, 2024
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
10 changes: 10 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,13 @@ utilities/RTP/Emissions/Off Model Calculators/Model Data*.csv
model-files/runtime/config/jppf-2.4/JPPF-2.4-application-template/classes/*
*.project
utilities/RTP/metrics/metrics*.csv
.project
core/cmf/common-base/.project
core/cmf/common-daf-v2/.project
core/models/censusdata/.project
core/models/synpop/.project
core/models/utils/.project
core/projects/mtc/.project
core/third-party/jppf-2.4/.project
core/third-party/jppf-2.4/client/.project
core/third-party/sqlitejdbc/.project
11 changes: 11 additions & 0 deletions .project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,15 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<filteredResources>
<filter>
<id>1722290548961</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
11 changes: 11 additions & 0 deletions core/cmf/common-base/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,15 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<filteredResources>
<filter>
<id>1722290548373</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
11 changes: 11 additions & 0 deletions core/cmf/common-daf-v2/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,15 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<filteredResources>
<filter>
<id>1722290548423</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
11 changes: 11 additions & 0 deletions core/models/censusdata/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,15 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<filteredResources>
<filter>
<id>1722290548234</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
11 changes: 11 additions & 0 deletions core/models/ctramp/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,15 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<filteredResources>
<filter>
<id>1722290548469</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
11 changes: 11 additions & 0 deletions core/models/reference/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,15 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<filteredResources>
<filter>
<id>1722290548807</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
11 changes: 11 additions & 0 deletions core/models/synpop/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,15 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<filteredResources>
<filter>
<id>1722290548920</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
11 changes: 11 additions & 0 deletions core/models/utils/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,15 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<filteredResources>
<filter>
<id>1722290548995</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
11 changes: 11 additions & 0 deletions core/projects/mtc/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,15 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<filteredResources>
<filter>
<id>1722290548721</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
11 changes: 11 additions & 0 deletions core/third-party/jexcelapi/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,15 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<filteredResources>
<filter>
<id>1722290548595</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
11 changes: 11 additions & 0 deletions core/third-party/jppf-2.4/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,15 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<filteredResources>
<filter>
<id>1722290548644</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
11 changes: 11 additions & 0 deletions core/third-party/jppf-2.4/admin/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,15 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
<filteredResources>
<filter>
<id>1722290548184</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
11 changes: 11 additions & 0 deletions core/third-party/jppf-2.4/client/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,15 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
<filteredResources>
<filter>
<id>1722290548285</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
11 changes: 11 additions & 0 deletions core/third-party/jppf-2.4/common/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,15 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
<filteredResources>
<filter>
<id>1722290548335</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
11 changes: 11 additions & 0 deletions core/third-party/jppf-2.4/demo/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,15 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
<filteredResources>
<filter>
<id>1722290548514</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
11 changes: 11 additions & 0 deletions core/third-party/jppf-2.4/jca-client/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,15 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
<filteredResources>
<filter>
<id>1722290548558</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
11 changes: 11 additions & 0 deletions core/third-party/jppf-2.4/node/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,15 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
<filteredResources>
<filter>
<id>1722290548767</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
11 changes: 11 additions & 0 deletions core/third-party/jppf-2.4/server/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,15 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
<filteredResources>
<filter>
<id>1722290548852</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
11 changes: 11 additions & 0 deletions core/third-party/logging-log4j-1.2.9/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,15 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<filteredResources>
<filter>
<id>1722290548687</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
11 changes: 11 additions & 0 deletions core/third-party/sqlitejdbc/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,15 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<filteredResources>
<filter>
<id>1722290548887</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
Binary file modified utilities/NextGenFwys/ModelRuns_Round2.xlsx
View file
Open in desktop
Binary file not shown.
4 changes: 3 additions & 1 deletion utilities/NextGenFwys/metrics/Additional Scripts/ngfs_corridor_map_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ def calculate_travel_time_and_return_weighted_sum_across_corridors(tm_runid, yea
# filter df for minor groupings (travel time)
minor_group_am_df = tm_ab_ctim_df.copy().loc[tm_ab_ctim_df['Grouping minor_AMPM'] == i+'_AM']
minor_group_am = sum_grouping(minor_group_am_df.loc[tm_loaded_network_df['USEAM'] == 1],'AM')
#minor_group_am = sum_grouping(minor_group_am_df.loc[(tm_loaded_network_df['USEAM'] == 1) & (tm_loaded_network_df['USEAM'] == 4)],'AM')

metrics_dict[tm_runid,metric_id,'extra',i,'%s_AM_travel_time' % i, year] = minor_group_am

# add vmt to metric dict
Expand Down Expand Up @@ -170,7 +172,7 @@ def calculate_map_data(tm_runid, year, tm_loaded_network_df, representative_link
# define base run inputs
# # base year run for comparisons (no project)
# ______load no project network to use for speed comparisons in vmt corrections______
tm_runid_base = "2035_TM160_NGF_r2_NoProject_04"
tm_runid_base = "2035_TM160_NGF_r2_NoProject_06"
tm_run_location_base = os.path.join(NGFS_SCENARIOS, tm_runid_base)
# tm_run_location_base = os.path.join(NGFS_SCENARIOS, run4)
# tm_runid_base = run4
Expand Down
Loading