diff --git a/chemotools/baseline/_air_pls.py b/chemotools/baseline/_air_pls.py index cef6326..a064270 100644 --- a/chemotools/baseline/_air_pls.py +++ b/chemotools/baseline/_air_pls.py @@ -24,7 +24,7 @@ from sklearn.utils.validation import check_is_fitted from chemotools.utils.check_inputs import check_input -from chemotools.utils.whittaker_base import WhittakerLikeSolver +from chemotools.utils._whittaker_base import WhittakerLikeSolver logger = logging.getLogger(__name__) diff --git a/chemotools/baseline/_ar_pls.py b/chemotools/baseline/_ar_pls.py index c8ad49c..3bf21d0 100644 --- a/chemotools/baseline/_ar_pls.py +++ b/chemotools/baseline/_ar_pls.py @@ -27,7 +27,7 @@ from sklearn.utils.validation import check_is_fitted, check_scalar from chemotools.utils.check_inputs import check_input -from chemotools.utils.whittaker_base import WhittakerLikeSolver +from chemotools.utils._whittaker_base import WhittakerLikeSolver logger = logging.getLogger(__name__) diff --git a/chemotools/smooth/_whittaker_smooth.py b/chemotools/smooth/_whittaker_smooth.py index 211207d..d270091 100644 --- a/chemotools/smooth/_whittaker_smooth.py +++ b/chemotools/smooth/_whittaker_smooth.py @@ -28,7 +28,7 @@ from chemotools.utils.check_inputs import check_input, check_weights from chemotools.utils.types import RealNumeric -from chemotools.utils.whittaker_base import ( +from chemotools.utils._whittaker_base import ( WhittakerLikeSolver, WhittakerSmoothLambda, WhittakerSmoothMethods, diff --git a/chemotools/utils/whittaker_base/__init__.py b/chemotools/utils/_whittaker_base/__init__.py similarity index 88% rename from chemotools/utils/whittaker_base/__init__.py rename to chemotools/utils/_whittaker_base/__init__.py index 69c23aa..add3d30 100644 --- a/chemotools/utils/whittaker_base/__init__.py +++ b/chemotools/utils/_whittaker_base/__init__.py @@ -18,4 +18,4 @@ WhittakerSmoothLambda, WhittakerSmoothMethods, ) -from chemotools.utils.whittaker_base.main import WhittakerLikeSolver # noqa: F401 +from chemotools.utils._whittaker_base.main import WhittakerLikeSolver # noqa: F401 diff --git a/chemotools/utils/whittaker_base/auto_lambda/__init__.py b/chemotools/utils/_whittaker_base/auto_lambda/__init__.py similarity index 61% rename from chemotools/utils/whittaker_base/auto_lambda/__init__.py rename to chemotools/utils/_whittaker_base/auto_lambda/__init__.py index bba327c..eb50bf8 100644 --- a/chemotools/utils/whittaker_base/auto_lambda/__init__.py +++ b/chemotools/utils/_whittaker_base/auto_lambda/__init__.py @@ -7,13 +7,13 @@ class implementation. ### Imports ### -from chemotools.utils.whittaker_base.auto_lambda.logml import ( # noqa: F401 +from chemotools.utils._whittaker_base.auto_lambda.logml import ( # noqa: F401 get_log_marginal_likelihood, get_log_marginal_likelihood_constant_term, ) -from chemotools.utils.whittaker_base.auto_lambda.optimization import ( # noqa: F401 +from chemotools.utils._whittaker_base.auto_lambda.optimization import ( # noqa: F401 get_optimized_lambda, ) -from chemotools.utils.whittaker_base.auto_lambda.shared import ( # noqa: F401 +from chemotools.utils._whittaker_base.auto_lambda.shared import ( # noqa: F401 _Factorization, ) diff --git a/chemotools/utils/whittaker_base/auto_lambda/logml.py b/chemotools/utils/_whittaker_base/auto_lambda/logml.py similarity index 98% rename from chemotools/utils/whittaker_base/auto_lambda/logml.py rename to chemotools/utils/_whittaker_base/auto_lambda/logml.py index 8777400..4376daa 100644 --- a/chemotools/utils/whittaker_base/auto_lambda/logml.py +++ b/chemotools/utils/_whittaker_base/auto_lambda/logml.py @@ -13,7 +13,7 @@ from chemotools.utils import banded_linalg as bla from chemotools.utils import models -from chemotools.utils.whittaker_base.auto_lambda.shared import get_smooth_wrss +from chemotools.utils._whittaker_base.auto_lambda.shared import get_smooth_wrss ### Constants ### diff --git a/chemotools/utils/whittaker_base/auto_lambda/optimization.py b/chemotools/utils/_whittaker_base/auto_lambda/optimization.py similarity index 100% rename from chemotools/utils/whittaker_base/auto_lambda/optimization.py rename to chemotools/utils/_whittaker_base/auto_lambda/optimization.py diff --git a/chemotools/utils/whittaker_base/auto_lambda/shared.py b/chemotools/utils/_whittaker_base/auto_lambda/shared.py similarity index 100% rename from chemotools/utils/whittaker_base/auto_lambda/shared.py rename to chemotools/utils/_whittaker_base/auto_lambda/shared.py diff --git a/chemotools/utils/whittaker_base/initialisation.py b/chemotools/utils/_whittaker_base/initialisation.py similarity index 100% rename from chemotools/utils/whittaker_base/initialisation.py rename to chemotools/utils/_whittaker_base/initialisation.py diff --git a/chemotools/utils/whittaker_base/main.py b/chemotools/utils/_whittaker_base/main.py similarity index 98% rename from chemotools/utils/whittaker_base/main.py rename to chemotools/utils/_whittaker_base/main.py index a0ed2a1..874cd84 100644 --- a/chemotools/utils/whittaker_base/main.py +++ b/chemotools/utils/_whittaker_base/main.py @@ -17,10 +17,10 @@ from chemotools._runtime import PENTAPY_AVAILABLE from chemotools.utils import models from chemotools.utils.banded_linalg import LAndUBandCounts -from chemotools.utils.whittaker_base import auto_lambda as auto -from chemotools.utils.whittaker_base import initialisation as init -from chemotools.utils.whittaker_base import solvers -from chemotools.utils.whittaker_base.misc import get_weight_generator +from chemotools.utils._whittaker_base import auto_lambda as auto +from chemotools.utils._whittaker_base import initialisation as init +from chemotools.utils._whittaker_base import solvers +from chemotools.utils._whittaker_base.misc import get_weight_generator ### Class Implementation ### diff --git a/chemotools/utils/whittaker_base/misc.py b/chemotools/utils/_whittaker_base/misc.py similarity index 100% rename from chemotools/utils/whittaker_base/misc.py rename to chemotools/utils/_whittaker_base/misc.py diff --git a/chemotools/utils/whittaker_base/solvers.py b/chemotools/utils/_whittaker_base/solvers.py similarity index 100% rename from chemotools/utils/whittaker_base/solvers.py rename to chemotools/utils/_whittaker_base/solvers.py diff --git a/tests/test_for_utils/test_whittaker_base.py b/tests/test_for_utils/test_whittaker_base.py index 562ec70..d4c524a 100644 --- a/tests/test_for_utils/test_whittaker_base.py +++ b/tests/test_for_utils/test_whittaker_base.py @@ -13,14 +13,14 @@ import pytest from chemotools.utils import models -from chemotools.utils.whittaker_base.auto_lambda.shared import get_smooth_wrss -from chemotools.utils.whittaker_base.initialisation import ( +from chemotools.utils._whittaker_base.auto_lambda.shared import get_smooth_wrss +from chemotools.utils._whittaker_base.initialisation import ( get_checked_lambda, get_penalty_log_pseudo_det, ) -from chemotools.utils.whittaker_base.main import WhittakerLikeSolver -from chemotools.utils.whittaker_base.misc import get_weight_generator -from chemotools.utils.whittaker_base.solvers import solve_normal_equations +from chemotools.utils._whittaker_base.main import WhittakerLikeSolver +from chemotools.utils._whittaker_base.misc import get_weight_generator +from chemotools.utils._whittaker_base.solvers import solve_normal_equations from tests.fixtures import noise_level_whittaker_auto_lambda # noqa: F401 from tests.fixtures import spectrum_whittaker_auto_lambda # noqa: F401 from tests.test_for_utils.utils_funcs import ( diff --git a/tests/test_for_utils/utils_funcs.py b/tests/test_for_utils/utils_funcs.py index 5c1c1bb..e16f585 100644 --- a/tests/test_for_utils/utils_funcs.py +++ b/tests/test_for_utils/utils_funcs.py @@ -21,7 +21,7 @@ from scipy.sparse import linalg as spla from chemotools.utils.finite_differences import calc_forward_diff_kernel -from chemotools.utils.whittaker_base import WhittakerLikeSolver +from chemotools.utils._whittaker_base import WhittakerLikeSolver ### Utility Functions ###