From 530eb0413f9c3cf3305ea5154ac4286c91665302 Mon Sep 17 00:00:00 2001 From: Nicolas Courty Date: Wed, 9 Nov 2016 00:15:10 +0100 Subject: da with GL --- examples/demo_OTDA_classes.py | 2 +- ot/optim.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/demo_OTDA_classes.py b/examples/demo_OTDA_classes.py index 43fd37e..bd52fdf 100644 --- a/examples/demo_OTDA_classes.py +++ b/examples/demo_OTDA_classes.py @@ -58,7 +58,7 @@ xstg=da_lpl1.interp() # True Group lasso regularization reg=1e-1 -eta=1e1 +eta=1e0 da_l1l2=ot.da.OTDA_l1l2() da_l1l2.fit(xs,ys,xt,reg=reg,eta=eta,numItermax=20,verbose=True) xstgl=da_l1l2.interp() diff --git a/ot/optim.py b/ot/optim.py index d807824..760b3c6 100644 --- a/ot/optim.py +++ b/ot/optim.py @@ -304,7 +304,7 @@ def gcg(a,b,M,reg1,reg2,f,df,G0=None,numItermax = 10,numInnerItermax = 200,stopT deltaG=Gc-G # line search - dcost=Mi+reg1*np.sum(deltaG*(1+np.log(G))) #?? + dcost=Mi+reg1*(1+np.log(G)) #?? alpha,fc,f_val = line_search_armijo(cost,G,deltaG,dcost,f_val) G=G+alpha*deltaG -- cgit v1.2.3