From 674e69f1ffb6e4b7ba40757f641ccf6d86608b09 Mon Sep 17 00:00:00 2001 From: peterdudfield Date: Tue, 12 Dec 2023 19:18:07 +0000 Subject: [PATCH] fix test_eval_forecast --- quartz_solar_forecast/eval/forecast.py | 7 ++++--- tests/eval/test_eval_forecast.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/quartz_solar_forecast/eval/forecast.py b/quartz_solar_forecast/eval/forecast.py index c09b269c..b864cd90 100644 --- a/quartz_solar_forecast/eval/forecast.py +++ b/quartz_solar_forecast/eval/forecast.py @@ -55,9 +55,10 @@ def run_forecast(pv_df: pd.DataFrame, nwp_df: pd.DataFrame, nwp_source="ICON") - # format times = nwp_site_df["time"] step = times - ts - nwp_site_df = nwp_site_df.drop( - columns=["timestamp", "latitude", "longitude", "pv_id"] - ) + for c in ["timestamp", "latitude", "longitude", "pv_id"]: + if c in nwp_site_df.columns: + nwp_site_df = nwp_site_df.drop(columns=c) + nwp_site_df.set_index("time", inplace=True, drop=True) if isinstance(ts, str): diff --git a/tests/eval/test_eval_forecast.py b/tests/eval/test_eval_forecast.py index a660d24e..22f48fd2 100644 --- a/tests/eval/test_eval_forecast.py +++ b/tests/eval/test_eval_forecast.py @@ -18,7 +18,7 @@ def test_run_forecast(): nwp_df = pd.DataFrame( columns=[ - "id", + "pv_id", "timestamp", "t", "prate",