Commit f538cb65 authored by Alvarez, Gonzalo's avatar Alvarez, Gonzalo
Browse files

more closures for CrsMatrix

parent edcbe255

src/CrsMatrix.h

+32 −25
Original line number Diff line number Diff line
@@ -197,7 +197,8 @@ public: 


	CrsMatrix(const std::ClosureOperator<T,CrsMatrix,std::ClosureOperations::OP_MULT>& c)

	{

		multiplyScalar(*this,c.v2_,c.v1_);

		*this = c.v2_;

		this->values_ *= c.v1_;

	}



	// end all ctors
@@ -274,11 +275,12 @@ public: 


	void operator*=(T x)

	{

		for (SizeType i=0;i<values_.size();i++) values_[i] *= x;

		values_ *= x;

	}



	template<typename VerySparseMatrixType>

	void operator=(const VerySparseMatrixType& m)

	typename EnableIf<!std::IsClosureLike<VerySparseMatrixType>::True,void>::Type

	operator=(const VerySparseMatrixType& m)

	{

		if (!m.sorted())

			throw RuntimeError("CrsMatrix: VerySparseMatrix must be sorted\n");
@@ -398,8 +400,23 @@ public: 
	}



	// closures operators start



	template<typename T1>

	typename EnableIf<Loki::TypeTraits<T1>::isArith || IsComplexNumber<T1>::True,

	CrsMatrix>::Type

	operator=(const std::ClosureOperator<T1,

	          CrsMatrix,

	          std::ClosureOperations::OP_MULT>& c)

	{

		*this = c.v2_;

		this->values_ *= c.v1_;

		return *this;

	}



	template<typename T1>

	CrsMatrix operator+=(const std::ClosureOperator<T1,

	typename EnableIf<Loki::TypeTraits<T1>::isArith || IsComplexNumber<T1>::True,

	CrsMatrix>::Type

	operator+=(const std::ClosureOperator<T1,

	           CrsMatrix,

	           std::ClosureOperations::OP_MULT>& c)

	{
@@ -409,7 +426,10 @@ public: 
		return *this;

	}



	CrsMatrix operator+=(const std::ClosureOperator<std::ClosureOperator<T,

	template<typename T1>

	typename EnableIf<Loki::TypeTraits<T1>::isArith || IsComplexNumber<T1>::True,

	CrsMatrix>::Type

	operator+=(const std::ClosureOperator<std::ClosureOperator<T1,

	                     CrsMatrix,

	                     std::ClosureOperations::OP_MULT>,

	                     CrsMatrix,
@@ -449,9 +469,6 @@ public: 
	template<typename S>

	friend std::ostream &operator<<(std::ostream &os,const CrsMatrix<S> &m);



	template<typename S,typename S2>

	friend void multiplyScalar(CrsMatrix<S> &ret,CrsMatrix<S> const &s,S2 const &v);



	template<class S>

	friend void difference(const CrsMatrix<S>& A,const CrsMatrix<S>& B);
@@ -716,16 +733,6 @@ void externalProduct(CrsMatrix<T> &C, 
	C.setRow(n,counter);

}



//! Sets ret = s * v where ret and s are CRS matrices and v is a scalar number

template<typename S,typename T>

void multiplyScalar(CrsMatrix<S> &ret,CrsMatrix<S> const &s,T const &v)

{

	ret = s;

	for (SizeType ii=0;ii<s.values_.size();ii++) {

		ret.values_[ii] *= v;

	}

}



template<typename T>

void printFullMatrix(const CrsMatrix<T>& s,

                     const String& name,