Merge pull request #9 from tvdboom/development

Development
tvdboom · Jun 28, 2021 · b940500 · b940500
2 parents 2a800a7 + 93ace13
commit b940500
Show file tree

Hide file tree

Showing 275 changed files with 11,961 additions and 2,182 deletions.
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-latest ]
+        os: [ ubuntu-latest, windows-latest ]
         python-version: [3.6, 3.7, 3.8, 3.9]
 
     steps:

diff --git a/README.md b/README.md
@@ -135,7 +135,7 @@ atom = ATOMClassifier(X, y, logger="auto", n_jobs=2, verbose=2)
 ATOM has multiple data cleaning methods to help you prepare the data for modelling:
 
 ```python
-atom.impute(strat_num="knn", strat_cat="most_frequent", min_frac_rows=0.1)  
+atom.impute(strat_num="knn", strat_cat="most_frequent", max_nan_rows=0.1)  
 atom.encode(strategy="LeaveOneOut", max_onehot=8, frac_to_other=0.05)  
 atom.feature_selection(strategy="PCA", n_features=12)
 ```
@@ -144,11 +144,11 @@ Run the pipeline with the models you want to compare:
 
 ```python
 atom.run(
-	models=["LR", "LDA", "XGB", "lSVM"],
-	metric="f1",
-	n_calls=25,
-	n_initial_points=10,
-	n_bootstrap=4,
+    models=["LR", "LDA", "XGB", "lSVM"],
+    metric="f1",
+    n_calls=25,
+    n_initial_points=10,
+    n_bootstrap=4,
 )
 ```
 

diff --git a/atom/__init__.py b/atom/__init__.py
@@ -9,4 +9,4 @@
 
 from .api import ATOMClassifier, ATOMRegressor, ATOMLoader, ATOMModel
 
-__version__ = "4.5.0"
+__version__ = "4.6.0"
diff --git a/atom/api.py b/atom/api.py
@@ -17,7 +17,7 @@
 # Own modules
 from .atom import ATOM
 from .basetransformer import BaseTransformer
-from .utils import Y_TYPES, custom_transform
+from .utils import SCALAR, Y_TYPES, custom_transform
 
 
 # Functions ======================================================== >>
@@ -259,7 +259,7 @@ def __init__(
         *arrays,
         y: Y_TYPES = -1,
         shuffle: bool = True,
-        n_rows: Union[int, float] = 1,
+        n_rows: SCALAR = 1,
         test_size: float = 0.2,
         n_jobs: int = 1,
         verbose: int = 0,
@@ -366,7 +366,7 @@ def __init__(
         *arrays,
         y: Y_TYPES = -1,
         shuffle: bool = True,
-        n_rows: Union[int, float] = 1,
+        n_rows: SCALAR = 1,
         test_size: float = 0.2,
         n_jobs: int = 1,
         verbose: int = 0,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,4 +9,4 @@

		from .api import ATOMClassifier, ATOMRegressor, ATOMLoader, ATOMModel

		__version__ = "4.5.0"
		__version__ = "4.6.0"