From b2eae39e8a422b18ecc3fadc08bc909ee1dae55f Mon Sep 17 00:00:00 2001 From: Rémi Flamary Date: Mon, 22 Jun 2020 11:07:33 +0200 Subject: [WIP] Update bregman.py : barycenter_sinkhorn function (#195) * Update bregman.py * correct call to function Co-authored-by: FerdinandGns <56926826+FerdinandGns@users.noreply.github.com> --- ot/optim.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ot/optim.py') diff --git a/ot/optim.py b/ot/optim.py index e7e6e65..8e546d0 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 -- cgit v1.2.3