delete tollway.data.mac

.github/workflows/restrict-pr-source.yml

@@ -0,0 +1,23 @@
+name: Restrict PR Source Branch
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  verify-source-branch:
+    runs-on: windows-latest
+    steps:
+      - name: Verify PR source branch
+        shell: pwsh
+        run: |
+          $allowedBranch = "develop"
+          $headBranch = "${{ github.head_ref }}"
+
+          if ($headBranch -ne $allowedBranch) {
+            Write-Error "Pull Requests to this branch are only allowed from '$allowedBranch'. You tried to merge from '$headBranch'."
+            exit 1
+          }
+
+          Write-Output "Branch verification successful."

.gitignore

@@ -1,6 +1,10 @@
 # Ignore compiled Python.
 **/__pycache__
 
+# Ignore files generated by installing Python eggs.
+src/Mode-Dest-TOD/cmap_modedest.egg-info
+src/Mode-Dest-TOD/sharrow/sharrow.egg-info
+
 # Ignore large Emme project files.
 Database/emmemat
 Database/emmebank
@@ -11,6 +15,7 @@ Database/tg/fortran/HH_IN.TXT
 Database/tg/fortran/POPSYN_HH.CSV
 Database/tg/fortran/GQ_IN.TXT
 Database/tg/fortran/ATTR_IN.TXT
+Database/tg/fortran/airport_sz.csv
 Database/tg/fortran/SCHOOL_IN.CSV
 Database/tg/fortran/wfhmodule/indusmix.csv
 
@@ -34,10 +39,6 @@ Database/tg/fortran/wfhmodule/synthetic_*.zip
 Database/TG_HHENUM_OUTPUT.TXT
 Database/tg/fortran/HH_WFH_STATUS.CSV
 Database/tg/fortran/SIMULATED_HHVEH.TXT
-Database/tg/fortran/households_selected_noWFH_enumeration_count.csv
-Database/tg/fortran/households_selected_WFH_enumeration_count.csv
-Database/tg/fortran/missing_hhtype.csv
-Database/tg/fortran/trip_generation_model_log.txt
 
 # Ignore files generated by prep macros.
 Database/*_DISTR.TXT

Database/batch_file.yaml

@@ -1,12 +1,16 @@
 # Project details
-model_version: c26q2
+model_version: c25q2
 scenario_code: 100
+# ---------------- Work from home module inputs (trip generation)
+validationfiles: N
+usualwfhpct: 0.0510
+tc14pct: 0.1031
 # ---------------- Select link analysis files: provide file name (ex: RSP32_links.txt [stored in Database\Select_Link\]) or use None
 # ---------------- Can submit up to 5, comma-separated, any order, no spaces, (ex: None,test4.txt,test1.txt,None,None)
 selectLinkFile: None,None,None,None,None
 # ---------------- Transaction file path: include the path to the transaction files that will build the scenario networks in double quotes (spaces OK), 
 # ---------------- point to directory above highway\ and transit\, no ending backslash (ex: "M:\catslib\modelprod\c24q2" or "M:/catslib/modelprod/24q2")
-transactionFilePath: "M:/proj1/nrf/Conformity/c25q4"
+transactionFilePath: "M:/proj1/nrf/Conformity/c25q2"
 # ---------------- Run Transit Assignment at the end of the model run? Default is False.
 runTransitAsmt: False
 # ---------------- Transit select line analysis file: provide file name (ex: rsp57_line.txt [stored in Database\Select_Line\]) or use None
@@ -17,6 +21,6 @@ util_files: False
 UrbanSim_file: False
 # ---------------- Is this an RSP evaluation run? Default is False.
 RSP: False
-# ---------------- PUMA version used in Trip Generation. 2010 is the current option.
-pumaVersion: 2010
-
+# ---------------- sourceCode will force CMAP-TRIP2 to use the source code in this model setup if set to True. Default is True.
+# ---------------- Set to False if this is the second of two simultaneous runs being submitted.
+sourceCode: True

Database/build_scenario_networks.bat

@@ -11,7 +11,7 @@ for /f "eol=# skip=1 tokens=2 delims=:" %%z in (batch_file.yaml) do (set ver=%%z
 :break0
 for /f "eol=# skip=2 tokens=2 delims=:" %%a in (batch_file.yaml) do (set val=%%a & goto break1)
 :break1
-for /f "eol=# skip=8 tokens=2* delims=:" %%g in (batch_file.yaml) do (set transactFilePath1=%%g & set transactFilePath2=%%h & goto break6)
+for /f "eol=# skip=12 tokens=2* delims=:" %%g in (batch_file.yaml) do (set transactFilePath1=%%g & set transactFilePath2=%%h & goto break6)
 :break6
 
 set ver=%ver:~1,5%
@@ -39,14 +39,17 @@ set ok=%ok:y=Y%
 if not "%ok%"=="Y" (goto end)
 @echo ==================================================================
 
+rem Activate Emme Python env
+call %~dp0..\Scripts\manage\env\activate_env.cmd emme
+
 @ECHO --- Cleaning up databank ---
 if exist cleanup.rpt (del cleanup.rpt)
-uv run useful_macros\cleanup_for_rerun.py %val%>> cleanup.rpt
+call python useful_macros\cleanup_for_rerun.py %val%>> cleanup.rpt
 if exist reports (del reports)
 @ECHO  Cleanup complete.
 
 @ECHO --- Creating time-of-day highway and transit networks ---
-uv run prep_macros\initialize_scenarios.py
+call python prep_macros\initialize_scenarios.py
 if %ERRORLEVEL% GTR 0 (goto end)
 
 @ECHO -- Checking for transit network input errors --
@@ -56,7 +59,7 @@ if exist report\build_transit.error (del report\build_transit.error /Q)
 
 :while
 if %trnscen% GTR %maxscen% (goto loopend)
-uv run prep_macros\build_transit_error_check.py %trnscen%
+python prep_macros\build_transit_error_check.py %trnscen%
 if exist report\build_transit.error (goto badnet)
 set /A trnscen=%trnscen%+2
 goto while

Database/choice_model_params.yaml

@@ -77,6 +77,7 @@ HBWL:
   intrazonal              : 0.02173059479852062
   log_attraction          : 1.0
   metra_longtrip          : 5.625
+  ovtt_dist               : -0.076
   ovtt_dist               : -0.07639147912439262
   samp_af                 : 1.0
   totaltime               : -0.014712168298471244