From 3a74f016318e193f78e2ff26dcf8e4b502c7d8ed Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Wed, 22 Feb 2023 16:45:13 +0100
Subject: [PATCH] Adjusting to namespace in result keys
---
src/vips_reference_model/reference_model.py | 12 ++++++------
tests/test_reference_model.py | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/vips_reference_model/reference_model.py b/src/vips_reference_model/reference_model.py
index 5106975..4e87423 100644
--- a/src/vips_reference_model/reference_model.py
+++ b/src/vips_reference_model/reference_model.py
@@ -75,15 +75,15 @@ class ReferenceModel(VIPSModel):
# Calculate day degrees from sowingDate and as far as weather data goes
# Adjusting for base temperature
- self.df["TMContrib"] = self.df["TM"].apply(get_temp_adjusted_for_base, args=(5,))
+ self.df["WEATHER.TMContrib"] = self.df["TM"].apply(get_temp_adjusted_for_base, args=(5,))
# Aggregating the day degrees
- self.df["TMDD"] = self.df["TMContrib"].cumsum()
+ self.df["WEATHER.TMDD"] = self.df["WEATHER.TMContrib"].cumsum()
# Adding the thresholds to the data frame
- self.df["THRESHOLD_LOW"] = ReferenceModel.THRESHOLD_LOW
- self.df["THRESHOLD_MEDIUM"] = ReferenceModel.THRESHOLD_MEDIUM
- self.df["THRESHOLD_HIGH"] = ReferenceModel.THRESHOLD_HIGH
+ self.df["%s.THRESHOLD_LOW" % self.MODEL_ID] = ReferenceModel.THRESHOLD_LOW
+ self.df["%s.THRESHOLD_MEDIUM" % self.MODEL_ID] = ReferenceModel.THRESHOLD_MEDIUM
+ self.df["%s.THRESHOLD_HIGH" % self.MODEL_ID] = ReferenceModel.THRESHOLD_HIGH
# For each day: check accumulated day-degrees and decide warning status
- self.df["WARNING_STATUS"] = self.df["TMDD"].apply(self.determine_warning_status)
+ self.df["WARNING_STATUS"] = self.df["WEATHER.TMDD"].apply(self.determine_warning_status)
#print(self.df)
result = get_result_list_from_dataframe(self.df)
#print(result)
diff --git a/tests/test_reference_model.py b/tests/test_reference_model.py
index 13b869a..6c5144a 100644
--- a/tests/test_reference_model.py
+++ b/tests/test_reference_model.py
@@ -58,7 +58,7 @@ class TestReferenceModel(unittest.TestCase):
self.assertIsNotNone(result_list)
last_result = result_list[len(result_list)-1]
self.assertIsNotNone(result_list[0].valid_time_start)
- self.assertEqual(555.8507083333333, last_result.get_value("TMDD"))
+ self.assertEqual(555.8507083333333, last_result.get_value("WEATHER","TMDD"))
def test_get_model_id(self):
"""
--
GitLab