From 0f6b315caf29f67d89b876ee14178dc7b1db6254 Mon Sep 17 00:00:00 2001 From: jeanpouget-abadie Date: Fri, 15 May 2015 10:58:29 +0200 Subject: poster+beginning of experiments --- src/convex_optimization.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/convex_optimization.py') diff --git a/src/convex_optimization.py b/src/convex_optimization.py index 0d506e1..000143f 100644 --- a/src/convex_optimization.py +++ b/src/convex_optimization.py @@ -33,7 +33,7 @@ def sparse_recovery(lbda, n_cascades): y = lbda * theta_.norm(1) - 1./n_cascades*( (w).dot(tensor.log(1-tensor.exp(M.dot(theta_)))) + (1-w).dot(tensor.dot(M, theta_)) - ) + ) z = tensor.row().T z_ = z.flatten() @@ -134,7 +134,7 @@ def test(): A = cascade_creation.generate_cascades(G, .1, 500) M_val, w_val = cascade_creation.icc_matrixvector_for_node(A, 2) print(len(M_val)) - + #Type lasso if 0: f_x, f_xz = type_lasso(lbda) -- cgit v1.2.3-70-g09d2