Merge remote-tracking branch 'origin/master'

sgoldenlab · Nov 20, 2024 · cfb1353 · cfb1353
2 parents d0befb1 + c86f004
commit cfb1353
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 12 deletions.
diff --git a/simba/data_processors/gibbs_sampler.py b/simba/data_processors/gibbs_sampler.py
@@ -1,10 +1,13 @@
 import os
-from typing import Union, Tuple
+from typing import Tuple, Union
+
 import numpy as np
 import pandas as pd
 
+from simba.utils.checks import (check_float, check_if_dir_exists, check_int,
+                                check_valid_array)
 from simba.utils.printing import SimbaTimer, stdout_success
-from simba.utils.checks import check_valid_array, check_float, check_int, check_if_dir_exists
+
 
 class GibbSampler():
 

diff --git a/simba/mixins/circular_statistics.py b/simba/mixins/circular_statistics.py
@@ -4,10 +4,11 @@
 
 import numpy as np
 from numba import float32, float64, int64, jit, njit, prange, typed, types
-from simba.utils.checks import check_valid_array, check_float
+
+from simba.utils.checks import check_float, check_valid_array
+from simba.utils.data import get_mode
 from simba.utils.enums import Formats
 from simba.utils.errors import InvalidInputError
-from simba.utils.data import get_mode
 
 
 class CircularStatisticsMixin(object):

diff --git a/simba/model/regression/metrics.py b/simba/model/regression/metrics.py
@@ -1,8 +1,11 @@
 from typing import Optional
+
 import numpy as np
-from simba.utils.checks import check_valid_array, check_float
+
+from simba.utils.checks import check_float, check_valid_array
 from simba.utils.enums import Formats
 
+
 def mean_absolute_percentage_error(y_true: np.ndarray,
                                    y_pred: np.ndarray,
                                    epsilon=1e-10,

diff --git a/simba/model/regression/model.py b/simba/model/regression/model.py
@@ -1,16 +1,20 @@
-from typing import Optional, Dict, List
+from typing import Dict, List, Optional
+
 import numpy as np
 import pandas as pd
 import xgboost as xgb
 from sklearn.model_selection import StratifiedKFold
-from simba.utils.checks import check_valid_array, check_int, check_valid_lst, check_str, check_float, check_instance, check_valid_dataframe
+
+from simba.model.regression.metrics import (mean_absolute_error,
+                                            mean_absolute_percentage_error,
+                                            mean_squared_error, r2_score,
+                                            root_mean_squared_error)
+from simba.utils.checks import (check_float, check_instance, check_int,
+                                check_str, check_valid_array,
+                                check_valid_dataframe, check_valid_lst)
 from simba.utils.enums import Formats
 from simba.utils.errors import DataHeaderError
-from simba.model.regression.metrics import (mean_absolute_percentage_error,
-                                            mean_squared_error,
-                                            mean_absolute_error,
-                                            r2_score,
-                                            root_mean_squared_error)
+
 
 def fit_xgb(x: pd.DataFrame,
             y: np.ndarray,