Adjust error messages

Author: SabineHaas

windpowerlib/power_curves.py

@@ -181,16 +181,16 @@ def wake_losses_to_power_curve(power_curve_wind_speeds, power_curve_values,
     if wake_losses_model == 'constant_efficiency':
         if not isinstance(wind_farm_efficiency, float):
             raise TypeError("'wind_farm_efficiency' must be float if " +
-                            "`wake_losses_model´ is '{}'".format(
-                                wake_losses_model))
+                            "`wake_losses_model´ is '{}' but is {}".format(
+                                wake_losses_model, wind_farm_efficiency))
         power_curve_df['power'] = power_curve_values * wind_farm_efficiency
     elif wake_losses_model == 'power_efficiency_curve':
         if (not isinstance(wind_farm_efficiency, dict) and
                 not isinstance(wind_farm_efficiency, pd.DataFrame)):
             raise TypeError(
-                "'wind_farm_efficiency' must be a dictionary or " +
-                "pd.DataFrame if `wake_losses_model´ is '{}'".format(
-                    wake_losses_model))
+                "'wind_farm_efficiency' must be pd.DataFrame if " +
+                "`wake_losses_model´ is '{}' but is {}".format(
+                    wake_losses_model, wind_farm_efficiency))
         df = pd.concat([power_curve_df.set_index('wind_speed'),
                         wind_farm_efficiency.set_index('wind_speed')], axis=1)
         # Add by efficiency reduced power column (nan values of efficiency

windpowerlib/wake_losses.py

@@ -88,9 +88,9 @@ def get_wind_efficiency_curve(curve_name='dena_mean'):
                             'dena_extreme2', 'knorr_extreme1',
                             'knorr_extreme2', 'knorr_extreme3']
     if curve_name.split('_')[0] not in ['dena', 'knorr']:
-        raise ValueError("Wrong wind efficiency curve name. Must be one of " +
-                         "the following: {}".format(possible_curve_names) +
-                         "but is {}".format(curve_name))
+        raise ValueError("`curve_name` must be one of the following: " +
+                         "{} but is {}".format(possible_curve_names,
+                                               curve_name))
     path = os.path.join(os.path.dirname(__file__), 'data',
                         'wind_efficiency_curves_{}.csv'.format(
                             curve_name.split('_')[0]))