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
3d353eca
Commit
3d353eca
authored
Mar 14, 2019
by
Philipp Arras
Browse files
Fix handling of metric in _OpSum
parent
4be4bc7f
Pipeline
#45244
passed with stages
in 9 minutes and 26 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
nifty5/operators/operator.py
View file @
3d353eca
...
...
@@ -384,7 +384,6 @@ class _OpSum(Operator):
v
=
x
.
_val
if
lin
else
x
v1
=
v
.
extract
(
self
.
_op1
.
domain
)
v2
=
v
.
extract
(
self
.
_op2
.
domain
)
res
=
None
if
not
lin
:
return
self
.
_op1
(
v1
).
unite
(
self
.
_op2
(
v2
))
wm
=
x
.
want_metric
...
...
@@ -393,7 +392,7 @@ class _OpSum(Operator):
op
=
lin1
.
_jac
.
_myadd
(
lin2
.
_jac
,
False
)
res
=
lin1
.
new
(
lin1
.
_val
.
unite
(
lin2
.
_val
),
op
(
x
.
jac
))
if
lin1
.
_metric
is
not
None
and
lin2
.
_metric
is
not
None
:
res
=
res
.
add_metric
(
lin1
.
_metric
+
lin2
.
_metric
)
res
=
res
.
add_metric
(
self
.
_op1
(
x
).
_metric
+
self
.
_op2
(
x
)
.
_metric
)
return
res
def
_simplify_for_constant_input_nontrivial
(
self
,
c_inp
):
...
...
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