Mercurial > hg > smallbox

diff solvers/CVX_add_const_Audio_declipping.m @ 159:23763c5fbda5 danieleb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Daniele Barchiesi <daniele.barchiesi@eecs.qmul.ac.uk>
date Wed, 31 Aug 2011 10:43:32 +0100
parents b14209313ba4
children
line wrap: on
line diff
--- a/solvers/CVX_add_const_Audio_declipping.m	Wed Aug 31 10:37:57 2011 +0100
+++ b/solvers/CVX_add_const_Audio_declipping.m	Wed Aug 31 10:43:32 2011 +0100
@@ -32,8 +32,8 @@
     b_ineq_pos = wa_pos(:)*clippingLevelEst;
     b_ineq_neg = -wa_neg(:)*clippingLevelEst;
     if isfield(Problem,'Upper_Limit') && ~isempty(Problem.Upper_Limit)
-        b_ineq_pos_upper_limit = wa_pos(:)*Problem.Upper_Limit*clippingLevelEst;
-        b_ineq_neg_upper_limit = -wa_neg(:)*Problem.Upper_Limit*clippingLevelEst;
+        b_ineq_pos_upper_limit = wa_pos(:)*Problem.Upper_Limit;
+        b_ineq_neg_upper_limit = -wa_neg(:)*Problem.Upper_Limit;
     else
         b_ineq_pos_upper_limit = Inf;
         b_ineq_neg_upper_limit = -Inf;