Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
NIFTy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ift
NIFTy
Commits
ed095aa2
Commit
ed095aa2
authored
Jun 21, 2019
by
Martin Reinecke
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/NIFTy_5' into PowerGrid
parents
437c3994
a1191b51
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!327
Power grid
Pipeline
#50983
passed
Jun 21, 2019
Stage: build_docker
Stage: test
Stage: demo_runs
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
nifty5/operators/diagonal_operator.py
+1
-1
1 addition, 1 deletion
nifty5/operators/diagonal_operator.py
with
1 addition
and
1 deletion
nifty5/operators/diagonal_operator.py
+
1
−
1
View file @
ed095aa2
...
@@ -105,7 +105,7 @@ class DiagonalOperator(EndomorphicOperator):
...
@@ -105,7 +105,7 @@ class DiagonalOperator(EndomorphicOperator):
res
.
_spaces
=
None
res
.
_spaces
=
None
else
:
else
:
res
.
_spaces
=
tuple
(
set
(
self
.
_spaces
)
|
set
(
spc
))
res
.
_spaces
=
tuple
(
set
(
self
.
_spaces
)
|
set
(
spc
))
res
.
_ldiag
=
ldiag
res
.
_ldiag
=
np
.
array
(
ldiag
)
res
.
_fill_rest
()
res
.
_fill_rest
()
return
res
return
res
...
...
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
sign in
to comment