revision class state

jmeidow · jmeidow · commit a41776fd7764 · 2025-07-04T17:18:51.000+02:00
diff --git a/src/conncomp.cpp b/src/conncomp.cpp
@@ -44,7 +44,7 @@ ConnComp::ConnComp( const SparseMatrix<int, ColMajor> &BB)
 
 
 
-VectorXi ConnComp::head(const int n) const
+VectorXi ConnComp::head( const Index n) const
 {
    assert( n>=0 );
    if ( n==0) {
@@ -53,7 +53,7 @@ VectorXi ConnComp::head(const int n) const
    return m_comp.head(n);
 }
 
-VectorXi ConnComp::tail( const int n) const
+VectorXi ConnComp::tail( const Index n) const
 {
    assert( n>=0 );
    if ( n==0) {
diff --git a/src/conncomp.h b/src/conncomp.h
@@ -42,8 +42,8 @@ class ConnComp
     [[nodiscard]] VectorXi mapHead( int cc, Index n) const;  //!< Get linear indices of the elements in 1...n with label 'cc'.
     [[nodiscard]] VectorXi mapTail(int cc, Index n) const;  //!< Get linear indices of the elements in n-1...end with label 'cc'.
     [[nodiscard]] int label( Index i) const;     //!< Get label/index of i-th element
-    [[nodiscard]] VectorXi head( int n) const;   //!< Get labels/indices of first n elements
-    [[nodiscard]] VectorXi tail( int n) const;   //!< Get labels/indices of last n elements
+    [[nodiscard]] VectorXi head( Index n) const;   //!< Get labels/indices of first n elements
+    [[nodiscard]] VectorXi tail( Index n) const;   //!< Get labels/indices of last n elements
 
     //! Get number of connected components
     [[nodiscard]] int number() const {  return m_comp.size()>0 ? m_comp.maxCoeff()+1 : 0; }
diff --git a/src/greasepad.pro b/src/greasepad.pro
@@ -19,7 +19,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
 
 
 # set assember's flags (MinGW), syntax: -Wa,<comma-separated list>
-QMAKE_CXXFLAGS += -Wa,-mbig-obj
+# QMAKE_CXXFLAGS += -Wa,-mbig-obj
 
 
 SOURCES += \
diff --git a/src/matrix.cpp b/src/matrix.cpp
@@ -66,7 +66,7 @@ SparseMatrix<int> IncidenceMatrix::biadjacency() const {
 }
 
 
-VectorXi IncidenceMatrix::findInColumn( const int c ) const
+VectorXi IncidenceMatrix::findInColumn( const Index c ) const
 {
     Eigen::Index const nnz = innerVector(c).nonZeros();
 
@@ -81,7 +81,7 @@ VectorXi IncidenceMatrix::findInColumn( const int c ) const
 
 
 
-void IncidenceMatrix::remove_column( const int c) {
+void IncidenceMatrix::remove_column( const Index c) {
 
     // qDebug() << Q_FUNC_INFO;
 
@@ -100,7 +100,7 @@ void IncidenceMatrix::remove_column( const int c) {
     *this = (*this)*TT;
 }
 
-void IncidenceMatrix::remove_row(const int r)
+void IncidenceMatrix::remove_row( const Index r)
 {
     // qDebug() << QString("remove row #%1").arg(r);
 
@@ -122,7 +122,7 @@ void IncidenceMatrix::remove_row(const int r)
 
 
 // remove i-th column and i-th row.....................................
-void IncidenceMatrix::reduce(const int i)
+void IncidenceMatrix::reduce( const Index i)
 {
     // qDebug() << QString("reduce %1").arg(i);
 
diff --git a/src/matrix.h b/src/matrix.h
@@ -41,16 +41,16 @@ class IncidenceMatrix : public SparseMatrix<int, ColMajor, int>
         return *this;
     }
 
-    [[nodiscard]] VectorXi findInColumn( int c ) const;    //!< Matlab: find(A(:,c))
+    [[nodiscard]] VectorXi findInColumn( Index c ) const;    //!< Matlab: find(A(:,c))
     [[nodiscard]] bool isSet( Index r, Index c) const;     //!< Check if r and c are related
     [[nodiscard]] SparseMatrix<int> biadjacency() const;   //!< Create biadjacency matrix [O, A; A', O]
 
     void   set( Index r, Index c)  { coeffRef(r,c) = 1; }  //!< Set relation (row r, column c)
     void unset( Index r, Index c)  { coeffRef(r,c) = 0; }  //!< Delete relation (row r, column c)
 
-    void remove_row(    int r );  //!< Remove r-th row
-    void remove_column( int c );  //!< Remove c-th column
-    void reduce( int i);          //!< Remove i-th column and i-th row
+    void remove_row(    Index r );  //!< Remove r-th row
+    void remove_column( Index c );  //!< Remove c-th column
+    void reduce( Index i);          //!< Remove i-th column and i-th row
 
     //! Augment matrix by one row and one column
     void augment() { conservativeResize( rows()+1, cols()+1); }
diff --git a/src/state.cpp b/src/state.cpp
diff --git a/src/state.h b/src/state.h

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ ConnComp::ConnComp( const SparseMatrix<int, ColMajor> &BB)`
`44`	`44`
`45`	`45`
`46`	`46`
`47`		`-VectorXi ConnComp::head(const int n) const`
	`47`	`+VectorXi ConnComp::head( const Index n) const`
`48`	`48`	`{`
`49`	`49`	`assert( n>=0 );`
`50`	`50`	`if ( n==0) {`
`@@ -53,7 +53,7 @@ VectorXi ConnComp::head(const int n) const`
`53`	`53`	`return m_comp.head(n);`
`54`	`54`	`}`
`55`	`55`
`56`		`-VectorXi ConnComp::tail( const int n) const`
	`56`	`+VectorXi ConnComp::tail( const Index n) const`
`57`	`57`	`{`
`58`	`58`	`assert( n>=0 );`
`59`	`59`	`if ( n==0) {`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ SparseMatrix<int> IncidenceMatrix::biadjacency() const {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`
`69`		`-VectorXi IncidenceMatrix::findInColumn( const int c ) const`
	`69`	`+VectorXi IncidenceMatrix::findInColumn( const Index c ) const`
`70`	`70`	`{`
`71`	`71`	`Eigen::Index const nnz = innerVector(c).nonZeros();`
`72`	`72`
`@@ -81,7 +81,7 @@ VectorXi IncidenceMatrix::findInColumn( const int c ) const`
`81`	`81`
`82`	`82`
`83`	`83`
`84`		`-void IncidenceMatrix::remove_column( const int c) {`
	`84`	`+void IncidenceMatrix::remove_column( const Index c) {`
`85`	`85`
`86`	`86`	`// qDebug() << Q_FUNC_INFO;`
`87`	`87`
`@@ -100,7 +100,7 @@ void IncidenceMatrix::remove_column( const int c) {`
`100`	`100`	`this = (this)*TT;`
`101`	`101`	`}`
`102`	`102`
`103`		`-void IncidenceMatrix::remove_row(const int r)`
	`103`	`+void IncidenceMatrix::remove_row( const Index r)`
`104`	`104`	`{`
`105`	`105`	`// qDebug() << QString("remove row #%1").arg(r);`
`106`	`106`
`@@ -122,7 +122,7 @@ void IncidenceMatrix::remove_row(const int r)`
`122`	`122`
`123`	`123`
`124`	`124`	`// remove i-th column and i-th row.....................................`
`125`		`-void IncidenceMatrix::reduce(const int i)`
	`125`	`+void IncidenceMatrix::reduce( const Index i)`
`126`	`126`	`{`
`127`	`127`	`// qDebug() << QString("reduce %1").arg(i);`
`128`	`128`