Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 make all imports explicit #13

Merged
merged 2 commits into from
Jun 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/njab/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
13 changes: 7 additions & 6 deletions src/njab/sklearn/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/njab/sklearn/scoring.py
Original file line number Diff line number Diff line change
@@ -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():
Expand Down
4 changes: 2 additions & 2 deletions src/njab/stats/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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']