diff --git a/Database/transit_asmt_macros/run_transit_assignment.bat b/Database/transit_asmt_macros/run_transit_assignment.bat index 434dae4..2d95ee2 100644 --- a/Database/transit_asmt_macros/run_transit_assignment.bat +++ b/Database/transit_asmt_macros/run_transit_assignment.bat @@ -70,7 +70,8 @@ python cmap_transit_assignment_runner.py %file1% 1 %val% REM -- Summarize transit boardings cd .. set /a val21=%val%+21 -call emme -ng 000 -m transit_asmt_macros/summarize_transit_boardings.mac %val21% +rem call emme -ng 000 -m transit_asmt_macros/summarize_transit_boardings.mac %val21% +call python transit_asmt_macros\summarize_transit_boardings.py %val21% echo. REM -- Delete transit assignment matrices python transit_asmt_macros/delete_transit_skims.py %file1% diff --git a/Database/useful_macros/delete_initial_batchin_scenarios.py b/Database/useful_macros/delete_initial_batchin_scenarios.py index 713719f..6e5a7e1 100644 --- a/Database/useful_macros/delete_initial_batchin_scenarios.py +++ b/Database/useful_macros/delete_initial_batchin_scenarios.py @@ -6,6 +6,7 @@ - submit with 3-digit scenario number - modified 7/26/2016: also delete build.turn.rpt translated: Tim O'Leary, 9/26/2025 to Python 3 + - reads batch_file.yaml to retrieve 3-digit scenario number ''' import os @@ -17,7 +18,7 @@ sys.path.append(str(proj_dir.joinpath('Scripts'))) from tbmtools import project as tbm -print('delete initial batchin scenarios (*0001-*0008)') +print('delete initial batchin scenarios (*0000-*0008)') print('(and build_turn.rpt if it exists)') print(' executing...') @@ -34,7 +35,7 @@ lines_without_backslashes = ''.join([line.replace('\\','/') for line in f]) config = yaml.safe_load(lines_without_backslashes) scen_yr = config['scenario_code'] # e.g., '200' -scenarios_to_delete = [f'{scen_yr}0{i}' for i in range(1,9)] + [f'{scen_yr}0'] +scenarios_to_delete = [f'{scen_yr}0{i}' for i in range(0,9)] + [f'{scen_yr}0'] #delete scenarios for scen in scenarios_to_delete: