Mercurial > hg > smallbox

comparison solvers/CVX_add_const_Audio_declipping.m @ 164:4205744092e6 release_1.9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "ivand_dev"
author Ivan Damnjanovic lnx <ivan.damnjanovic@eecs.qmul.ac.uk>
date Wed, 07 Sep 2011 14:17:30 +0100
parents b14209313ba4
children
comparison
equal deleted inserted replaced
151:af5abc34a5e1 164:4205744092e6
30 wa_pos = wa(idxPos); 30 wa_pos = wa(idxPos);
31 wa_neg = wa(idxNeg); 31 wa_neg = wa(idxNeg);
32 b_ineq_pos = wa_pos(:)*clippingLevelEst; 32 b_ineq_pos = wa_pos(:)*clippingLevelEst;
33 b_ineq_neg = -wa_neg(:)*clippingLevelEst; 33 b_ineq_neg = -wa_neg(:)*clippingLevelEst;
34 if isfield(Problem,'Upper_Limit') && ~isempty(Problem.Upper_Limit) 34 if isfield(Problem,'Upper_Limit') && ~isempty(Problem.Upper_Limit)
35 b_ineq_pos_upper_limit = wa_pos(:)*Problem.Upper_Limit*clippingLevelEst; 35 b_ineq_pos_upper_limit = wa_pos(:)*Problem.Upper_Limit;
36 b_ineq_neg_upper_limit = -wa_neg(:)*Problem.Upper_Limit*clippingLevelEst; 36 b_ineq_neg_upper_limit = -wa_neg(:)*Problem.Upper_Limit;
37 else 37 else
38 b_ineq_pos_upper_limit = Inf; 38 b_ineq_pos_upper_limit = Inf;
39 b_ineq_neg_upper_limit = -Inf; 39 b_ineq_neg_upper_limit = -Inf;
40 end 40 end
41 41