diff --git a/nifty5/__init__.py b/nifty5/__init__.py index e4c782f32ea3203ce24451a4f35c33e7718e2f48..fdd354e69053cd45e377fda267e4ed4e04712ea4 100644 --- a/nifty5/__init__.py +++ b/nifty5/__init__.py @@ -14,7 +14,9 @@ from .domains.dof_space import DOFSpace from .domains.log_rg_space import LogRGSpace from .domain_tuple import DomainTuple +from .multi_domain import MultiDomain from .field import Field +from .multi_field import MultiField from .operators.operator import Operator from .operators.central_zero_padder import CentralZeroPadder @@ -44,6 +46,7 @@ from .operators.slope_operator import SlopeOperator from .operators.smoothness_operator import SmoothnessOperator from .operators.symmetrizing_operator import SymmetrizingOperator from .operators.vdot_operator import VdotOperator +from .operators.block_diagonal_operator import BlockDiagonalOperator from .probing.utils import probe_with_posterior_samples, probe_diagonal, \ StatCalculator @@ -85,10 +88,6 @@ from .utilities import memo, frozendict from .logger import logger -from .multi.multi_domain import MultiDomain -from .multi.multi_field import MultiField -from .multi.block_diagonal_operator import BlockDiagonalOperator - from .energies.kl import SampledKullbachLeiblerDivergence from .energies.hamiltonian import Hamiltonian from .energies.energy_adapter import EnergyAdapter diff --git a/nifty5/library/amplitude_model.py b/nifty5/library/amplitude_model.py index c2e27ef1f00496dfe71cddc6507468766d2a3979..f9ff03b79eba6f1ddc6f2d53e37936e017d52bec 100644 --- a/nifty5/library/amplitude_model.py +++ b/nifty5/library/amplitude_model.py @@ -24,8 +24,8 @@ from ..compat import * from ..domains.power_space import PowerSpace from ..domains.unstructured_domain import UnstructuredDomain from ..field import Field -from ..multi.multi_field import MultiField -from ..multi.multi_domain import MultiDomain +from ..multi_field import MultiField +from ..multi_domain import MultiDomain from ..sugar import makeOp, sqrt from ..operators.operator import Operator diff --git a/nifty5/library/correlated_fields.py b/nifty5/library/correlated_fields.py index d139259b8b1f674679746bafc1dc6ae959a72d04..f7576965b146528ff072d7c7977741b6d35e2800 100644 --- a/nifty5/library/correlated_fields.py +++ b/nifty5/library/correlated_fields.py @@ -20,8 +20,8 @@ from __future__ import absolute_import, division, print_function from ..compat import * from ..domain_tuple import DomainTuple -from ..multi.multi_field import MultiField -from ..multi.multi_domain import MultiDomain +from ..multi_field import MultiField +from ..multi_domain import MultiDomain from ..operators.domain_distributor import DomainDistributor from ..operators.harmonic_transform_operator import HarmonicTransformOperator from ..operators.power_distributor import PowerDistributor diff --git a/nifty5/library/point_sources.py b/nifty5/library/point_sources.py index fa121f675433bcc29569e33d6d2c5b665fb324e8..381ec3a9697479718a41b5978b908ee1c8e287e1 100644 --- a/nifty5/library/point_sources.py +++ b/nifty5/library/point_sources.py @@ -24,7 +24,7 @@ from scipy.stats import invgamma, norm from ..compat import * from ..field import Field from ..models.model import Model -from ..multi.multi_field import MultiField +from ..multi_field import MultiField from ..operators.selection_operator import SelectionOperator from ..sugar import makeOp from ..utilities import memo diff --git a/nifty5/linearization.py b/nifty5/linearization.py index 18a0a52c794dd9183f2be9ff95789a6eaa9d7db0..7447ca162094eabbd0a1a66b9675ec5bbda8ba8a 100644 --- a/nifty5/linearization.py +++ b/nifty5/linearization.py @@ -4,7 +4,7 @@ import numpy as np from .compat import * from .field import Field -from .multi.multi_field import MultiField +from .multi_field import MultiField from .sugar import makeOp from .domain_tuple import DomainTuple diff --git a/nifty5/multi/multi_domain.py b/nifty5/multi_domain.py similarity index 97% rename from nifty5/multi/multi_domain.py rename to nifty5/multi_domain.py index 7876184af1c0fadbd77f9e4117bc0c78f3124082..a4fb03aec7b183a61049696f34b97d6ca1fa863a 100644 --- a/nifty5/multi/multi_domain.py +++ b/nifty5/multi_domain.py @@ -18,9 +18,9 @@ from __future__ import absolute_import, division, print_function -from ..compat import * -from ..domain_tuple import DomainTuple -from ..utilities import frozendict +from .compat import * +from .domain_tuple import DomainTuple +from .utilities import frozendict class MultiDomain(object): diff --git a/nifty5/multi/multi_field.py b/nifty5/multi_field.py similarity index 99% rename from nifty5/multi/multi_field.py rename to nifty5/multi_field.py index 525e79cecf369f6a8a0eb01b3ad853b16a6e8950..43dc74a5aaad1994e303f5ef1902439ffb8cfd91 100644 --- a/nifty5/multi/multi_field.py +++ b/nifty5/multi_field.py @@ -20,10 +20,10 @@ from __future__ import absolute_import, division, print_function import numpy as np -from ..compat import * -from ..field import Field +from .compat import * +from .field import Field from .multi_domain import MultiDomain -from .. import utilities +from . import utilities class MultiField(object): diff --git a/nifty5/multi/block_diagonal_operator.py b/nifty5/operators/block_diagonal_operator.py similarity index 95% rename from nifty5/multi/block_diagonal_operator.py rename to nifty5/operators/block_diagonal_operator.py index 9d176a3532cead5b1bfd6217127c05c4b7cafc76..956be8dcb374d365d7eb544b97fac578efa5a950 100644 --- a/nifty5/multi/block_diagonal_operator.py +++ b/nifty5/operators/block_diagonal_operator.py @@ -19,9 +19,9 @@ from __future__ import absolute_import, division, print_function from ..compat import * -from ..operators.endomorphic_operator import EndomorphicOperator -from .multi_domain import MultiDomain -from .multi_field import MultiField +from .endomorphic_operator import EndomorphicOperator +from ..multi_domain import MultiDomain +from ..multi_field import MultiField class BlockDiagonalOperator(EndomorphicOperator): diff --git a/nifty5/operators/chain_operator.py b/nifty5/operators/chain_operator.py index eb2da04d9d4b5a7af14f6535d2afd31a7129e680..0ca24e9d19fd056ed3601113919b6e17a3a70609 100644 --- a/nifty5/operators/chain_operator.py +++ b/nifty5/operators/chain_operator.py @@ -87,7 +87,7 @@ class ChainOperator(LinearOperator): opsnew.append(op) ops = opsnew # Step 5: combine BlockDiagonalOperators where possible - from ..multi.block_diagonal_operator import BlockDiagonalOperator + from .block_diagonal_operator import BlockDiagonalOperator opsnew = [] for op in ops: if (len(opsnew) > 0 and diff --git a/nifty5/operators/field_adapter.py b/nifty5/operators/field_adapter.py index 42cbbcb6febb0c785130d96c803b174454972d66..055b8f525dd1ac37c51177f1758d1a8360f174b0 100644 --- a/nifty5/operators/field_adapter.py +++ b/nifty5/operators/field_adapter.py @@ -2,8 +2,8 @@ from __future__ import absolute_import, division, print_function from ..compat import * from .linear_operator import LinearOperator -from ..multi.multi_domain import MultiDomain -from ..multi.multi_field import MultiField +from ..multi_domain import MultiDomain +from ..multi_field import MultiField from ..field import Field diff --git a/nifty5/operators/linear_operator.py b/nifty5/operators/linear_operator.py index 5b4bbf799cd45147bfc0b87d39b4318e1afa2f31..6eb5a74440989712499733cbf786f82d92b5c459 100644 --- a/nifty5/operators/linear_operator.py +++ b/nifty5/operators/linear_operator.py @@ -211,7 +211,7 @@ class LinearOperator(Operator): def __call__(self, x): """Same as :meth:`times`""" from ..field import Field - from ..multi.multi_field import MultiField + from ..multi_field import MultiField if isinstance(x, (Field, MultiField)): return self.apply(x, self.TIMES) from ..linearization import Linearization diff --git a/nifty5/operators/null_operator.py b/nifty5/operators/null_operator.py index 733184a1af4bb6f58e4939787be296ef88a4bb12..c07b3c53d96c82fab162858a6c6ce75ff06401af 100644 --- a/nifty5/operators/null_operator.py +++ b/nifty5/operators/null_operator.py @@ -20,7 +20,7 @@ from __future__ import absolute_import, division, print_function from ..compat import * from ..domain_tuple import DomainTuple from ..field import Field -from ..multi.multi_field import MultiField +from ..multi_field import MultiField from ..operators.linear_operator import LinearOperator diff --git a/nifty5/operators/relaxed_sum_operator.py b/nifty5/operators/relaxed_sum_operator.py index 9585b55352ce1f0844eaa5df66c397cec2ab715e..4b52cea437c4110c5a1be100291678af3ee61518 100644 --- a/nifty5/operators/relaxed_sum_operator.py +++ b/nifty5/operators/relaxed_sum_operator.py @@ -24,8 +24,8 @@ from ..compat import * from ..utilities import my_sum from .linear_operator import LinearOperator from ..sugar import domain_union -from ..multi.multi_domain import MultiDomain -from ..multi.multi_field import MultiField +from ..multi_domain import MultiDomain +from ..multi_field import MultiField class RelaxedSumOperator(LinearOperator): diff --git a/nifty5/operators/scaling_operator.py b/nifty5/operators/scaling_operator.py index 3a4413bb6e455b313788d3e26ecaea6d382ae8a4..0d0e891ab1f701b101a18234c103f6d9d94f3779 100644 --- a/nifty5/operators/scaling_operator.py +++ b/nifty5/operators/scaling_operator.py @@ -23,7 +23,7 @@ import numpy as np from ..compat import * from ..domain_tuple import DomainTuple from ..field import Field -from ..multi.multi_field import MultiField +from ..multi_field import MultiField from ..sugar import full from .endomorphic_operator import EndomorphicOperator diff --git a/nifty5/operators/sum_operator.py b/nifty5/operators/sum_operator.py index d8cb5e28c153755b3eb25e976651d676c5055449..a2b9ffe6c405e0f6369463aa82782788ade17ce5 100644 --- a/nifty5/operators/sum_operator.py +++ b/nifty5/operators/sum_operator.py @@ -113,7 +113,7 @@ class SumOperator(LinearOperator): ops = opsnew neg = negnew # Step 5: combine BlockDiagonalOperators where possible - from ..multi.block_diagonal_operator import BlockDiagonalOperator + from .block_diagonal_operator import BlockDiagonalOperator processed = [False] * len(ops) opsnew = [] negnew = [] diff --git a/nifty5/sugar.py b/nifty5/sugar.py index 9ac12ff31f5b9ffa2749c6fdae397e66320a41be..ed2bee0f3be7ab6132158890deef4b11ba278b20 100644 --- a/nifty5/sugar.py +++ b/nifty5/sugar.py @@ -28,9 +28,9 @@ from .domain_tuple import DomainTuple from .domains.power_space import PowerSpace from .field import Field from .logger import logger -from .multi.block_diagonal_operator import BlockDiagonalOperator -from .multi.multi_domain import MultiDomain -from .multi.multi_field import MultiField +from .operators.block_diagonal_operator import BlockDiagonalOperator +from .multi_domain import MultiDomain +from .multi_field import MultiField from .operators.diagonal_operator import DiagonalOperator from .operators.power_distributor import PowerDistributor