refactor: change repo structure by adding core module

iraedeus · iraedeus · commit 65fbf7c85e29 · 2025-02-19T05:24:38.000+03:00
diff --git a/examples/mono_test_generator.py b/examples/mono_test_generator.py
@@ -6,11 +6,11 @@
 import numpy as np
 
 from examples.utils import Clicker, Test
-from mpest.distribution import Distribution
+from mpest.core.distribution import Distribution
+from mpest.core.mixture_distribution import MixtureDistribution
+from mpest.core.problem import Problem
 from mpest.em import EM
-from mpest.mixture_distribution import MixtureDistribution
 from mpest.models import AModel, AModelWithGenerator
-from mpest.problem import Problem
 
 
 def generate_mono_test(
diff --git a/examples/prepare_result.py b/examples/prepare_result.py
@@ -9,8 +9,8 @@
 from examples.config import MAX_WORKERS
 from examples.mono_test_generator import Clicker
 from examples.utils import SingleSolverResult, TestResult
-from mpest.mixture_distribution import DistributionInMixture, MixtureDistribution
-from mpest.types import Samples
+from mpest.annotations import Samples
+from mpest.core.mixture_distribution import DistributionInMixture, MixtureDistribution
 
 
 def nll(samples: Samples, mixture: MixtureDistribution) -> float:
diff --git a/examples/utils.py b/examples/utils.py
@@ -10,17 +10,17 @@
 from tqdm.contrib.concurrent import process_map
 
 from examples.config import RESULTS_FOLDER
+from mpest.annotations import Samples
+from mpest.core.mixture_distribution import MixtureDistribution
+from mpest.core.problem import Problem, Result
 from mpest.em import EM
 from mpest.em.breakpointers import ParamDifferBreakpointer, StepCountBreakpointer
 from mpest.em.distribution_checkers import (
     FiniteChecker,
     PriorProbabilityThresholdChecker,
 )
 from mpest.em.methods.likelihood_method import LikelihoodMethod
-from mpest.mixture_distribution import MixtureDistribution
 from mpest.optimizers import TOptimizer
-from mpest.problem import Problem, Result
-from mpest.types import Samples
 
 np.seterr(all="ignore")
 
diff --git a/experimental_env/preparation/dataset_description.py b/experimental_env/preparation/dataset_description.py
@@ -2,8 +2,8 @@
 
 import copy
 
-from mpest.mixture_distribution import MixtureDistribution
-from mpest.types import Samples
+from mpest.annotations import Samples
+from mpest.core.mixture_distribution import MixtureDistribution
 
 
 class DatasetDescrciption:
diff --git a/experimental_env/preparation/dataset_generator.py b/experimental_env/preparation/dataset_generator.py
@@ -10,8 +10,8 @@
     DatasetMixtureGenerator,
 )
 from experimental_env.preparation.dataset_saver import DatasetDescrciption, DatasetSaver
-from mpest.distribution import Distribution
-from mpest.mixture_distribution import MixtureDistribution
+from mpest.core.distribution import Distribution
+from mpest.core.mixture_distribution import MixtureDistribution
 from mpest.models.abstract_model import AModel
 
 
diff --git a/mpest/__init__.py b/mpest/__init__.py
@@ -4,7 +4,7 @@
 """
 
 from mpest import em, models, optimizers, utils
-from mpest.distribution import Distribution
-from mpest.mixture_distribution import DistributionInMixture, MixtureDistribution
-from mpest.problem import Problem, Result
-from mpest.types import Params, Samples
+from mpest.core.distribution import Distribution
+from mpest.core.mixture_distribution import DistributionInMixture, MixtureDistribution
+from mpest.core.problem import Problem, Result
+from mpest.annotations import Params, Samples
diff --git a/mpest/annotations.py b/mpest/annotations.py
diff --git a/mpest/core/__init__.py b/mpest/core/__init__.py
diff --git a/mpest/core/distribution.py b/mpest/core/distribution.py
@@ -4,8 +4,8 @@
 
 import numpy as np
 
+from mpest.annotations import Params, Samples
 from mpest.models import AModel, AModelWithGenerator
-from mpest.types import Params, Samples
 
 
 class APDFAble(ABC):
diff --git a/mpest/core/mixture_distribution.py b/mpest/core/mixture_distribution.py
@@ -9,9 +9,9 @@
 
 import numpy as np
 
-from mpest.distribution import APDFAble, AWithGenerator, Distribution
+from mpest.annotations import Params
+from mpest.core.distribution import APDFAble, AWithGenerator, Distribution
 from mpest.models import AModel, AModelWithGenerator
-from mpest.types import Params
 from mpest.utils import IteratorWrapper
 
 
diff --git a/mpest/core/problem.py b/mpest/core/problem.py
@@ -2,8 +2,8 @@
 
 from abc import ABC, abstractmethod
 
-from mpest.mixture_distribution import MixtureDistribution
-from mpest.types import Samples
+from mpest.annotations import Samples
+from mpest.core.mixture_distribution import MixtureDistribution
 from mpest.utils import ResultWithError
 
 
@@ -13,6 +13,7 @@ class Problem:
 
     Described by samples and the initial approximation.
     Initial approximation is an mixture distribution.
+
     """
 
     def __init__(
diff --git a/mpest/em/breakpointers/param_differ_breakpointer.py b/mpest/em/breakpointers/param_differ_breakpointer.py
@@ -2,8 +2,8 @@
 
 import numpy as np
 
+from mpest.core.mixture_distribution import MixtureDistribution
 from mpest.em.breakpointers.unionable_breakpointer import AUnionableBreakpointer
-from mpest.mixture_distribution import MixtureDistribution
 
 
 class ParamDifferBreakpointer(AUnionableBreakpointer):
diff --git a/mpest/em/breakpointers/step_count_breakpointer.py b/mpest/em/breakpointers/step_count_breakpointer.py
@@ -1,7 +1,7 @@
 """Module which contains EM breakpointer by step count"""
 
+from mpest.core.mixture_distribution import MixtureDistribution
 from mpest.em.breakpointers.unionable_breakpointer import AUnionableBreakpointer
-from mpest.mixture_distribution import MixtureDistribution
 
 
 class StepCountBreakpointer(AUnionableBreakpointer):
diff --git a/mpest/em/breakpointers/unionable_breakpointer.py b/mpest/em/breakpointers/unionable_breakpointer.py
@@ -2,8 +2,8 @@
 
 from abc import ABC
 
+from mpest.core.mixture_distribution import MixtureDistribution
 from mpest.em import EM
-from mpest.mixture_distribution import MixtureDistribution
 
 
 class UnionBreakpointer(EM.ABreakpointer):
diff --git a/mpest/em/distribution_checkers/finite_checker.py b/mpest/em/distribution_checkers/finite_checker.py
@@ -2,10 +2,10 @@
 
 import numpy as np
 
+from mpest.core.mixture_distribution import DistributionInMixture
 from mpest.em.distribution_checkers.unionable_distribution_checker import (
     AUnionableDistributionChecker,
 )
-from mpest.mixture_distribution import DistributionInMixture
 
 
 class FiniteChecker(AUnionableDistributionChecker):
diff --git a/mpest/em/distribution_checkers/prior_probability_threshold_checker.py b/mpest/em/distribution_checkers/prior_probability_threshold_checker.py
@@ -1,9 +1,9 @@
 """Module which contains distribution checker by using prior probability threshold"""
 
+from mpest.core.mixture_distribution import DistributionInMixture
 from mpest.em.distribution_checkers.unionable_distribution_checker import (
     AUnionableDistributionChecker,
 )
-from mpest.mixture_distribution import DistributionInMixture
 
 
 class PriorProbabilityThresholdChecker(AUnionableDistributionChecker):
diff --git a/mpest/em/distribution_checkers/unionable_distribution_checker.py b/mpest/em/distribution_checkers/unionable_distribution_checker.py
@@ -2,8 +2,8 @@
 
 from abc import ABC
 
+from mpest.core.mixture_distribution import DistributionInMixture
 from mpest.em import EM
-from mpest.mixture_distribution import DistributionInMixture
 
 
 class UnionDistributionChecker(EM.ADistributionChecker):
diff --git a/mpest/em/em.py b/mpest/em/em.py
@@ -7,10 +7,10 @@
 from abc import ABC, abstractmethod
 from collections.abc import Callable
 
-from mpest.distribution import Distribution
+from mpest.core.distribution import Distribution
+from mpest.core.mixture_distribution import DistributionInMixture, MixtureDistribution
+from mpest.core.problem import ASolver, Problem, Result
 from mpest.em.methods.method import Method
-from mpest.mixture_distribution import DistributionInMixture, MixtureDistribution
-from mpest.problem import ASolver, Problem, Result
 from mpest.utils import (
     ANamed,
     ObjectWrapper,
diff --git a/mpest/em/methods/abstract_steps.py b/mpest/em/methods/abstract_steps.py
@@ -3,8 +3,8 @@
 from abc import ABC, abstractmethod
 from typing import Generic, TypeVar
 
-from mpest.mixture_distribution import MixtureDistribution
-from mpest.problem import Problem
+from mpest.core.mixture_distribution import MixtureDistribution
+from mpest.core.problem import Problem
 from mpest.utils import ResultWithError
 
 T = TypeVar("T")
diff --git a/mpest/em/methods/l_moments_method.py b/mpest/em/methods/l_moments_method.py
@@ -6,11 +6,11 @@
 import numpy as np
 
 from mpest import Samples
-from mpest.distribution import Distribution
+from mpest.core.distribution import Distribution
+from mpest.core.mixture_distribution import MixtureDistribution
+from mpest.core.problem import Problem, Result
 from mpest.em.methods.abstract_steps import AExpectation, AMaximization
 from mpest.exceptions import EStepError, MStepError
-from mpest.mixture_distribution import MixtureDistribution
-from mpest.problem import Problem, Result
 from mpest.utils import ResultWithError, find_file
 
 EResult = tuple[Problem, list[float], np.ndarray] | ResultWithError[MixtureDistribution]
diff --git a/mpest/em/methods/likelihood_method.py b/mpest/em/methods/likelihood_method.py
@@ -4,13 +4,13 @@
 
 import numpy as np
 
-from mpest.distribution import Distribution
+from mpest.core.distribution import Distribution
+from mpest.core.mixture_distribution import MixtureDistribution
+from mpest.core.problem import Problem, Result
 from mpest.em.methods.abstract_steps import AExpectation, AMaximization
 from mpest.exceptions import SampleError
-from mpest.mixture_distribution import MixtureDistribution
 from mpest.models import AModel, AModelDifferentiable
 from mpest.optimizers import AOptimizerJacobian, TOptimizer
-from mpest.problem import Problem, Result
 from mpest.utils import ResultWithError
 
 EResult = tuple[list[float], np.ndarray, Problem] | ResultWithError[MixtureDistribution]
diff --git a/mpest/em/methods/method.py b/mpest/em/methods/method.py
@@ -2,9 +2,9 @@
 
 from typing import Generic, TypeVar
 
+from mpest.core.mixture_distribution import MixtureDistribution
+from mpest.core.problem import Problem
 from mpest.em.methods.abstract_steps import AExpectation, AMaximization
-from mpest.mixture_distribution import MixtureDistribution
-from mpest.problem import Problem
 from mpest.utils import ResultWithError
 
 T = TypeVar("T")
diff --git a/mpest/models/abstract_model.py b/mpest/models/abstract_model.py
@@ -4,7 +4,7 @@
 
 import numpy as np
 
-from mpest.types import Params, Samples
+from mpest.annotations import Params, Samples
 from mpest.utils import ANamed
 
 
diff --git a/mpest/models/exponential.py b/mpest/models/exponential.py
@@ -3,8 +3,8 @@
 import numpy as np
 from scipy.stats import expon
 
+from mpest.annotations import Params, Samples
 from mpest.models.abstract_model import AModelDifferentiable, AModelWithGenerator
-from mpest.types import Params, Samples
 
 
 class LMomentsParameterMixin:
diff --git a/mpest/models/gaussian.py b/mpest/models/gaussian.py
@@ -3,8 +3,8 @@
 import numpy as np
 from scipy.stats import norm
 
+from mpest.annotations import Params, Samples
 from mpest.models.abstract_model import AModelDifferentiable, AModelWithGenerator
-from mpest.types import Params, Samples
 
 
 class LMomentsParameterMixin:
diff --git a/mpest/models/weibull.py b/mpest/models/weibull.py
@@ -5,8 +5,8 @@
 import numpy as np
 from scipy.stats import weibull_min
 
+from mpest.annotations import Params, Samples
 from mpest.models.abstract_model import AModelDifferentiable, AModelWithGenerator
-from mpest.types import Params, Samples
 
 
 class LMomentsParameterMixin:
diff --git a/mpest/optimizers/abstract_optimizer.py b/mpest/optimizers/abstract_optimizer.py
@@ -5,7 +5,7 @@
 
 import numpy as np
 
-from mpest.types import Params
+from mpest.annotations import Params
 from mpest.utils import ANamed
 
 
diff --git a/mpest/optimizers/scipy_cg.py b/mpest/optimizers/scipy_cg.py
@@ -4,8 +4,8 @@
 
 from scipy.optimize import minimize
 
+from mpest.annotations import Params
 from mpest.optimizers.abstract_optimizer import AOptimizer
-from mpest.types import Params
 
 
 class ScipyCG(AOptimizer):
diff --git a/mpest/optimizers/scipy_cobyla.py b/mpest/optimizers/scipy_cobyla.py
@@ -4,8 +4,8 @@
 
 from scipy.optimize import minimize
 
+from mpest.annotations import Params
 from mpest.optimizers.abstract_optimizer import AOptimizer
-from mpest.types import Params
 
 
 class ScipyCOBYLA(AOptimizer):
diff --git a/mpest/optimizers/scipy_nelder_mead.py b/mpest/optimizers/scipy_nelder_mead.py
@@ -4,8 +4,8 @@
 
 from scipy.optimize import minimize
 
+from mpest.annotations import Params
 from mpest.optimizers.abstract_optimizer import AOptimizer
-from mpest.types import Params
 
 
 class ScipyNelderMead(AOptimizer):
diff --git a/mpest/optimizers/scipy_newton_cg.py b/mpest/optimizers/scipy_newton_cg.py
@@ -5,8 +5,8 @@
 import numpy as np
 from scipy.optimize import minimize
 
+from mpest.annotations import Params
 from mpest.optimizers.abstract_optimizer import AOptimizerJacobian
-from mpest.types import Params
 
 
 class ScipyNewtonCG(AOptimizerJacobian):
diff --git a/mpest/optimizers/scipy_slsqp.py b/mpest/optimizers/scipy_slsqp.py
@@ -4,8 +4,8 @@
 
 from scipy.optimize import minimize
 
+from mpest.annotations import Params
 from mpest.optimizers.abstract_optimizer import AOptimizer
-from mpest.types import Params
 
 
 class ScipySLSQP(AOptimizer):
diff --git a/mpest/optimizers/scipy_tnc.py b/mpest/optimizers/scipy_tnc.py
@@ -4,8 +4,8 @@
 
 from scipy.optimize import minimize
 
+from mpest.annotations import Params
 from mpest.optimizers.abstract_optimizer import AOptimizer
-from mpest.types import Params
 
 
 class ScipyTNC(AOptimizer):
diff --git a/tests/tests_l_moments/l_moments_utils.py b/tests/tests_l_moments/l_moments_utils.py
@@ -1,5 +1,6 @@
 """TODO"""
 
+from mpest.core.problem import Problem, Result
 from mpest.em import EM
 from mpest.em.breakpointers import ParamDifferBreakpointer, StepCountBreakpointer
 from mpest.em.distribution_checkers import (
@@ -8,7 +9,6 @@
 )
 from mpest.em.methods.l_moments_method import IndicatorEStep, LMomentsMStep
 from mpest.em.methods.method import Method
-from mpest.problem import Problem, Result
 
 
 def run_test(problem: Problem, deviation: float) -> Result:
diff --git a/tests/tests_l_moments/test_one_distribution_l.py b/tests/tests_l_moments/test_one_distribution_l.py
@@ -6,15 +6,15 @@
 import numpy as np
 import pytest
 
-from mpest.distribution import Distribution
-from mpest.mixture_distribution import MixtureDistribution
+from mpest.core.distribution import Distribution
+from mpest.core.mixture_distribution import MixtureDistribution
+from mpest.core.problem import Problem
 from mpest.models import (
     AModelWithGenerator,
     ExponentialModel,
     GaussianModel,
     WeibullModelExp,
 )
-from mpest.problem import Problem
 from tests.tests_l_moments.l_moments_utils import run_test
 from tests.utils import check_for_params_error_tolerance
 
diff --git a/tests/tests_l_moments/test_two_same_distributions_complex_l.py b/tests/tests_l_moments/test_two_same_distributions_complex_l.py
diff --git a/tests/tests_l_moments/test_two_same_distributions_simple_l.py b/tests/tests_l_moments/test_two_same_distributions_simple_l.py
diff --git a/tests/tests_likelihood/likelihood_utils.py b/tests/tests_likelihood/likelihood_utils.py
diff --git a/tests/tests_likelihood/test_any_distributions_complex.py b/tests/tests_likelihood/test_any_distributions_complex.py
diff --git a/tests/tests_likelihood/test_any_distributions_simple.py b/tests/tests_likelihood/test_any_distributions_simple.py
diff --git a/tests/tests_likelihood/test_one_distribution.py b/tests/tests_likelihood/test_one_distribution.py
diff --git a/tests/tests_likelihood/test_two_same_distributions_complex.py b/tests/tests_likelihood/test_two_same_distributions_complex.py
diff --git a/tests/tests_likelihood/test_two_same_distributions_simple.py b/tests/tests_likelihood/test_two_same_distributions_simple.py
diff --git a/tests/utils.py b/tests/utils.py

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@`
`10`	`10`	`DatasetMixtureGenerator,`
`11`	`11`	`)`
`12`	`12`	`from experimental_env.preparation.dataset_saver import DatasetDescrciption, DatasetSaver`
`13`		`-from mpest.distribution import Distribution`
`14`		`-from mpest.mixture_distribution import MixtureDistribution`
	`13`	`+from mpest.core.distribution import Distribution`
	`14`	`+from mpest.core.mixture_distribution import MixtureDistribution`
`15`	`15`	`from mpest.models.abstract_model import AModel`
`16`	`16`
`17`	`17`