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
5b696445
Commit
5b696445
authored
Jun 20, 2018
by
Martin Reinecke
Browse files
cosmetics and fix in SamplingEnabler
parent
912892f2
Pipeline
#31472
failed with stages
in 4 minutes and 50 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
nifty5/library/nonlinear_wiener_filter_energy.py
View file @
5b696445
...
...
@@ -24,7 +24,8 @@ from ..sugar import makeOp
class
NonlinearWienerFilterEnergy
(
Energy
):
def
__init__
(
self
,
position
,
d
,
Instrument
,
nonlinearity
,
ht
,
power
,
N
,
S
,
iteration_controller
=
None
,
iteration_controller_sampling
=
None
):
iteration_controller
=
None
,
iteration_controller_sampling
=
None
):
super
(
NonlinearWienerFilterEnergy
,
self
).
__init__
(
position
=
position
)
self
.
d
=
d
.
lock
()
self
.
Instrument
=
Instrument
...
...
nifty5/multi/multi_field.py
View file @
5b696445
...
...
@@ -180,13 +180,14 @@ class MultiField(object):
if
not
isinstance
(
other
,
MultiField
):
return
False
for
key
,
val
in
self
.
_domain
.
items
():
if
not
key
in
other
.
_domain
or
other
.
_domain
[
key
]
!=
val
:
if
key
not
in
other
.
_domain
or
other
.
_domain
[
key
]
!=
val
:
return
False
for
key
,
val
in
self
.
_val
.
items
():
if
not
val
.
isSubsetOf
(
other
[
key
]):
return
False
return
True
for
op
in
[
"__add__"
,
"__radd__"
,
"__iadd__"
,
"__sub__"
,
"__rsub__"
,
"__isub__"
,
"__mul__"
,
"__rmul__"
,
"__imul__"
,
...
...
nifty5/operators/sampling_enabler.py
View file @
5b696445
...
...
@@ -66,8 +66,11 @@ class SamplingEnabler(EndomorphicOperator):
energy
=
QuadraticEnergy
(
s
,
self
.
_op
,
sp
+
nj
,
_grad
=
self
.
_likelihood
(
s
)
-
nj
)
inverter
=
ConjugateGradient
(
self
.
_ic
)
energy
,
convergence
=
inverter
(
energy
,
preconditioner
=
self
.
_approximation
.
inverse
)
if
self
.
_approximation
is
not
None
:
energy
,
convergence
=
inverter
(
energy
,
preconditioner
=
self
.
_approximation
.
inverse
)
else
:
energy
,
convergence
=
inverter
(
energy
)
return
energy
.
position
@
property
...
...
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