Commit 95c028af authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Avoided SegmentsView from DenseMatrixView constructor.

parent 02423143

src/TNL/Matrices/Dense.hpp

+2 −4
Original line number Diff line number Diff line
@@ -99,8 +99,7 @@ getView() -> ViewType 
{

   return ViewType( this->getRows(),

                    this->getColumns(),

                    this->getValues().getView(),

                    this->segments.getView() );

                    this->getValues().getView() );

}



template< typename Real,
@@ -114,8 +113,7 @@ getConstView() const -> ConstViewType 
{

   return ConstViewType( this->getRows(),

                         this->getColumns(),

                         this->getValues().getConstView(),

                         this->segments.getConstView() );

                         this->getValues().getConstView() );

}



template< typename Real,

src/TNL/Matrices/DenseMatrixView.h

+1 −2
Original line number Diff line number Diff line
@@ -64,8 +64,7 @@ class DenseMatrixView : public MatrixView< Real, Device, Index > 
      __cuda_callable__

      DenseMatrixView( const IndexType rows,

                       const IndexType columns,

                       const ValuesViewType& values,

                       const SegmentsViewType& segments );

                       const ValuesViewType& values );



      __cuda_callable__

      DenseMatrixView( const DenseMatrixView& m ) = default;

src/TNL/Matrices/DenseMatrixView.hpp

+6 −7
Original line number Diff line number Diff line
@@ -35,10 +35,11 @@ __cuda_callable__ 
DenseMatrixView< Real, Device, Index, RowMajorOrder >::

DenseMatrixView( const IndexType rows,

                 const IndexType columns,

                 const ValuesViewType& values,

                 const SegmentsViewType& segments )

 : MatrixView< Real, Device, Index >( rows, columns, values ), segments( segments )

                 const ValuesViewType& values )

 : MatrixView< Real, Device, Index >( rows, columns, values )

{

   SegmentsType a( rows, columns );

   segments = a.getView();

}



template< typename Real,
@@ -53,8 +54,7 @@ getView() -> ViewType 
   return ViewType( this->getRows(),

                    this->getColumns(),

                    this->getValues().getView(),

                    this->columnIndexes.getView(),

                    this->segments.getView() );

                    this->columnIndexes.getView() );

}



template< typename Real,
@@ -69,8 +69,7 @@ getConstView() const -> ConstViewType 
   return ConstViewType( this->getRows(),

                         this->getColumns(),

                         this->getValues().getConstView(),

                         this->getColumnsIndexes().getConstView(),

                         this->segments.getConstView() );

                         this->getColumnsIndexes().getConstView() );

}



template< typename Real,