Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 9e5b9389 authored by hhakim's avatar hhakim
Browse files

Fix 2 bugs on matfaust proxs: one concerning 'const' prox and the second all...

Fix 2 bugs on matfaust proxs: one concerning 'const' prox and the second all proxs but only for complex matrices.
parent a5c9c83a
No related branches found
No related tags found
No related merge requests found
......@@ -31,7 +31,7 @@ classdef (Abstract) ConstraintGeneric
if(isreal(M))
pM = mexFaustReal('prox', M, this.name.name, this.param);
else
mexFaustCplx('prox', M, this.name.name, this.param);
pM = mexFaustCplx('prox', M, this.name.name, this.param);
end
end
end
......
......@@ -227,7 +227,6 @@ void save(Faust::TransformHelper<SCALAR,Cpu>* core_ptr, int nargs, const mxArray
}
cout << "mex prox, scal_param: " << scal_param << " constraint id: " << constraint_type << endl;
switch(constraint_type)
{
case CONSTRAINT_NAME_SP: /*!< fixed number of non zero elements, INT (frobenius norm 1) */
......@@ -252,7 +251,7 @@ void save(Faust::TransformHelper<SCALAR,Cpu>* core_ptr, int nargs, const mxArray
Faust::prox_normcol(mat, scal_param);
break;
case CONSTRAINT_NAME_CONST: /**< Matrix equal to A ; MAT */
// nothing to do, same mat returned
mat = *mat_param;
break ;
case CONSTRAINT_NAME_BLKDIAG:
//not impl. yet in cpp core
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment