Merge 253c6f5 into 985784f

EvoDAG/__init__.py

@@ -15,4 +15,4 @@
 
 from .base import EvoDAG, RGP, RootGP
 __all__ = ["EvoDAG", "RGP", "RootGP"]
-__version__ = '0.16.4'
+__version__ = '0.17.0'

EvoDAG/model.py

@@ -54,7 +54,15 @@ def fit(X_y_evodag):
     except KeyError:
         pass
     try:
+        max_training_size = evodag.get("max_training_size", None)
         evodag = EvoDAG(**evodag)
+        if max_training_size is not None:
+            X = np.atleast_2d(X)
+            y = np.atleast_1d(y)
+            index = np.arange(X.shape[0])
+            np.random.shuffle(index)
+            X = X[index[:max_training_size]]
+            y = y[index[:max_training_size]]
         evodag.fit(X, y, test_set=test_set)
     except RuntimeError:
         return None

EvoDAG/tests/test_model.py

@@ -411,3 +411,19 @@ def test_regression_multiple_outputs():
     y = [SparseArray.fromlist(cl), SparseArray.fromlist(cl*-1), SparseArray.fromlist(cl*-1 + 0.5)]
     m = EvoDAGE(time_limit=4, multiple_outputs=True, classifier=False).fit(X, y)
     assert m
+
+
+def test_max_training_size():
+    from EvoDAG.model import EvoDAGE
+    import time
+    local = time.time()
+    try:
+        EvoDAGE(n_estimators=30, n_jobs=2, time_limit=4,
+                max_training_size="hola").fit(X, cl)
+    except TypeError:
+        default_nargs()
+        t = time.time() - local
+        print(t)
+        assert t <= 6
+        return
+    assert False        

VERSION

@@ -1 +1 @@
-0.16.4
+0.17.0

conda-recipe/meta.yaml

@@ -1,6 +1,6 @@
 package:
   name: evodag
-  version: "0.16.4"
+  version: "0.17.0"
 
 requirements:
   build: