Adapt tests to API changes

Author: SabineHaas

tests/test_density.py

@@ -1,29 +1,13 @@
-from windpowerlib.density import (temperature_gradient,
-                                  rho_barometric, rho_ideal_gas)
+from windpowerlib.density import barometric, ideal_gas
 import pandas as pd
 from pandas.util.testing import assert_series_equal
-from numpy.testing import assert_array_equal, assert_allclose
+from numpy.testing import assert_allclose
 import numpy as np
 
 
-class TestDensityTemperature:
+class TestDensity:
 
-    def test_temperature_gradient(self):
-        parameters = {'temperature': pd.Series(data=[267, 268]),
-                      'temperature_height': 2,
-                      'hub_height': 100}
-
-        # Test temperature as pd.Series
-        temp_hub_exp = pd.Series(data=[266.363, 267.36300])
-        assert_series_equal(temperature_gradient(**parameters), temp_hub_exp)
-
-        # Test temperature as np.array
-        temp_hub_exp = np.array([266.363, 267.36300])
-        parameters['temperature'] = np.array(parameters['temperature'])
-        assert_array_equal(temperature_gradient(**parameters), temp_hub_exp)
-        assert isinstance(temperature_gradient(**parameters), np.ndarray)
-
-    def test_rho_barometric(self):
+    def test_barometric(self):
         parameters = {'pressure': pd.Series(data=[101125, 101000]),
                       'pressure_height': 0,
                       'hub_height': 100,
@@ -32,25 +16,25 @@ def test_rho_barometric(self):
         # Test pressure as pd.Series and temperature_hub_height as pd.Series
         # and np.array
         rho_exp = pd.Series(data=[1.30305336, 1.29656645])
-        assert_series_equal(rho_barometric(**parameters), rho_exp)
+        assert_series_equal(barometric(**parameters), rho_exp)
         parameters['temperature_hub_height'] = np.array(
             parameters['temperature_hub_height'])
-        assert_series_equal(rho_barometric(**parameters), rho_exp)
+        assert_series_equal(barometric(**parameters), rho_exp)
 
         # Test pressure as np.array and temperature_hub_height as pd.Series
         parameters['pressure'] = np.array(parameters['pressure'])
         parameters['temperature_hub_height'] = pd.Series(
             data=parameters['temperature_hub_height'])
-        assert_series_equal(rho_barometric(**parameters), rho_exp)
+        assert_series_equal(barometric(**parameters), rho_exp)
 
         # Test pressure as np.array and temperature_hub_height as np.array
         rho_exp = np.array([1.30305336, 1.29656645])
         parameters['temperature_hub_height'] = np.array(
             parameters['temperature_hub_height'])
-        assert_allclose(rho_barometric(**parameters), rho_exp)
-        assert isinstance(rho_barometric(**parameters), np.ndarray)
+        assert_allclose(barometric(**parameters), rho_exp)
+        assert isinstance(barometric(**parameters), np.ndarray)
 
-    def test_rho_ideal_gas(self):
+    def test_ideal_gas(self):
         parameters = {'pressure': pd.Series(data=[101125, 101000]),
                       'pressure_height': 0,
                       'hub_height': 100,
@@ -59,20 +43,20 @@ def test_rho_ideal_gas(self):
         # Test pressure as pd.Series and temperature_hub_height as pd.Series
         # and np.array
         rho_exp = pd.Series(data=[1.30309439, 1.29660728])
-        assert_series_equal(rho_ideal_gas(**parameters), rho_exp)
+        assert_series_equal(ideal_gas(**parameters), rho_exp)
         parameters['temperature_hub_height'] = np.array(
             parameters['temperature_hub_height'])
-        assert_series_equal(rho_ideal_gas(**parameters), rho_exp)
+        assert_series_equal(ideal_gas(**parameters), rho_exp)
 
         # Test pressure as np.array and temperature_hub_height as pd.Series
         parameters['pressure'] = np.array(parameters['pressure'])
         parameters['temperature_hub_height'] = pd.Series(
             data=parameters['temperature_hub_height'])
-        assert_allclose(rho_ideal_gas(**parameters), rho_exp)
+        assert_allclose(ideal_gas(**parameters), rho_exp)
 
         # Test pressure as np.array and temperature_hub_height as np.array
         rho_exp = np.array([1.30309439, 1.29660728])
         parameters['temperature_hub_height'] = np.array(
             parameters['temperature_hub_height'])
-        assert_allclose(rho_ideal_gas(**parameters), rho_exp)
-        assert isinstance(rho_ideal_gas(**parameters), np.ndarray)
+        assert_allclose(ideal_gas(**parameters), rho_exp)
+        assert isinstance(ideal_gas(**parameters), np.ndarray)

tests/test_power_output.py

@@ -1,14 +1,15 @@
 from pandas.util.testing import assert_series_equal
-from windpowerlib.power_output import (cp_curve, cp_curve_density_corr,
-                                       p_curve, p_curve_density_corr)
+from windpowerlib.power_output import (power_coefficient_curve,
+                                       cp_curve_density_corr,
+                                       power_curve, p_curve_density_corr)
 import pandas as pd
 import numpy as np
 from numpy.testing import assert_allclose
 
 
 class TestPowerOutput:
 
-    def test_cp_curve(self):
+    def test_power_coefficient_curve(self):
         parameters = {'wind_speed': pd.Series(data=[2.0, 5.5, 7.0]),
                       'density': pd.Series(data=[1.3, 1.3, 1.3]),
                       'rotor_diameter': 80,
@@ -18,18 +19,22 @@ def test_cp_curve(self):
         # Test wind_speed as pd.Series with density as pd.Series and np.array
         power_output_exp = pd.Series(data=[0.0, 244615.399, 0.0],
                                      name='feedin_wind_turbine')
-        assert_series_equal(cp_curve(**parameters), power_output_exp)
+        assert_series_equal(power_coefficient_curve(**parameters),
+                            power_output_exp)
         parameters['density'] = np.array(parameters['density'])
-        assert_series_equal(cp_curve(**parameters), power_output_exp)
+        assert_series_equal(power_coefficient_curve(**parameters),
+                            power_output_exp)
 
         # Test wind_speed as np.array with density as np.array and pd.Series
         power_output_exp = np.array([0.0, 244615.399, 0.0])
         parameters['wind_speed'] = np.array(parameters['wind_speed'])
-        assert_allclose(cp_curve(**parameters), power_output_exp)
-        assert isinstance(cp_curve(**parameters), np.ndarray)
+        assert_allclose(power_coefficient_curve(**parameters),
+                        power_output_exp)
+        assert isinstance(power_coefficient_curve(**parameters), np.ndarray)
         parameters['density'] = pd.Series(data=parameters['density'])
-        assert_allclose(cp_curve(**parameters), power_output_exp)
-        assert isinstance(cp_curve(**parameters), np.ndarray)
+        assert_allclose(power_coefficient_curve(**parameters),
+                        power_output_exp)
+        assert isinstance(power_coefficient_curve(**parameters), np.ndarray)
 
     def test_cp_curve_density_corrected(self):
         parameters = {'wind_speed': pd.Series(data=[2.0, 5.5, 7.0]),
@@ -58,21 +63,21 @@ def test_cp_curve_density_corrected(self):
                         power_output_exp)
         assert isinstance(cp_curve_density_corr(**parameters), np.ndarray)
 
-    def test_p_curve(self):
+    def test_power_curve(self):
         parameters = {'wind_speed': pd.Series(data=[2.0, 5.5, 7.0]),
                       'p_values': pd.DataFrame(data={'p': [300, 400, 500]},
                                                index=[4.0, 5.0, 6.0])}
 
         # Test wind_speed as pd.Series
         power_output_exp = pd.Series(data=[0.0, 450.0, 0.0],
                                      name='feedin_wind_turbine')
-        assert_series_equal(p_curve(**parameters), power_output_exp)
+        assert_series_equal(power_curve(**parameters), power_output_exp)
 
         # Test wind_speed as np.array
         power_output_exp = np.array([0.0, 450.0, 0.0])
         parameters['wind_speed'] = np.array(parameters['wind_speed'])
-        assert_allclose(p_curve(**parameters), power_output_exp)
-        assert isinstance(p_curve(**parameters), np.ndarray)
+        assert_allclose(power_curve(**parameters), power_output_exp)
+        assert isinstance(power_curve(**parameters), np.ndarray)
 
     def test_p_curve_density_corrected(self):
         parameters = {'wind_speed': pd.Series(data=[2.0, 5.5, 7.0]),

tests/test_temperature.py

@@ -0,0 +1,23 @@
+from windpowerlib.temperature import linear_gradient
+import pandas as pd
+from pandas.util.testing import assert_series_equal
+from numpy.testing import assert_array_equal
+import numpy as np
+
+
+class TestTemperature:
+
+    def test_linear_gradient(self):
+        parameters = {'temperature': pd.Series(data=[267, 268]),
+                      'temperature_height': 2,
+                      'hub_height': 100}
+
+        # Test temperature as pd.Series
+        temp_hub_exp = pd.Series(data=[266.363, 267.36300])
+        assert_series_equal(linear_gradient(**parameters), temp_hub_exp)
+
+        # Test temperature as np.array
+        temp_hub_exp = np.array([266.363, 267.36300])
+        parameters['temperature'] = np.array(parameters['temperature'])
+        assert_array_equal(linear_gradient(**parameters), temp_hub_exp)
+        assert isinstance(linear_gradient(**parameters), np.ndarray)

tests/test_wind_speed.py

@@ -1,4 +1,4 @@
-from windpowerlib.wind_speed import logarithmic_wind_profile, v_wind_hellman
+from windpowerlib.wind_speed import logarithmic_profile, hellman
 import pandas as pd
 from pandas.util.testing import assert_series_equal
 import numpy as np
@@ -8,7 +8,7 @@
 
 class TestWindSpeed:
 
-    def test_logarithmic_wind_profile(self):
+    def test_logarithmic_profile(self):
         parameters = {'wind_speed': pd.Series(data=[5.0, 6.5]),
                       'wind_speed_height': 10,
                       'hub_height': 100,
@@ -18,43 +18,43 @@ def test_logarithmic_wind_profile(self):
         # Test wind_speed as pd.Series with roughness_length as pd.Series,
         # np.array and float
         v_wind_hub_exp = pd.Series(data=[7.74136523, 10.0637748])
-        assert_series_equal(logarithmic_wind_profile(**parameters),
+        assert_series_equal(logarithmic_profile(**parameters),
                             v_wind_hub_exp)
         parameters['roughness_length'] = np.array(
             parameters['roughness_length'])
-        assert_series_equal(logarithmic_wind_profile(**parameters),
+        assert_series_equal(logarithmic_profile(**parameters),
                             v_wind_hub_exp)
         parameters['roughness_length'] = parameters['roughness_length'][0]
-        assert_series_equal(logarithmic_wind_profile(**parameters),
+        assert_series_equal(logarithmic_profile(**parameters),
                             v_wind_hub_exp)
 
         # Test wind_speed as np.array with roughness_length as float, pd.Series
         # and np.array
         v_wind_hub_exp = np.array([7.74136523, 10.0637748])
         parameters['wind_speed'] = np.array(parameters['wind_speed'])
-        assert_allclose(logarithmic_wind_profile(**parameters), v_wind_hub_exp)
-        assert isinstance(logarithmic_wind_profile(**parameters), np.ndarray)
+        assert_allclose(logarithmic_profile(**parameters), v_wind_hub_exp)
+        assert isinstance(logarithmic_profile(**parameters), np.ndarray)
         parameters['roughness_length'] = pd.Series(
             data=[parameters['roughness_length'],
                   parameters['roughness_length']])
-        assert_allclose(logarithmic_wind_profile(**parameters), v_wind_hub_exp)
-        assert isinstance(logarithmic_wind_profile(**parameters), np.ndarray)
+        assert_allclose(logarithmic_profile(**parameters), v_wind_hub_exp)
+        assert isinstance(logarithmic_profile(**parameters), np.ndarray)
         parameters['roughness_length'] = np.array(
             parameters['roughness_length'])
-        assert_allclose(logarithmic_wind_profile(**parameters), v_wind_hub_exp)
-        assert isinstance(logarithmic_wind_profile(**parameters), np.ndarray)
+        assert_allclose(logarithmic_profile(**parameters), v_wind_hub_exp)
+        assert isinstance(logarithmic_profile(**parameters), np.ndarray)
 
         # Test obstacle_height is not zero
         v_wind_hub_exp = np.array([13.54925281, 17.61402865])
         parameters['obstacle_height'] = 12
-        assert_allclose(logarithmic_wind_profile(**parameters), v_wind_hub_exp)
+        assert_allclose(logarithmic_profile(**parameters), v_wind_hub_exp)
 
         # Raise ValueError due to 0.7 * `obstacle_height` > `wind_speed_height`
         with pytest.raises(ValueError):
             parameters['obstacle_height'] = 20
-            logarithmic_wind_profile(**parameters)
+            logarithmic_profile(**parameters)
 
-    def test_v_wind_hellman(self):
+    def test_hellman(self):
         parameters = {'wind_speed': pd.Series(data=[5.0, 6.5]),
                       'wind_speed_height': 10,
                       'hub_height': 100,
@@ -64,37 +64,37 @@ def test_v_wind_hellman(self):
         # Test wind_speed is pd.Series with roughness_length is pd.Series,
         # np.array and float
         v_wind_hub_exp = pd.Series(data=[7.12462437, 9.26201168])
-        assert_series_equal(v_wind_hellman(**parameters), v_wind_hub_exp)
+        assert_series_equal(hellman(**parameters), v_wind_hub_exp)
         parameters['roughness_length'] = np.array(
             parameters['roughness_length'])
-        assert_series_equal(v_wind_hellman(**parameters), v_wind_hub_exp)
+        assert_series_equal(hellman(**parameters), v_wind_hub_exp)
         parameters['roughness_length'] = parameters['roughness_length'][0]
-        assert_series_equal(v_wind_hellman(**parameters), v_wind_hub_exp)
+        assert_series_equal(hellman(**parameters), v_wind_hub_exp)
 
         # Test wind_speed as np.array with roughness_length is float, pd.Series
         # and np.array
         v_wind_hub_exp = np.array([7.12462437, 9.26201168])
         parameters['wind_speed'] = np.array(parameters['wind_speed'])
-        assert_allclose(v_wind_hellman(**parameters), v_wind_hub_exp)
-        assert isinstance(v_wind_hellman(**parameters), np.ndarray)
+        assert_allclose(hellman(**parameters), v_wind_hub_exp)
+        assert isinstance(hellman(**parameters), np.ndarray)
         parameters['roughness_length'] = pd.Series(
             data=(parameters['roughness_length'],
                   parameters['roughness_length']))
-        assert_allclose(v_wind_hellman(**parameters), v_wind_hub_exp)
-        assert isinstance(v_wind_hellman(**parameters), np.ndarray)
+        assert_allclose(hellman(**parameters), v_wind_hub_exp)
+        assert isinstance(hellman(**parameters), np.ndarray)
         parameters['roughness_length'] = np.array(
             parameters['roughness_length'])
-        assert_allclose(v_wind_hellman(**parameters), v_wind_hub_exp)
-        assert isinstance(v_wind_hellman(**parameters), np.ndarray)
+        assert_allclose(hellman(**parameters), v_wind_hub_exp)
+        assert isinstance(hellman(**parameters), np.ndarray)
 
         # Test roughness_length is None and hellman_exponent is None
         v_wind_hub_exp = pd.Series(data=[6.9474774, 9.03172])
         parameters['wind_speed'] = pd.Series(data=parameters['wind_speed'])
         parameters['roughness_length'] = None
-        assert_series_equal(v_wind_hellman(**parameters), v_wind_hub_exp)
+        assert_series_equal(hellman(**parameters), v_wind_hub_exp)
 
         # Test hellman_exponent is not None
         v_wind_hub_exp = pd.Series(data=[7.92446596, 10.30180575])
         parameters['roughness_length'] = 0.15
         parameters['hellman_exponent'] = 0.2
-        assert_series_equal(v_wind_hellman(**parameters), v_wind_hub_exp)
+        assert_series_equal(hellman(**parameters), v_wind_hub_exp)