Skip to content

Commit 22b2846

Browse files
Jammy2211claude
authored and
Jammy2211
committed
refactor: consolidate rectangular meshes — kernel-CDF takes the plain names
RectangularAdaptDensity/AdaptImage are now the kernel-density-CDF meshes (formerly RectangularKernelAdapt*, #374); RectangularUniform is unchanged. Removed: the linear empirical-CDF implementation, the spline-CDF pair (#289), the PCA-rotated multi-node mesh (#323), density_components, and their interpolators/geometry/tests. InterpolatorRectangular keeps its name/module path as the kernel implementation; prior-config keys and downstream imports are unchanged. Closes #402. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XK2ZZagTywsBZC4CZL66eB
1 parent 2a07302 commit 22b2846

26 files changed

Lines changed: 1082 additions & 3738 deletions

‎autoarray/__init__.py‎

Lines changed: 108 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,111 @@
1-
from autonerves import jax_wrapper
2-
from autonerves.dictable import register_parser
3-
from autonerves import conf
4-
5-
conf.instance.register(__file__)
6-
7-
from . import exc
8-
from . import type
9-
from . import util
10-
from . import fixtures
11-
from . import mock as m
12-
13-
from .dataset import preprocess
14-
from .dataset.abstract.dataset import AbstractDataset
15-
from .dataset.grids import GridsInterface
16-
from .dataset.imaging.dataset import Imaging
17-
from .dataset.imaging.simulator import SimulatorImaging
18-
from .dataset.interferometer.dataset import Interferometer
19-
from .dataset.interferometer.simulator import SimulatorInterferometer
20-
from .dataset.dataset_model import DatasetModel
21-
from .fit.fit_dataset import AbstractFit
22-
from .fit.fit_dataset import FitDataset
23-
from .fit.fit_imaging import FitImaging
24-
from .fit.fit_interferometer import FitInterferometer
25-
from .geometry.geometry_2d import Geometry2D
26-
from .inversion.mesh import mesh
27-
from .inversion.mesh import image_mesh
28-
from .inversion import regularization as reg
29-
from .settings import Settings
30-
from .inversion.inversion.abstract import AbstractInversion
31-
from .preloads import AbstractPreloads
32-
from .preloads import PreloadsImaging
33-
from .preloads import PreloadsInterferometer
34-
from .inversion.regularization.abstract import AbstractRegularization
35-
from .inversion.inversion.factory import inversion_from as Inversion
36-
from .inversion.inversion.dataset_interface import DatasetInterface
37-
from .inversion.mesh.border_relocator import BorderRelocator
38-
from .inversion.pixelization import Pixelization
39-
from .inversion.mappers.abstract import Mapper
40-
from .inversion.mesh.image_mesh.abstract import AbstractImageMesh
41-
from .inversion.mesh.mesh.abstract import AbstractMesh
42-
from .inversion.mesh.interpolator.rectangular import InterpolatorRectangular
43-
from .inversion.mesh.interpolator.delaunay import InterpolatorDelaunay
44-
from .inversion.inversion.imaging.mapping import InversionImagingMapping
45-
from .inversion.inversion.imaging.sparse import InversionImagingSparse
46-
from .inversion.inversion.imaging.inversion_imaging_util import ImagingSparseOperator
47-
from .inversion.inversion.interferometer.sparse import (
48-
InversionInterferometerSparse,
49-
)
50-
from .inversion.inversion.interferometer.mapping import InversionInterferometerMapping
51-
from .inversion.inversion.interferometer.inversion_interferometer_util import (
52-
InterferometerSparseOperator,
53-
)
54-
from .inversion.linear_obj.linear_obj import LinearObj
55-
from .inversion.linear_obj.func_list import AbstractLinearObjFuncList
56-
from .mask.derive.indexes_2d import DeriveIndexes2D
57-
from .mask.derive.mask_1d import DeriveMask1D
58-
from .mask.derive.mask_2d import DeriveMask2D
59-
from .mask.derive.grid_1d import DeriveGrid1D
60-
from .mask.derive.grid_2d import DeriveGrid2D
61-
from .mask.derive.zoom_2d import Zoom2D
62-
from .mask.mask_1d import Mask1D
63-
from .mask.mask_2d import Mask2D
64-
from .operators.transformer import TransformerDFT
65-
from .operators.transformer import TransformerNUFFT
66-
from .operators.transformer import TransformerNUFFTPyNUFFT
67-
from .operators.over_sampling.decorator import over_sample
68-
from .operators.contour import Grid2DContour
69-
from .layout.layout import Layout1D
70-
from .layout.layout import Layout2D
71-
from .structures.arrays.uniform_1d import Array1D
72-
from .structures.arrays.uniform_2d import Array2D
73-
from .structures.arrays.rgb import Array2DRGB
74-
from .structures.arrays.irregular import ArrayIrregular
75-
from .structures.grids.uniform_1d import Grid1D
76-
from .structures.grids.uniform_2d import Grid2D
77-
from .operators.over_sampling.over_sampler import OverSampler
78-
from .structures.grids.irregular_2d import Grid2DIrregular
79-
from .inversion.mesh.mesh_geometry.rectangular import MeshGeometryRectangular
80-
from .inversion.mesh.mesh_geometry.delaunay import MeshGeometryDelaunay
81-
from .inversion.mesh.interpolator.rectangular import InterpolatorRectangular
82-
from .inversion.mesh.interpolator.delaunay import InterpolatorDelaunay
83-
from .operators.convolver import Convolver
84-
from .operators.interp_2d import interp_2d
85-
from .structures.vectors.uniform import VectorYX2D
86-
from .structures.vectors.irregular import VectorYX2DIrregular
87-
from .structures.triangles.abstract import AbstractTriangles
88-
from .structures.triangles.shape import Circle
89-
from .structures.triangles.shape import Triangle
90-
from .structures.triangles.shape import Square
91-
from .structures.triangles.shape import Polygon
92-
from .structures import decorators as grid_dec # deprecated alias
93-
from .structures import decorators
94-
from .structures.header import Header
95-
from .layout.region import Region1D
96-
from .layout.region import Region2D
97-
from .structures.visibilities import Visibilities
98-
from .structures.visibilities import VisibilitiesNoiseMap
99-
100-
from autonerves import conf
101-
from autonerves.fitsable import ndarray_via_hdu_from
102-
from autonerves.fitsable import ndarray_via_fits_from
103-
from autonerves.fitsable import header_obj_from
104-
from autonerves.fitsable import output_to_fits
105-
from autonerves.fitsable import hdu_list_for_output_from
106-
107-
conf.instance.register(__file__)
108-
109-
__version__ = "2026.7.9.1"
1+
from autonerves import jax_wrapper
2+
from autonerves.dictable import register_parser
3+
from autonerves import conf
4+
5+
conf.instance.register(__file__)
6+
7+
from . import exc
8+
from . import type
9+
from . import util
10+
from . import fixtures
11+
from . import mock as m
12+
13+
from .dataset import preprocess
14+
from .dataset.abstract.dataset import AbstractDataset
15+
from .dataset.grids import GridsInterface
16+
from .dataset.imaging.dataset import Imaging
17+
from .dataset.imaging.simulator import SimulatorImaging
18+
from .dataset.interferometer.dataset import Interferometer
19+
from .dataset.interferometer.simulator import SimulatorInterferometer
20+
from .dataset.dataset_model import DatasetModel
21+
from .fit.fit_dataset import AbstractFit
22+
from .fit.fit_dataset import FitDataset
23+
from .fit.fit_imaging import FitImaging
24+
from .fit.fit_interferometer import FitInterferometer
25+
from .geometry.geometry_2d import Geometry2D
26+
from .inversion.mesh import mesh
27+
from .inversion.mesh import image_mesh
28+
from .inversion import regularization as reg
29+
from .settings import Settings
30+
from .inversion.inversion.abstract import AbstractInversion
31+
from .preloads import AbstractPreloads
32+
from .preloads import PreloadsImaging
33+
from .preloads import PreloadsInterferometer
34+
from .inversion.regularization.abstract import AbstractRegularization
35+
from .inversion.inversion.factory import inversion_from as Inversion
36+
from .inversion.inversion.dataset_interface import DatasetInterface
37+
from .inversion.mesh.border_relocator import BorderRelocator
38+
from .inversion.pixelization import Pixelization
39+
from .inversion.mappers.abstract import Mapper
40+
from .inversion.mesh.image_mesh.abstract import AbstractImageMesh
41+
from .inversion.mesh.mesh.abstract import AbstractMesh
42+
from .inversion.mesh.interpolator.rectangular import InterpolatorRectangular
43+
from .inversion.mesh.interpolator.delaunay import InterpolatorDelaunay
44+
from .inversion.inversion.imaging.mapping import InversionImagingMapping
45+
from .inversion.inversion.imaging.sparse import InversionImagingSparse
46+
from .inversion.inversion.imaging.inversion_imaging_util import ImagingSparseOperator
47+
from .inversion.inversion.interferometer.sparse import (
48+
InversionInterferometerSparse,
49+
)
50+
from .inversion.inversion.interferometer.mapping import InversionInterferometerMapping
51+
from .inversion.inversion.interferometer.inversion_interferometer_util import (
52+
InterferometerSparseOperator,
53+
)
54+
from .inversion.linear_obj.linear_obj import LinearObj
55+
from .inversion.linear_obj.func_list import AbstractLinearObjFuncList
56+
from .mask.derive.indexes_2d import DeriveIndexes2D
57+
from .mask.derive.mask_1d import DeriveMask1D
58+
from .mask.derive.mask_2d import DeriveMask2D
59+
from .mask.derive.grid_1d import DeriveGrid1D
60+
from .mask.derive.grid_2d import DeriveGrid2D
61+
from .mask.derive.zoom_2d import Zoom2D
62+
from .mask.mask_1d import Mask1D
63+
from .mask.mask_2d import Mask2D
64+
from .operators.transformer import TransformerDFT
65+
from .operators.transformer import TransformerNUFFT
66+
from .operators.transformer import TransformerNUFFTPyNUFFT
67+
from .operators.over_sampling.decorator import over_sample
68+
from .operators.contour import Grid2DContour
69+
from .layout.layout import Layout1D
70+
from .layout.layout import Layout2D
71+
from .structures.arrays.uniform_1d import Array1D
72+
from .structures.arrays.uniform_2d import Array2D
73+
from .structures.arrays.rgb import Array2DRGB
74+
from .structures.arrays.irregular import ArrayIrregular
75+
from .structures.grids.uniform_1d import Grid1D
76+
from .structures.grids.uniform_2d import Grid2D
77+
from .operators.over_sampling.over_sampler import OverSampler
78+
from .structures.grids.irregular_2d import Grid2DIrregular
79+
from .inversion.mesh.mesh_geometry.rectangular import MeshGeometryRectangular
80+
from .inversion.mesh.mesh_geometry.delaunay import MeshGeometryDelaunay
81+
from .inversion.mesh.interpolator.delaunay import InterpolatorDelaunay
82+
from .operators.convolver import Convolver
83+
from .operators.interp_2d import interp_2d
84+
from .structures.vectors.uniform import VectorYX2D
85+
from .structures.vectors.irregular import VectorYX2DIrregular
86+
from .structures.triangles.abstract import AbstractTriangles
87+
from .structures.triangles.shape import Circle
88+
from .structures.triangles.shape import Triangle
89+
from .structures.triangles.shape import Square
90+
from .structures.triangles.shape import Polygon
91+
from .structures import decorators as grid_dec # deprecated alias
92+
from .structures import decorators
93+
from .structures.header import Header
94+
from .layout.region import Region1D
95+
from .layout.region import Region2D
96+
from .structures.visibilities import Visibilities
97+
from .structures.visibilities import VisibilitiesNoiseMap
98+
99+
from autonerves import conf
100+
from autonerves.fitsable import ndarray_via_hdu_from
101+
from autonerves.fitsable import ndarray_via_fits_from
102+
from autonerves.fitsable import header_obj_from
103+
from autonerves.fitsable import output_to_fits
104+
from autonerves.fitsable import hdu_list_for_output_from
105+
106+
conf.instance.register(__file__)
107+
108+
__version__ = "2026.7.9.1"
110109

111110
# ---------------------------------------------------------------------------
112111
# Public re-export of the autonerves configuration / serialization surface.

‎autoarray/inversion/mesh/interpolator/density_components.py‎

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

0 commit comments

Comments
 (0)