Skip to content
GitLab
Menu
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
50d6a969
Commit
50d6a969
authored
Jul 08, 2017
by
Theo Steininger
Browse files
Merge branch 'cleanup' into 'master'
various cleanups See merge request
!158
parents
e25f7013
443de529
Pipeline
#14515
passed with stages
in 12 minutes and 54 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
nifty/operators/diagonal_operator/diagonal_operator.py
View file @
50d6a969
...
...
@@ -21,7 +21,6 @@ import numpy as np
from
d2o
import
distributed_data_object
,
\
STRATEGIES
as
DISTRIBUTION_STRATEGIES
from
nifty.basic_arithmetics
import
log
as
nifty_log
from
nifty.config
import
nifty_configuration
as
gc
from
nifty.field
import
Field
from
nifty.operators.endomorphic_operator
import
EndomorphicOperator
...
...
nifty/operators/linear_operator/linear_operator.py
View file @
50d6a969
...
...
@@ -73,7 +73,7 @@ class LinearOperator(Loggable, object):
__metaclass__
=
NiftyMeta
def
__init__
(
self
,
default_spaces
=
None
):
self
.
default_spaces
=
default_spaces
self
.
_
default_spaces
=
default_spaces
@
staticmethod
def
_parse_domain
(
domain
):
...
...
@@ -119,10 +119,6 @@ class LinearOperator(Loggable, object):
def
default_spaces
(
self
):
return
self
.
_default_spaces
@
default_spaces
.
setter
def
default_spaces
(
self
,
spaces
):
self
.
_default_spaces
=
utilities
.
cast_axis_to_tuple
(
spaces
)
def
__call__
(
self
,
*
args
,
**
kwargs
):
return
self
.
times
(
*
args
,
**
kwargs
)
...
...
nifty/operators/smoothing_operator/smoothing_operator.py
View file @
50d6a969
...
...
@@ -135,8 +135,8 @@ class SmoothingOperator(EndomorphicOperator):
# "space as input domain.")
self
.
_domain
=
self
.
_parse_domain
(
domain
)
self
.
sigma
=
sigma
self
.
log_distances
=
log_distances
self
.
_
sigma
=
sigma
self
.
_
log_distances
=
log_distances
def
_inverse_times
(
self
,
x
,
spaces
):
if
self
.
sigma
==
0
:
...
...
@@ -183,18 +183,10 @@ class SmoothingOperator(EndomorphicOperator):
def
sigma
(
self
):
return
self
.
_sigma
@
sigma
.
setter
def
sigma
(
self
,
sigma
):
self
.
_sigma
=
np
.
float
(
sigma
)
@
property
def
log_distances
(
self
):
return
self
.
_log_distances
@
log_distances
.
setter
def
log_distances
(
self
,
log_distances
):
self
.
_log_distances
=
bool
(
log_distances
)
@
abc
.
abstractmethod
def
_smooth
(
self
,
x
,
spaces
,
inverse
):
raise
NotImplementedError
Write
Preview
Supports
Markdown
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