fix imports in tests and examples

mind-inria · Feb 17, 2025 · c377e80 · c377e80
1 parent 42164b0
commit c377e80
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/examples/plot_diabetes_variable_importance_example.py b/examples/plot_diabetes_variable_importance_example.py
@@ -55,9 +55,7 @@
 from sklearn.metrics import r2_score, root_mean_squared_error
 from sklearn.model_selection import KFold
 
-from hidimstat.cpi import CPI
-from hidimstat.loco import LOCO
-from hidimstat.permutation_importance import permutation_importance
+from hidimstat import CPI, LOCO, permutation_importance
 
 #############################################################################
 # Load the diabetes dataset

diff --git a/src/hidimstat/__init__.py b/src/hidimstat/__init__.py
@@ -1,18 +1,20 @@
 from .adaptive_permutation_threshold import ada_svr
 from .clustered_inference import clustered_inference, hd_inference
+from .conditional_permutation_importance import CPI
 from .desparsified_lasso import desparsified_group_lasso, desparsified_lasso
 from .Dnn_learner_single import DnnLearnerSingle
 from .ensemble_clustered_inference import ensemble_clustered_inference
 from .knockoff_aggregation import knockoff_aggregation
 from .knockoffs import model_x_knockoff
+from .leave_one_covariate_out import LOCO
 from .multi_sample_split import aggregate_quantiles
 from .noise_std import group_reid, reid
+from .permutation_importance import PermutationImportance
+from .permutation_importance_func import cpi, loco, permutation_importance
 from .permutation_test import permutation_test_cv
 from .scenario import multivariate_1D_simulation
 from .standardized_svr import standardized_svr
 from .stat_tools import zscore_from_pval
-from .permutation_importance import permutation_importance, cpi, loco
-from .permutation_importance_classes import PermutationImportance, CPI, LOCO
 
 try:
     from ._version import __version__

diff --git a/test/test_cpi.py b/test/test_cpi.py
@@ -7,7 +7,7 @@
 from sklearn.metrics import log_loss
 from sklearn.model_selection import train_test_split
 
-from hidimstat.permutation_importance_classes import CPI
+from hidimstat import CPI
 
 
 def test_cpi(linear_scenario):

diff --git a/test/test_loco.py b/test/test_loco.py
@@ -6,7 +6,7 @@
 from sklearn.metrics import log_loss
 from sklearn.model_selection import train_test_split
 
-from hidimstat.permutation_importance_classes import LOCO
+from hidimstat import LOCO
 
 
 def test_loco(linear_scenario):

diff --git a/test/test_permutation_importance.py b/test/test_permutation_importance.py
@@ -4,7 +4,7 @@
 from sklearn.metrics import log_loss
 from sklearn.model_selection import train_test_split
 
-from hidimstat.permutation_importance_classes import PermutationImportance
+from hidimstat import PermutationImportance
 
 
 def test_permutation_importance(linear_scenario):

diff --git a/test/test_permutation_importance_function.py b/test/test_permutation_importance_function.py
@@ -4,7 +4,7 @@
 from sklearn.metrics import log_loss
 from sklearn.model_selection import train_test_split
 
-from hidimstat.permutation_importance import permutation_importance
+from hidimstat.permutation_importance_func import permutation_importance
 
 
 def test_permutation_importance_no_fitting(linear_scenario):