Fix calibration scripts and calibration update

BayAreaMetro · Mar 27, 2019 · de2c5cb · de2c5cb
1 parent 92f3d6b
commit de2c5cb
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/model-files/model/ModeChoice.xls b/model-files/model/ModeChoice.xls
diff --git a/model-files/model/TripModeChoice.xls b/model-files/model/TripModeChoice.xls
diff --git a/utilities/calibration/11_tour_mode_choice_TM.R b/utilities/calibration/11_tour_mode_choice_TM.R
@@ -8,7 +8,7 @@ TARGET_DIR   <- Sys.getenv("TARGET_DIR")  # The location of the input files
 ITER         <- Sys.getenv("ITER")        # The iteration of model outputs to read
 SAMPLESHARE  <- Sys.getenv("SAMPLESHARE") # Sampling
 
-TAZ_SD_FILE    <- "X:\\travel-model-one-calibration\\utilities\\geographies\\taz-superdistrict-county.csv"
+TAZ_SD_FILE    <- "X:\\travel-model-one-master\\utilities\\geographies\\taz-superdistrict-county.csv"
 WORKBOOK       <- "M:\\Development\\Travel Model One\\Calibration\\Version 1.5.0\\11 Tour Mode Choice\\11_TourModeChoice.xlsx"
 WORKBOOK_BLANK <- gsub(".xlsx","_blank.xlsx",WORKBOOK)
 WORKBOOK_TEMP  <- gsub(".xlsx","_temp.xlsx", WORKBOOK)

diff --git a/utilities/calibration/15_trip_mode_choice_TM.R b/utilities/calibration/15_trip_mode_choice_TM.R
@@ -8,7 +8,7 @@ TARGET_DIR   <- Sys.getenv("TARGET_DIR")  # The location of the input files
 ITER         <- Sys.getenv("ITER")        # The iteration of model outputs to read
 SAMPLESHARE  <- Sys.getenv("SAMPLESHARE") # Sampling
 
-TAZ_SD_FILE    <- "X:\\travel-model-one-calibration\\utilities\\geographies\\taz-superdistrict-county.csv"
+TAZ_SD_FILE    <- "X:\\travel-model-one-master\\utilities\\geographies\\taz-superdistrict-county.csv"
 WORKBOOK       <- "M:\\Development\\Travel Model One\\Calibration\\Version 1.5.0\\15 Trip Mode Choice\\15_TripModeChoice.xlsx"
 WORKBOOK_BLANK <- gsub(".xlsx","_blank.xlsx",WORKBOOK)
 WORKBOOK_TEMP  <- gsub(".xlsx","_temp.xlsx", WORKBOOK)

diff --git a/utilities/prepare-validation-data/Prepare Observed Transit Summaries.R b/utilities/prepare-validation-data/Prepare Observed Transit Summaries.R
@@ -21,9 +21,9 @@ F_INPUT_SURVEY_DIR     = "M:/Data/OnBoard/Data and Reports/_data Standardized"
 F_INPUT_LEGACY_RDATA   = file.path(F_INPUT_SURVEY_DIR, "survey_legacy.RData")
 F_INPUT_STANDARD_RDATA = file.path(F_INPUT_SURVEY_DIR, "survey_standard.RData")
 
-F_VALIDATION_DIR       = "M:/Development/Travel Model One/Calibration/Version 1.5.0/2015_TM150_calib11/OUTPUT/validation"
+F_VALIDATION_DIR       = "M:/Development/Travel Model One/Calibration/Version 1.5.0/2015_TM150_calib13/OUTPUT/validation"
 F_INPUT_RIDERSHIP      = "M:/Data/Transit/2015 Ridership/transit ridership growth database.xlsx"
-F_INPUT_ESTIMATED      = "M:/Development/Travel Model One/Calibration/Version 1.5.0/2015_TM150_calib11/OUTPUT/validation/trnline.csv"
+F_INPUT_ESTIMATED      = "M:/Development/Travel Model One/Calibration/Version 1.5.0/2015_TM150_calib13/OUTPUT/validation/trnline.csv"
 
 F_INPUT_MUNI_APC       = "M:/Data/Transit/Muni APC Through Time/consolidated-database.csv"