Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 6 additions & 19 deletions model-files/RunLogsums.bat
Original file line number Diff line number Diff line change
Expand Up @@ -76,34 +76,21 @@ if not exist logsums\indivTripData_%ITER%.csv (

:: ------------------------------------------------------------------------------------------------------
::
:: Step 3: Reformat logsums
:: Step 3: Reformat logsums and Summarize Accessibilities Market
::
:: ------------------------------------------------------------------------------------------------------

set TARGET_DIR=%CD%
if not exist logsums\mandatoryAccessibilities.csv (
call "%R_HOME%\bin\x64\Rscript.exe" --vanilla ".\CTRAMP\scripts\core_summaries\logsumJoiner.R"
IF %ERRORLEVEL% GTR 0 goto done
)
if not exist %TARGET_DIR%\popsyn\hhFile.csv ( copy %TARGET_DIR%\popsyn\hhFile.*.csv %TARGET_DIR%\popsyn\hhFile.csv )
if not exist %TARGET_DIR%\popsyn\personFile.csv ( copy %TARGET_DIR%\popsyn\personFile.*.csv %TARGET_DIR%\popsyn\personFile.csv )

:: ------------------------------------------------------------------------------------------------------
::
:: Step 4: Accessibilities Markets
::
:: ------------------------------------------------------------------------------------------------------

if not exist core_summaries\AccessibilityMarkets.csv (
rem Rename these to standard names
if not exist %TARGET_DIR%\popsyn\hhFile.csv ( copy %TARGET_DIR%\popsyn\hhFile.*.csv %TARGET_DIR%\popsyn\hhFile.csv )
if not exist %TARGET_DIR%\popsyn\personFile.csv ( copy %TARGET_DIR%\popsyn\personFile.*.csv %TARGET_DIR%\popsyn\personFile.csv )

call "%R_HOME%\bin\x64\Rscript.exe" --vanilla ".\CTRAMP\scripts\core_summaries\AccessibilityMarkets.R"
IF %ERRORLEVEL% GTR 0 goto done
if not exist logsums\mandatoryAccessibilities.csv (
python CTRAMP\scripts\core_summaries\summarizeLogsums.py --iter %ITER% --sampleShare %SAMPLESHARE%
)

:: ------------------------------------------------------------------------------------------------------
::
:: Step 5: Accessibilities (logsums) for Bay Area UrbanSim
:: Step 4: Accessibilities (logsums) for Bay Area UrbanSim
::
:: ------------------------------------------------------------------------------------------------------

Expand Down
181 changes: 0 additions & 181 deletions model-files/scripts/core_summaries/AccessibilityMarkets.R

This file was deleted.

107 changes: 0 additions & 107 deletions model-files/scripts/core_summaries/logsumJoiner.R

This file was deleted.

Loading