Allow using SKPERM prox in PALM4MSA by updating faust_ConstraintGeneric.* and...

Allow using SKPERM prox in PALM4MSA by updating faust_ConstraintGeneric.* and faust_ConstraintType.h.

src/algorithm/constraint/faust_ConstraintGeneric.cpp

@@ -60,8 +60,7 @@ bool is_constraint_name_int(const char * type)
 	is_const_int = ((is_const_int) || ((strcmp(type,"splincol") == 0)));
 	is_const_int = ((is_const_int) || ((strcmp(type,"splin") == 0)));
 //	is_const_int = ((is_const_int) || ((strcmp(type,"blkdiag") == 0)));
-
-
+	is_const_int = ((is_const_int) || ((strcmp(type,"skperm") == 0)));
 	return is_const_int;
 }
 
@@ -99,7 +98,8 @@ faust_constraint_name get_equivalent_constraint(const char * type)
 		return CONSTRAINT_NAME_SUPP;
 	if  (!strcmp(type,"normlin"))
 		return CONSTRAINT_NAME_NORMLIN;
-
+	if(!strcmp(type, "skperm"))
+		return CONSTRAINT_NAME_SKPERM;
 
 	handleError("Faust::ConstraintGeneric","get_equivalent_constraint : Unknown type of constraint");
 }
@@ -143,6 +143,8 @@ const char* Faust::ConstraintGeneric::get_constraint_name()const
          return "CONSTRAINT_NAME_NORMCOL";
       case CONSTRAINT_NAME_SPLINCOL:
          return "CONSTRAINT_NAME_SPLINCOL";
+	  case CONSTRAINT_NAME_SKPERM:
+		 return "CONSTRAINST_NAME_SKPERM";
       case CONSTRAINT_NAME_CONST:
          return "CONSTRAINT_NAME_CONST";
       case CONSTRAINT_NAME_SP_POS:

src/algorithm/constraint/faust_ConstraintGeneric.hpp

@@ -190,6 +190,9 @@ bool Faust::ConstraintGeneric::is_constraint_parameter_int()const
 		case CONSTRAINT_NAME_SPLINCOL:
 			return (typeid(typename  ConstraintType<FPP,DEVICE,FPP2>::ConstraintTypeSplincol)==typeid(Faust::ConstraintInt<FPP,DEVICE>)?true:false);
 		break;
+		case CONSTRAINT_NAME_SKPERM:
+			return (typeid(typename  ConstraintType<FPP,DEVICE,FPP2>::ConstraintTypeSkperm)==typeid(Faust::ConstraintInt<FPP,DEVICE>)?true:false);
+		break;
 		case CONSTRAINT_NAME_CONST:
 			return (typeid(typename  ConstraintType<FPP,DEVICE,FPP2>::ConstraintTypeConst)==typeid(Faust::ConstraintInt<FPP,DEVICE>)?true:false);
 		break;
@@ -236,6 +239,9 @@ bool Faust::ConstraintGeneric::is_constraint_parameter_real()const
 		case CONSTRAINT_NAME_SPLINCOL:
 			return (typeid(typename  ConstraintType<FPP,DEVICE,FPP2>::ConstraintTypeSplincol)==typeid(Faust::ConstraintFPP<FPP,DEVICE,FPP2>)?true:false);
 		break;
+		case CONSTRAINT_NAME_SKPERM:
+			return (typeid(typename  ConstraintType<FPP,DEVICE,FPP2>::ConstraintTypeSkperm)==typeid(Faust::ConstraintFPP<FPP,DEVICE,FPP2>)?true:false);
+		break;
 		case CONSTRAINT_NAME_CONST:
 			return (typeid(typename  ConstraintType<FPP,DEVICE,FPP2>::ConstraintTypeConst)==typeid(Faust::ConstraintFPP<FPP,DEVICE,FPP2>)?true:false);
 		break;
@@ -282,6 +288,9 @@ bool Faust::ConstraintGeneric::is_constraint_parameter_mat()const
 		case CONSTRAINT_NAME_SPLINCOL:
 			return (typeid(typename  ConstraintType<FPP,DEVICE,FPP2>::ConstraintTypeSplincol)==typeid(Faust::ConstraintMat<FPP,DEVICE>)?true:false);
 		break;
+		case CONSTRAINT_NAME_SKPERM:
+			return (typeid(typename  ConstraintType<FPP,DEVICE,FPP2>::ConstraintTypeSkperm)==typeid(Faust::ConstraintMat<FPP,DEVICE>)?true:false);
+		break;
 		case CONSTRAINT_NAME_CONST:
 			return (typeid(typename  ConstraintType<FPP,DEVICE,FPP2>::ConstraintTypeConst)==typeid(Faust::ConstraintMat<FPP,DEVICE>)?true:false);
 		break;

src/algorithm/constraint/faust_ConstraintType.h

@@ -64,6 +64,7 @@ namespace Faust
 			typedef const  Faust::ConstraintInt<FPP,DEVICE>   ConstraintTypeSpcol;
 			typedef const  Faust::ConstraintInt<FPP,DEVICE>   ConstraintTypeSplin;
 			typedef const  Faust::ConstraintInt<FPP,DEVICE>   ConstraintTypeSplincol;
+			typedef const  Faust::ConstraintInt<FPP,DEVICE>   ConstraintTypeSkperm;
 			typedef const  Faust::ConstraintInt<FPP,DEVICE>   ConstraintTypeSpPos;
 			typedef const  Faust::ConstraintMat<FPP,DEVICE>   ConstraintTypeBlkdiag;