Change named tuple to normal tupel; no additional package needed

Author: SabineHaas

windpowerlib/modelchain.py

@@ -154,8 +154,8 @@ def rho_hub(self, weather, data_height):
             data_height['temp_air'], data_height['temp_air_2'],
             self.wind_turbine.hub_height, weather['temp_air'],
             weather['temp_air_2'])
-        temp_air_height = values.closest_value
-        temp_air_closest = values.corresp_value
+        temp_air_height = values[0]
+        temp_air_closest = values[1]
         # Check if temperature data is at hub height.
         if temp_air_height == self.wind_turbine.hub_height:
             logging.debug('Using given temperature at hub height.')
@@ -232,8 +232,8 @@ def v_wind_hub(self, weather, data_height):
             data_height['v_wind'], data_height['v_wind_2'],
             self.wind_turbine.hub_height, weather['v_wind'],
             weather['v_wind_2'])
-        v_wind_height = values.closest_value
-        v_wind_closest = values.corresp_value
+        v_wind_height = values[0]
+        v_wind_closest = values[1]
         # Check if wind speed data is at hub height.
         if v_wind_height == self.wind_turbine.hub_height:
             logging.debug('Using given wind speed at hub height.')

windpowerlib/tools.py

@@ -7,8 +7,6 @@
 __copyright__ = "Copyright oemof developer group"
 __license__ = "GPLv3"
 
-import collections
-
 
 def smallest_difference(value_1, value_2, comp_value, corresp_1, corresp_2):
     r"""
@@ -40,6 +38,7 @@ def smallest_difference(value_1, value_2, comp_value, corresp_1, corresp_2):
     Tuple(float, float)
         Value closer to comparing value as float and its corresponding value as
         float.
+
     """
     if (value_2 is not None and corresp_2 is not None):
         if abs(value_1 - comp_value) <= abs(value_2 - comp_value):
@@ -54,8 +53,4 @@ def smallest_difference(value_1, value_2, comp_value, corresp_1, corresp_2):
         corresp_value = corresp_1
     else:
         corresp_value = corresp_2
-    # Store values in a named tuple
-    return_tuple = collections.namedtuple('selected_values',
-                                          ['closest_value',
-                                           'corresp_value'])
-    return return_tuple(closest_value, corresp_value)
+    return (closest_value, corresp_value)