From cc7e38cd7c6badd9d9673bf1cc2bd1f9b82a65f9 Mon Sep 17 00:00:00 2001 From: Philipp Arras Date: Tue, 10 Jul 2018 22:42:00 +0200 Subject: [PATCH] More import cosmetics --- nifty5/library/amplitude_model.py | 4 +++- nifty5/library/apply_data.py | 1 + nifty5/library/bernoulli_energy.py | 4 +++- nifty5/library/correlated_fields.py | 12 ++++++------ nifty5/library/gaussian_energy.py | 1 + nifty5/library/los_response.py | 10 ++++++---- nifty5/library/point_sources.py | 9 +++++---- nifty5/library/poissonian_energy.py | 4 +++- nifty5/library/wiener_filter_curvature.py | 3 ++- nifty5/library/wiener_filter_energy.py | 1 + 10 files changed, 31 insertions(+), 18 deletions(-) diff --git a/nifty5/library/amplitude_model.py b/nifty5/library/amplitude_model.py index 9d3018a2..5f599503 100644 --- a/nifty5/library/amplitude_model.py +++ b/nifty5/library/amplitude_model.py @@ -17,8 +17,10 @@ # and financially supported by the Studienstiftung des deutschen Volkes. from __future__ import absolute_import, division, print_function -from ..compat import * + import numpy as np + +from ..compat import * from ..domains.power_space import PowerSpace from ..domains.unstructured_domain import UnstructuredDomain from ..field import Field diff --git a/nifty5/library/apply_data.py b/nifty5/library/apply_data.py index 4df78fdc..7a90cfde 100644 --- a/nifty5/library/apply_data.py +++ b/nifty5/library/apply_data.py @@ -17,6 +17,7 @@ # and financially supported by the Studienstiftung des deutschen Volkes. from __future__ import absolute_import, division, print_function + from ..compat import * diff --git a/nifty5/library/bernoulli_energy.py b/nifty5/library/bernoulli_energy.py index c056b3a7..4ac0c483 100644 --- a/nifty5/library/bernoulli_energy.py +++ b/nifty5/library/bernoulli_energy.py @@ -17,8 +17,10 @@ # and financially supported by the Studienstiftung des deutschen Volkes. from __future__ import absolute_import, division, print_function -from ..compat import * + from numpy import inf, isnan + +from ..compat import * from ..minimization.energy import Energy from ..operators.sandwich_operator import SandwichOperator from ..sugar import log, makeOp diff --git a/nifty5/library/correlated_fields.py b/nifty5/library/correlated_fields.py index 2b4f0a55..c30b2072 100644 --- a/nifty5/library/correlated_fields.py +++ b/nifty5/library/correlated_fields.py @@ -17,17 +17,17 @@ # and financially supported by the Studienstiftung des deutschen Volkes. from __future__ import absolute_import, division, print_function + from ..compat import * -from ..operators.fft_operator import FFTOperator +from ..domain_tuple import DomainTuple from ..field import Field -from ..multi.multi_field import MultiField from ..models.local_nonlinearity import PointwiseExponential -from ..operators.power_distributor import PowerDistributor from ..models.variable import Variable -from ..domain_tuple import DomainTuple +from ..multi.multi_field import MultiField from ..operators.domain_distributor import DomainDistributor -from ..operators.harmonic_transform_operator \ - import HarmonicTransformOperator +from ..operators.fft_operator import FFTOperator +from ..operators.harmonic_transform_operator import HarmonicTransformOperator +from ..operators.power_distributor import PowerDistributor def make_correlated_field(s_space, amplitude_model): diff --git a/nifty5/library/gaussian_energy.py b/nifty5/library/gaussian_energy.py index 5f726fcc..9ed61b50 100644 --- a/nifty5/library/gaussian_energy.py +++ b/nifty5/library/gaussian_energy.py @@ -17,6 +17,7 @@ # and financially supported by the Studienstiftung des deutschen Volkes. from __future__ import absolute_import, division, print_function + from ..compat import * from ..minimization.energy import Energy from ..operators.sandwich_operator import SandwichOperator diff --git a/nifty5/library/los_response.py b/nifty5/library/los_response.py index 45be9b47..3176361f 100644 --- a/nifty5/library/los_response.py +++ b/nifty5/library/los_response.py @@ -17,17 +17,19 @@ # and financially supported by the Studienstiftung des deutschen Volkes. from __future__ import absolute_import, division, print_function -from ..compat import * + import numpy as np -from scipy.special import erfc from scipy.sparse import coo_matrix from scipy.sparse.linalg import aslinearoperator -from ..operators.linear_operator import LinearOperator +from scipy.special import erfc + +from .. import dobj +from ..compat import * from ..domain_tuple import DomainTuple from ..domains.rg_space import RGSpace from ..domains.unstructured_domain import UnstructuredDomain from ..field import Field -from .. import dobj +from ..operators.linear_operator import LinearOperator def _gaussian_error_function(x): diff --git a/nifty5/library/point_sources.py b/nifty5/library/point_sources.py index 0fb7cb97..7ae8250a 100644 --- a/nifty5/library/point_sources.py +++ b/nifty5/library/point_sources.py @@ -17,15 +17,16 @@ # and financially supported by the Studienstiftung des deutschen Volkes. from __future__ import absolute_import, division, print_function -from ..compat import * + import numpy as np from scipy.stats import invgamma, norm + +from ..compat import * from ..field import Field -from ..sugar import makeOp -from ..multi.multi_field import MultiField from ..models.model import Model - +from ..multi.multi_field import MultiField from ..operators.selection_operator import SelectionOperator +from ..sugar import makeOp from ..utilities import memo diff --git a/nifty5/library/poissonian_energy.py b/nifty5/library/poissonian_energy.py index 4f910876..e6eadc45 100644 --- a/nifty5/library/poissonian_energy.py +++ b/nifty5/library/poissonian_energy.py @@ -17,8 +17,10 @@ # and financially supported by the Studienstiftung des deutschen Volkes. from __future__ import absolute_import, division, print_function -from ..compat import * + from numpy import inf, isnan + +from ..compat import * from ..minimization.energy import Energy from ..operators.sandwich_operator import SandwichOperator from ..sugar import log, makeOp diff --git a/nifty5/library/wiener_filter_curvature.py b/nifty5/library/wiener_filter_curvature.py index ea8d8244..d878e4de 100644 --- a/nifty5/library/wiener_filter_curvature.py +++ b/nifty5/library/wiener_filter_curvature.py @@ -17,10 +17,11 @@ # and financially supported by the Studienstiftung des deutschen Volkes. from __future__ import absolute_import, division, print_function + from ..compat import * -from ..operators.sandwich_operator import SandwichOperator from ..operators.inversion_enabler import InversionEnabler from ..operators.sampling_enabler import SamplingEnabler +from ..operators.sandwich_operator import SandwichOperator def WienerFilterCurvature(R, N, S, iteration_controller=None, diff --git a/nifty5/library/wiener_filter_energy.py b/nifty5/library/wiener_filter_energy.py index 62f57cfb..dc46ab09 100644 --- a/nifty5/library/wiener_filter_energy.py +++ b/nifty5/library/wiener_filter_energy.py @@ -17,6 +17,7 @@ # and financially supported by the Studienstiftung des deutschen Volkes. from __future__ import absolute_import, division, print_function + from ..compat import * from ..minimization.quadratic_energy import QuadraticEnergy from .wiener_filter_curvature import WienerFilterCurvature -- GitLab