Correct use of estimator/model container

Author: ilan-gold

diffxpy/testing/det.py

@@ -652,7 +652,7 @@ def scales(self):
 
         dmat, sample_description = dmat_unique(dmat, sample_description)
 
-        retval = self.full_estim.inverse_link_scale(dmat.doc(self.full_estim.par_link_scale))
+        retval = self.full_estim.model_container.inverse_link_scale(dmat.doc(self.full_estim.par_link_scale))
         retval = pd.DataFrame(retval, columns=self.full_estim.model_container.features)
         for col in sample_description:
             retval[col] = sample_description[col]
@@ -698,7 +698,7 @@ class DifferentialExpressionTestWald(_DifferentialExpressionTestSingle):
     Single wald test per gene.
     """
 
-    model_estim: glm.train.base.BaseModelContainer
+    model_estim: glm.train.base.BaseEstimatorGlm
     sample_description: pd.DataFrame
     coef_loc_totest: np.ndarray
     theta_mle: np.ndarray
@@ -708,7 +708,7 @@ class DifferentialExpressionTestWald(_DifferentialExpressionTestSingle):
 
     def __init__(
             self,
-            model_estim: glm.train.base.BaseModelContainer,
+            model_estim: glm.train.base.BaseEstimatorGlm,
             col_indices: np.ndarray,
             noise_model: str,
             sample_description: pd.DataFrame
@@ -726,16 +726,16 @@ def __init__(
         self._store_ols = None
 
         try:
-            if self.model_estim.error_codes is not None:
-                self._error_codes = self.model_estim.error_codes
+            if self.model_estim.model_container.error_codes is not None:
+                self._error_codes = self.model_estim.model_container.error_codes
             else:
                 self._error_codes = None
         except Exception as e:
             self._error_codes = None
 
         try:
-            if self.model_estim.niter is not None:
-                self._niter = self.model_estim.niter
+            if self.model_estim.model_container.niter is not None:
+                self._niter = self.model_estim.model_container.niter
             else:
                 self._niter = None
         except Exception as e:

diffxpy/testing/det_cont.py

@@ -20,15 +20,15 @@
 
 class _DifferentialExpressionTestCont(_DifferentialExpressionTestSingle):
     _de_test: _DifferentialExpressionTestSingle
-    _model_estim: glm.train.base.BaseModelContainer
+    _model_estim: glm.train.base.BaseEstimatorGlm
     _size_factors: np.ndarray
     _continuous_coords: np.ndarray
     _spline_coefs: list
 
     def __init__(
             self,
             de_test: _DifferentialExpressionTestSingle,
-            model_estim: glm.train.base.BaseModelContainer,
+            model_estim: glm.train.base.BaseEstimatorGlm,
             size_factors: np.ndarray,
             continuous_coords: np.ndarray,
             spline_coefs: list,

diffxpy/testing/det_pair.py

@@ -341,13 +341,13 @@ class DifferentialExpressionTestZTest(_DifferentialExpressionTestPairwiseBase):
     lazy test evaluation.
     """
 
-    model_estim: glm.train.base.BaseModelContainer
+    model_estim: glm.train.base.BaseEstimatorGlm
     theta_mle: np.ndarray
     theta_sd: np.ndarray
 
     def __init__(
             self,
-            model_estim: glm.train.base.BaseModelContainer,
+            model_estim: glm.train.base.BaseEstimatorGlm,
             grouping,
             groups,
             correction_type: str
@@ -528,13 +528,13 @@ class DifferentialExpressionTestZTestLazy(_DifferentialExpressionTestPairwiseLaz
     memory.
     """
 
-    model_estim: glm.train.base.BaseModelContainer
+    model_estim: glm.train.base.BaseEstimatorGlm
     _theta_mle: np.ndarray
     _theta_sd: np.ndarray
 
     def __init__(
             self,
-            model_estim: glm.train.base.BaseModelContainer,
+            model_estim: glm.train.base.BaseEstimatorGlm,
             grouping, groups,
             correction_type="global"
     ):