Skip to content

Commit a1affcd

Browse files
committed
Corrections in error messages
1 parent 240fb5c commit a1affcd

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

windpowerlib/power_curves.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,14 +169,16 @@ def wake_losses_to_power_curve(power_curve_wind_speeds, power_curve_values,
169169
if wake_losses_method == 'constant_efficiency':
170170
if not isinstance(wind_farm_efficiency, float):
171171
raise TypeError("'wind_farm_efficiency' must be float if " +
172-
"`wake_losses_method´ is '{0}'")
172+
"`wake_losses_method´ is '{}'".format(
173+
wake_losses_method))
173174
power_curve_df['power'] = power_curve_values * wind_farm_efficiency
174175
elif wake_losses_method == 'power_efficiency_curve':
175176
if (not isinstance(wind_farm_efficiency, dict) and
176177
not isinstance(wind_farm_efficiency, pd.DataFrame)):
177178
raise TypeError(
178179
"'wind_farm_efficiency' must be a dictionary or " +
179-
"pd.DataFrame if `wake_losses_method´ is '{0}'")
180+
"pd.DataFrame if `wake_losses_method´ is '{}'".format(
181+
wake_losses_method))
180182
df = pd.concat([power_curve_df.set_index('wind_speed'),
181183
wind_farm_efficiency.set_index('wind_speed')], axis=1)
182184
# Add by efficiency reduced power column (nan values of efficiency
@@ -189,7 +191,7 @@ def wake_losses_to_power_curve(power_curve_wind_speeds, power_curve_values,
189191
power_curve_df.columns = ['wind_speed', 'power']
190192
else:
191193
raise ValueError(
192-
"`wake_losses_method` is {0} but should be ".format(
194+
"`wake_losses_method` is {} but should be ".format(
193195
wake_losses_method) +
194196
"'constant_efficiency' or 'power_efficiency_curve'")
195197
return power_curve_df

0 commit comments

Comments
 (0)