Renaming and cleanup

demos/sampling_demo.py

@@ -43,7 +43,7 @@ D_inv_1 = ift.SamplingEnabler(ift.SandwichOperator.make(R_p, N.inverse),
 D_inv_1 = ift.InversionEnabler(D_inv_1, inverter)
 
 
-D_inv_2 = ift.SamplingEnabler2(D_inv, sampling_inverter)
+D_inv_2 = ift.GreedySamplingEnabler(D_inv, sampling_inverter)
 
 # GOOD
 samps_1 = [D_inv_1.draw_sample(from_inverse=True) for i in range(N_samps)]

nifty4/operators/__init__.py

@@ -12,11 +12,11 @@ from .power_distributor import PowerDistributor
 from .inversion_enabler import InversionEnabler
 from .sandwich_operator import SandwichOperator
 from .sampling_enabler import SamplingEnabler
-from .sampling_enabler2 import SamplingEnabler2
+from .sampling_enabler_greedy import GreedySamplingEnabler
 
 __all__ = ["LinearOperator", "EndomorphicOperator", "ScalingOperator",
            "DiagonalOperator", "HarmonicTransformOperator", "FFTOperator",
            "FFTSmoothingOperator", "GeometryRemover",
            "LaplaceOperator", "SmoothnessOperator", "PowerDistributor",
            "InversionEnabler", "SandwichOperator", "SamplingEnabler",
-           "SamplingEnabler2"]
+           "GreedySamplingEnabler"]

nifty4/operators/sampling_enabler.py

@@ -16,11 +16,10 @@
 # NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
+import numpy as np
+
 from ..minimization.quadratic_energy import QuadraticEnergy
-from ..minimization.iteration_controller import IterationController
-from ..logger import logger
 from .endomorphic_operator import EndomorphicOperator
-import numpy as np
 
 
 class SamplingEnabler(EndomorphicOperator):

nifty4/operators/sampling_enabler2.py → nifty4/operators/sampling_enabler_greedy.py

@@ -16,15 +16,13 @@
 # NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
-from ..minimization.quadratic_energy import QuadraticEnergy
-from ..minimization.iteration_controller import IterationController
-from ..logger import logger
+import numpy as np
+
 from .endomorphic_operator import EndomorphicOperator
 from .inversion_enabler import InversionEnabler
-import numpy as np
 
 
-class SamplingEnabler2(EndomorphicOperator):
+class GreedySamplingEnabler(EndomorphicOperator):
     """Class which augments the capability of another operator object via
     numerical inversion.
 
@@ -46,7 +44,7 @@ class SamplingEnabler2(EndomorphicOperator):
     """
 
     def __init__(self, op, sampling_inverter, approximation=None):
-        super(SamplingEnabler2, self).__init__()
+        super(GreedySamplingEnabler, self).__init__()
         self._op = op
         self._sampling_op = InversionEnabler(op, sampling_inverter,
                                              approximation=approximation)