diff options
| -rw-r--r-- | examples/demo_barycenter_1D.py | 5 | ||||
| -rw-r--r-- | ot/bregman.py | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/examples/demo_barycenter_1D.py b/examples/demo_barycenter_1D.py index 200444b..c9f63a2 100644 --- a/examples/demo_barycenter_1D.py +++ b/examples/demo_barycenter_1D.py @@ -42,9 +42,8 @@ pl.title('Distributions') bary_l2=A.mean(1) # wasserstein -reg=1e-2 -log=dict() -bary_wass=ot.bregman.barycenter(A,M,reg,log=log) +reg=1e-3 +bary_wass,log=ot.bregman.barycenter(A,M,reg) pl.figure(2) pl.clf() 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 |