Skip to content

Commit 8c5827f

Browse files
Jammy2211Jammy2211
authored andcommitted
refactor renaming unit tested
1 parent 2af5688 commit 8c5827f

6 files changed

Lines changed: 12 additions & 11 deletions

File tree

autoarray/inversion/regularization/__init__.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
from .constant import Constant
44
from .constant_zeroth import ConstantZeroth
55
from .constant_split import ConstantSplit
6-
from .adaptive_brightness import Adapt
7-
from .adaptive_brightness_split import AdaptSplit
6+
from .adapt import Adapt
7+
from .adapt_split import AdaptSplit
88
from .brightness_zeroth import BrightnessZeroth
9-
from .adaptive_brightness_split_zeroth import AdaptSplitZeroth
9+
from .adapt_split_zeroth import AdaptSplitZeroth
1010
from .gaussian_kernel import GaussianKernel
1111
from .exponential_kernel import ExponentialKernel
1212
from .matern_kernel import MaternKernel
13-
from .matern_adaptive_brightness_kernel import MaternAdaptKernel
13+
from .matern_adapt_kernel import MaternAdaptKernel
14+
from .matern_adapt_kernel_rho import MaternAdaptKernelRho

autoarray/inversion/regularization/adapt_split.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
if TYPE_CHECKING:
66
from autoarray.inversion.linear_obj.linear_obj import LinearObj
77

8-
from autoarray.inversion.regularization.adaptive_brightness import Adapt
8+
from autoarray.inversion.regularization.adapt import Adapt
99

1010
from autoarray.inversion.regularization import regularization_util
1111

autoarray/inversion/regularization/adaptive_split_zeroth.py renamed to autoarray/inversion/regularization/adapt_split_zeroth.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
if TYPE_CHECKING:
66
from autoarray.inversion.linear_obj.linear_obj import LinearObj
77

8-
from autoarray.inversion.regularization.adaptive_brightness import Adapt
8+
from autoarray.inversion.regularization.adapt import Adapt
99
from autoarray.inversion.regularization.brightness_zeroth import BrightnessZeroth
1010
from autoarray.inversion.regularization import regularization_util
1111

autoarray/inversion/regularization/matern_adapt_kernel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from autoarray.inversion.regularization.matern_kernel import matern_kernel
1111
from autoarray.inversion.regularization.matern_kernel import matern_cov_matrix_from
1212
from autoarray.inversion.regularization.matern_kernel import inv_via_cholesky
13-
from autoarray.inversion.regularization.adaptive_brightness import adapt_regularization_weights_from
13+
from autoarray.inversion.regularization.adapt import adapt_regularization_weights_from
1414

1515

1616
class MaternAdaptKernel(MaternKernel):

autoarray/inversion/regularization/regularization_util.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
from autoarray import exc
55

6-
from autoarray.inversion.regularization.adaptive_brightness import (
6+
from autoarray.inversion.regularization.adapt import (
77
adapt_regularization_weights_from,
88
)
9-
from autoarray.inversion.regularization.adaptive_brightness import (
9+
from autoarray.inversion.regularization.adapt import (
1010
weighted_regularization_matrix_from,
1111
)
1212
from autoarray.inversion.regularization.brightness_zeroth import (

test_autoarray/inversion/regularizations/test_matern_adapt_kernel.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
def test__regularization_matrix():
1010

11-
reg = aa.reg.MaternAdaptKernel(
11+
reg = aa.reg.MaternAdaptKernelRho(
1212
coefficient=1.0, scale=2.0, nu=2.0, rho=1.0
1313
)
1414

@@ -29,7 +29,7 @@ def test__regularization_matrix():
2929
assert regularization_matrix[0, 0] == pytest.approx(18.7439565009, 1.0e-4)
3030
assert regularization_matrix[0, 1] == pytest.approx(-8.786547368, 1.0e-4)
3131

32-
reg = aa.reg.MaternAdaptKernel(
32+
reg = aa.reg.MaternAdaptKernelRho(
3333
coefficient=1.5, scale=2.5, nu=2.5, rho=1.5
3434
)
3535

0 commit comments

Comments
 (0)