diff options
| author | Rémi Flamary <remi.flamary@gmail.com> | 2016-10-26 16:49:52 +0200 |
|---|---|---|
| committer | Rémi Flamary <remi.flamary@gmail.com> | 2016-10-26 16:49:52 +0200 |
| commit | b8d5e6baac6b57e99eeff7f67a76700aa04e1b24 (patch) | |
| tree | 1f51ca33a3107df2635b0651a4afc13b02290480 /ot/optim.py | |
| parent | 22dcef6c1cf6bd7ae626ef768359c7495298ba29 (diff) | |
add conditionnal gradient and demo
Diffstat (limited to 'ot/optim.py')
| -rw-r--r-- | ot/optim.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ot/optim.py b/ot/optim.py index 86371b9..03ed83d 100644 --- a/ot/optim.py +++ b/ot/optim.py @@ -120,7 +120,7 @@ def cg(a,b,M,reg,f,df,G0=None,numItermax = 200,stopThr=1e-9,verbose=False,log=Fa deltaG=Gc-G # line search - alpha,fc,f_val = line_search_armijo(f,G,deltaG,Mi,f_val) + alpha,fc,f_val = line_search_armijo(cost,G,deltaG,Mi,f_val) G=G+alpha*deltaG |