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
bfdb0c7f
Commit
bfdb0c7f
authored
Jan 18, 2019
by
Martin Reinecke
Browse files
privatization
parent
95837aad
Changes
3
Hide whitespace changes
Inline
Side-by-side
nifty5/__init__.py
View file @
bfdb0c7f
...
...
@@ -64,7 +64,7 @@ from .minimization.nonlinear_cg import NonlinearCG
from
.minimization.descent_minimizers
import
(
DescentMinimizer
,
SteepestDescent
,
VL_BFGS
,
L_BFGS
,
RelaxedNewton
,
NewtonCG
)
from
.minimization.scipy_minimizer
import
(
ScipyMinimizer
,
L_BFGS_B
,
ScipyCG
)
from
.minimization.scipy_minimizer
import
L_BFGS_B
from
.minimization.energy
import
Energy
from
.minimization.quadratic_energy
import
QuadraticEnergy
from
.minimization.energy_adapter
import
EnergyAdapter
...
...
@@ -73,7 +73,7 @@ from .minimization.kl_energy import KL_Energy
from
.sugar
import
*
from
.plot
import
Plot
from
.library.smooth_linear_amplitude
import
(
SLAmplitude
,
CepstrumOperator
)
from
.library.smooth_linear_amplitude
import
SLAmplitude
,
CepstrumOperator
from
.library.inverse_gamma_operator
import
InverseGammaOperator
from
.library.los_response
import
LOSResponse
from
.library.dynamic_operator
import
(
dynamic_operator
,
...
...
nifty5/minimization/scipy_minimizer.py
View file @
bfdb0c7f
...
...
@@ -93,7 +93,7 @@ class _MinHelper(object):
return
_toArray_rw
(
res
)
class
ScipyMinimizer
(
Minimizer
):
class
_
ScipyMinimizer
(
Minimizer
):
"""Scipy-based minimizer
Parameters
...
...
@@ -136,19 +136,19 @@ class ScipyMinimizer(Minimizer):
def
L_BFGS_B
(
ftol
,
gtol
,
maxiter
,
maxcor
=
10
,
disp
=
False
,
bounds
=
None
):
"""Returns a ScipyMinimizer object carrying out the L-BFGS-B algorithm.
"""Returns a
_
ScipyMinimizer object carrying out the L-BFGS-B algorithm.
See Also
--------
ScipyMinimizer
_
ScipyMinimizer
"""
options
=
{
"ftol"
:
ftol
,
"gtol"
:
gtol
,
"maxiter"
:
maxiter
,
"maxcor"
:
maxcor
,
"disp"
:
disp
}
return
ScipyMinimizer
(
"L-BFGS-B"
,
options
,
False
,
bounds
)
return
_
ScipyMinimizer
(
"L-BFGS-B"
,
options
,
False
,
bounds
)
class
ScipyCG
(
Minimizer
):
"""Returns a ScipyMinimizer object carrying out the conjugate gradient
class
_
ScipyCG
(
Minimizer
):
"""Returns a
_
ScipyMinimizer object carrying out the conjugate gradient
algorithm as implemented by SciPy.
This class is only intended for double-checking NIFTy's own conjugate
...
...
test/test_minimizers.py
View file @
bfdb0c7f
...
...
@@ -41,7 +41,8 @@ minimizers = [
newton_minimizers
=
[
'ift.RelaxedNewton(IC)'
]
quadratic_only_minimizers
=
[
'ift.ConjugateGradient(IC)'
,
'ift.ScipyCG(tol=1e-5, maxiter=300)'
'ift.ConjugateGradient(IC)'
,
'ift.minimization.scipy_minimizer._ScipyCG(tol=1e-5, maxiter=300)'
]
slow_minimizers
=
[
'ift.SteepestDescent(IC)'
]
...
...
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