summaryrefslogtreecommitdiff
path: root/ot/optim.py
diff options
context:
space:
mode:
authorRĂ©mi Flamary <remi.flamary@gmail.com>2021-10-27 08:41:08 +0200
committerGitHub <noreply@github.com>2021-10-27 08:41:08 +0200
commitd7554331fc409fea48ee758fd630909dd9dc4827 (patch)
tree9b8ed4bf94c12d034d5fb1de5b7b5b76c23b4d05 /ot/optim.py
parent76450dddf8dd62b9714b72e99ae075516246d433 (diff)
[WIP] Sinkhorn in log space (#290)
* adda sinkhorn log and working sinkhorn2 function * more tests pass * more tests pass * it works but not by default yet * remove warningd * update circleci doc * update circleci doc * new sinkhorn implemeted but not by default * better * doctest pass * test doctest * new test utils * remove pep8 errors * remove pep8 errors * doc new implementtaion with log * test sinkhorn 2 * doc for log implementation
Diffstat (limited to 'ot/optim.py')
-rw-r--r--ot/optim.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ot/optim.py b/ot/optim.py
index 6822e4e..34cbb17 100644
--- a/ot/optim.py
+++ b/ot/optim.py
@@ -20,7 +20,7 @@ from .backend import get_backend
def line_search_armijo(f, xk, pk, gfk, old_fval,
args=(), c1=1e-4, alpha0=0.99):
- """
+ r"""
Armijo linesearch function that works with matrices
Find an approximate minimum of :math:`f(x_k + \\alpha \cdot p_k)` that satisfies the
@@ -447,7 +447,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 the following problem:
.. math::