Skip to content
GitLab
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
6d09a243
Commit
6d09a243
authored
Nov 15, 2017
by
Martin Reinecke
Browse files
more rearrangements
parent
3d134e6f
Pipeline
#21632
passed with stage
in 4 minutes and 18 seconds
Changes
12
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
nifty/__init__.py
View file @
6d09a243
...
...
@@ -14,8 +14,6 @@ from .utilities import *
from
.field_types
import
*
from
.energies
import
*
from
.minimization
import
*
from
.spaces
import
*
...
...
nifty/energies/__init__.py
deleted
100644 → 0
View file @
3d134e6f
from
.energy
import
Energy
from
.quadratic_energy
import
QuadraticEnergy
from
.line_energy
import
LineEnergy
nifty/library/critical_filter/critical_power_energy.py
View file @
6d09a243
from
...
energies
.energy
import
Energy
from
...
minimization
.energy
import
Energy
from
...operators.smoothness_operator
import
SmoothnessOperator
from
...operators.power_projection_operator
import
PowerProjectionOperator
from
...operators.inversion_enabler
import
InversionEnabler
...
...
nifty/library/log_normal_wiener_filter/log_normal_wiener_filter_energy.py
View file @
6d09a243
from
...
energies
.energy
import
Energy
from
...
minimization
.energy
import
Energy
from
...utilities
import
memo
from
.
import
LogNormalWienerFilterCurvature
from
...sugar
import
create_composed_fft_operator
...
...
nifty/library/wiener_filter/wiener_filter_energy.py
View file @
6d09a243
from
...
energies
.energy
import
Energy
from
...
minimization
.energy
import
Energy
from
...utilities
import
memo
from
...operators.inversion_enabler
import
InversionEnabler
from
.
import
WienerFilterCurvature
...
...
nifty/minimization/__init__.py
View file @
6d09a243
...
...
@@ -9,3 +9,6 @@ from .descent_minimizer import DescentMinimizer
from
.steepest_descent
import
SteepestDescent
from
.vl_bfgs
import
VL_BFGS
from
.relaxed_newton
import
RelaxedNewton
from
.energy
import
Energy
from
.quadratic_energy
import
QuadraticEnergy
from
.line_energy
import
LineEnergy
nifty/
energies
/energy.py
→
nifty/
minimization
/energy.py
View file @
6d09a243
File moved
nifty/
energies
/line_energy.py
→
nifty/
minimization
/line_energy.py
View file @
6d09a243
File moved
nifty/minimization/line_search_strong_wolfe.py
View file @
6d09a243
...
...
@@ -20,7 +20,7 @@ from __future__ import division
from
builtins
import
range
import
numpy
as
np
from
.line_search
import
LineSearch
from
.
.
energ
ies
import
LineEnergy
from
.
line_
energ
y
import
LineEnergy
from
..
import
dobj
...
...
nifty/
energies
/quadratic_energy.py
→
nifty/
minimization
/quadratic_energy.py
View file @
6d09a243
File moved
nifty/operators/inversion_enabler.py
View file @
6d09a243
...
...
@@ -16,7 +16,7 @@
# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
# and financially supported by the Studienstiftung des deutschen Volkes.
from
..energ
ies
import
QuadraticEnergy
from
..
minimization.quadratic_
energ
y
import
QuadraticEnergy
from
..field
import
Field
from
.linear_operator
import
LinearOperator
...
...
nifty/operators/smoothness_operator.py
View file @
6d09a243
...
...
@@ -28,8 +28,8 @@ class SmoothnessOperator(EndomorphicOperator):
def
__init__
(
self
,
domain
,
strength
=
1.
,
logarithmic
=
True
,
space
=
None
):
super
(
SmoothnessOperator
,
self
).
__init__
()
self
.
_laplace
=
LaplaceOperator
(
domain
,
logarithmic
=
logarithmic
,
space
=
space
)
self
.
_laplace
=
LaplaceOperator
(
domain
,
logarithmic
=
logarithmic
,
space
=
space
)
if
strength
<=
0
:
raise
ValueError
(
"ERROR: invalid sigma."
)
...
...
@@ -48,11 +48,8 @@ class SmoothnessOperator(EndomorphicOperator):
return
False
def
_times
(
self
,
x
):
if
self
.
_strength
!=
0
:
result
=
self
.
_laplace
.
adjoint_times
(
self
.
_laplace
(
x
))
result
*=
self
.
_strength
**
2
else
:
result
=
Field
.
zeros_like
(
x
)
result
=
self
.
_laplace
.
adjoint_times
(
self
.
_laplace
(
x
))
result
*=
self
.
_strength
**
2
return
result
@
property
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment