Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
NIFTy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
10
Issues
10
List
Boards
Labels
Service Desk
Milestones
Merge Requests
8
Merge Requests
8
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ift
NIFTy
Commits
aa3cdd2c
Commit
aa3cdd2c
authored
Mar 01, 2019
by
Martin Reinecke
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
small tweaks
parent
6d63329f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
9 deletions
+7
-9
nifty5/operators/scaling_operator.py
nifty5/operators/scaling_operator.py
+4
-9
nifty5/operators/sum_operator.py
nifty5/operators/sum_operator.py
+3
-0
No files found.
nifty5/operators/scaling_operator.py
View file @
aa3cdd2c
...
...
@@ -35,14 +35,6 @@ class ScalingOperator(EndomorphicOperator):
-----
:class:`Operator` supports the multiplication with a scalar. So one does
not need instantiate :class:`ScalingOperator` explicitly in most cases.
Formally, this operator always supports all operation modes (times,
adjoint_times, inverse_times and inverse_adjoint_times), even if `factor`
is 0 or infinity. It is the user's responsibility to apply the operator
only in appropriate ways (e.g. call inverse_times only if `factor` is
nonzero).
This shortcoming will hopefully be fixed in the future.
"""
def
__init__
(
self
,
factor
,
domain
):
...
...
@@ -52,7 +44,10 @@ class ScalingOperator(EndomorphicOperator):
raise
TypeError
(
"Scalar required"
)
self
.
_factor
=
factor
self
.
_domain
=
makeDomain
(
domain
)
self
.
_capability
=
self
.
_all_ops
if
self
.
_factor
==
0.
:
self
.
_capability
=
self
.
TIMES
|
self
.
ADJOINT_TIMES
else
:
self
.
_capability
=
self
.
_all_ops
def
apply
(
self
,
x
,
mode
):
self
.
_check_input
(
x
,
mode
)
...
...
nifty5/operators/sum_operator.py
View file @
aa3cdd2c
...
...
@@ -23,6 +23,7 @@ from ..sugar import domain_union
from
..utilities
import
indent
from
.block_diagonal_operator
import
BlockDiagonalOperator
from
.linear_operator
import
LinearOperator
from
.simple_linear_operators
import
NullOperator
class
SumOperator
(
LinearOperator
):
...
...
@@ -59,6 +60,8 @@ class SumOperator(LinearOperator):
negnew
+=
[
not
n
for
n
in
op
.
_neg
]
else
:
negnew
+=
list
(
op
.
_neg
)
elif
isinstance
(
op
,
NullOperator
):
pass
else
:
opsnew
.
append
(
op
)
negnew
.
append
(
ng
)
...
...
Philipp Arras
@parras
mentioned in commit
0fd95da9
·
Mar 07, 2019
mentioned in commit
0fd95da9
mentioned in commit 0fd95da9234a67001f6781106a17ad36c66575e7
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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