From 8c64b6419200890bf5c01984b55ecea3f61e37dc Mon Sep 17 00:00:00 2001 From: Alexey Velikiy Date: Mon, 15 Apr 2019 13:58:27 +0300 Subject: [PATCH] np.NaN -> np.nan (#571) --- analytics/tests/test_dataset.py | 4 ++-- analytics/tests/test_utils.py | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/analytics/tests/test_dataset.py b/analytics/tests/test_dataset.py index e0c92f3..00249e2 100644 --- a/analytics/tests/test_dataset.py +++ b/analytics/tests/test_dataset.py @@ -138,14 +138,14 @@ class TestDataset(unittest.TestCase): self.fail('Model {} raised unexpectedly'.format(model_name)) def test_prepare_data_for_nan(self): - data = [[1523889000000, np.NaN], [1523889000001, np.NaN], [1523889000002, np.NaN]] + data = [[1523889000000, np.nan], [1523889000001, np.nan], [1523889000002, np.nan]] try: data = prepare_data(data) except ValueError: self.fail('Model {} raised unexpectedly'.format(model_name)) def test_prepare_data_output_fon_nan(self): - data_nan = [[1523889000000, np.NaN], [1523889000001, np.NaN], [1523889000002, np.NaN]] + data_nan = [[1523889000000, np.nan], [1523889000001, np.nan], [1523889000002, np.nan]] data_none = [[1523889000000, None], [1523889000001, None], [1523889000002, None]] return_data_nan = prepare_data(data_nan) return_data_none = prepare_data(data_none) diff --git a/analytics/tests/test_utils.py b/analytics/tests/test_utils.py index b8a3144..d7850f5 100644 --- a/analytics/tests/test_utils.py +++ b/analytics/tests/test_utils.py @@ -20,11 +20,11 @@ class TestUtils(unittest.TestCase): self.assertTrue(math.isclose(utils_result, result, rel_tol = RELATIVE_TOLERANCE)) def test_confidence_all_nan_value(self): - segment = [np.NaN, np.NaN, np.NaN, np.NaN] + segment = [np.nan, np.nan, np.nan, np.nan] self.assertEqual(utils.find_confidence(segment)[0], 0) def test_confidence_with_nan_value(self): - data = [np.NaN, np.NaN, 0, 8] + data = [np.nan, np.nan, 0, 8] utils_result = utils.find_confidence(data)[0] result = 4.0 self.assertTrue(math.isclose(utils_result, result, rel_tol = RELATIVE_TOLERANCE)) @@ -53,7 +53,7 @@ class TestUtils(unittest.TestCase): self.assertEqual(utils_result, result) def test_subtract_min_with_nan(self): - segment = [np.NaN, 2, 4, 1, 2, 4] + segment = [np.nan, 2, 4, 1, 2, 4] segment = pd.Series(segment) result = [2, 4, 1, 2, 4] utils_result = list(utils.subtract_min_without_nan(segment)[1:]) @@ -69,7 +69,7 @@ class TestUtils(unittest.TestCase): self.assertNotEqual(utils.get_convolve(pattern_index, av_model, data, window_size), result) def test_get_convolve_with_nan(self): - data = [1, 2, 3, 2, np.NaN, 0, 2, 3, 4, np.NaN, 2, 1, 1, 2, 3, 4, 3, np.NaN, 0] + data = [1, 2, 3, 2, np.nan, 0, 2, 3, 4, np.nan, 2, 1, 1, 2, 3, 4, 3, np.nan, 0] data = pd.Series(data) pattern_index = [2, 8, 15] window_size = 2 @@ -137,7 +137,7 @@ class TestUtils(unittest.TestCase): self.assertEqual(utils.get_av_model(patterns_list), result) def test_find_jump_nan_data(self): - data = [np.NaN, np.NaN, np.NaN, np.NaN] + data = [np.nan, np.nan, np.nan, np.nan] data = pd.Series(data) length = 2 height = 3 @@ -148,7 +148,7 @@ class TestUtils(unittest.TestCase): self.assertEqual(utils.find_jump(data, height_zero, length_zero), result) def test_find_drop_nan_data(self): - data = [np.NaN, np.NaN, np.NaN, np.NaN] + data = [np.nan, np.nan, np.nan, np.nan] data = pd.Series(data) length = 2 height = 3 @@ -222,7 +222,7 @@ class TestUtils(unittest.TestCase): self.fail('Method get_convolve raised unexpectedly') def test_find_nan_indexes(self): - data = [1, 1, 1, 0, 0, np.NaN, None, []] + data = [1, 1, 1, 0, 0, np.nan, None, []] data = pd.Series(data) result = [5, 6] self.assertEqual(utils.find_nan_indexes(data), result)