Skip to content

Commit 75da959

Browse files
committed
fix(ci): ultralast
1 parent ac0e530 commit 75da959

38 files changed

+127
-66
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ repos:
1616
entry: poetry run ruff check --fix --exit-non-zero-on-fix
1717
language: system
1818
types: [python]
19+
files: ^(mpest/|experimental_env/|tests/).*
1920

2021
- id: ruff-format
2122
name: ruff format
2223
entry: poetry run ruff format
2324
language: system
2425
types: [python]
26+
files: ^(mpest/|experimental_env/|tests/).*
2527

2628
- id: mypy
2729
name: mypy check

examples/big_mono_tests.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
import random
44

55
import numpy as np
6-
7-
from examples.config import MAX_WORKERS, TESTS_OPTIMIZERS
8-
from examples.mono_test_generator import generate_mono_test
9-
from examples.utils import Clicker, Test, init_solver, run_tests, save_results
106
from mpest.models import (
117
AModelWithGenerator,
128
ExponentialModel,
139
GaussianModel,
1410
WeibullModelExp,
1511
)
1612

13+
from examples.config import MAX_WORKERS, TESTS_OPTIMIZERS
14+
from examples.mono_test_generator import generate_mono_test
15+
from examples.utils import Clicker, Test, init_solver, run_tests, save_results
16+
1717
if __name__ == "__main__":
1818
random.seed(42)
1919
np.random.seed(42)

examples/diff_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
import random
44

55
import numpy as np
6+
from mpest import Distribution, MixtureDistribution, Problem
7+
from mpest.models import GaussianModel, WeibullModelExp
68

79
from examples.config import MAX_WORKERS, TESTS_OPTIMIZERS
810
from examples.mono_test_generator import Clicker
911
from examples.utils import Test, init_solver, run_tests, save_results
10-
from mpest import Distribution, MixtureDistribution, Problem
11-
from mpest.models import GaussianModel, WeibullModelExp
1212

1313
# Gaussian
1414

examples/mono_test_generator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
from collections.abc import Iterable
55

66
import numpy as np
7-
8-
from examples.utils import Clicker, Test
97
from mpest.core.distribution import Distribution
108
from mpest.core.mixture_distribution import MixtureDistribution
119
from mpest.core.problem import Problem
1210
from mpest.em import EM
1311
from mpest.models import AModel, AModelWithGenerator
1412

13+
from examples.utils import Clicker, Test
14+
1515

1616
def generate_mono_test(
1717
model_t: type[AModelWithGenerator],

examples/prepare_result.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
import numpy as np
66
import pandas as pd
7+
from mpest.annotations import Samples
8+
from mpest.core.mixture_distribution import DistributionInMixture, MixtureDistribution
79
from tqdm.contrib.concurrent import process_map
810

911
from examples.config import MAX_WORKERS
1012
from examples.mono_test_generator import Clicker
1113
from examples.utils import SingleSolverResult, TestResult
12-
from mpest.annotations import Samples
13-
from mpest.core.mixture_distribution import DistributionInMixture, MixtureDistribution
1414

1515

1616
def nll(samples: Samples, mixture: MixtureDistribution) -> float:

examples/quick_test.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
import random
44

55
import numpy as np
6-
7-
from examples.config import MAX_WORKERS
8-
from examples.mono_test_generator import generate_mono_test
9-
from examples.utils import Clicker, Test, init_solver, run_tests, save_results
106
from mpest.models import (
117
AModelWithGenerator,
128
ExponentialModel,
@@ -15,6 +11,10 @@
1511
)
1612
from mpest.optimizers import ALL_OPTIMIZERS
1713

14+
from examples.config import MAX_WORKERS
15+
from examples.mono_test_generator import generate_mono_test
16+
from examples.utils import Clicker, Test, init_solver, run_tests, save_results
17+
1818

1919
def run_test():
2020
"""Runs the mixture distributions of single model quick test"""

examples/readme_example/example.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import matplotlib.pyplot as plt
44
import numpy as np
55
import seaborn as sns
6-
76
from mpest import Distribution, MixtureDistribution, Problem
87
from mpest.em import EM
98
from mpest.em.breakpointers import StepCountBreakpointer

examples/readme_example/example_ml.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77
import numpy as np
88
import pandas as pd
99
import seaborn as sns
10-
from scipy.stats import entropy, wasserstein_distance
11-
from sklearn.cluster import DBSCAN, AgglomerativeClustering, KMeans
12-
from sklearn.metrics import calinski_harabasz_score, davies_bouldin_score, silhouette_score
13-
from sklearn.neighbors import NearestNeighbors
14-
1510
from mpest import Distribution, MixtureDistribution, Problem
1611
from mpest.em import EM
1712
from mpest.em.breakpointers import StepCountBreakpointer
@@ -20,6 +15,10 @@
2015
from mpest.em.methods.method import Method
2116
from mpest.models import GaussianModel, WeibullModelExp
2217
from mpest.optimizers import ScipyCG
18+
from scipy.stats import entropy, wasserstein_distance
19+
from sklearn.cluster import DBSCAN, AgglomerativeClustering, KMeans
20+
from sklearn.metrics import calinski_harabasz_score, davies_bouldin_score, silhouette_score
21+
from sklearn.neighbors import NearestNeighbors
2322

2423
os.makedirs("results", exist_ok=True)
2524
os.makedirs("results/plots", exist_ok=True)

examples/utils.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
from typing import ClassVar, NamedTuple
88

99
import numpy as np
10-
from tqdm.contrib.concurrent import process_map
11-
12-
from examples.config import RESULTS_FOLDER
1310
from mpest.annotations import Samples
1411
from mpest.core.mixture_distribution import MixtureDistribution
1512
from mpest.core.problem import Problem, Result
@@ -21,6 +18,9 @@
2118
)
2219
from mpest.em.methods.likelihood_method import LikelihoodMethod
2320
from mpest.optimizers import TOptimizer
21+
from tqdm.contrib.concurrent import process_map
22+
23+
from examples.config import RESULTS_FOLDER
2424

2525
np.seterr(all="ignore")
2626

experimental_env/analysis/metrics.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
from itertools import permutations
55

66
import numpy as np
7-
from scipy.integrate import quad
8-
97
from mpest import MixtureDistribution
108
from mpest.utils import ANamed
9+
from scipy.integrate import quad
1110

1211

1312
class AMetric(ANamed, ABC):

0 commit comments

Comments
 (0)