summaryrefslogtreecommitdiff
path: root/ot/optim.py
diff options
context:
space:
mode:
authorPanayiotis Panayiotou <p.panayiotou2@gmail.com>2020-05-26 01:14:09 +0200
committerGitHub <noreply@github.com>2020-05-26 01:14:09 +0200
commit5af645299477cf3595e65ca4d1750d13c27def1d (patch)
tree9cc7eb227e2fc42363d9b95aab1ed448a39d158f /ot/optim.py
parent0adc8aac98afff8a9d5cb31ce0c852dfebe12cf5 (diff)
Restrict Armijo linesearch function step to be at most 1 (#189)
Thanks for the modification @panpan2
Diffstat (limited to 'ot/optim.py')
-rw-r--r--ot/optim.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ot/optim.py b/ot/optim.py
index b9ca891..e7e6e65 100644
--- a/ot/optim.py
+++ b/ot/optim.py
@@ -69,7 +69,7 @@ def line_search_armijo(f, xk, pk, gfk, old_fval,
alpha, phi1 = scalar_search_armijo(
phi, phi0, derphi0, c1=c1, alpha0=alpha0)
- return alpha, fc[0], phi1
+ return min(1, alpha), fc[0], phi1
def solve_linesearch(cost, G, deltaG, Mi, f_val,