Add daily NSSP forecast tests and support for ED visit type

Expanded end-to-end and fit test scripts to include daily NSSP count and 'other ED visits' forecasts. Updated argument handling in test_epiautogp_fit.sh to support an optional ed_visit_type parameter and adjusted expected model counts accordingly.

pipelines/tests/test_epiautogp_end_to_end.sh

@@ -22,7 +22,7 @@ echo "========================================"
 echo "Testing configurations:"
 echo "  Locations: ${LOCATIONS[*]}"
 echo "  Diseases: ${DISEASES[*]}"
-echo "  Targets: NHSN (weekly), NSSP (weekly percentage)"
+echo "  Targets: NHSN (weekly), NSSP (weekly percentage), NSSP (daily counts), NSSP (daily other ED visits)"
 echo "  Forecast date: $FORECAST_DATE"
 echo ""
 
@@ -64,7 +64,7 @@ for location in "${LOCATIONS[@]}"; do
 		echo "-----------------------------------------"
 
 		# Test 1: Weekly NHSN (hospital admissions)
-		echo "  [1/2] Running weekly NHSN forecast..."
+		echo "  [1/4] Running weekly NHSN forecast..."
 		bash pipelines/tests/test_epiautogp_fit.sh \
 			"$BASE_DIR" \
 			"$disease" \
@@ -81,7 +81,7 @@ for location in "${LOCATIONS[@]}"; do
 		fi
 
 		# Test 2: Weekly NSSP percentage (ED visits as percentage)
-		echo "  [2/2] Running weekly NSSP percentage forecast..."
+		echo "  [2/4] Running weekly NSSP percentage forecast..."
 		bash pipelines/tests/test_epiautogp_fit.sh \
 			"$BASE_DIR" \
 			"$disease" \
@@ -97,6 +97,41 @@ for location in "${LOCATIONS[@]}"; do
 			echo "  ✓ Weekly NSSP percentage forecast complete"
 		fi
 
+		# Test 3: Daily NSSP counts (ED visit counts, not percentages)
+		echo "  [3/4] Running daily NSSP count forecast..."
+		bash pipelines/tests/test_epiautogp_fit.sh \
+			"$BASE_DIR" \
+			"$disease" \
+			"$location" \
+			"nssp" \
+			"daily" \
+			"false"
+
+		if [ "$?" -ne 0 ]; then
+			echo "TEST-MODE FAIL: NSSP daily count forecast failed for $disease, $location"
+			exit 1
+		else
+			echo "  ✓ Daily NSSP count forecast complete"
+		fi
+
+		# Test 4: Daily NSSP other ED visits (non-target background)
+		echo "  [4/4] Running daily NSSP other ED visits forecast..."
+		bash pipelines/tests/test_epiautogp_fit.sh \
+			"$BASE_DIR" \
+			"$disease" \
+			"$location" \
+			"nssp" \
+			"daily" \
+			"false" \
+			"other"
+
+		if [ "$?" -ne 0 ]; then
+			echo "TEST-MODE FAIL: NSSP daily other ED visits forecast failed for $disease, $location"
+			exit 1
+		else
+			echo "  ✓ Daily NSSP other ED visits forecast complete"
+		fi
+
 		echo "✓ All forecasts complete for $disease, $location"
 	done
 done
@@ -106,8 +141,8 @@ echo "========================================="
 echo "Step 3: Verifying outputs"
 echo "========================================="
 
-# Count expected outputs (2 targets × number of locations × number of diseases)
-EXPECTED_MODELS=$((2 * ${#LOCATIONS[@]} * ${#DISEASES[@]}))
+# Count expected outputs (4 targets × number of locations × number of diseases)
+EXPECTED_MODELS=$((4 * ${#LOCATIONS[@]} * ${#DISEASES[@]}))
 ACTUAL_MODELS=$(find "$BASE_DIR/${FORECAST_DATE}_forecasts" -type d -name "epiautogp_*" | wc -l)
 
 echo "Expected models: $EXPECTED_MODELS"

pipelines/tests/test_epiautogp_fit.sh

@@ -4,13 +4,14 @@
 # Called by test_epiautogp_end_to_end.sh
 #
 # Usage:
-#   bash test_epiautogp_fit.sh <base_dir> <disease> <location> <target> <frequency> <use_percentage>
+#   bash test_epiautogp_fit.sh <base_dir> <disease> <location> <target> <frequency> <use_percentage> [ed_visit_type]
 
-if [[ $# -ne 6 ]]; then
-	echo "Usage: $0 <base_dir> <disease> <location> <target> <frequency> <use_percentage>"
+if [[ $# -lt 6 || $# -gt 7 ]]; then
+	echo "Usage: $0 <base_dir> <disease> <location> <target> <frequency> <use_percentage> [ed_visit_type]"
 	echo "  target: nhsn or nssp"
 	echo "  frequency: daily or epiweekly"
 	echo "  use_percentage: true or false"
+	echo "  ed_visit_type: observed or other (optional, default: observed)"
 	exit 1
 fi
 
@@ -20,6 +21,7 @@ location="$3"
 target="$4"
 frequency="$5"
 use_percentage="$6"
+ed_visit_type="${7:-observed}" # Default to "observed" if not provided
 
 # Build command arguments
 cmd_args=(
@@ -34,7 +36,7 @@ cmd_args=(
 	--frequency "$frequency"
 	--eval-data-path "$BASE_DIR/private_data/nssp-etl"
 	--nhsn-data-path "$BASE_DIR/private_data/nhsn_test_data/${disease}_${location}.parquet"
-	--n-forecast-weeks 4
+	--n-forecast-days 28
 	--n-particles 2
 	--n-mcmc 2
 	--n-hmc 2
@@ -47,6 +49,11 @@ if [ "$use_percentage" = "true" ]; then
 	cmd_args+=(--use-percentage)
 fi
 
+# Add ed-visit-type if not default
+if [ "$ed_visit_type" != "observed" ]; then
+	cmd_args+=(--ed-visit-type "$ed_visit_type")
+fi
+
 uv run python pipelines/epiautogp/forecast_epiautogp.py "${cmd_args[@]}"
 
 if [ "$?" -ne 0 ]; then