Mercurial > hg > smallbox
comparison examples/AudioInpainting/CVX_add_const_Audio_declipping.m @ 246:cef4500b936f ver_2.1
Merge
author | luisf <luis.figueira@eecs.qmul.ac.uk> |
---|---|
date | Wed, 31 Oct 2012 12:10:13 +0000 |
parents | 1fbd28dfb99e |
children |
comparison
equal
deleted
inserted
replaced
245:96d17e5dc5d3 | 246:cef4500b936f |
---|---|
54 cvx_end | 54 cvx_end |
55 if cvx_optval>1e3 | 55 if cvx_optval>1e3 |
56 cvx_begin | 56 cvx_begin |
57 cvx_quiet(true) | 57 cvx_quiet(true) |
58 variable solution(j) | 58 variable solution(j) |
59 minimize(norm(Dict(:,idxCoeff)*solution-xObs)) | 59 minimize(norm(Dict(:,idxCoeff)*solution-signal)) |
60 cvx_end | 60 cvx_end |
61 end | 61 end |
62 else | 62 else |
63 %% CVX code | 63 %% CVX code |
64 cvx_begin | 64 cvx_begin |
73 cvx_end | 73 cvx_end |
74 if cvx_optval>1e3 | 74 if cvx_optval>1e3 |
75 cvx_begin | 75 cvx_begin |
76 cvx_quiet(true) | 76 cvx_quiet(true) |
77 variable solution(j) | 77 variable solution(j) |
78 minimize(norm(Dict(:,idxCoeff)*solution-xObs)) | 78 minimize(norm(Dict(:,idxCoeff)*solution-signal)) |
79 cvx_end | 79 cvx_end |
80 end | 80 end |
81 end | 81 end |
82 | 82 |
83 solver.solution(idxCoeff) = solution; | 83 solver.solution(idxCoeff) = solution; |