Mentions légales du service

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

Fix MatDense compilation error occurring on Visual Studio by renaming min() to min_coeff().

parent 379970a4
No related branches found
No related tags found
No related merge requests found
......@@ -27,7 +27,7 @@ int main()
cout << M.getData()[j*3+i] << " ";
cout << endl;
}
cout << "M.min():" << M.min() << endl;
cout << "M.min_coeff():" << M.min_coeff() << endl;
int indices[3];
cout << "M.rowwise_min()" << endl;
......
......@@ -405,7 +405,7 @@ void spgemm(const Faust::MatSparse<FPP,Cpu> & A,const Faust::MatDense<FPP,Cpu> &
Faust::MatDense<FPP,Cpu>* get_rows(faust_unsigned_int start_row_id, faust_unsigned_int num_rows) const;
Faust::MatDense<FPP,Cpu>* get_rows(faust_unsigned_int* row_ids, faust_unsigned_int n) const;
FPP min() const {return mat.minCoeff();}
FPP min_coeff() const;
Faust::Vect<FPP,Cpu> rowwise_min() const;
Faust::Vect<FPP,Cpu> rowwise_min(int* col_indices) const;
......
......@@ -176,7 +176,7 @@ void Faust::MatDense<FPP,Cpu>::setEyes()
{
setZeros();
FPP* ptr_data = getData();
for (int i=0 ; i<std::min(this->dim1,this->dim2); i++)
for (int i=0;i<min(this->dim1,this->dim2); i++)
ptr_data[i*this->dim1+i] = FPP(1.0);
if (this->dim1 == this->dim2)
isIdentity = true;
......@@ -952,6 +952,11 @@ Faust::MatDense<FPP,Cpu>* Faust::MatDense<FPP,Cpu>::get_rows(faust_unsigned_int*
return rows;
}
template<typename FPP>
FPP Faust::MatDense<FPP,Cpu>::min_coeff() const
{
return mat.minCoeff();
}
template<typename FPP>
Faust::Vect<FPP,Cpu> Faust::MatDense<FPP,Cpu>::rowwise_min() const
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment