Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
sronilsson committed Nov 20, 2024
2 parents e893ebc + ccd9761 commit 47f1742
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion simba/mixins/feature_extraction_mixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from scipy.spatial.qhull import QhullError

import simba
from simba.utils.checks import (check_file_exist_and_readable,
from simba.utils.checks import (check, check_file_exist_and_readable,
check_if_filepath_list_is_empty,
check_minimum_roll_windows)
from simba.utils.enums import Options, Paths
Expand Down
2 changes: 1 addition & 1 deletion simba/mixins/feature_extraction_supplement_mixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
check_that_column_exist, check_valid_array,
check_valid_dataframe, check_valid_lst)
from simba.utils.data import detect_bouts
from simba.utils.enums import Formats
from simba.utils.errors import CountError, InvalidInputError
from simba.utils.printing import SimbaTimer, stdout_success
from simba.utils.read_write import get_fn_ext, read_df
from simba.utils.enums import Formats


class FeatureExtractionSupplemental(FeatureExtractionMixin):
Expand Down
3 changes: 2 additions & 1 deletion simba/mixins/statistics_mixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
from typing_extensions import Literal

import numpy as np
from numba import (bool_, float32, float64, int8, jit, njit, prange, typed, types)
from numba import (bool_, float32, float64, int8, jit, njit, prange, typed,
types)
from scipy import stats
from scipy.stats.distributions import chi2
from sklearn.covariance import EllipticEnvelope
Expand Down

0 comments on commit 47f1742

Please sign in to comment.