From 4ec90e66f8d6e18594eca081b3f2d8efca90a6d9 Mon Sep 17 00:00:00 2001 From: Philipp Arras <parras@mpa-garching.mpg.de> Date: Fri, 4 Jan 2019 14:57:24 +0100 Subject: [PATCH] Sort imports --- nifty5/library/dynamic_operator.py | 15 ++++++++------- nifty5/library/light_cone_operator.py | 24 ++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/nifty5/library/dynamic_operator.py b/nifty5/library/dynamic_operator.py index 70d2b67db..b1422b9aa 100644 --- a/nifty5/library/dynamic_operator.py +++ b/nifty5/library/dynamic_operator.py @@ -20,16 +20,17 @@ from __future__ import absolute_import, division, print_function import numpy as np -from ..operators.scaling_operator import ScalingOperator -from ..operators.harmonic_operators import FFTOperator -from ..operators.field_zero_padder import FieldZeroPadder -from ..operators.simple_linear_operators import Realizer,FieldAdapter +from ..compat import * +from ..domains.unstructured_domain import UnstructuredDomain +from ..field import Field from ..operators.diagonal_operator import DiagonalOperator +from ..operators.field_zero_padder import FieldZeroPadder +from ..operators.harmonic_operators import FFTOperator +from ..operators.scaling_operator import ScalingOperator +from ..operators.simple_linear_operators import FieldAdapter, Realizer from ..sugar import makeOp -from ..field import Field -from ..domains.unstructured_domain import UnstructuredDomain +from .light_cone_operator import LightConeOperator, field_from_function -from .light_cone_operator import LightConeOperator,field_from_function def make_dynamic_operator(FFT,harmonic_padding,sm_s0,sm_x0, keys=['f', 'c'], diff --git a/nifty5/library/light_cone_operator.py b/nifty5/library/light_cone_operator.py index 781593e26..829d39bf9 100644 --- a/nifty5/library/light_cone_operator.py +++ b/nifty5/library/light_cone_operator.py @@ -1,12 +1,32 @@ +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# Copyright(C) 2013-2018 Max-Planck-Society +# +# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik +# and financially supported by the Studienstiftung des deutschen Volkes. + from __future__ import absolute_import, division, print_function -from ..field import Field +import numpy as np + +from ..compat import * from ..domain_tuple import DomainTuple +from ..field import Field from ..linearization import Linearization from ..operators.linear_operator import LinearOperator from ..operators.operator import Operator -import numpy as np def make_coords(domain, absolute=False): domain = DomainTuple.make(domain) -- GitLab