From c883cb7ff6c7536d8dc4ea15dfc733bfbb98693c Mon Sep 17 00:00:00 2001 From: jeanpouget-abadie Date: Mon, 2 Feb 2015 14:08:03 -0500 Subject: earlier version --- src/convex_optimization.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/convex_optimization.py') diff --git a/src/convex_optimization.py b/src/convex_optimization.py index 3241bdb..6a43705 100644 --- a/src/convex_optimization.py +++ b/src/convex_optimization.py @@ -36,10 +36,10 @@ def sparse_recovery(M_val, w_val, lbda): w = theano.shared(w_val.astype(theano.config.floatX)) lbda = theano.shared(lbda.astype(theano.config.floatX)) - y = lbda*1./np.sqrt(m) * (theta_).norm(1) - 1./m*( - tensor.dot(1-w, tensor.log(1-tensor.exp(M.dot(theta_ *1./(n*m)))))\ - + (1 - 1./(n*m)) * tensor.dot(1 - w, tensor.dot(M, theta_)) \ - + tensor.dot(w, tensor.dot(M, theta_))) + y = lbda * theta_.norm(1) - 1./m*( + tensor.dot(1-w, tensor.log(1-tensor.exp(M.dot(theta_)))) + + tensor.dot(w, tensor.dot(M, theta_)) + ) return diff_and_opt(theta, theta_, M, M_val, w, lbda, y) -- cgit v1.2.3-70-g09d2