Skip to content

Commit d29ad97

Browse files
authored
Merge pull request #462 from PyAutoLabs/feature/rectangular-bilinear-rtu-mesh-split
feat: split rectangular adaptive meshes — Bilinear (rank-CDF) vs RTU (kernel-CDF)
2 parents 90f6f0c + f9aceea commit d29ad97

22 files changed

Lines changed: 706 additions & 96 deletions

autoarray/exc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class MeshException(Exception):
7272
"""
7373
Raises exceptions associated with the `inversion/mesh` modules and `Mesh` classes.
7474
75-
For example if a `RectangularAdaptDensity` mesh has dimensions below 3x3.
75+
For example if a `RectangularRTUAdaptDensity` mesh has dimensions below 3x3.
7676
"""
7777

7878
pass

autoarray/fixtures.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ def make_border_relocator_2d_7x7():
368368

369369
def make_rectangular_mapper_7x7_3x3():
370370

371-
from autoarray.inversion.mesh.mesh.rectangular_adapt_density import (
371+
from autoarray.inversion.mesh.mesh.rectangular_rtu_adapt_density import (
372372
overlay_grid_from,
373373
)
374374

autoarray/inversion/inversion/abstract.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ def cls_list_from(self, cls: Type, cls_filtered: Optional[Type] = None) -> List:
174174
175175
- If the input is `cls=aa.mesh.Mesh`, a list containing all pixelizations in the class are returned.
176176
177-
- If `cls=aa.mesh.Mesh` and `cls_filtered=aa.mesh.RectangularAdaptDensity`, a list of all pixelizations
178-
excluding those which are `RectangularAdaptDensity` pixelizations will be returned.
177+
- If `cls=aa.mesh.Mesh` and `cls_filtered=aa.mesh.RectangularRTUAdaptDensity`, a list of all pixelizations
178+
excluding those which are `RectangularRTUAdaptDensity` pixelizations will be returned.
179179
180180
Parameters
181181
----------

autoarray/inversion/linear_obj/neighbors.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
class Neighbors(np.ndarray):
55
def __new__(cls, arr: np.ndarray, sizes: np.ndarray):
66
"""
7-
Class packaging ndarrays describing the neighbors of every pixel in a mesh (e.g. `RectangularAdaptDensity`).
7+
Class packaging ndarrays describing the neighbors of every pixel in a mesh (e.g. `RectangularRTUAdaptDensity`).
88
99
The array `arr` contains the pixel indexes of the neighbors of every pixel. Its has shape [total_pixels,
1010
max_neighbors_in_single_pixel].
1111
1212
The array `sizes` contains the number of neighbors of every pixel in the pixelixzation.
1313
14-
For example, for a 3x3 `RectangularAdaptDensity` grid:
14+
For example, for a 3x3 `RectangularRTUAdaptDensity` grid:
1515
1616
- `total_pixels=9` and `max_neighbors_in_single_pixel=4` (because the central pixel has 4 neighbors whereas
1717
edge / corner pixels have 3 and 2).

autoarray/inversion/mesh/interpolator/delaunay.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -786,10 +786,10 @@ def _mappings_sizes_weights(self):
786786
The `sub_slim_index` refers to the masked data sub-pixels and `pix_indexes` the pixelization pixel indexes,
787787
for example:
788788
789-
- `pix_indexes_for_sub_slim_index[0, 0] = 2`: The data's first (index 0) sub-pixel maps to the RectangularAdaptDensity
789+
- `pix_indexes_for_sub_slim_index[0, 0] = 2`: The data's first (index 0) sub-pixel maps to the RectangularRTUAdaptDensity
790790
pixelization's third (index 2) pixel.
791791
792-
- `pix_indexes_for_sub_slim_index[2, 0] = 4`: The data's third (index 2) sub-pixel maps to the RectangularAdaptDensity
792+
- `pix_indexes_for_sub_slim_index[2, 0] = 4`: The data's third (index 2) sub-pixel maps to the RectangularRTUAdaptDensity
793793
pixelization's fifth (index 4) pixel.
794794
795795
The second dimension of the array `pix_indexes_for_sub_slim_index`, which is 0 in both examples above, is used

0 commit comments

Comments
 (0)