diff --git a/docs/installation.md b/docs/installation.md index 39007d507..f0f851fff 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -50,7 +50,7 @@ Java is required in order to create bicycle logsums, run the taxi/TNC routing mo As noted above, the user needs to install UV on the workstation they intend to install ABM3 on. UV is utilized to create a Python3-based environment required to run ActivitySim and other model components. -To install UV and create asim_140 environment using UV for all users on a server: +To install UV and create asim_151 environment using UV for all users on a server: - Create the following directories @@ -96,23 +96,23 @@ To install UV and create asim_140 environment using UV for all users on a server - Run the following commands (one at a time): - `mkdir asim_140 ` + `mkdir asim_151 ` - `cd asim_140 ` + `cd asim_151 ` `echo 3.10 > .python-version ` `uv init ` -- Open asim_140/pyproject.toml and edit the requires-python setting to: +- Open asim_151/pyproject.toml and edit the requires-python setting to: `requires-python = ">=3.10, <3.11"` -- Back in command prompt (at C:\uv_env\asim_140), run one final command +- Back in command prompt (at C:\uv_env\asim_151), run one final command `uv add -r requirements.txt ` - - The requirements.txt will have to be saved under asim_140 or you will have to point to wherever it is saved + - The requirements.txt will have to be saved under asim_151 or you will have to point to wherever it is saved - The requirements.txt is on the GitHub repo at: [requirements.txt](https://github.com/SANDAG/ABM/blob/main/src/asim/scripts/requirements.txt) @@ -128,9 +128,9 @@ To install UV and create asim_140 environment using UV for all users on a server - Under Environment Variables > System variables (requires Admin) - - Create a new variable called ***activate_uv_asim*** and set to the path of asim_140’s activate file + - Create a new variable called ***activate_uv_asim_151*** and set to the path of asim_151’s activate file - - E.g., C:\uv_env\asim_140\\.venv\Scripts\activate + - E.g., C:\uv_env\asim_151\\.venv\Scripts\activate #### Azure Environment Variables diff --git a/src/asim-cvm/extensions/cvm_route_stops.py b/src/asim-cvm/extensions/cvm_route_stops.py index 98c333cf3..26da0bacd 100644 --- a/src/asim-cvm/extensions/cvm_route_stops.py +++ b/src/asim-cvm/extensions/cvm_route_stops.py @@ -480,7 +480,7 @@ def _route_stop_location( eligibility_term ] - maz_choices = choose_MAZ_for_TAZ(state, taz_sample, MAZ_size_terms, trace_label) + maz_choices = choose_MAZ_for_TAZ(state, taz_sample, MAZ_size_terms, model_settings, trace_label) assert DEST_MAZ in maz_choices maz_choices = maz_choices.rename(columns={DEST_MAZ: alt_dest_col_name}) diff --git a/src/asim-cvm/extensions/cvm_terminal_choice.py b/src/asim-cvm/extensions/cvm_terminal_choice.py index f1988952f..159bb892b 100644 --- a/src/asim-cvm/extensions/cvm_terminal_choice.py +++ b/src/asim-cvm/extensions/cvm_terminal_choice.py @@ -7,7 +7,7 @@ import numpy as np import pandas as pd -from activitysim.abm.models.util import annotate, tour_destination +from activitysim.abm.models.util import tour_destination from activitysim.core import ( estimation, expressions, @@ -469,7 +469,7 @@ def route_endpoint( eligibility_term ] - maz_choices = choose_MAZ_for_TAZ(state, taz_sample, MAZ_size_terms, trace_label) + maz_choices = choose_MAZ_for_TAZ(state, taz_sample, MAZ_size_terms, model_settings, trace_label) assert DEST_MAZ in maz_choices maz_choices = maz_choices.rename(columns={DEST_MAZ: alt_dest_col_name}) @@ -498,7 +498,12 @@ def route_endpoint( state.add_table("routes", routes) if model_settings.annotate_routes: - annotate.annotate_tours(state, model_settings, trace_label) + expressions.assign_columns( + state, + df=routes, + model_settings=model_settings.annotate_routes, + trace_label=tracing.extend_trace_label(trace_label, "annotate_routes"), + ) @workflow.step diff --git a/src/asim-cvm/extensions/cvm_terminal_choice_tnc.py b/src/asim-cvm/extensions/cvm_terminal_choice_tnc.py index 688f97a3c..070e06292 100644 --- a/src/asim-cvm/extensions/cvm_terminal_choice_tnc.py +++ b/src/asim-cvm/extensions/cvm_terminal_choice_tnc.py @@ -7,7 +7,7 @@ import numpy as np import pandas as pd -from activitysim.abm.models.util import annotate, tour_destination +from activitysim.abm.models.util import tour_destination from activitysim.core.interaction_sample import interaction_sample from activitysim.core import ( estimation, @@ -306,7 +306,12 @@ def route_endpoint_tnc( state.add_table("routes", routes) if model_settings.annotate_routes: - annotate.annotate_tours(state, model_settings, trace_label) + expressions.assign_columns( + state, + df=routes, + model_settings=model_settings.annotate_routes, + trace_label=tracing.extend_trace_label(trace_label, "annotate_routes"), + ) @workflow.step diff --git a/src/asim/configs/crossborder/estimation.yaml b/src/asim/configs/crossborder/estimation.yaml index bbe11f7fc..a8d0da483 100644 --- a/src/asim/configs/crossborder/estimation.yaml +++ b/src/asim/configs/crossborder/estimation.yaml @@ -27,82 +27,4 @@ survey_tables: index_col: tour_id trips: file_name: trips_survey.csv - index_col: trip_id - -estimation_table_recipes: - - interaction_sample_simulate: - omnibus_tables: - choosers_combined: - - choices - - override_choices - - choosers - alternatives_combined: - - interaction_sample_alternatives - - interaction_expression_values - omnibus_tables_append_columns: [choosers_combined] - - interaction_simulate: - omnibus_tables: - choosers_combined: - - choices - - override_choices - - choosers - omnibus_tables_append_columns: [choosers_combined] - - simple_simulate: - omnibus_tables: - values_combined: - - choices - - override_choices - - expression_values - - choosers - omnibus_tables_append_columns: [values_combined] - - cdap_simulate: - omnibus_tables: - values_combined: - - choices - - override_choices - - choosers - omnibus_tables_append_columns: [values_combined] - - simple_probabilistic: - omnibus_tables: - values_combined: - - choices - - override_choices - - choosers - - probs - omnibus_tables_append_columns: [values_combined] - - -model_estimation_table_types: - tour_scheduling_probabilistic: simple_probabilistic - tour_od_choice: interaction_sample_simulate - school_location: interaction_sample_simulate - workplace_location: interaction_sample_simulate - auto_ownership: simple_simulate - free_parking: simple_simulate - cdap: cdap_simulate - mandatory_tour_frequency: simple_simulate - mandatory_tour_scheduling_work: interaction_sample_simulate - mandatory_tour_scheduling_school: interaction_sample_simulate - joint_tour_frequency: simple_simulate - joint_tour_composition: simple_simulate - joint_tour_participation: simple_simulate - joint_tour_destination: interaction_sample_simulate - joint_tour_scheduling: interaction_sample_simulate - non_mandatory_tour_frequency: interaction_simulate - non_mandatory_tour_destination: interaction_sample_simulate - non_mandatory_tour_scheduling: interaction_sample_simulate - tour_mode_choice: simple_simulate - atwork_subtour_frequency: simple_simulate - atwork_subtour_destination: interaction_sample_simulate - atwork_subtour_scheduling: interaction_sample_simulate - atwork_subtour_mode_choice: simple_simulate - stop_frequency: simple_simulate - trip_purpose: simple_probabilistic - trip_destination: interaction_sample_simulate - trip_scheduling: simple_probabilistic - trip_mode_choice: simple_simulate + index_col: trip_id \ No newline at end of file diff --git a/src/asim/configs/visitor/estimation.yaml b/src/asim/configs/visitor/estimation.yaml index 633333164..785b8f5ea 100644 --- a/src/asim/configs/visitor/estimation.yaml +++ b/src/asim/configs/visitor/estimation.yaml @@ -27,82 +27,4 @@ survey_tables: index_col: tour_id trips: file_name: trips_survey.csv - index_col: trip_id - -estimation_table_recipes: - - interaction_sample_simulate: - omnibus_tables: - choosers_combined: - - choices - - override_choices - - choosers - alternatives_combined: - - interaction_sample_alternatives - - interaction_expression_values - omnibus_tables_append_columns: [choosers_combined] - - interaction_simulate: - omnibus_tables: - choosers_combined: - - choices - - override_choices - - choosers - omnibus_tables_append_columns: [choosers_combined] - - simple_simulate: - omnibus_tables: - values_combined: - - choices - - override_choices - - expression_values - - choosers - omnibus_tables_append_columns: [values_combined] - - cdap_simulate: - omnibus_tables: - values_combined: - - choices - - override_choices - - choosers - omnibus_tables_append_columns: [values_combined] - - simple_probabilistic: - omnibus_tables: - values_combined: - - choices - - override_choices - - choosers - - probs - omnibus_tables_append_columns: [values_combined] - - -model_estimation_table_types: - tour_scheduling_probabilistic: simple_probabilistic - tour_od_choice: interaction_sample_simulate - school_location: interaction_sample_simulate - workplace_location: interaction_sample_simulate - auto_ownership: simple_simulate - free_parking: simple_simulate - cdap: cdap_simulate - mandatory_tour_frequency: simple_simulate - mandatory_tour_scheduling_work: interaction_sample_simulate - mandatory_tour_scheduling_school: interaction_sample_simulate - joint_tour_frequency: simple_simulate - joint_tour_composition: simple_simulate - joint_tour_participation: simple_simulate - joint_tour_destination: interaction_sample_simulate - joint_tour_scheduling: interaction_sample_simulate - non_mandatory_tour_frequency: interaction_simulate - non_mandatory_tour_destination: interaction_sample_simulate - non_mandatory_tour_scheduling: interaction_sample_simulate - tour_mode_choice: simple_simulate - atwork_subtour_frequency: simple_simulate - atwork_subtour_destination: interaction_sample_simulate - atwork_subtour_scheduling: interaction_sample_simulate - atwork_subtour_mode_choice: simple_simulate - stop_frequency: simple_simulate - trip_purpose: simple_probabilistic - trip_destination: interaction_sample_simulate - trip_scheduling: simple_probabilistic - trip_mode_choice: simple_simulate + index_col: trip_id \ No newline at end of file diff --git a/src/asim/scripts/requirements.txt b/src/asim/scripts/requirements.txt index b33cdfa0a..21dd4c78a 100644 --- a/src/asim/scripts/requirements.txt +++ b/src/asim/scripts/requirements.txt @@ -66,4 +66,4 @@ xmle wring zarr>=2,<3 zstandard -activitysim==1.4.0 +activitysim==1.5.1 diff --git a/src/main/resources/DataExporter.bat b/src/main/resources/DataExporter.bat index e77f73465..068d7c33f 100644 --- a/src/main/resources/DataExporter.bat +++ b/src/main/resources/DataExporter.bat @@ -7,7 +7,7 @@ call bin\CTRampEnv.bat set JAR_LOCATION=%PROJECT_DIRECTORY%/application rem ### Call environment -CALL %activate_uv_asim% +CALL %activate_uv_asim_151% %PROJECT_DRIVE% cd %PROJECT_DRIVE%%PROJECT_DIRECTORY% diff --git a/src/main/resources/RunViz.bat b/src/main/resources/RunViz.bat index 2a971fcc1..8c059f838 100644 --- a/src/main/resources/RunViz.bat +++ b/src/main/resources/RunViz.bat @@ -2,7 +2,7 @@ set PROJECT_DRIVE=%1 set PROJECT_DIRECTORY=%2 ECHO Activate ActivitySim.... -CALL %activate_uv_asim% +CALL %activate_uv_asim_151% cd /d %PROJECT_DIRECTORY% diff --git a/src/main/resources/convertSkimsToOMXZ.cmd b/src/main/resources/convertSkimsToOMXZ.cmd index 0e94a57fd..a694db850 100644 --- a/src/main/resources/convertSkimsToOMXZ.cmd +++ b/src/main/resources/convertSkimsToOMXZ.cmd @@ -1,7 +1,7 @@ set PROJECT_DRIVE=%1 set PROJECT_DIRECTORY=%2 -CALL %activate_uv_asim% +CALL %activate_uv_asim_151% %PROJECT_DRIVE% cd /d %PROJECT_DIRECTORY% diff --git a/src/main/resources/cvm.bat b/src/main/resources/cvm.bat index 34e5a713b..8b0797f97 100644 --- a/src/main/resources/cvm.bat +++ b/src/main/resources/cvm.bat @@ -4,7 +4,7 @@ set PROJECT_DIRECTORY=%2 set SCENARIO_YEAR_WITH_SUFFIX=%3 ECHO Activate ActivitySim for CVM... -CALL %activate_uv_asim% +CALL %activate_uv_asim_151% set MKL_NUM_THREADS=1 set MKL=1 diff --git a/src/main/resources/cvmEst.bat b/src/main/resources/cvmEst.bat index 7ed7de56f..36a4fc270 100644 --- a/src/main/resources/cvmEst.bat +++ b/src/main/resources/cvmEst.bat @@ -4,7 +4,7 @@ set PROJECT_DIRECTORY=%2 set luz_data_file=%3 ECHO Activate ActivitySim for CVM... -CALL %activate_uv_asim% +CALL %activate_uv_asim_151% set MKL_NUM_THREADS=1 set MKL=1 diff --git a/src/main/resources/export_hwy_shape.cmd b/src/main/resources/export_hwy_shape.cmd index e796a818e..cdb4302f0 100644 --- a/src/main/resources/export_hwy_shape.cmd +++ b/src/main/resources/export_hwy_shape.cmd @@ -6,8 +6,8 @@ set PROJECT_DIRECTORY=%2 %PROJECT_DRIVE% cd /d %PROJECT_DIRECTORY% -ECHO Activate asim_140.... -CALL %activate_uv_asim% +ECHO Activate asim_151.... +CALL %activate_uv_asim_151% set MKL_NUM_THREADS=1 set MKL=1 diff --git a/src/main/resources/htm.bat b/src/main/resources/htm.bat index 4f1133648..a9b92ef19 100644 --- a/src/main/resources/htm.bat +++ b/src/main/resources/htm.bat @@ -8,7 +8,7 @@ set scenario_year=%6 set scenario_year_with_suffix=%7 ECHO Activate ActivitySim for CVM... -CALL %activate_uv_asim% +CALL %activate_uv_asim_151% set MKL_NUM_THREADS=1 set MKL=1 diff --git a/src/main/resources/manage_skim_mem.cmd b/src/main/resources/manage_skim_mem.cmd index 20fa1db58..77edcb6d3 100644 --- a/src/main/resources/manage_skim_mem.cmd +++ b/src/main/resources/manage_skim_mem.cmd @@ -6,8 +6,8 @@ set PROJECT_DIRECTORY=%2 %PROJECT_DRIVE% cd /d %PROJECT_DIRECTORY% -ECHO Activate asim_140.... -CALL %activate_uv_asim% +ECHO Activate asim_151.... +CALL %activate_uv_asim_151% set MKL_NUM_THREADS=1 set MKL=1 diff --git a/src/main/resources/runSandagAbm_2zoneSkim.cmd b/src/main/resources/runSandagAbm_2zoneSkim.cmd index d2bcbcf72..bb5100001 100644 --- a/src/main/resources/runSandagAbm_2zoneSkim.cmd +++ b/src/main/resources/runSandagAbm_2zoneSkim.cmd @@ -8,7 +8,7 @@ cd /d %PROJECT_DIRECTORY% :: --------------------------------------------------------------------- ECHO Activate ActivitySim Environment.... -CALL %activate_uv_asim% +CALL %activate_uv_asim_151% :: Run skimming python src/main/python/2zoneSkim.py %PROJECT_DIRECTORY% || exit /b 2 diff --git a/src/main/resources/runSandagAbm_ActivitySim.cmd b/src/main/resources/runSandagAbm_ActivitySim.cmd deleted file mode 100644 index e841163f7..000000000 --- a/src/main/resources/runSandagAbm_ActivitySim.cmd +++ /dev/null @@ -1,81 +0,0 @@ -rem @echo on - -set PROJECT_DRIVE=%1 -set PROJECT_DIRECTORY=%2 -set SAMPLERATE=%3 -set ITERATION=%4 - -%PROJECT_DRIVE% -cd /d %PROJECT_DIRECTORY% - -SET SAMPLE_ITERATION1=300000 -SET SAMPLE_ITERATION2=600000 -SET SAMPLE_ITERATION3=0 - -:: ------------------------------------------------------------------------------------------------- -:: Loop -:: ------------------------------------------------------------------------------------------------- -ECHO ****MODEL ITERATION %ITERATION% -ECHO REINDEX %REINDEX% - -IF %ITERATION% EQU 1 SET SAMPLE=%SAMPLE_ITERATION1% -IF %ITERATION% EQU 2 SET SAMPLE=%SAMPLE_ITERATION2% -IF %ITERATION% EQU 3 SET SAMPLE=%SAMPLE_ITERATION3% - - -ECHO CURRENT DIRECTORY: %cd% -CD src\asim\configs\resident -:: Set sample_rate in configs file dynamically -ECHO # Configs File with Sample Rate set by Model Runner > settings_mp.yaml -FOR /F "delims=*" %%i IN (settings_mp_source.yaml) DO ( - SET LINE=%%i - SETLOCAL EnableDelayedExpansion - SET LINE=!LINE:%%sample_size%%=%SAMPLE%! - ECHO !LINE!>>settings_mp.yaml - ENDLOCAL -) -:: ------------------------------------------------------------------------------------------------- -:: Run SEMCOG ActivitySim -:: Anaconda installation directory is set in the Paremters tab in transcAD Add-In -:: --------------------------------------------------------------------- -SET ANACONDA_DIR=%CONDA_PREFIX% - - -SET PATH=%ANACONDA_DIR%\Library\bin;%PATH% -SET PATH=%ANACONDA_DIR%\Scripts;%ANACONDA_DIR%\bin;%PATH% - -:: setup paths to Python application, Conda script, etc. -SET CONDA_ACT=%ANACONDA_DIR%\Scripts\activate.bat -ECHO CONDA_ACT: %CONDA_ACT% - -SET CONDA_DEA=%ANACONDA_DIR%\Scripts\deactivate.bat -ECHO CONDA_DEA: %CONDA_DEA% - -SET PYTHON=C:\Users\%USERNAME%\.conda\envs\asim_140\python.exe -ECHO PYTHON: %PYTHON% - -ECHO Activate ActivitySim.... -CD /d %ANACONDA_DIR%\Scripts -CALL %CONDA_ACT% asim_140 - -set MKL_NUM_THREADS=1 -set MKL=1 - -cd /d %PROJECT_DIRECTORY% - -:: Create Directory to Store ActivitySim Outputs -CD Output -ECHO Create Output Directory -MD ActivitySim -MD ActivitySim\trace -MD ActivitySim\log -CD .. - -:: Run simulation.py -%PYTHON% src/asim/simulation.py -s settings_mp.yaml -c src/asim/configs/resident -c src/asim/configs/common -d input -o output/ActivitySim || exit /b 2 - -CD %BATCH_DIR% - -ECHO ActivitySim run complete!! -ECHO %startTime%%Time% - diff --git a/src/main/resources/runSandagAbm_ActivitySimAirport.cmd b/src/main/resources/runSandagAbm_ActivitySimAirport.cmd index 86c59199c..90f32a4e9 100644 --- a/src/main/resources/runSandagAbm_ActivitySimAirport.cmd +++ b/src/main/resources/runSandagAbm_ActivitySimAirport.cmd @@ -10,7 +10,7 @@ cd /d %PROJECT_DIRECTORY% :: Run ActivitySim :: --------------------------------------------------------------------- ECHO Activate ActivitySim.... -CALL %activate_uv_asim% +CALL %activate_uv_asim_151% set MKL_NUM_THREADS=1 set MKL=1 diff --git a/src/main/resources/runSandagAbm_ActivitySimResident.cmd b/src/main/resources/runSandagAbm_ActivitySimResident.cmd index fba5ceb20..f3ae2cf0a 100644 --- a/src/main/resources/runSandagAbm_ActivitySimResident.cmd +++ b/src/main/resources/runSandagAbm_ActivitySimResident.cmd @@ -11,7 +11,7 @@ cd /d %PROJECT_DIRECTORY% :: --------------------------------------------------------------------- ECHO Activate ActivitySim.... -CALL %activate_uv_asim% +CALL %activate_uv_asim_151% set MKL_NUM_THREADS=1 set MKL=1 diff --git a/src/main/resources/runSandagAbm_ActivitySimVisitor.cmd b/src/main/resources/runSandagAbm_ActivitySimVisitor.cmd index 511660fb0..621b58fb8 100644 --- a/src/main/resources/runSandagAbm_ActivitySimVisitor.cmd +++ b/src/main/resources/runSandagAbm_ActivitySimVisitor.cmd @@ -10,7 +10,7 @@ cd /d %PROJECT_DIRECTORY% :: Run ActivitySim :: --------------------------------------------------------------------- ECHO Activate ActivitySim.... -CALL %activate_uv_asim% +CALL %activate_uv_asim_151% set MKL_NUM_THREADS=1 set MKL=1 diff --git a/src/main/resources/runSandagAbm_ActivitySimXborder.cmd b/src/main/resources/runSandagAbm_ActivitySimXborder.cmd index 9fbce9243..9cbdcd28f 100644 --- a/src/main/resources/runSandagAbm_ActivitySimXborder.cmd +++ b/src/main/resources/runSandagAbm_ActivitySimXborder.cmd @@ -10,7 +10,7 @@ cd /d %PROJECT_DIRECTORY% :: Run ActivitySim :: --------------------------------------------------------------------- ECHO Activate ActivitySim.... -CALL %activate_uv_asim% +CALL %activate_uv_asim_151% set MKL_NUM_THREADS=1 set MKL=1 diff --git a/src/main/resources/runSandagAbm_ActivitySimXborderWaitModel.cmd b/src/main/resources/runSandagAbm_ActivitySimXborderWaitModel.cmd index 2442fa7a6..204ecab5a 100644 --- a/src/main/resources/runSandagAbm_ActivitySimXborderWaitModel.cmd +++ b/src/main/resources/runSandagAbm_ActivitySimXborderWaitModel.cmd @@ -15,7 +15,7 @@ ECHO ****MODEL ITERATION %ITERATION% :: Run ActivitySim :: --------------------------------------------------------------------- ECHO Activate ActivitySim.... -CALL %activate_uv_asim% +CALL %activate_uv_asim_151% set MKL_NUM_THREADS=1 set MKL=1 diff --git a/src/main/resources/runSandagAbm_Preprocessing.cmd b/src/main/resources/runSandagAbm_Preprocessing.cmd index 35a0a78de..6b7416cfd 100644 --- a/src/main/resources/runSandagAbm_Preprocessing.cmd +++ b/src/main/resources/runSandagAbm_Preprocessing.cmd @@ -9,7 +9,7 @@ set SCENYEAR=%4 cd /d %PROJECT_DIRECTORY% ECHO Activate ActivitySim.... -CALL %activate_uv_asim% +CALL %activate_uv_asim_151% CD output MD airport.CBX diff --git a/src/main/resources/runSandagMGRASkims.cmd b/src/main/resources/runSandagMGRASkims.cmd index 90aa392ab..0988601a8 100644 --- a/src/main/resources/runSandagMGRASkims.cmd +++ b/src/main/resources/runSandagMGRASkims.cmd @@ -6,7 +6,7 @@ set PROJECT_DIRECTORY=%2 %PROJECT_DRIVE% cd %PROJECT_DRIVE%%PROJECT_DIRECTORY% -CALL %activate_uv_asim% +CALL %activate_uv_asim_151% rem rem build walk skims ECHO Running 2-zone skimming procedure... diff --git a/src/main/resources/runSandag_ScenManagement.cmd b/src/main/resources/runSandag_ScenManagement.cmd index 2a77dd14d..268d3ce0c 100644 --- a/src/main/resources/runSandag_ScenManagement.cmd +++ b/src/main/resources/runSandag_ScenManagement.cmd @@ -7,7 +7,7 @@ set SCENYEARWITHSUFFIX=%3 %PROJECT_DRIVE% cd /d %PROJECT_DIRECTORY% -CALL %activate_uv_asim% +CALL %activate_uv_asim_151% python src/asim/scripts/ScenarioManagement/scenManagement.py %PROJECT_DIRECTORY% %SCENYEAR% %SCENYEARWITHSUFFIX% diff --git a/src/main/resources/runValidation.bat b/src/main/resources/runValidation.bat index b08410f35..3c7aa197e 100644 --- a/src/main/resources/runValidation.bat +++ b/src/main/resources/runValidation.bat @@ -12,7 +12,7 @@ if not exist %VALIDATION_DIRECTORY% mkdir %VALIDATION_DIRECTORY% rem CREATE VIS WORKSHEET FOR POWER BI VISUALIZATIONS rem ### Use ABM3 uv env (for both tcov and tned) -CALL %activate_uv_asim% +CALL %activate_uv_asim_151% rem ### Running validation pipeline for input scenario python python\validation.py %PROJECT_DRIVE%%PROJECT_DIRECTORY% %SCENARIOYEAR% \ No newline at end of file diff --git a/src/main/resources/run_travel_time_calculator.cmd b/src/main/resources/run_travel_time_calculator.cmd index e3ef36548..bc8d34f45 100644 --- a/src/main/resources/run_travel_time_calculator.cmd +++ b/src/main/resources/run_travel_time_calculator.cmd @@ -6,8 +6,8 @@ set PROJECT_DIRECTORY=%2 %PROJECT_DRIVE% cd /d %PROJECT_DIRECTORY% -ECHO Activate asim_140.... -CALL %activate_uv_asim% +ECHO Activate asim_151.... +CALL %activate_uv_asim_151% set MKL_NUM_THREADS=1 set MKL=1 diff --git a/src/main/resources/write_to_datalake.cmd b/src/main/resources/write_to_datalake.cmd index b8d915966..2488d1786 100644 --- a/src/main/resources/write_to_datalake.cmd +++ b/src/main/resources/write_to_datalake.cmd @@ -7,8 +7,8 @@ set ENV=%3 %PROJECT_DRIVE% cd /d %PROJECT_DIRECTORY% -ECHO Activate asim_140.... -CALL %activate_uv_asim% +ECHO Activate asim_151.... +CALL %activate_uv_asim_151% set MKL_NUM_THREADS=1 set MKL=1