Merge pull request #583 from autonomio/fix_param_index

Fix param index

setup.py

@@ -18,7 +18,7 @@
 URL = 'http://autonom.io'
 LICENSE = 'MIT'
 DOWNLOAD_URL = 'https://github.com/autonomio/talos/'
-VERSION = '1.2'
+VERSION = '1.2.2'
 
 
 try:

talos/__init__.py

@@ -34,4 +34,4 @@
 del commands, scan, model, metrics, key
 del sub, keep_from_templates, template_sub, warnings
 
-__version__ = "1.2"
+__version__ = "1.2.2"

talos/parameters/ParamSpace.py

@@ -129,21 +129,15 @@ def _param_space_creation(self):
         actual parameter permutations for the experiment.
         '''
 
-        if len(self.param_index) < 100000:
-
-            final_grid = list(it.product(*self._params_temp))
-            return np.array(final_grid, dtype='object')
-
-        else:
-            final_grid = []
-            for i in self.param_index:
-                p = []
-                for l in reversed(self._params_temp):
-                    i, s = divmod(int(i), len(l))
-                    p.insert(0, l[s])
-                final_grid.append(tuple(p))
-
-            return np.array(final_grid, dtype='object')
+        final_grid = []
+        for i in self.param_index:
+            p = []
+            for l in reversed(self._params_temp):
+                i, s = divmod(int(i), len(l))
+                p.insert(0, l[s])
+            final_grid.append(tuple(p))
+
+        return np.array(final_grid, dtype='object')
 
     def _check_time_limit(self):