diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/convex_optimization.py | 2 | ||||
| -rw-r--r-- | src/make_plots.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/convex_optimization.py b/src/convex_optimization.py index 81bee2b..0d506e1 100644 --- a/src/convex_optimization.py +++ b/src/convex_optimization.py @@ -90,7 +90,7 @@ def diff_and_opt(M_val, w_val, f_x, f_xz): def F(x=None, z=None): if x is None: - return 0, cvxopt.matrix(-.01, (n,1)) + return 0, cvxopt.matrix(-.1, (n,1)) elif z is None: y, y_diff = f_x(x, M_val, w_val) return cvxopt.matrix(float(y), (1, 1)),\ diff --git a/src/make_plots.py b/src/make_plots.py index d719337..e9e0de3 100644 --- a/src/make_plots.py +++ b/src/make_plots.py @@ -168,8 +168,8 @@ if __name__=="__main__": #convex_optimization.type_lasso) if 1: compute_graph("../datasets/kronecker_graph_256_cross.txt", - n_cascades=100, lbda=.01, min_proba=.2, max_proba=.7, + n_cascades=2000, lbda=0., min_proba=.2, max_proba=.7, passed_function= - #convex_optimization.sparse_recovery, - convex_optimization.type_lasso, - sparse_edges=False)
\ No newline at end of file + convex_optimization.sparse_recovery, + #convex_optimization.type_lasso, + sparse_edges=True)
\ No newline at end of file |