11from pandas .util .testing import assert_series_equal
22from windpowerlib .power_output import (power_coefficient_curve ,
3- power_curve , _p_curve_density_corr )
3+ power_curve ,
4+ power_curve_density_correction )
45import pandas as pd
56import numpy as np
67from numpy .testing import assert_allclose
@@ -39,7 +40,7 @@ def test_power_coefficient_curve(self):
3940 # Tests with density correction:
4041 # Test wind_speed as np.array with density as pd.Series and np.array
4142 power_output_exp = np .array ([0.0 , 262869.785 , 0.0 ])
42- parameters ['density_corr ' ] = True
43+ parameters ['density_correction ' ] = True
4344 assert_allclose (power_coefficient_curve (** parameters ),
4445 power_output_exp )
4546 assert isinstance (power_coefficient_curve (** parameters ), np .ndarray )
@@ -67,7 +68,7 @@ def test_power_curve(self):
6768 'p_values' : pd .Series ([300 , 400 , 500 ],
6869 index = [4.0 , 5.0 , 6.0 ]),
6970 'density' : pd .Series (data = [1.3 , 1.3 , 1.3 ]),
70- 'density_corr ' : False }
71+ 'density_correction ' : False }
7172
7273 # Tests without density correction:
7374 # Test wind_speed as pd.Series
@@ -83,7 +84,7 @@ def test_power_curve(self):
8384 # Tests with density correction:
8485 # Test wind_speed as np.array with density as pd.Series and np.array
8586 power_output_exp = np .array ([0.0 , 461.00290572 , 0.0 ])
86- parameters ['density_corr ' ] = True
87+ parameters ['density_correction ' ] = True
8788 assert_allclose (power_curve (** parameters ), power_output_exp )
8889 assert isinstance (power_curve (** parameters ), np .ndarray )
8990 parameters ['density' ] = np .array (parameters ['density' ])
@@ -103,24 +104,24 @@ def test_power_curve(self):
103104 parameters ['density' ] = 'wrong_type'
104105 power_curve (** parameters )
105106
106- def test_p_curve_density_corrected (self ):
107+ def test_power_curve_density_correction (self ):
107108 parameters = {'wind_speed' : pd .Series (data = [2.0 , 5.5 , 7.0 ]),
108109 'density' : pd .Series (data = [1.3 , 1.3 , 1.3 ]),
109110 'p_values' : pd .Series ([300 , 400 , 500 ],
110111 index = [4.0 , 5.0 , 6.0 ])}
111112
112113 # Test wind_speed as pd.Series with density as pd.Series and np.array
113114 power_output_exp = [0.0 , 461.00290572240806 , 0.0 ]
114- assert _p_curve_density_corr (** parameters ) == power_output_exp
115+ assert power_curve_density_correction (** parameters ) == power_output_exp
115116 parameters ['density' ] = np .array (parameters ['density' ])
116- assert _p_curve_density_corr (** parameters ) == power_output_exp
117+ assert power_curve_density_correction (** parameters ) == power_output_exp
117118
118119 # Test wind_speed as np.array with density as np.array and pd.Series
119- assert _p_curve_density_corr (** parameters ) == power_output_exp
120+ assert power_curve_density_correction (** parameters ) == power_output_exp
120121 parameters ['density' ] = pd .Series (data = parameters ['density' ])
121- assert _p_curve_density_corr (** parameters ) == power_output_exp
122+ assert power_curve_density_correction (** parameters ) == power_output_exp
122123
123124 # Raise TypeError due to density is None
124125 with pytest .raises (TypeError ):
125126 parameters ['density' ] = None
126- _p_curve_density_corr (** parameters )
127+ power_curve_density_correction (** parameters )
0 commit comments