Commit 4a70c74f authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Added matrix values holder.

parent 888869bd

src/TNL/Matrices/Dense.h

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ class Dense : public Matrix< Real, Device, Index > 
      using IndexType = Index;

      using RealAllocatorType = RealAllocator;

      using BaseType = Matrix< Real, Device, Index, RealAllocator >;

      using ValuesType = typename BaseType::ValuesVector;

      using ValuesViewType = typename ValuesType::ViewType;

      using ValuesHolderType = typename BaseType::ValuesHolderType;

      using ValuesViewType = typename ValuesHolderType::ViewType;

      using SegmentsType = Containers::Segments::Ellpack< DeviceType, IndexType, typename Allocators::Default< Device >::template Allocator< IndexType >, RowMajorOrder, 1 >;

      using SegmentViewType = typename SegmentsType::SegmentViewType;

      using ViewType = DenseMatrixView< Real, Device, Index, RowMajorOrder >;

src/TNL/Matrices/DenseMatrixView.h

+2 −2
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ class DenseMatrixView : public MatrixView< Real, Device, Index > 
      using DeviceType = Device;

      using IndexType = Index;

      using BaseType = Matrix< Real, Device, Index >;

      using ValuesType = typename BaseType::ValuesVector;

      using ValuesViewType = typename ValuesType::ViewType;

      using ValuesHolderType = typename BaseType::ValuesHolderType;

      using ValuesViewType = typename ValuesHolderType::ViewType;

      using SegmentsType = Containers::Segments::Ellpack< DeviceType, IndexType, typename Allocators::Default< Device >::template Allocator< IndexType >, RowMajorOrder, 1 >;

      using SegmentsViewType = typename SegmentsType::ViewType;

      using SegmentViewType = typename SegmentsType::SegmentViewType;

src/TNL/Matrices/Multidiagonal.h

+2 −2
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ class Multidiagonal : public Matrix< Real, Device, Index, RealAllocator > 
      using RealAllocatorType = RealAllocator;

      using IndexAllocatorType = IndexAllocator;

      using BaseType = Matrix< Real, Device, Index, RealAllocator >;

      using ValuesType = typename BaseType::ValuesVector;

      using ValuesViewType = typename ValuesType::ViewType;

      using ValuesHolderType = typename BaseType::ValuesHolderType;

      using ValuesViewType = typename ValuesHolderType::ViewType;

      using IndexerType = details::MultidiagonalMatrixIndexer< IndexType, RowMajorOrder >;

      using DiagonalsShiftsType = Containers::Vector< IndexType, DeviceType, IndexType, IndexAllocatorType >;

      using DiagonalsShiftsView = typename DiagonalsShiftsType::ViewType;

src/TNL/Matrices/SparseMatrix.h

+2 −2
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ class SparseMatrix : public Matrix< Real, Device, Index, RealAllocator > 
      using RowsCapacitiesType = Containers::Vector< IndexType, DeviceType, IndexType, IndexAllocatorType >;

      using RowsCapacitiesView = Containers::VectorView< IndexType, DeviceType, IndexType >;

      using ConstRowsCapacitiesView = typename RowsCapacitiesView::ConstViewType;

      using ValuesVectorType = typename Matrix< Real, Device, Index, RealAllocator >::ValuesVector;

      using ValuesViewType = typename ValuesVectorType::ViewType;

      using ValuesHolderType = typename Matrix< Real, Device, Index, RealAllocator >::ValuesHolderType;

      using ValuesViewType = typename ValuesHolderType::ViewType;

      using ColumnsIndexesVectorType = Containers::Vector< IndexType, DeviceType, IndexType, IndexAllocatorType >;

      using ColumnsIndexesViewType = typename ColumnsIndexesVectorType::ViewType;

      using ViewType = SparseMatrixView< Real, Device, Index, MatrixType, SegmentsViewTemplate >;

src/TNL/Matrices/Tridiagonal.h

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ class Tridiagonal : public Matrix< Real, Device, Index, RealAllocator > 
      using RealAllocatorType = RealAllocator;

      using BaseType = Matrix< Real, Device, Index, RealAllocator >;

      using IndexerType = details::TridiagonalMatrixIndexer< IndexType, RowMajorOrder >;

      using ValuesType = typename BaseType::ValuesVector;

      using ValuesViewType = typename ValuesType::ViewType;

      using ValuesHolderType = typename BaseType::ValuesHolderType;

      using ValuesViewType = typename ValuesHolderType::ViewType;

      using ViewType = TridiagonalMatrixView< Real, Device, Index, RowMajorOrder >;

      using ConstViewType = TridiagonalMatrixView< typename std::add_const< Real >::type, Device, Index, RowMajorOrder >;

      using RowView = TridiagonalMatrixRowView< ValuesViewType, IndexerType >;