From a166ba961c51ddfc947475c9ef832cfccfe31cc6 Mon Sep 17 00:00:00 2001 From: Philipp Arras <parras@mpa-garching.mpg.de> Date: Fri, 29 Jan 2021 17:11:55 +0100 Subject: [PATCH] Cosmetics --- demos/misc/convolution.py | 1 + src/library/correlated_fields.py | 4 ++-- test/test_linearization.py | 1 + test/test_multi_field.py | 1 + test/test_operators/test_convolution_operators.py | 2 +- test/test_operators/test_interpolated.py | 1 - test/test_operators/test_operator.py | 2 +- 7 files changed, 7 insertions(+), 5 deletions(-) diff --git a/demos/misc/convolution.py b/demos/misc/convolution.py index 7a83d264d..47a89760d 100644 --- a/demos/misc/convolution.py +++ b/demos/misc/convolution.py @@ -16,6 +16,7 @@ # NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik. import numpy as np + import nifty7 as ift diff --git a/src/library/correlated_fields.py b/src/library/correlated_fields.py index 7588f768a..496cb1029 100644 --- a/src/library/correlated_fields.py +++ b/src/library/correlated_fields.py @@ -37,9 +37,9 @@ from ..operators.distributors import PowerDistributor from ..operators.endomorphic_operator import EndomorphicOperator from ..operators.harmonic_operators import HarmonicTransformOperator from ..operators.linear_operator import LinearOperator +from ..operators.normal_operators import LognormalTransform, NormalTransform from ..operators.operator import Operator -from ..operators.simple_linear_operators import ducktape, VdotOperator -from ..operators.normal_operators import NormalTransform, LognormalTransform +from ..operators.simple_linear_operators import VdotOperator, ducktape from ..probing import StatCalculator from ..sugar import full, makeDomain, makeField, makeOp diff --git a/test/test_linearization.py b/test/test_linearization.py index 54b7117b1..a53f43405 100644 --- a/test/test_linearization.py +++ b/test/test_linearization.py @@ -20,6 +20,7 @@ import pytest from numpy.testing import assert_allclose import nifty7 as ift + from .common import setup_function, teardown_function pmp = pytest.mark.parametrize diff --git a/test/test_multi_field.py b/test/test_multi_field.py index 6eb6033df..aaffbccd5 100644 --- a/test/test_multi_field.py +++ b/test/test_multi_field.py @@ -19,6 +19,7 @@ import numpy as np from numpy.testing import assert_allclose, assert_equal import nifty7 as ift + from .common import setup_function, teardown_function dom = ift.makeDomain({"d1": ift.RGSpace(10)}) diff --git a/test/test_operators/test_convolution_operators.py b/test/test_operators/test_convolution_operators.py index 8e66f6bc0..65783ee0a 100644 --- a/test/test_operators/test_convolution_operators.py +++ b/test/test_operators/test_convolution_operators.py @@ -15,10 +15,10 @@ # # NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik. +import numpy as np from numpy.testing import assert_allclose import nifty7 as ift -import numpy as np from ..common import list2fixture, setup_function, teardown_function diff --git a/test/test_operators/test_interpolated.py b/test/test_operators/test_interpolated.py index f15c26b7b..e469c4261 100644 --- a/test/test_operators/test_interpolated.py +++ b/test/test_operators/test_interpolated.py @@ -44,4 +44,3 @@ def testInterpolationAccuracy(space, seed): arr1 = op(pos).val arr0 = invgamma.ppf(norm.cdf(pos.val), alpha, scale=q) assert_allclose(arr0, arr1) - diff --git a/test/test_operators/test_operator.py b/test/test_operators/test_operator.py index 1fef4b95e..ee1169182 100644 --- a/test/test_operators/test_operator.py +++ b/test/test_operators/test_operator.py @@ -16,10 +16,10 @@ # NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik. import numpy as np +import pytest from numpy.testing import assert_allclose import nifty7 as ift -import pytest from ..common import setup_function, teardown_function -- GitLab