diff options
| author | Rémi Flamary <remi.flamary@gmail.com> | 2020-06-22 11:59:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-22 11:59:10 +0200 |
| commit | acfff525e043c8733936e8e99367543edd28822b (patch) | |
| tree | 9cc7eb227e2fc42363d9b95aab1ed448a39d158f /ot/optim.py | |
| parent | b2eae39e8a422b18ecc3fadc08bc909ee1dae55f (diff) | |
Revert "[WIP] Update bregman.py : barycenter_sinkhorn function (#195)" (#196)
This reverts commit b2eae39e8a422b18ecc3fadc08bc909ee1dae55f.
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 8e546d0..e7e6e65 100644 --- a/ot/optim.py +++ b/ot/optim.py @@ -136,7 +136,7 @@ def solve_linesearch(cost, G, deltaG, Mi, f_val, def cg(a, b, M, reg, f, df, G0=None, numItermax=200, numItermaxEmd=100000, stopThr=1e-9, stopThr2=1e-9, verbose=False, log=False, **kwargs): - r""" + """ Solve the general regularized OT problem with conditional gradient The function solves the following optimization problem: @@ -275,7 +275,7 @@ def cg(a, b, M, reg, f, df, G0=None, numItermax=200, numItermaxEmd=100000, def gcg(a, b, M, reg1, reg2, f, df, G0=None, numItermax=10, numInnerItermax=200, stopThr=1e-9, stopThr2=1e-9, verbose=False, log=False): - r""" + """ Solve the general regularized OT problem with the generalized conditional gradient The function solves the following optimization problem: @@ -413,7 +413,7 @@ def gcg(a, b, M, reg1, reg2, f, df, G0=None, numItermax=10, def solve_1d_linesearch_quad(a, b, c): - r""" + """ For any convex or non-convex 1d quadratic function f, solve on [0,1] the following problem: .. math:: \argmin f(x)=a*x^{2}+b*x+c |