Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ift
NIFTy
Commits
2a0a6f90
Commit
2a0a6f90
authored
Aug 05, 2018
by
Martin Reinecke
Browse files
no more multi/ subdirectory
parent
0ce790cb
Changes
16
Hide whitespace changes
Inline
Side-by-side
nifty5/__init__.py
View file @
2a0a6f90
...
...
@@ -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
...
...
nifty5/library/amplitude_model.py
View file @
2a0a6f90
...
...
@@ -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
...
...
nifty5/library/correlated_fields.py
View file @
2a0a6f90
...
...
@@ -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
...
...
nifty5/library/point_sources.py
View file @
2a0a6f90
...
...
@@ -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
...
...
nifty5/linearization.py
View file @
2a0a6f90
...
...
@@ -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
...
...
nifty5/multi
/multi
_domain.py
→
nifty5/multi_domain.py
View file @
2a0a6f90
...
...
@@ -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
):
...
...
nifty5/multi
/multi
_field.py
→
nifty5/multi_field.py
View file @
2a0a6f90
...
...
@@ -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
):
...
...
nifty5/
multi
/block_diagonal_operator.py
→
nifty5/
operators
/block_diagonal_operator.py
View file @
2a0a6f90
...
...
@@ -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
):
...
...
nifty5/operators/chain_operator.py
View file @
2a0a6f90
...
...
@@ -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
...
...
nifty5/operators/field_adapter.py
View file @
2a0a6f90
...
...
@@ -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
...
...
nifty5/operators/linear_operator.py
View file @
2a0a6f90
...
...
@@ -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
...
...
nifty5/operators/null_operator.py
View file @
2a0a6f90
...
...
@@ -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
...
...
nifty5/operators/relaxed_sum_operator.py
View file @
2a0a6f90
...
...
@@ -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
):
...
...
nifty5/operators/scaling_operator.py
View file @
2a0a6f90
...
...
@@ -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
...
...
nifty5/operators/sum_operator.py
View file @
2a0a6f90
...
...
@@ -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
=
[]
...
...
nifty5/sugar.py
View file @
2a0a6f90
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment