Loading src/TNL/Matrices/SparseMatrix.h +3 −8 Original line number Diff line number Diff line Loading @@ -209,13 +209,8 @@ class SparseMatrix : public Matrix< Real, Device, Index, RealAllocator > const IndexAllocatorType& indexAllocator = IndexAllocatorType() ); /** <<<<<<< HEAD * \brief Constructor with matrix rows capacities and number of columns. * ======= * \brief Constructor with matrix rows capacities given as an initializer list and a number of columns. * >>>>>>> Added SparseMatrix constructor with row capacities vector. * The number of matrix rows is given by the size of \e rowCapacities list. * * \tparam ListIndex is the initializer list values type. Loading Loading
src/TNL/Matrices/SparseMatrix.h +3 −8 Original line number Diff line number Diff line Loading @@ -209,13 +209,8 @@ class SparseMatrix : public Matrix< Real, Device, Index, RealAllocator > const IndexAllocatorType& indexAllocator = IndexAllocatorType() ); /** <<<<<<< HEAD * \brief Constructor with matrix rows capacities and number of columns. * ======= * \brief Constructor with matrix rows capacities given as an initializer list and a number of columns. * >>>>>>> Added SparseMatrix constructor with row capacities vector. * The number of matrix rows is given by the size of \e rowCapacities list. * * \tparam ListIndex is the initializer list values type. Loading