From df22b021536c0f4e0411cd07c23fa916bd9dbb6d Mon Sep 17 00:00:00 2001 From: Nathanael Perraudin Date: Sat, 27 Jun 2020 12:27:11 +0200 Subject: [PATCH] updates --- mat2doc/html/ref-unlocbox.txt | 9 +++++---- test_bench/test_prox_l1.m | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mat2doc/html/ref-unlocbox.txt b/mat2doc/html/ref-unlocbox.txt index 2bf4569..bc22231 100644 --- a/mat2doc/html/ref-unlocbox.txt +++ b/mat2doc/html/ref-unlocbox.txt @@ -6,8 +6,9 @@ .. |gradient_descent| replace:: :linkrole:`gradient_descent` .. |prox_tv3d| replace:: :linkrole:`prox_tv3d` .. |close_unlocbox| replace:: :linkrole:`close_unlocbox` -.. |prox_nuclearnorm_block| replace:: :linkrole:`prox_nuclearnorm_block` +.. |vec| replace:: :linkrole:`vec` .. |init_unlocbox| replace:: :linkrole:`init_unlocbox` +.. |chambolle_pock| replace:: :linkrole:`chambolle_pock` .. |prox_linf1| replace:: :linkrole:`prox_linf1` .. |gradient_op| replace:: :linkrole:`gradient_op` .. |demo_unlocbox| replace:: :linkrole:`demo_unlocbox` @@ -60,7 +61,6 @@ .. |rlr| replace:: :linkrole:`rlr` .. |zero_diag| replace:: :linkrole:`zero_diag` .. |prox_l2gradfourier| replace:: :linkrole:`prox_l2gradfourier` -.. |vec| replace:: :linkrole:`vec` .. |norm_linf1| replace:: :linkrole:`norm_linf1` .. |demo_graph_reconstruction| replace:: :linkrole:`demo_graph_reconstruction` .. |norm_l21| replace:: :linkrole:`norm_l21` @@ -68,12 +68,13 @@ .. |proj_b1| replace:: :linkrole:`proj_b1` .. |proj_b2| replace:: :linkrole:`proj_b2` .. |prox_sum_log_norm2| replace:: :linkrole:`prox_sum_log_norm2` +.. |prox_nuclearnorm_block| replace:: :linkrole:`prox_nuclearnorm_block` .. |prox_adjoint| replace:: :linkrole:`prox_adjoint` .. |gradient_op1d| replace:: :linkrole:`gradient_op1d` .. |div_op4d| replace:: :linkrole:`div_op4d` -.. |norm_sumg| replace:: :linkrole:`norm_sumg` -.. |demo_admm| replace:: :linkrole:`demo_admm` .. |proj_nuclearnorm| replace:: :linkrole:`proj_nuclearnorm` +.. |demo_admm| replace:: :linkrole:`demo_admm` +.. |norm_sumg| replace:: :linkrole:`norm_sumg` .. |prox_l1| replace:: :linkrole:`prox_l1` .. |prox_l0| replace:: :linkrole:`prox_l0` .. |prox_l2| replace:: :linkrole:`prox_l2` diff --git a/test_bench/test_prox_l1.m b/test_bench/test_prox_l1.m index 2e9ed68..0fafc3e 100644 --- a/test_bench/test_prox_l1.m +++ b/test_bench/test_prox_l1.m @@ -47,7 +47,7 @@ s = 2*rand(N); y = 1/N*fft2(s); y(abs(y)<=1) = 0; - y(abs(y)>0) = exp(1i*phase(y(abs(y)>0))) .* (abs(y(abs(y)>0)) - 1); + y(abs(y)>0) = exp(1i*angle(y(abs(y)>0))) .* (abs(y(abs(y)>0)) - 1); param.verbose = 0; param.A = @(x) 1/N*fft2(x);