Skip to content

Merge C24q4_setup - #7

Merged
nrferguson merged 14 commits into
developfrom
c24q4_setup
Oct 29, 2024
Merged

nrferguson merged 14 commits into
developfrom
c24q4_setup

Conversation

@tinleycraig

Copy link
Copy Markdown
Contributor

Merge c24q4_setup into develop branch. Changes to implement in c24q4 Conformity:

Added

  • cmap_trip-based_model\source_code_pointer.bat - ensures CMAP-TRIP2 environment uses modedest source code in the model folder submitted
  • Database\macros\TOD_network_prep.py - replaces net5I_7c.mac; imports Arterial_delay.py, Ftime_capacity.py, calculate_busveq.py
  • Database\macros\Arterial_delay.py - Python version of Emme macro
  • Database\macros\Ftime_capacity.py - Python version of Emme macro
  • Database\macros\calculate_busveq.py - calculate bus vehicle equivalents by time-of-day period
  • Database\prep_macros\initialize_scenarios.py - build TOD highway & transit networks, import @pspac & @pcost for bus terminals
  • Database\build_scenario_networks.bat - calls prep_macros\initialize_scenarios.py and prep_macros\build_transit_error_check.py to build TOD networks

Modified

  • batch_file.yaml - sourceCode parameter added, transit_file_path --> transactionFilePath
  • Submit_Full_Regional_Model_SOLA.bat - reads updated batch_file.yaml, calls source_code_pointer.bat if flagged, calls macros\TOD_network_prep.py
  • macros\SOLA_assignment.py - revised line 124 to: if trnAsmtFlag==1 and rspFlag=="T":
  • useful_macros\cleanup_for_rerun.py - don't delete transit assignment scenarios
  • macros\skim_transit.py - change zfare to zfare_link
  • macros\transit_skim_final_matrices1.py - do not print index values for QC
  • macros\transit_skim_final_matrices2.py - do not print index values for QC
  • macros\transit_triple_indexing.py - calcUl3_2: explicitly get @pspac for RAIL nodes only
  • transit_asmt_macros\create_transit_demand.bat - update for batch_file.yaml, remove call to setup_transit_asmt_1_build_transit_asmt_networks.mac
  • transit_asmt_macros\run_transit_assignment.bat - update to remove path to transactions file
  • cmap_trip-based_model\Scripts\manage\env\CMAP-TRIP2.yml - updated to install emat 0.6
  • prep_macros\build_transit_error_check.py - updated path to transit build reports due to using emme-plus env

Deleted

  • Database\macros\net5I_7c.mac
  • Database\prep_macros\build_transit_error_check.bat
  • Database\prep_macros\build_tod_transit
  • Database\prep_macros\initialize.scenarios
  • Database\prep_macros\call\Arterial.Delay
  • Database\prep_macros\call\Ftime.Capacity
  • Database\transit_asmt_macros\setup_transit_asmt_1_build_transit_asmt_networks.mac

@tinleycraig tinleycraig changed the title Merge C24q_setup Merge C24q4_setup Oct 23, 2024
Comment thread source_code_pointer.bat Outdated
Comment thread source_code_pointer.bat Outdated
Comment thread Database/Submit_Full_Regional_Model_SOLA.bat Outdated

@nrferguson nrferguson left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have a few comments and suggestions. The most impactful is to begin using tbmtools.project.connect as the standard protocol for constructing a Modeller object.

Comment thread Database/macros/TOD_network_prep.py Outdated
Comment thread Database/Submit_Full_Regional_Model_SOLA.bat Outdated
Comment thread Database/macros/Arterial_delay.py Outdated
Comment thread Database/macros/Ftime_capacity.py Outdated
Comment thread Database/macros/Arterial_delay.py
Comment thread Database/macros/SOLA_assignment.py Outdated
Comment thread Database/macros/SOLA_assignment.py Outdated
Comment thread Database/macros/SOLA_assignment.py Outdated
Comment thread Database/Submit_Full_Regional_Model_SOLA.bat Outdated
Comment thread Database/macros/TOD_network_prep.py Outdated
@nrferguson
nrferguson force-pushed the c24q4_setup branch 2 times, most recently from 718762e to 19e9fd2 Compare October 28, 2024 16:05
Replace net5I_7c.mac and calculate bus VEQs.
sourceCode parameter added, transit_file_path --> transactionFilePath

Update references in:
* Submit_Full_Regional_Model_SOLA.bat
    - install cmap_modedest if flagged
    - call TOD_network_prep.py
* create_transit_demand.bat
    - remove call to setup_transit_asmt_1_build_transit_asmt_networks.mac
* run_transit_assignment.bat
revised line 124 to: if trnAsmtFlag==1 and rspFlag=="T":
calcUl3_2: explicitly get @pspac for RAIL nodes only
build TOD highway & transit networks

Replaces build_tod_transit, build_transit_error_check.bat, and
initialize.scenarios.

Calls:
* initialize_scenarios.py
    - build TOD networks
    - import @pspac & @pcost for bus terminals
* build_transit_error_check.py
    - updated path to transit build reports
Replace Arterial.Delay
Replace Ftime.Capacity

Delete Database/prep_macros/call/Ftime.Capacity

replaced by Ftime_capacity.py
@nrferguson
nrferguson merged commit 953c55b into develop Oct 29, 2024
@nrferguson
nrferguson deleted the c24q4_setup branch October 29, 2024 18:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants