Skip to content

Commit 7e47e63

Browse files
АнгелинаАнгелина
authored andcommitted
refactor: Update register names
1 parent 76838d6 commit 7e47e63

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

tests/algorithms/nm_algorithms/semiparametric_sigma_estimation/test_sigma_estimation_eigenvalue_based.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def test_sigma_estimation_eigenvalue_based_expon_single(
2929
)
3030

3131
estimator = NMSemiParametricEstimator(
32-
"sigma_estimation_eigenvalue_based", {"k": k, "l": l, "eps": eps, "search_area": search_area}
32+
"sigma_estimation_eigenvalue", {"k": k, "l": l, "eps": eps, "search_area": search_area}
3333
)
3434
est = estimator.estimate(sample)
3535
print(est.value)
@@ -55,7 +55,7 @@ def test_sigma_estimation_eigenvalue_based_expon_1(
5555
)
5656

5757
estimator = NMSemiParametricEstimator(
58-
"sigma_estimation_eigenvalue_based", {"k": k, "l": l, "eps": eps, "search_area": search_area}
58+
"sigma_estimation_eigenvalue", {"k": k, "l": l, "eps": eps, "search_area": search_area}
5959
)
6060
est = estimator.estimate(sample)
6161
print(est.value)
@@ -81,7 +81,7 @@ def test_sigma_estimation_eigenvalue_based_expon_2(
8181
)
8282

8383
estimator = NMSemiParametricEstimator(
84-
"sigma_estimation_eigenvalue_based", {"k": k, "l": l, "eps": eps, "search_area": search_area}
84+
"sigma_estimation_eigenvalue", {"k": k, "l": l, "eps": eps, "search_area": search_area}
8585
)
8686
est = estimator.estimate(sample)
8787
print(est.value)
@@ -107,7 +107,7 @@ def test_sigma_estimation_eigenvalue_based_expon_3(
107107
)
108108

109109
estimator = NMSemiParametricEstimator(
110-
"sigma_estimation_eigenvalue_based", {"k": k, "l": l, "eps": eps, "search_area": search_area}
110+
"sigma_estimation_eigenvalue", {"k": k, "l": l, "eps": eps, "search_area": search_area}
111111
)
112112
est = estimator.estimate(sample)
113113
print(est.value)
@@ -132,7 +132,7 @@ def test_sigma_estimation_eigenvalue_based_uniform(
132132
)
133133

134134
estimator = NMSemiParametricEstimator(
135-
"sigma_estimation_eigenvalue_based", {"k": k, "l": l, "eps": eps, "search_area": search_area}
135+
"sigma_estimation_eigenvalue", {"k": k, "l": l, "eps": eps, "search_area": search_area}
136136
)
137137
est = estimator.estimate(sample)
138138
print(est.value)

tests/algorithms/nm_algorithms/semiparametric_sigma_estimation/test_sigma_estimation_empirical.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def test_sigma_estimation_empirical_expon(self, real_sigma: float, sample_len: i
2020
answer_list = []
2121
for alpha in [round(x, 5) for x in [i * 0.0001 for i in range(1, 10000)]]:
2222
t = math.sqrt(alpha * math.log(sample_len)) / (2 * search_area)
23-
estimator = NMSemiParametricEstimator("sigma_estimation_empirical", {"t": t})
23+
estimator = NMSemiParametricEstimator("sigma_estimation_laplace", {"t": t})
2424
est = estimator.estimate(sample)
2525
left = (est.value**2 - real_sigma**2) ** 0.5
2626
right = (
@@ -39,7 +39,7 @@ def test_sigma_estimation_empirical_uniform(self, real_sigma: float, sample_len:
3939
M = 10
4040
for alpha in [round(x, 4) for x in [i * 0.0001 for i in range(1, 10000)]]:
4141
t = math.sqrt(alpha * math.log(sample_len)) / (2 * search_area)
42-
estimator = NMSemiParametricEstimator("sigma_estimation_empirical", {"t": t})
42+
estimator = NMSemiParametricEstimator("sigma_estimation_laplace", {"t": t})
4343
est = estimator.estimate(sample)
4444
left = abs(est.value**2 - real_sigma**2) ** 0.5
4545
right = 4 * M * search_area / math.sqrt(alpha * math.log(sample_len))

tests/algorithms/nmv_algorithms/semiparametric_g_estimation/test_g_estimation_given_mu.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def test_g_estimation_expon(self, x_data) -> None:
1919
mixture = NormalMeanVarianceMixtures("canonical", alpha=0, mu=given_mu, distribution=expon)
2020
sample = NMVGenerator().canonical_generate(mixture, n)
2121
estimator = NMVSemiParametricEstimator(
22-
"g_estimation_given_mu", {"x_data": x_data, "u_value": 7.6, "v_value": 0.9}
22+
"density_estim_inv_mellin_quad_int", {"x_data": x_data, "u_value": 7.6, "v_value": 0.9}
2323
)
2424
est = estimator.estimate(sample)
2525
error = 0.0

tests/algorithms/nmv_algorithms/semiparametric_g_estimation/test_post_widder.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def test_post_widder_expon(self, mu, sigma, degree, sample_size) -> None:
2121
x_data = np.linspace(0.5, 10.0, 30)
2222

2323
estimator = NMVSemiParametricEstimator(
24-
"g_estimation_post_widder", {"x_data": x_data, "mu": mu, "sigma": sigma, "n": degree}
24+
"density_estim_post_widder", {"x_data": x_data, "mu": mu, "sigma": sigma, "n": degree}
2525
)
2626
est = estimator.estimate(sample)
2727
est_data = est.list_value
@@ -44,7 +44,7 @@ def test_post_widder_gamma(self, mu, sigma, degree, sample_size, a) -> None:
4444
x_data = np.linspace(0.5, 10.0, 30)
4545

4646
estimator = NMVSemiParametricEstimator(
47-
"g_estimation_post_widder", {"x_data": x_data, "mu": mu, "sigma": sigma, "n": degree}
47+
"density_estim_post_widder", {"x_data": x_data, "mu": mu, "sigma": sigma, "n": degree}
4848
)
4949
est = estimator.estimate(sample)
5050
est_data = est.list_value

tests/algorithms/nv_algorithms/test_g_estimation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def test_g_estimation_expon(self, x_data) -> None:
1818
mixture = NormalVarianceMixtures("canonical", alpha=0, distribution=expon)
1919
sample = NVGenerator().canonical_generate(mixture, n)
2020
estimator = NVSemiParametricEstimator(
21-
"g_estimation_given_mu", {"x_data": x_data, "u_value": 7.6, "v_value": 0.9}
21+
"density_estim_inv_mellin_quad_int", {"x_data": x_data, "u_value": 7.6, "v_value": 0.9}
2222
)
2323
est = estimator.estimate(sample)
2424
error = 0.0

tests/algorithms/nv_algorithms/test_post_widder_nv.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def test_post_widder_expon(self, sigma, degree, sample_size) -> None:
2121
x_data = np.linspace(0.5, 10.0, 30)
2222

2323
estimator = NVSemiParametricEstimator(
24-
"g_estimation_post_widder", {"x_data": x_data, "sigma": sigma, "n": degree}
24+
"density_estim_post_widder", {"x_data": x_data, "sigma": sigma, "n": degree}
2525
)
2626
est = estimator.estimate(sample)
2727
est_data = est.list_value
@@ -44,7 +44,7 @@ def test_post_widder_gamma(self, sigma, degree, sample_size, a) -> None:
4444
x_data = np.linspace(0.5, 10.0, 30)
4545

4646
estimator = NVSemiParametricEstimator(
47-
"g_estimation_post_widder", {"x_data": x_data, "sigma": sigma, "n": degree}
47+
"density_estim_post_widder", {"x_data": x_data, "sigma": sigma, "n": degree}
4848
)
4949
est = estimator.estimate(sample)
5050
est_data = est.list_value

0 commit comments

Comments
 (0)