From 0c3f21a6d2a089bf66c78b58c8a3ca0eaceeef6a Mon Sep 17 00:00:00 2001 From: Samuel Farrens Date: Tue, 23 Jul 2019 17:53:26 +0200 Subject: [PATCH 1/2] fixed bug for passing progress kwarg --- modopt/opt/algorithms.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modopt/opt/algorithms.py b/modopt/opt/algorithms.py index 28776d69..a14e771d 100644 --- a/modopt/opt/algorithms.py +++ b/modopt/opt/algorithms.py @@ -194,7 +194,7 @@ def _iterations(self, max_iter, bar=None): if self.idx % self.metric_call_period == 0: self._compute_metrics() - if self.converge: + if self.converge and self.verbose: print(' - Converged!') break @@ -270,7 +270,8 @@ class FISTA(object): ] def __init__(self, restart_strategy=None, min_beta=None, s_greedy=None, - xi_restart=None, a_cd=None, p_lazy=1, q_lazy=1, r_lazy=4): + xi_restart=None, a_cd=None, p_lazy=1, q_lazy=1, r_lazy=4, + **kwargs): if isinstance(a_cd, type(None)): self.mode = 'regular' From a41724a680d92482d7c64ec99ccc512841532682 Mon Sep 17 00:00:00 2001 From: Samuel Farrens Date: Tue, 23 Jul 2019 17:54:33 +0200 Subject: [PATCH 2/2] updated version --- README.rst | 4 ++-- docs/source/index.rst | 4 ++-- modopt/info.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.rst b/README.rst index 86ed1899..b921f3f6 100644 --- a/README.rst +++ b/README.rst @@ -23,9 +23,9 @@ ModOpt :Author: Samuel Farrens `(samuel.farrens@cea.fr) `_ -:Version: 1.3.2 +:Version: 1.3.3 -:Date: 10/07/2019 +:Date: 23/07/2019 :Documentation: |link-to-docs| diff --git a/docs/source/index.rst b/docs/source/index.rst index 2ea50c76..8b9f8ae0 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -8,9 +8,9 @@ ModOpt Documentation :Author: Samuel Farrens -:Version: 1.3.2 +:Version: 1.3.3 -:Date: 10/07/2019 +:Date: 23/07/2019 ModOpt is a series of Modular Optimisation tools for solving inverse problems. diff --git a/modopt/info.py b/modopt/info.py index 96bc02a7..c09b0293 100644 --- a/modopt/info.py +++ b/modopt/info.py @@ -6,12 +6,12 @@ :Author: Samuel Farrens -:Version: 1.3.2 +:Version: 1.3.3 """ # Package Version -version_info = (1, 3, 2) +version_info = (1, 3, 3) __version__ = '.'.join(str(c) for c in version_info) __about__ = ('ModOpt \n\n '