update tests acc. to Refactor Data Generators #306

Author: JanTeichertKluge

doubleml/plm/tests/conftest.py

@@ -4,7 +4,7 @@
 from scipy.linalg import toeplitz
 from sklearn.datasets import make_spd_matrix
 
-from doubleml.datasets import make_pliv_CHS2015, make_plr_turrell2018
+from doubleml.plm.datasets import make_pliv_CHS2015, make_plr_turrell2018
 
 
 def _g(x):

doubleml/plm/tests/test_pliv_external_predictions.py

@@ -5,7 +5,7 @@
 from sklearn.linear_model import LinearRegression
 
 from doubleml import DoubleMLData, DoubleMLPLIV
-from doubleml.datasets import make_pliv_CHS2015
+from doubleml.plm.datasets import make_pliv_CHS2015
 from doubleml.utils import DMLDummyRegressor
 
 

doubleml/plm/tests/test_plr_external_predictions.py

@@ -5,7 +5,7 @@
 from sklearn.linear_model import LinearRegression
 
 from doubleml import DoubleMLData, DoubleMLPLR
-from doubleml.datasets import make_plr_CCDDHNR2018
+from doubleml.plm.datasets import make_plr_CCDDHNR2018
 from doubleml.utils import DMLDummyRegressor
 
 

doubleml/tests/conftest.py

@@ -4,7 +4,7 @@
 from sklearn.datasets import make_classification, make_regression, make_spd_matrix
 
 from doubleml import DoubleMLData
-from doubleml.datasets import make_pliv_CHS2015, make_plr_turrell2018
+from doubleml.plm.datasets import make_pliv_CHS2015, make_plr_turrell2018
 
 
 def _g(x):

doubleml/tests/test_datasets.py

@@ -3,21 +3,22 @@
 import pytest
 
 from doubleml import DoubleMLClusterData, DoubleMLData
-from doubleml.datasets import (
-    _make_pliv_data,
-    fetch_401K,
-    fetch_bonus,
+from doubleml.datasets import fetch_401K, fetch_bonus
+from doubleml.irm.datasets import (
     make_confounded_irm_data,
-    make_confounded_plr_data,
     make_heterogeneous_data,
     make_iivm_data,
     make_irm_data,
     make_irm_data_discrete_treatments,
+    make_ssm_data,
+)
+from doubleml.plm.datasets import (
+    _make_pliv_data,
+    make_confounded_plr_data,
     make_pliv_CHS2015,
     make_pliv_multiway_cluster_CKMS2021,
     make_plr_CCDDHNR2018,
     make_plr_turrell2018,
-    make_ssm_data,
 )
 
 msg_inv_return_type = "Invalid return_type."

doubleml/tests/test_evaluate_learner.py

@@ -5,7 +5,7 @@
 from sklearn.linear_model import LinearRegression, LogisticRegression
 
 import doubleml as dml
-from doubleml.datasets import make_irm_data
+from doubleml.irm.datasets import make_irm_data
 from doubleml.utils._estimation import _logloss
 
 np.random.seed(3141)

doubleml/tests/test_exceptions.py

@@ -21,13 +21,8 @@
     DoubleMLPQ,
     DoubleMLQTE,
 )
-from doubleml.datasets import (
-    make_iivm_data,
-    make_irm_data,
-    make_pliv_CHS2015,
-    make_pliv_multiway_cluster_CKMS2021,
-    make_plr_CCDDHNR2018,
-)
+from doubleml.irm.datasets import make_iivm_data, make_irm_data
+from doubleml.plm.datasets import make_pliv_CHS2015, make_pliv_multiway_cluster_CKMS2021, make_plr_CCDDHNR2018
 from doubleml.did.datasets import make_did_SZ2020
 
 from ._utils import DummyDataClass

doubleml/tests/test_exceptions_ext_preds.py

@@ -2,7 +2,7 @@
 from sklearn.ensemble import RandomForestClassifier, RandomForestRegressor
 
 from doubleml import DoubleMLCVAR, DoubleMLData, DoubleMLIRM, DoubleMLQTE
-from doubleml.datasets import make_irm_data
+from doubleml.irm.datasets import make_irm_data
 from doubleml.utils import DMLDummyClassifier, DMLDummyRegressor
 
 df_irm = make_irm_data(n_obs=10, dim_x=2, theta=0.5, return_type="DataFrame")

doubleml/tests/test_framework.py

@@ -3,7 +3,7 @@
 import pytest
 from sklearn.linear_model import LinearRegression, LogisticRegression
 
-from doubleml.datasets import make_irm_data
+from doubleml.irm.datasets import make_irm_data
 from doubleml.double_ml_framework import DoubleMLFramework, concat
 from doubleml.irm.irm import DoubleMLIRM
 

doubleml/tests/test_model_defaults.py

@@ -4,13 +4,8 @@
 from sklearn.linear_model import Lasso, LogisticRegression
 
 import doubleml as dml
-from doubleml.datasets import (
-    make_iivm_data,
-    make_irm_data,
-    make_pliv_CHS2015,
-    make_plr_CCDDHNR2018,
-    make_ssm_data,
-)
+from doubleml.irm.datasets import make_iivm_data, make_irm_data, make_ssm_data
+from doubleml.plm.datasets import make_pliv_CHS2015, make_plr_CCDDHNR2018
 from doubleml.did.datasets import make_did_SZ2020
 
 np.random.seed(3141)

doubleml/tests/test_multiway_cluster.py

@@ -6,7 +6,7 @@
 from sklearn.linear_model import Lasso, LinearRegression
 
 import doubleml as dml
-from doubleml.datasets import make_pliv_multiway_cluster_CKMS2021
+from doubleml.plm.datasets import make_pliv_multiway_cluster_CKMS2021
 
 from ..plm.tests._utils_pliv_manual import compute_pliv_residuals, fit_pliv
 from ._utils import _clone

doubleml/tests/test_nonlinear_cluster.py

@@ -7,7 +7,8 @@
 from sklearn.linear_model import Lasso, LinearRegression
 
 import doubleml as dml
-from doubleml.datasets import DoubleMLClusterData, make_pliv_multiway_cluster_CKMS2021
+from doubleml import DoubleMLClusterData
+from doubleml.plm.datasets import make_pliv_multiway_cluster_CKMS2021
 
 from .test_nonlinear_score_mixin import DoubleMLPLRWithNonLinearScoreMixin
 

doubleml/tests/test_return_types.py

@@ -23,14 +23,8 @@
     DoubleMLPQ,
     DoubleMLSSM,
 )
-from doubleml.datasets import (
-    make_iivm_data,
-    make_irm_data,
-    make_pliv_CHS2015,
-    make_pliv_multiway_cluster_CKMS2021,
-    make_plr_CCDDHNR2018,
-    make_ssm_data,
-)
+from doubleml.irm.datasets import make_iivm_data, make_irm_data, make_ssm_data
+from doubleml.plm.datasets import make_pliv_CHS2015, make_pliv_multiway_cluster_CKMS2021, make_plr_CCDDHNR2018
 from doubleml.did.datasets import make_did_SZ2020
 
 np.random.seed(3141)

doubleml/tests/test_scores.py

@@ -3,7 +3,8 @@
 from sklearn.linear_model import Lasso, LogisticRegression
 
 from doubleml import DoubleMLIIVM, DoubleMLIRM, DoubleMLPLIV, DoubleMLPLR
-from doubleml.datasets import make_iivm_data, make_irm_data, make_pliv_CHS2015, make_plr_CCDDHNR2018
+from doubleml.irm.datasets import make_iivm_data, make_irm_data
+from doubleml.plm.datasets import make_pliv_CHS2015, make_plr_CCDDHNR2018
 
 np.random.seed(3141)
 dml_data_plr = make_plr_CCDDHNR2018(n_obs=100)

doubleml/tests/test_sensitivity.py

@@ -5,7 +5,7 @@
 from sklearn.linear_model import LinearRegression, LogisticRegression
 
 import doubleml as dml
-from doubleml.datasets import make_irm_data
+from doubleml.irm.datasets import make_irm_data
 
 from ._utils_doubleml_sensitivity_manual import doubleml_sensitivity_benchmark_manual, doubleml_sensitivity_manual
 

doubleml/tests/test_sensitivity_cluster.py

@@ -5,7 +5,7 @@
 from sklearn.linear_model import LinearRegression
 
 import doubleml as dml
-from doubleml.datasets import make_pliv_multiway_cluster_CKMS2021
+from doubleml.plm.datasets import make_pliv_multiway_cluster_CKMS2021
 
 from ._utils_doubleml_sensitivity_manual import doubleml_sensitivity_benchmark_manual
 

doubleml/tests/test_set_ml_nuisance_params.py

@@ -3,7 +3,8 @@
 from sklearn.ensemble import RandomForestClassifier, RandomForestRegressor
 
 from doubleml import DoubleMLCVAR, DoubleMLIIVM, DoubleMLIRM, DoubleMLLPQ, DoubleMLPLIV, DoubleMLPLR, DoubleMLPQ
-from doubleml.datasets import make_iivm_data, make_irm_data, make_pliv_CHS2015, make_plr_CCDDHNR2018
+from doubleml.irm.datasets import make_iivm_data, make_irm_data
+from doubleml.plm.datasets import make_pliv_CHS2015, make_plr_CCDDHNR2018
 
 # set default and test values
 n_est_default = 100

doubleml/tests/test_set_sample_splitting.py

@@ -3,7 +3,7 @@
 from sklearn.linear_model import Lasso
 
 from doubleml import DoubleMLPLR
-from doubleml.datasets import make_plr_CCDDHNR2018
+from doubleml.plm.datasets import make_plr_CCDDHNR2018
 
 np.random.seed(3141)
 dml_data = make_plr_CCDDHNR2018(n_obs=10)