Add MatGeneric<FPP,Cpu>::getNBytes() and subclass impls + refactor...

Add MatGeneric<FPP,Cpu>::getNBytes() and subclass impls + refactor TransformHelperGen::optimize_storage.

src/faust_linear_operator/CPU/faust_MatDense.h

@@ -454,6 +454,7 @@ namespace Faust
 			Vect<FPP, Cpu> adiagonal(int index);
 			Vect<FPP, Cpu> gen_diagonal(int index, bool diag /* true for diagonal, false for anti-diagonal*/);
 
+			size_t getNBytes() const;
 
 			/**
 			 * \brief Returns the nonzeros indices.

src/faust_linear_operator/CPU/faust_MatDense.hpp

@@ -137,6 +137,11 @@ namespace Faust
 		}
 
 
+	template<typename FPP>
+	size_t MatDense<FPP,Cpu>::getNBytes() const
+	{
+		return this->getNbCol()*this->getNbRow()*sizeof(FPP);
+	}
 
 	template<typename FPP>
 		void MatDense<FPP,Cpu>::check_dim_validity()

src/faust_linear_operator/CPU/faust_MatDiag.h

@@ -69,6 +69,7 @@ namespace Faust
 			void adjoint() { conjugate(true); transpose(); }
 			faust_unsigned_int getNonZeros() const { return mat.diagonal().nonZeros(); }
 
+			size_t getNBytes() const;
 			matvar_t* toMatIOVar(bool transpose, bool conjugate) const;
 			Real<FPP> normL1(const bool transpose=false) const;
 			typename Eigen::NumTraits<FPP>::Real norm() const;

src/faust_linear_operator/CPU/faust_MatDiag.hpp

@@ -182,3 +182,8 @@ std::list<std::pair<int,int>> Faust::MatDiag<FPP>::nonzeros_indices() const
 	return nz_inds;
 }
 
+template<typename FPP>
+size_t Faust::MatDiag<FPP>::getNBytes() const
+{
+	sizeof(FPP)*this->dim1*this->dim2;
+}

src/faust_linear_operator/CPU/faust_MatSparse.h

@@ -205,6 +205,7 @@ namespace Faust
 			//int getNbRow()const{return this->dim1;}
 			//int getNbCol()const{return this->dim2;}
 			faust_unsigned_int getNonZeros()const{return nnz;}
+			size_t getNBytes() const;
 			bool isCompressedMode()const{return mat.isCompressed();}
 			void makeCompression(){mat.makeCompressed();}
 

src/faust_linear_operator/CPU/faust_MatSparse.hpp

@@ -1139,4 +1139,12 @@ void Faust::MatSparse<FPP,Cpu>::swap_cols(faust_unsigned_int id1, faust_unsigned
 	*this = dmat;
 }
 
+template<typename FPP>
+size_t Faust::MatSparse<FPP,Cpu>::getNBytes() const
+{
+	return this->getNonZeros()*(sizeof(FPP)+sizeof(int))+(this->getNbRow()+1)*sizeof(int);
+}
+
+
+
 #endif

src/faust_linear_operator/faust_MatGeneric.h

@@ -140,6 +140,8 @@ namespace Faust
 			//! \brief return the number of non-zeros element in the matrix
 			virtual faust_unsigned_int getNonZeros()const=0;
 
+			virtual size_t getNBytes() const=0;
+
 			//!brief return the percentage of non-zeros coefficient in the matrix,
 			//! \return value between 0 and 1
 			float density() const{return ((float) this->getNonZeros())/((float)this->getNbCol()*this->getNbRow());}

src/faust_linear_operator/faust_TransformHelperGen.hpp

@@ -426,8 +426,8 @@ namespace Faust
 				}
 				else
 				{ // storage size is the main criterion
-					sparse_weight = fac->getNonZeros()*(sizeof(FPP)+sizeof(int))+(fac->getNbRow()+1)*sizeof(int);
-					if(sparse_weight < fac->getNbCol()*fac->getNbRow()*sizeof(FPP))
+					sparse_weight = fac->getNBytes();
+					if(sparse_weight < fac->getNBytes())
 					{
 						// choose CSR format
 						if(dfac)