diff --git a/src/njab/__init__.py b/src/njab/__init__.py index b85ba29..58757ec 100644 --- a/src/njab/__init__.py +++ b/src/njab/__init__.py @@ -6,7 +6,7 @@ """ from importlib.metadata import version -from . import stats, sklearn, plotting, pandas, io +from njab import io, pandas, plotting, sklearn, stats __version__ = version('njab') diff --git a/src/njab/sklearn/__init__.py b/src/njab/sklearn/__init__.py index 8cc2aa6..8478e0c 100644 --- a/src/njab/sklearn/__init__.py +++ b/src/njab/sklearn/__init__.py @@ -9,12 +9,11 @@ import sklearn import sklearn.model_selection -from mrmr import mrmr_classif - -from .types import Splits, ResultsSplit, Results, AucRocCurve, PrecisionRecallCurve -from .pca import run_pca -from .preprocessing import StandardScaler -from . import scoring +from njab.sklearn import scoring +from njab.sklearn.pca import run_pca +from njab.sklearn.preprocessing import StandardScaler +from njab.sklearn.types import (AucRocCurve, PrecisionRecallCurve, Results, + ResultsSplit, Splits) __all__ = [ 'run_model', @@ -42,6 +41,7 @@ def run_model( """Fit a model on the training split and calculate performance metrics on both train and test split. """ + from mrmr import mrmr_classif selected_features = mrmr_classif(X=splits.X_train, y=splits.y_train, K=n_feat_to_select) @@ -102,6 +102,7 @@ def find_n_best_features( return_train_score: bool = False, fit_params: Optional[dict] = None): """Create a summary of model performance on 10 times 5-fold cross-validation.""" + from mrmr import mrmr_classif summary = [] cv = sklearn.model_selection.RepeatedStratifiedKFold( n_splits=5, n_repeats=10, random_state=random_state) diff --git a/src/njab/sklearn/scoring.py b/src/njab/sklearn/scoring.py index aae836d..9302896 100644 --- a/src/njab/sklearn/scoring.py +++ b/src/njab/sklearn/scoring.py @@ -1,8 +1,8 @@ +import numpy as np import pandas as pd import sklearn.metrics as sklm -import numpy as np -from .types import Results +from njab.sklearn.types import Results class ConfusionMatrix(): diff --git a/src/njab/stats/__init__.py b/src/njab/stats/__init__.py index b68c4ff..0f443b7 100644 --- a/src/njab/stats/__init__.py +++ b/src/njab/stats/__init__.py @@ -4,7 +4,7 @@ and differential analysis of continuous variables between groups using t-tests. """ -from . import ancova -from .groups_comparision import diff_analysis, binomtest +from njab.stats import ancova +from njab.stats.groups_comparision import binomtest, diff_analysis __all__ = ['ancova', 'diff_analysis', 'binomtest']