Commit 2388f742 authored by Lukas Cejka's avatar Lukas Cejka Committed by Tomáš Oberhuber
Browse files

Fixed getType to be consistent across different matrix formats.

parent 2ebb1334

src/TNL/Matrices/AdEllpack_impl.h

+22 −0
Original line number Diff line number Diff line
@@ -157,6 +157,28 @@ AdEllpack< Real, Device, Index >::AdEllpack() 
warpSize( 32 )

{}



template< typename Real,

          typename Device,

          typename Index >

String AdEllpack< Real, Device, Index >::getTypeVirtual() const

{

    return this->getType();

}



template< typename Real,

          typename Device,

          typename Index >

String AdEllpack< Real, Device, Index >::getType()

{

    return String( "Matrices::AdEllpack< ") +

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

           String( ", " ) +

           String( Device::getDeviceType() ) +

           String( ", " ) +

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

           String( " >" );

}



template< typename Real,

          typename Device,

          typename Index >

src/TNL/Matrices/BiEllpackSymmetric_impl.h

+24 −0
Original line number Diff line number Diff line
@@ -45,6 +45,30 @@ BiEllpackSymmetric< Real, Device, Index, StripSize >::BiEllpackSymmetric() 
  logWarpSize( 5 )

{}



template< typename Real,

          typename Device,

          typename Index,

          int StripSize >

String BiEllpackSymmetric< Real, Device, Index, StripSize >::getType()

{

    return String( "Matrices::BiEllpackMatrix< ") +

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

           String( ", " ) +

           String( Device :: getDeviceType() ) +

           String( ", " ) +

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

           String( " >" );

}



template< typename Real,

          typename Device,

          typename Index,

          int StripSize >

String BiEllpackSymmetric< Real, Device, Index, StripSize >::getTypeVirtual() const

{

    return this->getType();

}



template< typename Real,

          typename Device,

          typename Index,

src/TNL/Matrices/BiEllpack_impl.h

+24 −0
Original line number Diff line number Diff line
@@ -47,6 +47,30 @@ BiEllpack< Real, Device, Index, StripSize >::BiEllpack() 
  logWarpSize( 5 )

{}



template< typename Real,

	  typename Device,

	  typename Index,

	  int StripSize >

String BiEllpack< Real, Device, Index, StripSize >::getType()

{

	return String( "Matrices::BiEllpack< ") +

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

	       String( ", " ) +

	       String( Device :: getDeviceType() ) +

               String( ", " ) +

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

	       String( " >" );

}



template< typename Real,

	  typename Device,

	  typename Index,

	  int StripSize >

String BiEllpack< Real, Device, Index, StripSize >::getTypeVirtual() const

{

    return this->getType();

}



template< typename Real,

	  typename Device,

	  typename Index,

src/TNL/Matrices/COOMatrix_impl.h

+22 −0
Original line number Diff line number Diff line
@@ -27,6 +27,28 @@ COOMatrix< Real, Device, Index >::COOMatrix() 
{

};



template< typename Real,

	  	  typename Device,

	  	  typename Index >

String COOMatrix< Real, Device, Index >::getType()

{

	return String( "Matrices::COOMatrix< " ) +

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

               String( ", " ) +

               String( Device :: getDeviceType() ) +

               String( ", " ) +

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

               String( " >" );

}



template< typename Real,

	  	  typename Device,

	  	  typename Index >

String COOMatrix< Real, Device, Index >::getTypeVirtual() const

{

	return this->getType();

}



template< typename Real,

		  typename Device,

		  typename Index >

src/TNL/Matrices/CSR_impl.h

+3 −1
Original line number Diff line number Diff line
@@ -46,7 +46,9 @@ String CSR< Real, Device, Index >::getSerializationType() 
   return String( "Matrices::CSR< ") +

          TNL::getType< Real>() +

          String( ", " ) +

          getType< Devices::Host >() +

          String( Device :: getDeviceType() ) +

          String( ", " ) +

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

          String( " >" );

}