diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/convex_optimization.py | 8 | ||||
| -rw-r--r-- | src/make_plots.py | 4 |
2 files changed, 6 insertions, 6 deletions
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) diff --git a/src/make_plots.py b/src/make_plots.py index 60c2292..c69673c 100644 --- a/src/make_plots.py +++ b/src/make_plots.py @@ -34,10 +34,10 @@ def test(): G = cascade_creation.InfluenceGraph(max_proba=.8) G.erdos_init(n=20, p=.2) print(G.mat) - A = cascade_creation.generate_cascades(G, p_init=.1, n_cascades=1000) + A = cascade_creation.generate_cascades(G, p_init=.1, n_cascades=100) G_hat = algorithms.recovery_l1obj_l2constraint(G, A, passed_function=convex_optimization.sparse_recovery, - floor_cstt=.1, lbda=20) + floor_cstt=.1, lbda=1) algorithms.correctness_measure(G, G_hat, print_values=True) if __name__=="__main__": |