1091720045

Build # 1091720045

Build Type

github-actions

Committed by GitHub

Commit Message

<a href="https://github.com/USDA-ARS-NWRC/smrf/commit/<a class=hub.com/USDA-ARS-NWRC/smrf/commit/<a class="double-link" href="https://git"><a class=hub.com/USDA-ARS-NWRC/smrf/commit/<a class="double-link" href="https://git"><a class=hub.com/USDA-ARS-NWRC/smrf/commit/2be1c281fa6ecdc6a8df04342619d50ebc7d143f">2be1c281f<a href="https://github.com/USDA-ARS-NWRC/smrf/commit/2be1c281fa6ecdc6a8df04342619d50ebc7d143f">&quot;&gt;&amp;lt;a href=&amp;quot;https://github.com/USDA-ARS-NWRC/smrf/commit/&lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/USDA-ARS-NWRC/smrf/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/USDA-ARS-NWRC/smrf/commit/2be1c281fa6ecdc6a8df04342619d50ebc7d143f&quot;&gt;2be1c281f&lt;/a&gt;&lt;a href=&quot;https://github.com/USDA-ARS-NWRC/smrf/commit/2be1c281fa6ecdc6a8df04342619d50ebc7d143f&quot;&gt;&amp;lt;a href=&amp;quot;https://github.com/USDA-ARS-NWRC/smrf/commit/2be1c281fa6ecdc6a8df04342619d50e&lt;/a&gt;bc7d143f">&quot;&gt;Merge &lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/USDA-ARS-NWRC/smrf/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/USDA-ARS-NWRC/smrf/commit/<a class="double-link" href="https://github.com/USDA-ARS-NWRC/smrf/commit/3600a897847f6fade47b3d2d9288b1db00bb12b2">3600a8978</a><a href="https://github.com/USDA-ARS-NWRC/smrf/commit/2be1c281fa6ecdc6a8df04342619d50ebc7d143f">&amp;quot;&amp;gt;3600a8978&amp;lt;/a&amp;gt;&amp;quot;&amp;gt;3600a8978&amp;lt;/a&amp;gt;&amp;lt;a href=&amp;quot;https://github.com/USDA-ARS-NWRC/smrf/commit/2be1c281fa6ecdc6a8df04342619d50ebc7d1&lt;/a&gt;43f&quot;&gt; into &lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/USDA-ARS-NWRC/smrf/commit/<a class="double-link" href="https://github.com/USDA-ARS-NWRC/smrf/commit/465d42cca">465d42cca">465d42cca</a>

Pull Request Pull Request #213: Precip - input and output data scalars and testing

Run Details

140 of 140 new or added lines in 9 files covered. (100.0%)

3928 of 4679 relevant lines covered (83.95%)

0.84 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

96.0

/smrf/tests/data/test_modifiers.py

import unittest

import numpy as np
import pandas as pd

from smrf.data.modifiers import Modifiers
from parameterized import parameterized


input_array = np.array([
    [1.0, 1.1, 1.2],
    [3.1, 3.2, 5.7],
    [0.1, -1.1, 2.0]
])

input_series = pd.Series([10.2, 42.0, 5.1])


class TestModifiers(unittest.TestCase):
    @parameterized.expand(
        [
            ({}, None, None, None),
            (
                {'input_scalar_type': 'factor', 'input_scalar_factor': 2.0},
                2.0, None, None),
            (
                {'output_scalar_type': 'factor', 'output_scalar_factor': 1.2},
                None, 1.2, None),
            ({}, None, None, None),
            (
                {'input_scalar_type': 'factor', 'input_scalar_factor': 2.0,
                 'output_scalar_type': 'factor', 'output_scalar_factor': 1.2},
                2.0, 1.2, None),
            ({'input_scalar_type': 'foo'}, None, None, ValueError)
        ]
    )
    def test_get_scalar(self, config, expected_input_scalar,
                        expected_output_scalar, expected_exception):
        if expected_exception is not None:
            with self.assertRaises(expected_exception):
                Modifiers.from_variable_config(config)
        else:
            mod = Modifiers.from_variable_config(config)
            self.assertEqual(mod._input_scalar, expected_input_scalar)
            self.assertEqual(mod._output_scalar, expected_output_scalar)

    @parameterized.expand(
        [
            (input_array, Modifiers(2.1, None), input_array * 2.1),
            (input_series, Modifiers(2.0, None),
             pd.Series([20.4, 84.0, 10.2])),
            (input_array, Modifiers(None, None), input_array)
        ]
    )
    def test_scale_input_data(self, data, mod, expected):
        result = mod.scale_input_data(data)
        if isinstance(result, np.ndarray):
            np.testing.assert_almost_equal(result, expected)
        else:
            pd.testing.assert_series_equal(result, expected)

    @parameterized.expand(
        [
            (input_array, Modifiers(None, 1.0), input_array),
            (input_array, Modifiers(None, 1.5), input_array * 1.5),
            (input_array, Modifiers(None, None), input_array)
        ]
    )
    def test_scale_output_data(self, data, mod, expected):
        result = mod.scale_output_data(data)
        if isinstance(result, np.ndarray):
            np.testing.assert_almost_equal(result, expected)
        else:
            pd.testing.assert_series_equal(result, expected)

1	import unittest	1✔
2
3	import numpy as np	1✔
4	import pandas as pd	1✔
5
6	from smrf.data.modifiers import Modifiers	1✔
7	from parameterized import parameterized	1✔
8
9
10	input_array = np.array([	1✔
11	[1.0, 1.1, 1.2],
12	[3.1, 3.2, 5.7],
13	[0.1, -1.1, 2.0]
14	])
15
16	input_series = pd.Series([10.2, 42.0, 5.1])	1✔
17
18
19	class TestModifiers(unittest.TestCase):	1✔
20	@parameterized.expand(	1✔
21	[
22	({}, None, None, None),
23	(
24	{'input_scalar_type': 'factor', 'input_scalar_factor': 2.0},
25	2.0, None, None),
26	(
27	{'output_scalar_type': 'factor', 'output_scalar_factor': 1.2},
28	None, 1.2, None),
29	({}, None, None, None),
30	(
31	{'input_scalar_type': 'factor', 'input_scalar_factor': 2.0,
32	'output_scalar_type': 'factor', 'output_scalar_factor': 1.2},
33	2.0, 1.2, None),
34	({'input_scalar_type': 'foo'}, None, None, ValueError)
35	]
36	)
37	def test_get_scalar(self, config, expected_input_scalar,
38	expected_output_scalar, expected_exception):
39	if expected_exception is not None:	1✔
40	with self.assertRaises(expected_exception):	1✔
41	Modifiers.from_variable_config(config)	1✔
42	else:
43	mod = Modifiers.from_variable_config(config)	1✔
44	self.assertEqual(mod._input_scalar, expected_input_scalar)	1✔
45	self.assertEqual(mod._output_scalar, expected_output_scalar)	1✔
46
47	@parameterized.expand(	1✔
48	[
49	(input_array, Modifiers(2.1, None), input_array * 2.1),
50	(input_series, Modifiers(2.0, None),
51	pd.Series([20.4, 84.0, 10.2])),
52	(input_array, Modifiers(None, None), input_array)
53	]
54	)
55	def test_scale_input_data(self, data, mod, expected):
56	result = mod.scale_input_data(data)	1✔
57	if isinstance(result, np.ndarray):	1✔
58	np.testing.assert_almost_equal(result, expected)	1✔
59	else:
60	pd.testing.assert_series_equal(result, expected)	1✔
61
62	@parameterized.expand(	1✔
63	[
64	(input_array, Modifiers(None, 1.0), input_array),
65	(input_array, Modifiers(None, 1.5), input_array * 1.5),
66	(input_array, Modifiers(None, None), input_array)
67	]
68	)
69	def test_scale_output_data(self, data, mod, expected):
70	result = mod.scale_output_data(data)	1✔
71	if isinstance(result, np.ndarray):	1✔
72	np.testing.assert_almost_equal(result, expected)	1✔
73	else:
74	pd.testing.assert_series_equal(result, expected)	×

USDA-ARS-NWRC / smrf / 1091720045

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous