From d6341dcbb6740dc67f649fc5b0de0b65a41d3ce7 Mon Sep 17 00:00:00 2001
From: Theo Steininger <theo.steininger@ultimanet.de>
Date: Mon, 10 Jul 2017 02:43:22 +0200
Subject: [PATCH] Fixes in the import structure.

---
 .../critical_power_curvature.py               | 23 +++++++++++--------
 .../critical_filter/critical_power_energy.py  |  5 ++--
 .../wiener_filter/wiener_filter_energy.py     |  2 +-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/nifty/library/critical_filter/critical_power_curvature.py b/nifty/library/critical_filter/critical_power_curvature.py
index 1f4edeca..798e666e 100644
--- a/nifty/library/critical_filter/critical_power_curvature.py
+++ b/nifty/library/critical_filter/critical_power_curvature.py
@@ -1,6 +1,6 @@
-from nifty.operators import EndomorphicOperator,\
-                            InvertibleOperatorMixin,\
-                            DiagonalOperator
+from nifty.operators.endomorphic_operator import EndomorphicOperator
+from nifty.operators.invertible_operator_mixin import InvertibleOperatorMixin
+from nifty.operators.diagonal_operator import DiagonalOperator
 
 
 class CriticalPowerCurvature(InvertibleOperatorMixin, EndomorphicOperator):
@@ -18,6 +18,9 @@ class CriticalPowerCurvature(InvertibleOperatorMixin, EndomorphicOperator):
     T : SmoothnessOperator,
         The smoothness prior contribution to the curvature.
     """
+
+    # ---Overwritten properties and methods---
+
     def __init__(self, theta, T, inverter=None, preconditioner=None):
 
         self.theta = DiagonalOperator(theta.domain, diagonal=theta)
@@ -25,8 +28,15 @@ class CriticalPowerCurvature(InvertibleOperatorMixin, EndomorphicOperator):
         if preconditioner is None:
             preconditioner = self.theta.inverse_times
         self._domain = self.theta.domain
-        super(CriticalPowerCurvature, self).__init__(inverter=inverter,
+        super(CriticalPowerCurvature, self).__init__(
+                                                 inverter=inverter,
                                                  preconditioner=preconditioner)
+
+    def _times(self, x, spaces):
+        return self.T(x) + self.theta(x)
+
+    # ---Mandatory properties and methods---
+
     @property
     def domain(self):
         return self._domain
@@ -38,8 +48,3 @@ class CriticalPowerCurvature(InvertibleOperatorMixin, EndomorphicOperator):
     @property
     def unitary(self):
         return False
-
-    # ---Added properties and methods---
-
-    def _times(self, x, spaces):
-        return self.T(x) + self.theta(x)
diff --git a/nifty/library/critical_filter/critical_power_energy.py b/nifty/library/critical_filter/critical_power_energy.py
index 1baad0fe..3f1021e7 100644
--- a/nifty/library/critical_filter/critical_power_energy.py
+++ b/nifty/library/critical_filter/critical_power_energy.py
@@ -1,6 +1,7 @@
 from nifty.energies.energy import Energy
-from nifty.library.operator_library import CriticalPowerCurvature,\
-                                            SmoothnessOperator
+from nifty.operators.smoothness_operator import SmoothnessOperator
+from nifty.library.critical_filter import CriticalPowerCurvature
+
 
 from nifty.sugar import generate_posterior_sample
 from nifty import Field, exp
diff --git a/nifty/library/wiener_filter/wiener_filter_energy.py b/nifty/library/wiener_filter/wiener_filter_energy.py
index 6b9a1461..798319e5 100644
--- a/nifty/library/wiener_filter/wiener_filter_energy.py
+++ b/nifty/library/wiener_filter/wiener_filter_energy.py
@@ -1,6 +1,6 @@
 from nifty.energies.energy import Energy
 from nifty.energies.memoization import memo
-from nifty.library.operator_library import WienerFilterCurvature
+from nifty.library.wiener_filter import WienerFilterCurvature
 
 
 class WienerFilterEnergy(Energy):
-- 
GitLab