Merge pull request #239 from SANDAG/skip_validation

Add option to skip validation
SANDAG · Nov 7, 2024 · 747bd5c · 747bd5c
2 parents 1acb03f + fd99057
commit 747bd5c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/main/emme/toolbox/master_run.py b/src/main/emme/toolbox/master_run.py
@@ -323,6 +323,7 @@ def __call__(self, main_directory, scenario_id, scenario_title, emmebank_title,
         skipFinalTransitAssignment = props["RunModel.skipFinalTransitAssignment"]
         skipVisualizer = props["RunModel.skipVisualizer"]
         skipDataExport = props["RunModel.skipDataExport"]
+        skipValidation = props["RunModel.skipValidation"]
         skipDatalake = props["RunModel.skipDatalake"]
         skipDataLoadRequest = props["RunModel.skipDataLoadRequest"]
         skipDeleteIntermediateFiles = props["RunModel.skipDeleteIntermediateFiles"]
@@ -790,7 +791,7 @@ def __call__(self, main_directory, scenario_id, scenario_title, emmebank_title,
                 "Exporting MGRA-level travel times", capture_output=True)
 
         # This validation procedure only works with base (2022) scenarios utilizing TNED networks
-        if scenarioYear == "2022":
+        if scenarioYear == "2022" and not skipValidation:
             self.run_proc(
                 "runValidation.bat",
                 [drive, path_no_drive, scenarioYear],

diff --git a/src/main/emme/toolbox/utilities/properties.py b/src/main/emme/toolbox/utilities/properties.py
@@ -91,6 +91,7 @@ class PropertiesSetter(object):
     skipFinalTransitAssignment = _m.Attribute(bool)
     skipVisualizer = _m.Attribute(bool)
     skipDataExport = _m.Attribute(bool)
+    skipValidation = _m.Attribute(bool)
     skipDatalake = _m.Attribute(bool)
     skipDataLoadRequest = _m.Attribute(bool)
     skipDeleteIntermediateFiles = _m.Attribute(bool)
@@ -159,7 +160,7 @@ def __init__(self):
             "skipCopyBikeLogsum", "skipBikeLogsums", "skipBuildNetwork",
             "skipHighwayAssignment", "skipTransitSkimming", "skipTransitConnector", "skipTransponderExport", "skipScenManagement", "skipABMPreprocessing", "skipABMResident", "skipABMAirport", "skipABMXborderWait", "skipABMXborder", "skipABMVisitor", "skipMAASModel",
             "skipCVMEstablishmentSyn", "skipCTM", "skipTruck", "skipEI", "skipExternal", "skipTripTableCreation", "skipFinalHighwayAssignment",
-            "skipFinalTransitAssignment", "skipVisualizer", "skipDataExport", "skipDatalake", "skipDataLoadRequest",
+            "skipFinalTransitAssignment", "skipVisualizer", "skipDataExport", "skipValidation", "skipDatalake", "skipDataLoadRequest",
             "skipDeleteIntermediateFiles")
         self._properties = None
 
@@ -243,6 +244,7 @@ def add_properties_interface(self, pb, disclosure=False):
             ("skipFinalTransitAssignment",  "Skip final transit assignments"),
             ("skipVisualizer",              "Skip running visualizer"),
             ("skipDataExport",              "Skip data export"),
+            ("skipValidation",              "Skip validation"),
             ("skipDatalake",                "Skip write to datalake"),
             ("skipDataLoadRequest",         "Skip data load request"),
             ("skipDeleteIntermediateFiles", "Skip delete intermediate files"),
@@ -387,6 +389,7 @@ def load_properties(self):
         self.skipFinalTransitAssignment = props.get("RunModel.skipFinalTransitAssignment", False)
         self.skipVisualizer = props.get("RunModel.skipVisualizer", False)
         self.skipDataExport = props.get("RunModel.skipDataExport", False)
+        self.skipValidation = props.get("RunModel.skipValidation", False)
         self.skipDatalake = props.get("RunModel.skipDatalake", False)
         self.skipDataLoadRequest = props.get("RunModel.skipDataLoadRequest", False)
         self.skipDeleteIntermediateFiles = props.get("RunModel.skipDeleteIntermediateFiles", False)
@@ -431,6 +434,7 @@ def save_properties(self):
         props["RunModel.skipFinalTransitAssignment"] = self.skipFinalTransitAssignment
         props["RunModel.skipVisualizer"] = self.skipVisualizer
         props["RunModel.skipDataExport"] = self.skipDataExport
+        props["RunModel.skipValidation"] = self.skipValidation
         props["RunModel.skipDatalake"] = self.skipDatalake
         props["RunModel.skipDataLoadRequest"] = self.skipDataLoadRequest
         props["RunModel.skipDeleteIntermediateFiles"] = self.skipDeleteIntermediateFiles