Merge branch 'mobility_fix' into groundtruth_refactor

HopkinsIDD · Sep 1, 2021 · 6f0cb21 · 6f0cb21
2 parents 5613018 + ac9a28a
commit 6f0cb21
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/SEIR/NPI/Stacked.py b/SEIR/NPI/Stacked.py
@@ -107,7 +107,7 @@ def __init__(self, *, npi_config, global_config, geoids, loaded_df=None):
                     self.reduction_params.clear()
 
         for param in self.param_name:
-            if not re.match("^transition_rate \d+$",param):
+            if not re.match("^transition_rate [1234567890]+$",param):
                 self.reductions[param] = 1 - self.reductions[param]
 
         self.__checkErrors()

diff --git a/batch/inference_runner.sh b/batch/inference_runner.sh
@@ -77,7 +77,7 @@ DVC_OUTPUTS_ARRAY=($DVC_OUTPUTS)
 if [ -n "$S3_LAST_JOB_OUTPUT" ]; then
 	if [ $COVID_BLOCK_INDEX -eq 1 ]; then
 		export RESUME_RUN_INDEX=$COVID_OLD_RUN_INDEX
-		export PARQUET_TYPES="seed spar snpi seir hpar hnpi hosp"
+		export PARQUET_TYPES="seed spar snpi hpar hnpi"
 	else
 		export RESUME_RUN_INDEX=$COVID_RUN_INDEX
 		export PARQUET_TYPES="seed spar snpi seir hpar hnpi hosp llik"