From 4563808ee8c867f18fa4c2ecb5c3f0bffa53825d Mon Sep 17 00:00:00 2001
From: Rémi Flamary <remi.flamary@gmail.com>
Date: Thu, 27 Oct 2016 09:13:10 +0200
Subject: demo optim

---
 examples/demo_optim_OTreg.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'examples')

diff --git a/examples/demo_optim_OTreg.py b/examples/demo_optim_OTreg.py
index f12fdc1..9ffb02d 100644
--- a/examples/demo_optim_OTreg.py
+++ b/examples/demo_optim_OTreg.py
@@ -34,12 +34,13 @@ ot.plot.plot1D_mat(a,b,G0,'OT matrix G0')
 #%% exampel of regularization with Frobnisu norm
 
 def f(G):
-    return 0.5*np.sum(G**2)
+    #return 0.5*np.sum(G**2)
+    return np.sum(G*np.log(G))
     
 def df(G):
-    return G
-
-reg=1e1
+#    return G
+    return np.log(G)+1
+reg=1e-3
   
 Greg=ot.optim.cg(a,b,M,reg,f,df,verbose=True)
 
-- 
cgit v1.2.3