From 3d134e6f95296da9900feb0718cf93d6f5fc7560 Mon Sep 17 00:00:00 2001 From: Martin Reinecke <martin@mpa-garching.mpg.de> Date: Tue, 14 Nov 2017 22:52:46 +0100 Subject: [PATCH] rearranging --- nifty/minimization/__init__.py | 6 ++++-- nifty/minimization/descent_minimizer.py | 2 +- .../{iteration_controlling => }/gradient_norm_controller.py | 2 +- .../{iteration_controlling => }/iteration_controller.py | 2 +- nifty/minimization/iteration_controlling/__init__.py | 2 -- nifty/minimization/{line_searching => }/line_search.py | 0 .../{line_searching => }/line_search_strong_wolfe.py | 4 ++-- nifty/minimization/line_searching/__init__.py | 2 -- nifty/minimization/nonlinear_cg.py | 2 +- nifty/minimization/relaxed_newton.py | 2 +- nifty/minimization/vl_bfgs.py | 2 +- 11 files changed, 12 insertions(+), 14 deletions(-) rename nifty/minimization/{iteration_controlling => }/gradient_norm_controller.py (99%) rename nifty/minimization/{iteration_controlling => }/iteration_controller.py (98%) delete mode 100644 nifty/minimization/iteration_controlling/__init__.py rename nifty/minimization/{line_searching => }/line_search.py (100%) rename nifty/minimization/{line_searching => }/line_search_strong_wolfe.py (99%) delete mode 100644 nifty/minimization/line_searching/__init__.py diff --git a/nifty/minimization/__init__.py b/nifty/minimization/__init__.py index 76075150a..eea58b9ca 100644 --- a/nifty/minimization/__init__.py +++ b/nifty/minimization/__init__.py @@ -1,5 +1,7 @@ -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 diff --git a/nifty/minimization/descent_minimizer.py b/nifty/minimization/descent_minimizer.py index 7e55e674a..d51d8e794 100644 --- a/nifty/minimization/descent_minimizer.py +++ b/nifty/minimization/descent_minimizer.py @@ -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): diff --git a/nifty/minimization/iteration_controlling/gradient_norm_controller.py b/nifty/minimization/gradient_norm_controller.py similarity index 99% rename from nifty/minimization/iteration_controlling/gradient_norm_controller.py rename to nifty/minimization/gradient_norm_controller.py index 077cc72f8..8cdd9d60e 100644 --- a/nifty/minimization/iteration_controlling/gradient_norm_controller.py +++ b/nifty/minimization/gradient_norm_controller.py @@ -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): diff --git a/nifty/minimization/iteration_controlling/iteration_controller.py b/nifty/minimization/iteration_controller.py similarity index 98% rename from nifty/minimization/iteration_controlling/iteration_controller.py rename to nifty/minimization/iteration_controller.py index 44db3fae2..e5a2c3aad 100644 --- a/nifty/minimization/iteration_controlling/iteration_controller.py +++ b/nifty/minimization/iteration_controller.py @@ -18,7 +18,7 @@ from builtins import range import abc -from ...utilities import NiftyMeta +from ..utilities import NiftyMeta from future.utils import with_metaclass diff --git a/nifty/minimization/iteration_controlling/__init__.py b/nifty/minimization/iteration_controlling/__init__.py deleted file mode 100644 index 59ce7a671..000000000 --- a/nifty/minimization/iteration_controlling/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -from .iteration_controller import IterationController -from .gradient_norm_controller import GradientNormController diff --git a/nifty/minimization/line_searching/line_search.py b/nifty/minimization/line_search.py similarity index 100% rename from nifty/minimization/line_searching/line_search.py rename to nifty/minimization/line_search.py diff --git a/nifty/minimization/line_searching/line_search_strong_wolfe.py b/nifty/minimization/line_search_strong_wolfe.py similarity index 99% rename from nifty/minimization/line_searching/line_search_strong_wolfe.py rename to nifty/minimization/line_search_strong_wolfe.py index b94da5c8d..10113844e 100644 --- a/nifty/minimization/line_searching/line_search_strong_wolfe.py +++ b/nifty/minimization/line_search_strong_wolfe.py @@ -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): diff --git a/nifty/minimization/line_searching/__init__.py b/nifty/minimization/line_searching/__init__.py deleted file mode 100644 index 059403e7f..000000000 --- a/nifty/minimization/line_searching/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -from .line_search import LineSearch -from .line_search_strong_wolfe import LineSearchStrongWolfe diff --git a/nifty/minimization/nonlinear_cg.py b/nifty/minimization/nonlinear_cg.py index adba2a0f7..32127e603 100644 --- a/nifty/minimization/nonlinear_cg.py +++ b/nifty/minimization/nonlinear_cg.py @@ -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): diff --git a/nifty/minimization/relaxed_newton.py b/nifty/minimization/relaxed_newton.py index 77d4649cf..5562379f1 100644 --- a/nifty/minimization/relaxed_newton.py +++ b/nifty/minimization/relaxed_newton.py @@ -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): diff --git a/nifty/minimization/vl_bfgs.py b/nifty/minimization/vl_bfgs.py index 58df5d781..f9da3dd3d 100644 --- a/nifty/minimization/vl_bfgs.py +++ b/nifty/minimization/vl_bfgs.py @@ -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): -- GitLab