function findInColumn removed

jmeidow · jmeidow · commit 74ac29755ed8 · 2026-01-07T10:16:16.000+01:00
diff --git a/src/adjustment.cpp b/src/adjustment.cpp
@@ -55,7 +55,7 @@ using Geometry::Rot_ab;
 using Matfun::null;
 using Matfun::is_rank_deficient;
 using Matfun::indexOf;
-
+using Matfun::spfind;
 
 using TextColor::black;
 using TextColor::blue;
@@ -293,7 +293,7 @@ void AdjustmentFramework::Jacobian(
 
         // (first) location of idx(i) in vector 'maps',
         //     Matlab: [~,idx] = ismember(idx,maps)
-        auto idx = Bi.findInColumn( c );
+        auto idx = spfind<int>( Bi.col(c) );
         for ( Index i=0; i<idx.size(); i++ ) {
             idx(i) = indexOf<Index>( maps, idx(i) );
         }
@@ -353,7 +353,7 @@ void AdjustmentFramework::check_constraints(
             continue;
         }
 
-        auto idx = bi.findInColumn( mapc(c) );
+        auto idx = spfind<int>( bi.col(mapc(c)) );
         for ( Index i=0; i<idx.size(); i++ ) {
             idx(i) = indexOf<Index>( maps, idx(i) );
         }
@@ -370,7 +370,7 @@ void AdjustmentFramework::check_constraints(
             deb << (con->required() ? green : blue) << msg1 << black;
             deb << (con->enforced() ? black : red)  << msg2 << black;
 
-            auto idxx = bi.findInColumn( mapc(c) );
+            const auto idxx = spfind<int>( bi.col(mapc(c)) );
             for ( Index i=0; i<idxx.size(); i++ ) {
                 const Index idxxx = indexOf<Index>(maps, idxx(i));
                 deb << idxxx+1;
diff --git a/src/matrix.cpp b/src/matrix.cpp
@@ -67,21 +67,6 @@ SparseMatrix<int> IncidenceMatrix::biadjacency() const {
 }
 
 
-VectorXidx IncidenceMatrix::findInColumn( const Index c ) const
-{
-    Eigen::Index const nnz = innerVector(c).nonZeros();
-
-    VectorXidx idx( nnz );
-    int i=0;
-    for ( SparseMatrix<int>::InnerIterator it(*this,c); it; ++it) {
-        idx(i++) = it.index();
-    }
-
-    return idx;
-}
-
-
-
 void IncidenceMatrix::remove_column( const Index c) {
 
     // qDebug() << Q_FUNC_INFO;
diff --git a/src/matrix.h b/src/matrix.h
@@ -46,7 +46,6 @@ class IncidenceMatrix : public SparseMatrix<int, ColMajor, int>
         return *this;
     }
 
-    [[nodiscard]] Eigen::VectorXidx 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]
 
diff --git a/src/state.cpp b/src/state.cpp
@@ -624,7 +624,7 @@ Index impl::find_new_constraints()
     // concurrence & parallelism (1) ..................................
     if ( State::considerCopunctual() || State::considerParallel() ) {
         // Find walks of length 2 between the vertices of the graph.
-        VectorXidx nbs = spfind<int>( WW.col(c) );
+        const VectorXidx nbs = spfind<int>( WW.col(c) );
         for ( Index n=0; n<nbs.rows()-1; n++) {
             const Index a = nbs(n);  // [a] is a walk of length 2 away from [c].
 
@@ -642,7 +642,7 @@ Index impl::find_new_constraints()
             if ( State::considerCopunctual() ) {
                 // [a] and [c] are adjacent and have at least one common neighbor.
                 // Find all common neighbors of [a] and [c].
-                VectorXidx nbnb = Adj.findInColumn(a); // neighbors of [a].
+                const VectorXidx nbnb = spfind<int>( Adj.col(a) ); // neighbors of [a].
                 for ( Index m=0; m<nbnb.rows()-1; m++) {
                     const Index b = nbnb(m);
 
@@ -667,7 +667,7 @@ Index impl::find_new_constraints()
 
     // parallelism (2) ......................................
     // case: straight line segment connects two segments
-    VectorXidx idx = Adj.findInColumn(c); // neighbors of [c]
+    const VectorXidx idx = spfind<int>( Adj.col(c) ); // neighbors of [c]
 
     // Check all pairs of neighbors.
     for ( Index i=0; i<idx.rows(); i++) {
@@ -1043,7 +1043,7 @@ void impl::remove_constraint( const Index i )
 
     if ( m_constr.at(i)->is<Parallel>() )
     {
-        VectorXidx idx = Bi.findInColumn( i);
+        const VectorXidx idx = spfind<int>( Bi.col(i) );
         Q_ASSERT_X( idx.size() == 2, Q_FUNC_INFO,
                     QStringLiteral("parallel with %1 entities")
                     .arg( QString::number(idx.size())).toUtf8() );
@@ -1284,7 +1284,7 @@ void impl::replaceGraphics() {
     for( int c=0; c<m_constr.length(); c++)
     {
         bool modified = false;
-        const VectorXidx idxx = Bi.findInColumn(c);
+        const VectorXidx idxx = spfind<int>( Bi.col(c) );
 
         if ( m_constr.at(c).use_count()==1 ) {
             modified = true; // actually not modified, but added

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ class IncidenceMatrix : public SparseMatrix<int, ColMajor, int>`
`46`	`46`	`return *this;`
`47`	`47`	`}`
`48`	`48`
`49`		`- [[nodiscard]] Eigen::VectorXidx findInColumn( Index c ) const; //!< Matlab: find(A(:,c))`
`50`	`49`	`[[nodiscard]] bool isSet( Index r, Index c) const; //!< Check if r and c are related`
`51`	`50`	`[[nodiscard]] SparseMatrix<int> biadjacency() const; //!< Create biadjacency matrix [O, A; A', O]`
`52`	`51`