Commit 3d134e6f authored by Martin Reinecke's avatar Martin Reinecke

rearranging

parent 38d3a559
Pipeline #21617 passed with stage
in 4 minutes and 21 seconds
from .line_searching import *
from .iteration_controlling import *
from .line_search import LineSearch
from .line_search_strong_wolfe import LineSearchStrongWolfe
from .iteration_controller import IterationController
from .gradient_norm_controller import GradientNormController
from .minimizer import Minimizer
from .conjugate_gradient import ConjugateGradient
from .nonlinear_cg import NonlinearCG
......
......@@ -19,7 +19,7 @@
from __future__ import division
import abc
from .minimizer import Minimizer
from .line_searching import LineSearchStrongWolfe
from .line_search_strong_wolfe import LineSearchStrongWolfe
class DescentMinimizer(Minimizer):
......
......@@ -17,7 +17,7 @@
# and financially supported by the Studienstiftung des deutschen Volkes.
from .iteration_controller import IterationController
from ... import dobj
from .. import dobj
class GradientNormController(IterationController):
......
......@@ -18,7 +18,7 @@
from builtins import range
import abc
from ...utilities import NiftyMeta
from ..utilities import NiftyMeta
from future.utils import with_metaclass
......
from .iteration_controller import IterationController
from .gradient_norm_controller import GradientNormController
......@@ -20,8 +20,8 @@ from __future__ import division
from builtins import range
import numpy as np
from .line_search import LineSearch
from ...energies import LineEnergy
from ... import dobj
from ..energies import LineEnergy
from .. import dobj
class LineSearchStrongWolfe(LineSearch):
......
from .line_search import LineSearch
from .line_search_strong_wolfe import LineSearchStrongWolfe
......@@ -18,7 +18,7 @@
from __future__ import division
from .minimizer import Minimizer
from .line_searching import LineSearchStrongWolfe
from .line_search_strong_wolfe import LineSearchStrongWolfe
class NonlinearCG(Minimizer):
......
......@@ -17,7 +17,7 @@
# and financially supported by the Studienstiftung des deutschen Volkes.
from .descent_minimizer import DescentMinimizer
from .line_searching import LineSearchStrongWolfe
from .line_search_strong_wolfe import LineSearchStrongWolfe
class RelaxedNewton(DescentMinimizer):
......
......@@ -21,7 +21,7 @@ from builtins import range
from builtins import object
import numpy as np
from .descent_minimizer import DescentMinimizer
from .line_searching import LineSearchStrongWolfe
from .line_search_strong_wolfe import LineSearchStrongWolfe
class VL_BFGS(DescentMinimizer):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment