Skip to content

Commit f2cee16

Browse files
Jammy2211Jammy2211
authored andcommitted
regularization config bugs
1 parent ce9dc9d commit f2cee16

10 files changed

Lines changed: 110 additions & 69 deletions

File tree

autogalaxy/analysis/adapt_images/adapt_images.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def __init__(
8181
Pixelization image-mesh objects (e.g. `KMeans`, `Hilbert`) adapt the distribution of pixels to the observed
8282
image's brightness and therefore to the reconstructed source's morphology.
8383
84-
Certain regularization schemes (e.g. `AdaptiveBrightness`) adapt their regularization coefficients to the
84+
Certain regularization schemes (e.g. `Adapt`) adapt their regularization coefficients to the
8585
reconstructed source's morphology.
8686
8787
These adaptive schemes use "adapt-images", which are images of each galaxy (e.g. the lens and source of a
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
Adapt:
2+
inner_coefficient:
3+
type: LogUniform
4+
lower_limit: 1.0e-06
5+
upper_limit: 1000000.0
6+
width_modifier:
7+
type: Relative
8+
value: 0.5
9+
limits:
10+
lower: 0.0
11+
upper: inf
12+
outer_coefficient:
13+
type: LogUniform
14+
lower_limit: 1.0e-06
15+
upper_limit: 1000000.0
16+
width_modifier:
17+
type: Relative
18+
value: 0.5
19+
limits:
20+
lower: 0.0
21+
upper: inf
22+
signal_scale:
23+
type: Uniform
24+
lower_limit: 0.0
25+
upper_limit: 1.0
26+
width_modifier:
27+
type: Relative
28+
value: 0.2
29+
limits:
30+
lower: 0.0
31+
upper: inf
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
AdaptSplit:
2+
inner_coefficient:
3+
type: LogUniform
4+
lower_limit: 1.0e-06
5+
upper_limit: 1000000.0
6+
width_modifier:
7+
type: Relative
8+
value: 0.5
9+
limits:
10+
lower: 0.0
11+
upper: inf
12+
outer_coefficient:
13+
type: LogUniform
14+
lower_limit: 1.0e-06
15+
upper_limit: 1000000.0
16+
width_modifier:
17+
type: Relative
18+
value: 0.5
19+
limits:
20+
lower: 0.0
21+
upper: inf
22+
signal_scale:
23+
type: Uniform
24+
lower_limit: 0.0
25+
upper_limit: 1.0
26+
width_modifier:
27+
type: Relative
28+
value: 0.2
29+
limits:
30+
lower: 0.0
31+
upper: inf

autogalaxy/config/priors/regularization/adaptive_brightness_split_zeroth.yaml renamed to autogalaxy/config/priors/regularization/adapt_split_zeroth.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
AdaptiveBrightnessSplitZeroth:
1+
AdaptSplitZeroth:
22
zeroth_coefficient:
33
type: LogUniform
44
lower_limit: 1.0e-06

autogalaxy/config/priors/regularization/adaptive_brightness.yaml

Lines changed: 0 additions & 62 deletions
This file was deleted.

autogalaxy/config/priors/regularization/matern_adaptive_brightness_kernel.yaml renamed to autogalaxy/config/priors/regularization/matern_adapt_kernel.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
MaternAdaptiveBrightnessKernel:
1+
MaternAdaptKernel:
22
coefficient:
33
type: LogUniform
44
lower_limit: 1.0e-06
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
MaternAdaptKernel:
2+
coefficient:
3+
type: LogUniform
4+
lower_limit: 1.0e-06
5+
upper_limit: 1000000.0
6+
width_modifier:
7+
type: Relative
8+
value: 0.5
9+
limits:
10+
lower: 0.0
11+
upper: inf
12+
scale:
13+
type: LogUniform
14+
lower_limit: 1.0e-06
15+
upper_limit: 1000000.0
16+
width_modifier:
17+
type: Relative
18+
value: 0.2
19+
limits:
20+
lower: 0.0
21+
upper: inf
22+
nu:
23+
type: Uniform
24+
lower_limit: 0.5
25+
upper_limit: 5.5
26+
width_modifier:
27+
type: Relative
28+
value: 0.2
29+
limits:
30+
lower: 0.0
31+
upper: inf
32+
rho:
33+
type: Uniform
34+
lower_limit: 1.0e-06
35+
upper_limit: 1000000.0
36+
width_modifier:
37+
type: Relative
38+
value: 0.2
39+
limits:
40+
lower: 0.0
41+
upper: inf

docs/api/pixelization.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ Regularization [ag.reg]
6565

6666
Constant
6767
ConstantSplit
68-
AdaptiveBrightness
69-
AdaptiveBrightnessSplit
68+
Adapt
69+
AdaptSplit
7070

7171
Settings
7272
--------

test_autogalaxy/profiles/config/summary/priors/regularization.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"upper_limit": 1.0
77
}
88
},
9-
"AdaptiveBrightness": {
9+
"Adapt": {
1010
"coeffs_0": {
1111
"type": "Uniform",
1212
"lower_limit": 0.0,

test_autogalaxy/profiles/mass/config/summary/priors/regularization.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"upper_limit": 1.0
77
}
88
},
9-
"AdaptiveBrightness": {
9+
"Adapt": {
1010
"coeffs_0": {
1111
"type": "Uniform",
1212
"lower_limit": 0.0,

0 commit comments

Comments
 (0)