Commit 576216b8 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Fixes in matrices (windows to unix line breaks, small cosmetic changes)

parent a9a10f23

src/TNL/Matrices/AdEllpack.h

+245 −247
Original line number Diff line number Diff line
@@ -243,5 +243,3 @@ protected: 
} // namespace TNL



#include <TNL/Matrices/AdEllpack_impl.h>

src/TNL/Matrices/COOMatrix.h

+6 −8
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ 
#pragma once



#include <TNL/Matrices/Sparse.h>

#include <TNL/Containers/Vectors/Vector.h>

#include <TNL/Containers/Vector.h>



namespace TNL {

   namespace Matrices

namespace Matrices {



template< typename Device >

class COOMatrixDeviceDependentCode;
@@ -36,7 +36,7 @@ public: 
	typedef typename Sparse< RealType, DeviceType, IndexType >:: CompressedRowLengthsVector CompressedRowLengthsVector;

	typedef COOMatrix< Real, Device, Index > ThisType;

	typedef COOMatrix< Real, Devices::Host, Index > HostType;

	typedef COOMatrix< Real, tnlCuda, Index > CudaType;

	typedef COOMatrix< Real, Devices::Cuda, Index > CudaType;



	COOMatrix();
@@ -110,8 +110,8 @@ public: 


	bool load(const String& fileName);



	// nejsem si jisty jestli dela to co ma

	void print(ostream& str) const;

	// TODO: nejsem si jisty jestli dela to co ma

	void print(std::ostream& str) const;



	void reset();
@@ -134,5 +134,3 @@ private: 




#include <TNL/Matrices/COOMatrix_impl.h>
 


#endif

src/TNL/Matrices/COOMatrix_impl.h

+383 −385
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ 
#pragma once



#include <TNL/Matrices/COOMatrix.h>

#include <TNL/Containers/Vectors/Vector.h>

#include <TNL/Math.h>

#include <TNL/param-types.h>



namespace TNL {

namespace Matrices {
@@ -33,7 +33,7 @@ template< typename Real, 
String COOMatrix< Real, Device, Index >::getType()

{

	return String("COOMatrix< ") +

  	 	   String(::getType< Real>()) +

  	 	   String(TNL::getType< Real>()) +

		   String(", ") +

		   Device::getDeviceType() +

		   String(" >");
@@ -359,7 +359,7 @@ bool COOMatrix< Real, Device, Index >::load(const String& fileName) 
template< typename Real,

		  typename Device,

		  typename Index >

void COOMatrix< Real, Device, Index >::print(ostream& str) const

void COOMatrix< Real, Device, Index >::print(std::ostream& str) const

{

	//zatim jsem to napsal takhle, kdyztak to pozdeji zmenim

	for(IndexType elementPtr = 0; elementPtr < this->getNumberOfUsedValues(); elementPtr++)
@@ -381,5 +381,3 @@ void COOMatrix< Real, Device, Index >::reset() 


} // namespace Matrices

} // namespace TNL
 


#endif

src/TNL/Matrices/AdEllpack_impl.h

+1448 −1448

File changed.

Contains only whitespace changes.