Merge remote-tracking branch 'origin/master'

sgoldenlab · Nov 8, 2024 · 498d554 · 498d554
2 parents a1f691c + 13b57d4
commit 498d554
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/simba/outlier_tools/outlier_corrector_location_mp.py b/simba/outlier_tools/outlier_corrector_location_mp.py
@@ -1,20 +1,24 @@
 __author__ = "Simon Nilsson"
 
 
+import functools
+import multiprocessing
 import os
-from typing import Union, Optional, Dict
+from typing import Dict, Optional, Union
 
 import numpy as np
 import pandas as pd
-import multiprocessing
-import functools
 
-from simba.utils.checks import check_float, check_if_dir_exists, check_int
 from simba.mixins.config_reader import ConfigReader
 from simba.mixins.feature_extraction_mixin import FeatureExtractionMixin
-from simba.utils.enums import ConfigKey, Dtypes, Defaults
+from simba.utils.checks import check_float, check_if_dir_exists, check_int
+from simba.utils.enums import ConfigKey, Defaults, Dtypes
 from simba.utils.printing import SimbaTimer, stdout_success
-from simba.utils.read_write import (get_fn_ext, read_config_entry, read_df, write_df, find_core_cnt, find_files_of_filetypes_in_directory)
+from simba.utils.read_write import (find_core_cnt,
+                                    find_files_of_filetypes_in_directory,
+                                    get_fn_ext, read_config_entry, read_df,
+                                    write_df)
+
 
 def _location_outlier_corrector(data_path: str,
                                 config: FeatureExtractionMixin,

diff --git a/simba/outlier_tools/outlier_corrector_movement_mp.py b/simba/outlier_tools/outlier_corrector_movement_mp.py
@@ -1,20 +1,23 @@
 __author__ = "Simon Nilsson"
 
+import functools
+import multiprocessing
 import os
-from typing import Union, Optional, Dict
+from typing import Dict, Optional, Union
 
 import numpy as np
 import pandas as pd
 from numba import jit
-import multiprocessing
-import functools
 
 from simba.mixins.config_reader import ConfigReader
 from simba.mixins.feature_extraction_mixin import FeatureExtractionMixin
+from simba.utils.checks import check_float, check_if_dir_exists, check_int
 from simba.utils.enums import ConfigKey, Dtypes
 from simba.utils.printing import SimbaTimer, stdout_success
-from simba.utils.read_write import (get_fn_ext, read_config_entry, read_df, write_df, find_core_cnt, find_files_of_filetypes_in_directory)
-from simba.utils.checks import check_int, check_float, check_if_dir_exists
+from simba.utils.read_write import (find_core_cnt,
+                                    find_files_of_filetypes_in_directory,
+                                    get_fn_ext, read_config_entry, read_df,
+                                    write_df)
 
 
 def _movement_outlier_corrector(data_path: str,