Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 6b5066f0 authored by Adrien Leman's avatar Adrien Leman Committed by hhakim
Browse files

add faust_prox

parent 7b88ca8f
Branches
Tags
No related merge requests found
......@@ -7,10 +7,10 @@
#ifdef __COMPILE_GPU__
#include "faust_MatDense_gpu.h"
#include "prox_gpu.h"
#include "faust_prox_gpu.h"
#else
#include "faust_MatDense.h"
#include "prox.h"
#include "faust_prox.h"
#endif
......
......@@ -96,10 +96,10 @@ void Faust::ConstraintFPP<FPP,DEVICE>::project(Faust::MatDense<FPP,DEVICE> & mat
switch (this->constraint_name)
{
case CONSTRAINT_NAME_NORMCOL:
prox_normcol(mat,parameter);
Faust::prox_normcol(mat,parameter);
break;
case CONSTRAINT_NAME_NORMLIN:
prox_normlin(mat,parameter);
Faust::prox_normlin(mat,parameter);
break;
default:
handleError(class_name,"project : invalid constraint name");
......
......@@ -8,10 +8,10 @@
#ifdef __COMPILE_GPU__
#include "faust_MatDense_gpu.h"
#include "prox_gpu.h"
#include "faust_prox_gpu.h"
#else
#include "faust_MatDense.h"
#include "prox.h"
#include "faust_prox.h"
#endif
......
......@@ -115,19 +115,19 @@ void Faust::ConstraintInt<FPP,DEVICE>::project(Faust::MatDense<FPP,DEVICE> & mat
switch (this->constraint_name)
{
case CONSTRAINT_NAME_SP:
prox_sp(mat,parameter);
Faust::prox_sp(mat,parameter);
break;
case CONSTRAINT_NAME_SPCOL:
prox_spcol(mat,parameter);
Faust::prox_spcol(mat,parameter);
break;
case CONSTRAINT_NAME_SPLIN:
prox_splin(mat,parameter);
Faust::prox_splin(mat,parameter);
break;
case CONSTRAINT_NAME_SPLINCOL:
prox_splincol(mat,parameter);
Faust::prox_splincol(mat,parameter);
break;
case CONSTRAINT_NAME_SP_POS:
prox_sp_pos(mat,parameter);
Faust::prox_sp_pos(mat,parameter);
break;
default:
handleError(class_name,"project : cannot project with this constraint name");
......
......@@ -6,10 +6,10 @@
#ifdef __COMPILE_GPU__
#include "faust_MatDense_gpu.h"
#include "prox_gpu.h"
#include "faust_prox_gpu.h"
#else
#include "faust_MatDense.h"
#include "prox.h"
#include "faust_prox.h"
#endif
//! \class Faust::ConstraintMat
//! \brief Contains the matrix dense constraint parameters for the hierarchical factorization. <br>
......
......@@ -101,7 +101,7 @@ void Faust::ConstraintMat<FPP,DEVICE>::project(Faust::MatDense<FPP,DEVICE> & mat
mat=parameter;
break;
case CONSTRAINT_NAME_SUPP:
prox_supp(mat,parameter);
Faust::prox_supp(mat,parameter);
break;
default:
handleError(class_name,"project : invalid constraint_name");
......
......@@ -15,7 +15,7 @@
#include "faust_MatDense.h"
#include "faust_linear_algebra.h"
#include "prox.h"
#include "faust_prox.h"
#include "faust_ConstraintType.h"
#include "faust_exception.h"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment