Merge branch 'felix_issue087_BUG-multiply_extreme_None_check' into 'develop'

Felix issue087 bug multiply extreme none check

See merge request toar/machinelearningtools!82

src/data_handling/data_preparation.py

@@ -447,6 +447,12 @@ class DataPrep(object):
             if True only extract values larger than extreme_values
         :param timedelta: used as arguments for np.timedelta in order to mark extreme values on datetime
         """
+
+        # check if labels or history is None
+        if (self.label is None) or (self.history is None):
+            logging.debug(f"{self.station} has `None' labels, skip multiply extremes")
+            return
+
         # check type if inputs
         extreme_values = helpers.to_list(extreme_values)
         for i in extreme_values:

test/test_data_handling/test_data_preparation.py

@@ -427,6 +427,9 @@ class TestDataPrep:
         assert f(upsampled, lt, -1) == sum([f(orig, lt, -1), f(orig, lt, -1.5), f(orig, lt, -2) * 2, f(orig, lt, -3) * 4])
 
     def test_multiply_extremes_wrong_extremes(self, data):
+        data.transform("datetime")
+        data.make_history_window("variables", 3, "datetime")
+        data.make_labels("variables", "o3", "datetime", 2)
         with pytest.raises(TypeError) as e:
             data.multiply_extremes([1, "1.5", 2])
         assert "Elements of list extreme_values have to be (<class 'float'>, <class 'int'>), but at least element 1.5" \
@@ -445,6 +448,23 @@ class TestDataPrep:
         assert upsampled.shape[2] == sum([f(orig, gt, 1), f(orig, gt, 2)])
         assert f(upsampled, lt, -1) == 0
 
+    def test_multiply_extremes_none_label(self, data):
+        data.transform("datetime")
+        data.make_history_window("variables", 3, "datetime")
+        data.label = None
+        assert data.multiply_extremes([1], extremes_on_right_tail_only=False) is None
+
+    def test_multiply_extremes_none_history(self,data ):
+        data.transform("datetime")
+        data.history = None
+        data.make_labels("variables", "o3", "datetime", 2)
+        assert data.multiply_extremes([1], extremes_on_right_tail_only=False) is None
+
+    def test_multiply_extremes_none_label_history(self,data ):
+        data.history = None
+        data.label = None
+        assert data.multiply_extremes([1], extremes_on_right_tail_only=False) is None
+
     def test_get_extremes_history(self, data):
         data.transform("datetime")
         data.make_history_window("variables", 3, "datetime")