more rearrangements

nifty/__init__.py

@@ -14,8 +14,6 @@ from .utilities import *
 
 from .field_types import *
 
-from .energies import *
-
 from .minimization import *
 
 from .spaces import *

nifty/energies/__init__.py

-from .energy import Energy
-from .quadratic_energy import QuadraticEnergy
-from .line_energy import LineEnergy

nifty/library/critical_filter/critical_power_energy.py

-from ...energies.energy import Energy
+from ...minimization.energy import Energy
 from ...operators.smoothness_operator import SmoothnessOperator
 from ...operators.power_projection_operator import PowerProjectionOperator
 from ...operators.inversion_enabler import InversionEnabler

nifty/library/log_normal_wiener_filter/log_normal_wiener_filter_energy.py

-from ...energies.energy import Energy
+from ...minimization.energy import Energy
 from ...utilities import memo
 from . import LogNormalWienerFilterCurvature
 from ...sugar import create_composed_fft_operator

nifty/library/wiener_filter/wiener_filter_energy.py

-from ...energies.energy import Energy
+from ...minimization.energy import Energy
 from ...utilities import memo
 from ...operators.inversion_enabler import InversionEnabler
 from . import WienerFilterCurvature

nifty/minimization/__init__.py

@@ -9,3 +9,6 @@ from .descent_minimizer import DescentMinimizer
 from .steepest_descent import SteepestDescent
 from .vl_bfgs import VL_BFGS
 from .relaxed_newton import RelaxedNewton
+from .energy import Energy
+from .quadratic_energy import QuadraticEnergy
+from .line_energy import LineEnergy

nifty/minimization/line_search_strong_wolfe.py

@@ -20,7 +20,7 @@ from __future__ import division
 from builtins import range
 import numpy as np
 from .line_search import LineSearch
-from ..energies import LineEnergy
+from .line_energy import LineEnergy
 from .. import dobj
 
 

nifty/operators/inversion_enabler.py

@@ -16,7 +16,7 @@
 # NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
-from ..energies import QuadraticEnergy
+from ..minimization.quadratic_energy import QuadraticEnergy
 from ..field import Field
 from .linear_operator import LinearOperator
 

nifty/operators/smoothness_operator.py

@@ -28,8 +28,8 @@ class SmoothnessOperator(EndomorphicOperator):
 
     def __init__(self, domain, strength=1., logarithmic=True, space=None):
         super(SmoothnessOperator, self).__init__()
-        self._laplace = LaplaceOperator(domain,
-                                        logarithmic=logarithmic, space=space)
+        self._laplace = LaplaceOperator(domain, logarithmic=logarithmic,
+                                        space=space)
 
         if strength <= 0:
             raise ValueError("ERROR: invalid sigma.")
@@ -48,11 +48,8 @@ class SmoothnessOperator(EndomorphicOperator):
         return False
 
     def _times(self, x):
-        if self._strength != 0:
-            result = self._laplace.adjoint_times(self._laplace(x))
-            result *= self._strength**2
-        else:
-            result = Field.zeros_like(x)
+        result = self._laplace.adjoint_times(self._laplace(x))
+        result *= self._strength**2
         return result
 
     @property