repair data plot

Author: swo

Makefile

@@ -7,11 +7,12 @@ FITS = output/fits/$(RUN_ID)/
 DIAGNOSTICS = output/diagnostics/$(RUN_ID)/
 FORECASTS = output/forecasts/$(RUN_ID)/
 SCORES = output/scores/$(RUN_ID)/
+DATA_PLOT = output/diagnostics/$(RUN_ID)/data_national.png
 
 
 .PHONY: clean viz
 
-all: $(SETTINGS) $(DATA) $(FITS) $(DIAGNOSTICS) $(FORECASTS) $(SCORES)
+all: $(SETTINGS) $(DATA) $(FITS) $(DIAGNOSTICS) $(FORECASTS) $(SCORES) $(DATA_PLOT)
 
 viz:
 	streamlit run scripts/viz.py -- \
@@ -32,7 +33,7 @@ $(DIAGNOSTICS): scripts/diagnostics.py $(FITS) $(CONFIG)
 $(FITS): scripts/fit.py $(DATA) $(CONFIG)
 	python $< --data=$(DATA) --config=$(CONFIG) --output=$@
 
-output/diagnostics/$(RUN_ID)/data_national.png: scripts/describe_data.py $(DATA)
+$(DATA_PLOT): scripts/describe_data.py $(DATA)
 	python $< --input=$(DATA) --output_dir=output/diagnostics/$(RUN_ID)/
 
 $(DATA): scripts/preprocess.py $(RAW_DATA) $(CONFIG)

scripts/describe_data.py

@@ -34,16 +34,19 @@
         alt.Detail("geography"),
     ).mark_line().save(out_dir / "data_state.png")
 
+    # end of season
+    eos = data.filter((pl.col("time_end") == pl.col("time_end").max()).over("season"))
+
     # # state & nation, last month, by season
-    # alt.Chart(data.filter(pl.col("t") == 8)).mark_point().encode(
-    #     alt.X("season"), alt.Y("estimate"), alt.Color("geography_type")
-    # ).save(out_dir / "data_end_of_season.png")
+    alt.Chart(eos).mark_point().encode(
+        alt.X("season"), alt.Y("estimate"), alt.Color("geography_type")
+    ).save(out_dir / "data_end_of_season.png")
 
     # # state & nation, last month, every season
-    # alt.Chart(data.filter(pl.col("t") == 8)).mark_point().encode(
-    #     alt.X(
-    #         "geography", sort=alt.EncodingSortField("estimate", "median", "descending")
-    #     ),
-    #     alt.Y("estimate"),
-    #     alt.Color("geography_type"),
-    # ).save(out_dir / "data_end_state_season.png")
+    alt.Chart(eos).mark_point().encode(
+        alt.X(
+            "geography", sort=alt.EncodingSortField("estimate", "median", "descending")
+        ),
+        alt.Y("estimate"),
+        alt.Color("geography_type"),
+    ).save(out_dir / "data_end_state_season.png")