refactor and simplify SettingsInversion

Author: Jammy2211

autoarray/__init__.py

@@ -27,7 +27,7 @@
 from .inversion.pixelization import mesh
 from .inversion.pixelization import image_mesh
 from .inversion import regularization as reg
-from .inversion.inversion.settings import SettingsInversion
+from .settings import Settings
 from .inversion.inversion.abstract import AbstractInversion
 from .inversion.regularization.abstract import AbstractRegularization
 from .inversion.inversion.factory import inversion_from as Inversion
@@ -40,8 +40,8 @@
 from .inversion.pixelization.mappers.rectangular_uniform import MapperRectangularUniform
 from .inversion.pixelization.image_mesh.abstract import AbstractImageMesh
 from .inversion.pixelization.mesh.abstract import AbstractMesh
-from .inversion.pixelization.mesh_grid.rectangular_2d import Mesh2DRectangular
-from .inversion.pixelization.mesh_grid.delaunay_2d import Mesh2DDelaunay
+from .inversion.pixelization.mesh_grid.rectangular import Mesh2DRectangular
+from .inversion.pixelization.mesh_grid.delaunay import Mesh2DDelaunay
 from .inversion.inversion.imaging.mapping import InversionImagingMapping
 from .inversion.inversion.imaging.sparse import InversionImagingSparse
 from .inversion.inversion.imaging.inversion_imaging_util import ImagingSparseOperator
@@ -77,8 +77,8 @@
 from .structures.grids.uniform_2d import Grid2D
 from .operators.over_sampling.over_sampler import OverSampler
 from .structures.grids.irregular_2d import Grid2DIrregular
-from .inversion.pixelization.mesh_grid.rectangular_2d import Mesh2DRectangular
-from .inversion.pixelization.mesh_grid.delaunay_2d import Mesh2DDelaunay
+from .inversion.pixelization.mesh_grid.rectangular import Mesh2DRectangular
+from .inversion.pixelization.mesh_grid.delaunay import Mesh2DDelaunay
 from .structures.arrays.kernel_2d import Kernel2D
 from .structures.vectors.uniform import VectorYX2D
 from .structures.vectors.irregular import VectorYX2DIrregular

autoarray/config/general.yaml

@@ -6,7 +6,6 @@ inversion:
   check_reconstruction: true          # If True, the inversion's reconstruction is checked to ensure the solution of a meshs's mapper is not an invalid solution where the values are all the same.
   use_positive_only_solver: true      # If True, inversion's use a positive-only linear algebra solver by default, which is slower but prevents unphysical negative values in the reconstructed solutuion.
   no_regularization_add_to_curvature_diag_value : 1.0e-3 # The default value added to the curvature matrix's diagonal when regularization is not applied to a linear object, which prevents inversion's failing due to the matrix being singular.
-  positive_only_uses_p_initial: true  # If True, the positive-only solver of an inversion's uses an initial guess of the reconstructed data's values as which values should be positive, speeding up the solver.
   use_border_relocator: false          # If True, by default a pixelization's border is used to relocate all pixels outside its border to the border.
   reconstruction_vmax_factor: 0.5     # Plots of an Inversion's reconstruction use the reconstructed data's bright value multiplied by this factor.
 numba:

autoarray/inversion/inversion/abstract.py

@@ -11,7 +11,7 @@
 from autoarray.inversion.linear_obj.linear_obj import LinearObj
 from autoarray.inversion.pixelization.mappers.abstract import AbstractMapper
 from autoarray.inversion.regularization.abstract import AbstractRegularization
-from autoarray.inversion.inversion.settings import SettingsInversion
+from autoarray.settings import Settings
 from autoarray.preloads import Preloads
 from autoarray.structures.arrays.uniform_2d import Array2D
 from autoarray.structures.grids.irregular_2d import Grid2DIrregular
@@ -26,7 +26,7 @@ def __init__(
         self,
         dataset: Union[Imaging, Interferometer, DatasetInterface],
         linear_obj_list: List[LinearObj],
-        settings: SettingsInversion = SettingsInversion(),
+        settings: Settings = None,
         preloads: Preloads = None,
         xp=np,
     ):
@@ -72,7 +72,7 @@ def __init__(
 
         self.linear_obj_list = linear_obj_list
 
-        self.settings = settings
+        self.settings = settings or Settings()
 
         self.preloads = preloads or Preloads()
 

autoarray/inversion/inversion/factory.py

@@ -23,15 +23,15 @@
 from autoarray.inversion.inversion.imaging.sparse import (
     InversionImagingSparse,
 )
-from autoarray.inversion.inversion.settings import SettingsInversion
+from autoarray.settings import Settings
 from autoarray.preloads import Preloads
 from autoarray.structures.arrays.uniform_2d import Array2D
 
 
 def inversion_from(
     dataset: Union[Imaging, Interferometer, DatasetInterface],
     linear_obj_list: List[LinearObj],
-    settings: SettingsInversion = SettingsInversion(),
+    settings: Settings = None,
     preloads: Preloads = None,
     xp=np,
 ):
@@ -80,7 +80,7 @@ def inversion_from(
 def inversion_imaging_from(
     dataset,
     linear_obj_list: List[LinearObj],
-    settings: SettingsInversion = SettingsInversion(),
+    settings: Settings = None,
     preloads: Preloads = None,
     xp=np,
 ):
@@ -157,7 +157,7 @@ def inversion_imaging_from(
 def inversion_interferometer_from(
     dataset: Union[Interferometer, DatasetInterface],
     linear_obj_list: List[LinearObj],
-    settings: SettingsInversion = SettingsInversion(),
+    settings: Settings = None,
     xp=np,
 ):
     """

autoarray/inversion/inversion/imaging/abstract.py

@@ -7,7 +7,7 @@
 from autoarray.inversion.pixelization.mappers.abstract import AbstractMapper
 from autoarray.inversion.inversion.abstract import AbstractInversion
 from autoarray.inversion.linear_obj.linear_obj import LinearObj
-from autoarray.inversion.inversion.settings import SettingsInversion
+from autoarray.settings import Settings
 from autoarray.preloads import Preloads
 
 from autoarray.inversion.inversion.imaging import inversion_imaging_util
@@ -18,7 +18,7 @@ def __init__(
         self,
         dataset: Union[Imaging, DatasetInterface],
         linear_obj_list: List[LinearObj],
-        settings: SettingsInversion = SettingsInversion(),
+        settings: Settings = None,
         preloads: Preloads = None,
         xp=np,
     ):

autoarray/inversion/inversion/imaging/mapping.py

@@ -8,7 +8,7 @@
 from autoarray.inversion.inversion.imaging.abstract import AbstractInversionImaging
 from autoarray.inversion.linear_obj.linear_obj import LinearObj
 from autoarray.inversion.pixelization.mappers.abstract import AbstractMapper
-from autoarray.inversion.inversion.settings import SettingsInversion
+from autoarray.settings import Settings
 from autoarray.preloads import Preloads
 from autoarray.structures.arrays.uniform_2d import Array2D
 
@@ -21,7 +21,7 @@ def __init__(
         self,
         dataset: Union[Imaging, DatasetInterface],
         linear_obj_list: List[LinearObj],
-        settings: SettingsInversion = SettingsInversion(),
+        settings: Settings = None,
         preloads: Preloads = None,
         xp=np,
     ):

autoarray/inversion/inversion/imaging/sparse.py

@@ -7,7 +7,7 @@
 from autoarray.inversion.inversion.dataset_interface import DatasetInterface
 from autoarray.inversion.inversion.imaging.abstract import AbstractInversionImaging
 from autoarray.inversion.linear_obj.linear_obj import LinearObj
-from autoarray.inversion.inversion.settings import SettingsInversion
+from autoarray.settings import Settings
 from autoarray.inversion.linear_obj.func_list import AbstractLinearObjFuncList
 from autoarray.inversion.pixelization.mappers.abstract import AbstractMapper
 from autoarray.preloads import Preloads
@@ -21,7 +21,7 @@ def __init__(
         self,
         dataset: Union[Imaging, DatasetInterface],
         linear_obj_list: List[LinearObj],
-        settings: SettingsInversion = SettingsInversion(),
+        settings: Settings = None,
         preloads: Preloads = None,
         xp=np,
     ):

autoarray/inversion/inversion/imaging_numba/sparse.py

@@ -7,7 +7,7 @@
 from autoarray.inversion.inversion.dataset_interface import DatasetInterface
 from autoarray.inversion.inversion.imaging.abstract import AbstractInversionImaging
 from autoarray.inversion.linear_obj.linear_obj import LinearObj
-from autoarray.inversion.inversion.settings import SettingsInversion
+from autoarray.settings import Settings
 from autoarray.inversion.linear_obj.func_list import AbstractLinearObjFuncList
 from autoarray.inversion.pixelization.mappers.abstract import AbstractMapper
 from autoarray.preloads import Preloads
@@ -21,7 +21,7 @@ def __init__(
         self,
         dataset: Union[Imaging, DatasetInterface],
         linear_obj_list: List[LinearObj],
-        settings: SettingsInversion = SettingsInversion(),
+        settings: Settings = None,
         preloads: Preloads = None,
         xp=np,
     ):

autoarray/inversion/inversion/interferometer/abstract.py

@@ -6,7 +6,7 @@
 from autoarray.inversion.inversion.abstract import AbstractInversion
 from autoarray.mask.mask_2d import Mask2D
 from autoarray.inversion.linear_obj.linear_obj import LinearObj
-from autoarray.inversion.inversion.settings import SettingsInversion
+from autoarray.settings import Settings
 from autoarray.structures.arrays.uniform_2d import Array2D
 
 from autoarray.inversion.inversion import inversion_util
@@ -17,7 +17,7 @@ def __init__(
         self,
         dataset: Union[Interferometer, DatasetInterface],
         linear_obj_list: List[LinearObj],
-        settings: SettingsInversion = SettingsInversion(),
+        settings: Settings = None,
         xp=np,
     ):
         """

autoarray/inversion/inversion/interferometer/mapping.py

@@ -7,7 +7,7 @@
     AbstractInversionInterferometer,
 )
 from autoarray.inversion.linear_obj.linear_obj import LinearObj
-from autoarray.inversion.inversion.settings import SettingsInversion
+from autoarray.settings import Settings
 from autoarray.structures.visibilities import Visibilities
 
 from autoarray.inversion.inversion.interferometer import inversion_interferometer_util
@@ -19,7 +19,7 @@ def __init__(
         self,
         dataset: Union[Interferometer, DatasetInterface],
         linear_obj_list: List[LinearObj],
-        settings: SettingsInversion = SettingsInversion(),
+        settings: Settings = None,
         xp=np,
     ):
         """