Merge branch 'master' of https://github.com/CosmoStat/ModOpt into pyt…

…hon3.5+
CEA-COSMIC · Aug 5, 2019 · 331ecc5 · 331ecc5
2 parents 667a1d7 + 762a83f
commit 331ecc5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/README.rst b/README.rst
@@ -25,7 +25,7 @@ ModOpt
 
 :Version: 1.4.0
 
-:Date: 10/07/2019
+:Date: 23/07/2019
 
 :Documentation: |link-to-docs|
 

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -10,7 +10,7 @@ ModOpt Documentation
 
 :Version: 1.4.0
 
-:Date: 10/07/2019
+:Date: 23/07/2019
 
 :Documentation: |link-to-docs|
 

diff --git a/modopt/opt/algorithms.py b/modopt/opt/algorithms.py
@@ -192,7 +192,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
 
@@ -268,7 +268,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'