modAL.utils.combination make_linear_combination and make_product now uses genexps instead of list comprehension, 2x performance speedup

Author: cosmic-cortex

modAL/utils/combination.py

@@ -38,8 +38,8 @@ def make_linear_combination(*functions, weights=None):
                                                'same as the number of given functions'
 
     def linear_combination(*args, **kwargs):
-        return np.sum([weights[i]*functions[i](*args, **kwargs)
-                       for i in range(len(weights))], axis=0)
+        return np.sum((weights[i]*functions[i](*args, **kwargs)
+                       for i in range(len(weights))), axis=0)
 
     return linear_combination
 
@@ -73,8 +73,8 @@ def make_product(*functions, exponents=None):
                                                  'same as the number of given functions'
 
     def product_function(*args, **kwargs):
-        return np.prod([functions[i](*args, **kwargs)**exponents[i]
-                       for i in range(len(exponents))], axis=0)
+        return np.prod((functions[i](*args, **kwargs)**exponents[i]
+                       for i in range(len(exponents))), axis=0)
 
     return product_function