From 2f2bee41dcc2685a2ee9adfd60253ebb3131e5e8 Mon Sep 17 00:00:00 2001 From: RĂ©mi Flamary Date: Mon, 24 Oct 2016 16:34:26 +0200 Subject: update demo barycenter --- ot/bregman.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ot/bregman.py') diff --git a/ot/bregman.py b/ot/bregman.py index e46506b..8362dc4 100644 --- a/ot/bregman.py +++ b/ot/bregman.py @@ -136,7 +136,7 @@ def barycenter(A,M,reg, weights=None, numItermax = 1000, tol_error=1e-4,log=dict log['all_err'].append(err) log['niter']=cpt - return geometricBar(weights,UKv) + return geometricBar(weights,UKv),log def unmixBregman(distrib,D,M,M0,h0,reg,reg0,alpha,numItermax = 1000, tol_error=1e-3,log=dict()): @@ -181,4 +181,4 @@ def unmixBregman(distrib,D,M,M0,h0,reg,reg0,alpha,numItermax = 1000, tol_error=1 log['niter']=cpt - return np.sum(K0,axis=1) + return np.sum(K0,axis=1),log -- cgit v1.2.3