diff options
| author | Rémi Flamary <remi.flamary@gmail.com> | 2016-11-04 12:09:36 +0100 |
|---|---|---|
| committer | Rémi Flamary <remi.flamary@gmail.com> | 2016-11-04 12:09:36 +0100 |
| commit | a5f2569859424a00100f7ad29ae4d715ee90c29f (patch) | |
| tree | 021a7ee933ba31868328ff93f2cfc322bce72b1f /ot/optim.py | |
| parent | 151aa9b0c92d151bc9ed0edbe2217506652f19ec (diff) | |
doc nonlinear mapping estimation
Diffstat (limited to 'ot/optim.py')
| -rw-r--r-- | ot/optim.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ot/optim.py b/ot/optim.py index 2b8f565..7ed658c 100644 --- a/ot/optim.py +++ b/ot/optim.py @@ -27,7 +27,7 @@ def line_search_armijo(f,xk,pk,gfk,old_fval,args=(),c1=1e-4,alpha0=0.99): descent direction gfk : np.ndarray gradient of f at xk - old_fval: float + old_fval : float loss value at xk args : tuple, optional arguments given to f @@ -110,9 +110,9 @@ def cg(a,b,M,reg,f,df,G0=None,numItermax = 200,stopThr=1e-9,verbose=False,log=Fa Returns ------- - gamma: (ns x nt) ndarray + gamma : (ns x nt) ndarray Optimal transportation matrix for the given parameters - log: dict + log : dict log dictionary return only if log==True in parameters |