return type operator()

jmeidow · jmeidow · commit ccb70f7cc3a2 · 2026-02-20T15:52:41.000+01:00
diff --git a/src/matrix.h b/src/matrix.h
@@ -41,31 +41,30 @@ class IncidenceMatrix : public SparseMatrix<int, ColMajor, int>
     template<typename OtherDerived>
     IncidenceMatrix& operator=( const SparseMatrixBase <OtherDerived>& other)
     {
-        this->SparseMatrix<int, ColMajor,int>::operator=(other);
+        this->SparseMatrix<int,ColMajor,int>::operator=(other);
         return *this;
     }
 
     //! indexing with vectors
     template <typename Indices>
-    SparseMatrix<int,ColMajor,int>
-    operator() (const Indices & rowIndices, const Indices & colIndices) const
+    IncidenceMatrix operator() (const Indices & rowIndices, const Indices & colIndices) const
     {
         const Index R = rowIndices.size();
         const Index C = colIndices.size();
 
-        SparseMatrix<int,ColMajor,int> Left(R, this->rows());
+        SparseMatrix<int,ColMajor,int> Left(R,this->rows());
         Left.reserve(R);
         for (Index r=0; r<R; r++) {
             Left.insert(r,rowIndices(r)) = 1;
         }
 
-        SparseMatrix<int,ColMajor,int> Right(this->cols(), C);
-        Right.reserve(colIndices.size());
+        SparseMatrix<int,ColMajor,int> Right(this->cols(),C);
+        Right.reserve(C);
         for (Index c=0; c<C; c++) {
             Right.insert(colIndices(c),c) = 1;
         }
 
-        return Left*(*this)*Right;
+        return {Left*(*this)*Right};
     }
 
     [[nodiscard]] bool isSet( Index r, Index c) const;     //!< Check if r and c are related

Original file line number	Diff line number	Diff line change
`@@ -41,31 +41,30 @@ class IncidenceMatrix : public SparseMatrix<int, ColMajor, int>`
`41`	`41`	`template<typename OtherDerived>`
`42`	`42`	`IncidenceMatrix& operator=( const SparseMatrixBase <OtherDerived>& other)`
`43`	`43`	`{`
`44`		`- this->SparseMatrix<int, ColMajor,int>::operator=(other);`
	`44`	`+ this->SparseMatrix<int,ColMajor,int>::operator=(other);`
`45`	`45`	`return *this;`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`//! indexing with vectors`
`49`	`49`	`template <typename Indices>`
`50`		`- SparseMatrix<int,ColMajor,int>`
`51`		`- operator() (const Indices & rowIndices, const Indices & colIndices) const`
	`50`	`+ IncidenceMatrix operator() (const Indices & rowIndices, const Indices & colIndices) const`
`52`	`51`	`{`
`53`	`52`	`const Index R = rowIndices.size();`
`54`	`53`	`const Index C = colIndices.size();`
`55`	`54`
`56`		`- SparseMatrix<int,ColMajor,int> Left(R, this->rows());`
	`55`	`+ SparseMatrix<int,ColMajor,int> Left(R,this->rows());`
`57`	`56`	`Left.reserve(R);`
`58`	`57`	`for (Index r=0; r<R; r++) {`
`59`	`58`	`Left.insert(r,rowIndices(r)) = 1;`
`60`	`59`	`}`
`61`	`60`
`62`		`- SparseMatrix<int,ColMajor,int> Right(this->cols(), C);`
`63`		`- Right.reserve(colIndices.size());`
	`61`	`+ SparseMatrix<int,ColMajor,int> Right(this->cols(),C);`
	`62`	`+ Right.reserve(C);`
`64`	`63`	`for (Index c=0; c<C; c++) {`
`65`	`64`	`Right.insert(colIndices(c),c) = 1;`
`66`	`65`	`}`
`67`	`66`
`68`		`- return Left(this)*Right;`
	`67`	`+ return {Left(this)*Right};`
`69`	`68`	`}`
`70`	`69`
`71`	`70`	`[[nodiscard]] bool isSet( Index r, Index c) const; //!< Check if r and c are related`