From e4d0863b24b09f7cd54b22e4b3533d99ac792282 Mon Sep 17 00:00:00 2001 From: Nathanael Perraudin Date: Sun, 27 Dec 2015 12:39:32 +0100 Subject: [PATCH] version 1.7.1 --- demos/demo_dequantization.m | 4 ++-- prox/Contents.m | 1 + prox/prox_sum_log.m | 4 ++-- prox/prox_sum_log_norm2.m | 7 +++---- solver/fbf_primal_dual.m | 6 +++--- solver/solvep.m | 2 +- unlocbox_version | 2 +- utils/Contents.m | 2 +- utils/set_seed.m | 15 ++++++++------- 9 files changed, 22 insertions(+), 21 deletions(-) diff --git a/demos/demo_dequantization.m b/demos/demo_dequantization.m index 2a167a5..42b7171 100644 --- a/demos/demo_dequantization.m +++ b/demos/demo_dequantization.m @@ -1,4 +1,4 @@ -%DEMO_DEQUANTIZATION +%DEMO_DEQUANTIZATION Dequantization demo % This demo shows how a quantized signal, sparse in the DCT domain, can be dequantized % solving a convex problem using Douglas-Rachford algorithm % @@ -29,7 +29,7 @@ % .. C = { x | ||Dx - y_Q||_infty <= alpha/2 } % % .. math:: C = \{ x | \|Dx - y_Q\|_\infty <= \frac{\alpha}{2} \} -%d +% % Its prox is the orthogonal projection onto that set, which is realized % by entry-wise 1D projections onto the quantization stripes. This is % realized for all the entries at once by function proj_box. diff --git a/prox/Contents.m b/prox/Contents.m index dc55abb..70e1695 100644 --- a/prox/Contents.m +++ b/prox/Contents.m @@ -27,6 +27,7 @@ % PROX_TV1D - Proximal operator of the 1D TV norm % PROX_TV4D - Proximal operator of the 4D TV norm % PROX_SUM_LOG - Proximal operor for the sum of logarithms. +% PROX_SUM_LOG_NORM2 - Proximal operator of log-barrier - sum(log(x)) % % Projection operators % PROJ_B1 - Projection on a B1-Ball diff --git a/prox/prox_sum_log.m b/prox/prox_sum_log.m index 23d26ec..227e1cd 100644 --- a/prox/prox_sum_log.m +++ b/prox/prox_sum_log.m @@ -12,7 +12,7 @@ % sol : Solution. % info : Structure summarizing informations at convergence % -% `prox_l1(x, gamma, param)` solves: +% `prox_sum_log(x, gamma, param)` solves: % % .. sol = argmin_{z} 0.5*||x - z||_2^2 - gamma * sum(log(z)) % @@ -36,7 +36,7 @@ % * *info.crit* : Stopping critterion used % % -% See also: prox_l1 prox_l2 prox_tv +% See also: prox_l1 prox_l2 prox_tv prox_sum_log_norm2 % % Author: Vassilis Kalofolias diff --git a/prox/prox_sum_log_norm2.m b/prox/prox_sum_log_norm2.m index d64b6a1..5420bbd 100644 --- a/prox/prox_sum_log_norm2.m +++ b/prox/prox_sum_log_norm2.m @@ -1,7 +1,7 @@ function [sol,info] = prox_sum_log_norm2(x, alpha, beta, gamma, param) %PROX_SUM_LOG_NORM2 Proximal operator of log-barrier - sum(log(x)) -% Usage: sol = prox_sum_log(x, alpha, beta, gamma) -% sol = prox_sum_log(x, alpha, beta, gamma, param) +% Usage: sol = prox_sum_log_norm2(x, alpha, beta, gamma) +% sol = prox_sum_log_norm2(x, alpha, beta, gamma, param) % [sol, info] = prox_sum_log_norm2(x, alpha, beta, gamma, param) % % Input parameters: @@ -16,8 +16,7 @@ % % `prox_l1(x, gamma, param)` solves: % -% .. sol = argmin_{z} 0.5*||x - z||_2^2 - gamma * (alpha*sum(log(z)) + -% beta/2 ||z||^2) +% .. sol = argmin_{z} 0.5*||x - z||_2^2 - gamma * (alpha*sum(log(z)) + beta/2 ||z||^2) % % .. math:: sol = \arg\min_{z} \frac{1}{2} \|x - z\|_2^2 - \gamma (\alpha \sum_i(log(z_i)) + \beta/2 \|z\|_2^2) % diff --git a/solver/fbf_primal_dual.m b/solver/fbf_primal_dual.m index 0e5220b..16666a5 100644 --- a/solver/fbf_primal_dual.m +++ b/solver/fbf_primal_dual.m @@ -57,9 +57,9 @@ % Warning! This stopping criterion is different from other solvers! % % * *param.mu* : parameter mu of paper [1] -% * *param.epsilon: parameter epsilon of paper [1] -% * *param.normalized_timestep: from 0 to 1, mapping to [epsilon, -% (1-epsilon)/mu] +% * *param.epsilon*: parameter epsilon of paper [1] +% * *param.normalized_timestep*: from 0 to 1, mapping to [epsilon, +% (1-epsilon)/mu] % % See also: solvep fb_based_primal_dual % diff --git a/solver/solvep.m b/solver/solvep.m index 2f1984f..26d6e51 100644 --- a/solver/solvep.m +++ b/solver/solvep.m @@ -63,7 +63,7 @@ % % For the 'rel_norm' stopping criterion, the algorithm end if % -% .. || n(t) - n(t-1) ||_2 / || n(t) ||_2 < tol, +% .. ' || n(t) - n(t-1) ||_2 / || n(t) ||_2 < tol, % % .. math:: \frac{ \| n(t) - n(t-1) \|_2 }{\| n(t)\|_2} < tol, % diff --git a/unlocbox_version b/unlocbox_version index 266146b..943f9cb 100644 --- a/unlocbox_version +++ b/unlocbox_version @@ -1 +1 @@ -1.6.3 +1.7.1 diff --git a/utils/Contents.m b/utils/Contents.m index a971ddc..ea04dc1 100644 --- a/utils/Contents.m +++ b/utils/Contents.m @@ -27,7 +27,7 @@ % Other % snr - Signal to noise ratio % soft_threshold - Soft thresholding operation -% seet_seed - Set a new seed +% set_seed - Set a new seed % vec - Vectorize % svdecon - Acceleleration of svd % svdsecon - Acceleleration of svds diff --git a/utils/set_seed.m b/utils/set_seed.m index ca40e94..e06e7c1 100755 --- a/utils/set_seed.m +++ b/utils/set_seed.m @@ -1,14 +1,13 @@ function set_seed(my_seed) %SET_SEED sets the seed of the default random random generator -% Usage: set_seed(new_seed) -% set_seed +% Usage: set_seed(my_seed) +% set_seed() % % Input parameters: -% new_seed -% -% Output parameters: -% none -% +% my_seed : new_seed +% +% Set the seed of the default random random generator + % code author: Vassilis Kalofolias % date: August 2013 @@ -25,5 +24,7 @@ function set_seed(my_seed) %rng('default'); end +end +