diff options
| author | Rémi Flamary <remi.flamary@gmail.com> | 2021-04-19 15:03:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-19 15:03:57 +0200 |
| commit | cd3ce6140d7a2dbe2bcf05927a8dd8289f4ce9e2 (patch) | |
| tree | e39a2b00709c46c8b00772d1218f53fe33e59e11 /ot/optim.py | |
| parent | 2a3f2241951ea9cc044b4fba8a382b6ae9630513 (diff) | |
[MRG] Cleanup test warnings (#242)
* remove warnings in tests from docstrings
* working tets for bregman implemneted methods
* pep8
Diffstat (limited to 'ot/optim.py')
| -rw-r--r-- | ot/optim.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ot/optim.py b/ot/optim.py index 1902907..abe9e6a 100644 --- a/ot/optim.py +++ b/ot/optim.py @@ -139,7 +139,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: @@ -278,7 +278,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: |