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
13
Issues
13
List
Boards
Labels
Service Desk
Milestones
Merge Requests
15
Merge Requests
15
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
9e644972
Commit
9e644972
authored
Feb 15, 2019
by
Martin Reinecke
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'improving_clip' into 'NIFTy_5'
now clipper takes fields or multifields See merge request
!293
parents
d8bf9bf8
aa4e0f38
Pipeline
#43900
passed with stages
in 18 minutes and 59 seconds
Changes
3
Pipelines
5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
2 deletions
+12
-2
nifty5/field.py
nifty5/field.py
+2
-0
nifty5/multi_field.py
nifty5/multi_field.py
+6
-2
test/test_operators/test_jacobian.py
test/test_operators/test_jacobian.py
+4
-0
No files found.
nifty5/field.py
View file @
9e644972
...
...
@@ -636,6 +636,8 @@ class Field(object):
return
0.5
*
(
1.
+
self
.
tanh
())
def
clip
(
self
,
min
=
None
,
max
=
None
):
min
=
min
.
local_data
if
isinstance
(
min
,
Field
)
else
min
max
=
max
.
local_data
if
isinstance
(
max
,
Field
)
else
max
return
Field
(
self
.
_domain
,
dobj
.
clip
(
self
.
_val
,
min
,
max
))
def
one_over
(
self
):
...
...
nifty5/multi_field.py
View file @
9e644972
...
...
@@ -192,8 +192,12 @@ class MultiField(object):
return
self
.
_transform
(
lambda
x
:
x
.
conjugate
())
def
clip
(
self
,
min
=
None
,
max
=
None
):
return
MultiField
(
self
.
_domain
,
tuple
(
clip
(
v
,
min
,
max
)
for
v
in
self
.
_val
))
ncomp
=
len
(
self
.
_val
)
lmin
=
min
.
_val
if
isinstance
(
min
,
MultiField
)
else
(
min
,)
*
ncomp
lmax
=
max
.
_val
if
isinstance
(
max
,
MultiField
)
else
(
max
,)
*
ncomp
return
MultiField
(
self
.
_domain
,
tuple
(
self
.
_val
[
i
].
clip
(
lmin
[
i
],
lmax
[
i
])
for
i
in
range
(
ncomp
)))
def
all
(
self
):
for
v
in
self
.
_val
:
...
...
test/test_operators/test_jacobian.py
View file @
9e644972
...
...
@@ -87,6 +87,10 @@ def testBinary(type1, type2, space, seed):
model
=
select_s1
.
clip
(
-
1
,
1
)
pos
=
ift
.
from_random
(
"normal"
,
dom1
)
ift
.
extra
.
check_jacobian_consistency
(
model
,
pos
,
ntries
=
20
)
f
=
ift
.
from_random
(
"normal"
,
space
)
model
=
select_s1
.
clip
(
f
-
0.1
,
f
+
1.
)
pos
=
ift
.
from_random
(
"normal"
,
dom1
)
ift
.
extra
.
check_jacobian_consistency
(
model
,
pos
,
ntries
=
20
)
if
isinstance
(
space
,
ift
.
RGSpace
):
model
=
ift
.
FFTOperator
(
space
)(
select_s1
*
select_s2
)
pos
=
ift
.
from_random
(
"normal"
,
dom
)
...
...
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