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
60bf8aa9
Commit
60bf8aa9
authored
Jul 24, 2018
by
Martin Reinecke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
progress
parent
93c14275
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
4 deletions
+24
-4
nifty5/multi/multi_field.py
nifty5/multi/multi_field.py
+17
-0
nifty5/operator.py
nifty5/operator.py
+3
-2
nifty5/operators/linear_operator.py
nifty5/operators/linear_operator.py
+4
-2
No files found.
nifty5/multi/multi_field.py
View file @
60bf8aa9
...
...
@@ -210,6 +210,23 @@ class MultiField(object):
return
False
return
True
def
extract
(
self
,
subset
):
if
isinstance
(
subset
,
MultiDomain
):
return
MultiField
(
subset
,
tuple
(
self
[
key
]
for
key
in
subset
.
keys
()))
else
:
return
MultiField
.
from_dict
({
key
:
self
[
key
]
for
key
in
subset
})
@
staticmethod
def
combine
(
fields
):
res
=
{}
for
f
in
fields
:
for
key
in
f
.
keys
():
if
key
in
res
:
res
[
key
]
=
res
[
key
]
+
f
[
key
]
else
:
res
[
key
]
=
f
[
key
]
return
MultiField
.
from_dict
(
res
)
for
op
in
[
"__add__"
,
"__radd__"
,
"__sub__"
,
"__rsub__"
,
...
...
nifty5/operator.py
View file @
60bf8aa9
...
...
@@ -10,8 +10,6 @@ from .utilities import NiftyMetaBase
#from ..multi.multi_domain import MultiDomain
from
.field
import
Field
from
.multi.multi_field
import
MultiField
from
.operators.scaling_operator
import
ScalingOperator
from
.operators.diagonal_operator
import
DiagonalOperator
class
Linearization
(
object
):
...
...
@@ -54,6 +52,7 @@ class Linearization(object):
return
(
-
self
).
__add__
(
other
)
def
__mul__
(
self
,
other
):
from
.operators.diagonal_operator
import
DiagonalOperator
if
isinstance
(
other
,
Linearization
):
d1
=
DiagonalOperator
(
self
.
_val
)
d2
=
DiagonalOperator
(
other
.
_val
)
...
...
@@ -77,9 +76,11 @@ class Linearization(object):
@
staticmethod
def
make_var
(
field
):
from
.operators.scaling_operator
import
ScalingOperator
return
Linearization
(
field
,
ScalingOperator
(
1.
,
field
.
domain
))
@
staticmethod
def
make_const
(
field
):
from
.operators.scaling_operator
import
ScalingOperator
return
Linearization
(
field
,
ScalingOperator
(
0.
,
{}))
class
Operator
(
NiftyMetaBase
()):
...
...
nifty5/operators/linear_operator.py
View file @
60bf8aa9
...
...
@@ -23,10 +23,10 @@ import abc
import
numpy
as
np
from
..compat
import
*
from
..
utilities
import
NiftyMetaBase
from
..
operator
import
Operator
,
Linearization
class
LinearOperator
(
NiftyMetaBase
()
):
class
LinearOperator
(
Operator
):
"""NIFTY base class for linear operators.
The base NIFTY operator class is an abstract class from which
...
...
@@ -205,6 +205,8 @@ class LinearOperator(NiftyMetaBase()):
"""Same as :meth:`times`"""
from
..models.model
import
Model
from
..models.linear_model
import
LinearModel
if
isinstance
(
x
,
Linearization
):
return
Linearization
(
self
(
x
.
_val
),
self
*
x
.
_jac
)
if
isinstance
(
x
,
Model
):
return
LinearModel
(
x
,
self
)
return
self
.
apply
(
x
,
self
.
TIMES
)
...
...
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