Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 999a03f1 authored by hhakim's avatar hhakim
Browse files

Fix ConstraintMat::project, is_constraint_name_mat() and...

Fix ConstraintMat::project, is_constraint_name_mat() and get_equivalent_constraint() about identity projector/constraint.
parent fc6baab2
No related branches found
No related tags found
No related merge requests found
...@@ -72,7 +72,7 @@ bool is_constraint_name_real(const char * type) ...@@ -72,7 +72,7 @@ bool is_constraint_name_real(const char * type)
bool is_constraint_name_mat(const char * type) bool is_constraint_name_mat(const char * type)
{ {
return (strcmp(type,"supp") == 0) || (strcmp(type,"const")==0) || ! strcmp(type, "toeplitz") || ! strcmp(type, "circ") || ! strcmp(type, "blockdiag") || !strcmp(type, "blkdiag") || ! strcmp (type, "hankel"); return (strcmp(type,"supp") == 0) || (strcmp(type,"const")==0) || ! strcmp(type, "toeplitz") || ! strcmp(type, "circ") || ! strcmp(type, "blockdiag") || !strcmp(type, "blkdiag") || ! strcmp (type, "hankel") || ! strcmp(type, "id") || ! strcmp(type, "proj_id");
} }
faust_constraint_name get_equivalent_constraint(const char * type) faust_constraint_name get_equivalent_constraint(const char * type)
...@@ -100,7 +100,8 @@ faust_constraint_name get_equivalent_constraint(const char * type) ...@@ -100,7 +100,8 @@ faust_constraint_name get_equivalent_constraint(const char * type)
return CONSTRAINT_NAME_NORMLIN; return CONSTRAINT_NAME_NORMLIN;
if(!strcmp(type, "skperm")) if(!strcmp(type, "skperm"))
return CONSTRAINT_NAME_SKPERM; return CONSTRAINT_NAME_SKPERM;
if(!strcmp(type, "id"))
return CONSTRAINT_NAME_ID;
handleError("Faust::ConstraintGeneric","get_equivalent_constraint : Unknown type of constraint"); handleError("Faust::ConstraintGeneric","get_equivalent_constraint : Unknown type of constraint");
} }
...@@ -161,6 +162,8 @@ const char* Faust::ConstraintGeneric::get_constraint_name()const ...@@ -161,6 +162,8 @@ const char* Faust::ConstraintGeneric::get_constraint_name()const
return "CONSTRAINT_NAME_HANKEL"; return "CONSTRAINT_NAME_HANKEL";
case CONSTRAINT_NAME_TOEPLITZ: case CONSTRAINT_NAME_TOEPLITZ:
return "CONSTRAINT_NAME_TOEPLITZ"; return "CONSTRAINT_NAME_TOEPLITZ";
case CONSTRAINT_NAME_ID:
return "CONSTRAINT_NAME_ID";
default: default:
return "unknown constraint name"; return "unknown constraint name";
} }
......
...@@ -165,6 +165,7 @@ void Faust::ConstraintMat<FPP,DEVICE>::project(Faust::MatDense<FPP,DEVICE> & mat ...@@ -165,6 +165,7 @@ void Faust::ConstraintMat<FPP,DEVICE>::project(Faust::MatDense<FPP,DEVICE> & mat
break; break;
case CONSTRAINT_NAME_ID: case CONSTRAINT_NAME_ID:
Faust::prox_id(mat, normalizing, pos); Faust::prox_id(mat, normalizing, pos);
break;
default: default:
handleError(m_className,"project : invalid constraint_name"); handleError(m_className,"project : invalid constraint_name");
break; break;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment