From 9abc647463639a6ea72aa426e05f84123d21140c Mon Sep 17 00:00:00 2001
From: Martin Reinecke <martin@mpa-garching.mpg.de>
Date: Wed, 15 Nov 2017 11:22:30 +0100
Subject: [PATCH] more rearranging

---
 nifty/library/__init__.py                        |  9 ++++++---
 nifty/library/critical_filter/__init__.py        |  2 --
 .../critical_power_curvature.py                  |  4 ++--
 .../critical_power_energy.py                     | 16 ++++++++--------
 .../library/log_normal_wiener_filter/__init__.py |  2 --
 .../log_normal_wiener_filter_curvature.py        |  8 ++++----
 .../log_normal_wiener_filter_energy.py           | 11 ++++++-----
 nifty/library/wiener_filter/__init__.py          |  2 --
 .../wiener_filter_curvature.py                   |  2 +-
 .../{wiener_filter => }/wiener_filter_energy.py  |  8 ++++----
 10 files changed, 31 insertions(+), 33 deletions(-)
 delete mode 100644 nifty/library/critical_filter/__init__.py
 rename nifty/library/{critical_filter => }/critical_power_curvature.py (89%)
 rename nifty/library/{critical_filter => }/critical_power_energy.py (92%)
 delete mode 100644 nifty/library/log_normal_wiener_filter/__init__.py
 rename nifty/library/{log_normal_wiener_filter => }/log_normal_wiener_filter_curvature.py (93%)
 rename nifty/library/{log_normal_wiener_filter => }/log_normal_wiener_filter_energy.py (88%)
 delete mode 100644 nifty/library/wiener_filter/__init__.py
 rename nifty/library/{wiener_filter => }/wiener_filter_curvature.py (96%)
 rename nifty/library/{wiener_filter => }/wiener_filter_energy.py (90%)

diff --git a/nifty/library/__init__.py b/nifty/library/__init__.py
index 2092e9209..a16068b75 100644
--- a/nifty/library/__init__.py
+++ b/nifty/library/__init__.py
@@ -1,3 +1,6 @@
-from .critical_filter import *
-from .log_normal_wiener_filter import *
-from .wiener_filter import *
+from .critical_power_energy import CriticalPowerEnergy
+from .critical_power_curvature import CriticalPowerCurvature
+from .log_normal_wiener_filter_energy import LogNormalWienerFilterEnergy
+from .log_normal_wiener_filter_curvature import LogNormalWienerFilterCurvature
+from .wiener_filter_energy import WienerFilterEnergy
+from .wiener_filter_curvature import WienerFilterCurvature
diff --git a/nifty/library/critical_filter/__init__.py b/nifty/library/critical_filter/__init__.py
deleted file mode 100644
index c4d173b5d..000000000
--- a/nifty/library/critical_filter/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from .critical_power_curvature import CriticalPowerCurvature
-from .critical_power_energy import CriticalPowerEnergy
diff --git a/nifty/library/critical_filter/critical_power_curvature.py b/nifty/library/critical_power_curvature.py
similarity index 89%
rename from nifty/library/critical_filter/critical_power_curvature.py
rename to nifty/library/critical_power_curvature.py
index ae8bb6a9b..e3756a4a5 100644
--- a/nifty/library/critical_filter/critical_power_curvature.py
+++ b/nifty/library/critical_power_curvature.py
@@ -1,5 +1,5 @@
-from ...operators.endomorphic_operator import EndomorphicOperator
-from ...operators.diagonal_operator import DiagonalOperator
+from ..operators.endomorphic_operator import EndomorphicOperator
+from ..operators.diagonal_operator import DiagonalOperator
 
 
 class CriticalPowerCurvature(EndomorphicOperator):
diff --git a/nifty/library/critical_filter/critical_power_energy.py b/nifty/library/critical_power_energy.py
similarity index 92%
rename from nifty/library/critical_filter/critical_power_energy.py
rename to nifty/library/critical_power_energy.py
index 01951f438..88f554aac 100644
--- a/nifty/library/critical_filter/critical_power_energy.py
+++ b/nifty/library/critical_power_energy.py
@@ -1,11 +1,11 @@
-from ...minimization.energy import Energy
-from ...operators.smoothness_operator import SmoothnessOperator
-from ...operators.power_projection_operator import PowerProjectionOperator
-from ...operators.inversion_enabler import InversionEnabler
-from . import CriticalPowerCurvature
-from ...utilities import memo
-from ... import Field, exp
-from ...sugar import generate_posterior_sample
+from ..minimization.energy import Energy
+from ..operators.smoothness_operator import SmoothnessOperator
+from ..operators.power_projection_operator import PowerProjectionOperator
+from ..operators.inversion_enabler import InversionEnabler
+from .critical_power_curvature import CriticalPowerCurvature
+from ..utilities import memo
+from .. import Field, exp
+from ..sugar import generate_posterior_sample
 
 
 class CriticalPowerEnergy(Energy):
diff --git a/nifty/library/log_normal_wiener_filter/__init__.py b/nifty/library/log_normal_wiener_filter/__init__.py
deleted file mode 100644
index 3009fd935..000000000
--- a/nifty/library/log_normal_wiener_filter/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from .log_normal_wiener_filter_curvature import LogNormalWienerFilterCurvature
-from .log_normal_wiener_filter_energy import LogNormalWienerFilterEnergy
diff --git a/nifty/library/log_normal_wiener_filter/log_normal_wiener_filter_curvature.py b/nifty/library/log_normal_wiener_filter_curvature.py
similarity index 93%
rename from nifty/library/log_normal_wiener_filter/log_normal_wiener_filter_curvature.py
rename to nifty/library/log_normal_wiener_filter_curvature.py
index add9cc58f..40bf9da93 100644
--- a/nifty/library/log_normal_wiener_filter/log_normal_wiener_filter_curvature.py
+++ b/nifty/library/log_normal_wiener_filter_curvature.py
@@ -1,7 +1,7 @@
-from ...operators import EndomorphicOperator
-from ...utilities import memo
-from ...basic_arithmetics import exp
-from ...sugar import create_composed_fft_operator
+from ..operators import EndomorphicOperator
+from ..utilities import memo
+from ..basic_arithmetics import exp
+from ..sugar import create_composed_fft_operator
 
 
 class LogNormalWienerFilterCurvature(EndomorphicOperator):
diff --git a/nifty/library/log_normal_wiener_filter/log_normal_wiener_filter_energy.py b/nifty/library/log_normal_wiener_filter_energy.py
similarity index 88%
rename from nifty/library/log_normal_wiener_filter/log_normal_wiener_filter_energy.py
rename to nifty/library/log_normal_wiener_filter_energy.py
index c114d4c81..4b1d2ecf4 100644
--- a/nifty/library/log_normal_wiener_filter/log_normal_wiener_filter_energy.py
+++ b/nifty/library/log_normal_wiener_filter_energy.py
@@ -1,8 +1,9 @@
-from ...minimization.energy import Energy
-from ...utilities import memo
-from . import LogNormalWienerFilterCurvature
-from ...sugar import create_composed_fft_operator
-from ...operators.inversion_enabler import InversionEnabler
+from ..minimization.energy import Energy
+from ..utilities import memo
+from .log_normal_wiener_filter_curvature import LogNormalWienerFilterCurvature
+from ..sugar import create_composed_fft_operator
+from ..operators.inversion_enabler import InversionEnabler
+
 
 class LogNormalWienerFilterEnergy(Energy):
     """The Energy for the log-normal Wiener filter.
diff --git a/nifty/library/wiener_filter/__init__.py b/nifty/library/wiener_filter/__init__.py
deleted file mode 100644
index 174853bd2..000000000
--- a/nifty/library/wiener_filter/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from .wiener_filter_curvature import WienerFilterCurvature
-from .wiener_filter_energy import WienerFilterEnergy
diff --git a/nifty/library/wiener_filter/wiener_filter_curvature.py b/nifty/library/wiener_filter_curvature.py
similarity index 96%
rename from nifty/library/wiener_filter/wiener_filter_curvature.py
rename to nifty/library/wiener_filter_curvature.py
index cf626754d..7632219b5 100644
--- a/nifty/library/wiener_filter/wiener_filter_curvature.py
+++ b/nifty/library/wiener_filter_curvature.py
@@ -1,4 +1,4 @@
-from ...operators import EndomorphicOperator
+from ..operators import EndomorphicOperator
 
 
 class WienerFilterCurvature(EndomorphicOperator):
diff --git a/nifty/library/wiener_filter/wiener_filter_energy.py b/nifty/library/wiener_filter_energy.py
similarity index 90%
rename from nifty/library/wiener_filter/wiener_filter_energy.py
rename to nifty/library/wiener_filter_energy.py
index 3b456b225..5b77c1cd5 100644
--- a/nifty/library/wiener_filter/wiener_filter_energy.py
+++ b/nifty/library/wiener_filter_energy.py
@@ -1,7 +1,7 @@
-from ...minimization.energy import Energy
-from ...utilities import memo
-from ...operators.inversion_enabler import InversionEnabler
-from . import WienerFilterCurvature
+from ..minimization.energy import Energy
+from ..utilities import memo
+from ..operators.inversion_enabler import InversionEnabler
+from .wiener_filter_curvature import WienerFilterCurvature
 
 
 class WienerFilterEnergy(Energy):
-- 
GitLab