QList replaced by QVector

jmeidow · jmeidow · commit 51c2d2eff546 · 2022-05-19T15:02:10.000+02:00
diff --git a/src/adjustment.cpp b/src/adjustment.cpp
@@ -128,9 +128,8 @@ void AdjustmentFramework::update( const Index start,
     assert( l0_.segment( idx3,3).hasNaN()==false );
 }
 
-bool AdjustmentFramework::enforce_constraints( const QList<std::shared_ptr<Constraint::ConstraintBase> > *constr,
-                                               const IncidenceMatrix * bi,
-                                               // const int E,
+bool AdjustmentFramework::enforce_constraints( const QVector<std::shared_ptr<Constraint::ConstraintBase> > *constr,
+                                               const IncidenceMatrix * Bi,
                                                const Eigen::RowVectorXi & maps,
                                                const Eigen::RowVectorXi & mapc )
 {
@@ -176,7 +175,7 @@ bool AdjustmentFramework::enforce_constraints( const QList<std::shared_ptr<Const
         if ( verbose ) {
             qDebug().noquote() << QString("  iteration #%1...").arg(it+1);
         }
-        a_Jacobian( constr, bi, BBr, g0, maps, mapc);
+        a_Jacobian( constr, Bi, BBr, g0, maps, mapc);
 
         // reduced coordinates: vector and covariance matrix .............
         for ( Index s=0; s<S; s++ )
@@ -264,14 +263,14 @@ bool AdjustmentFramework::enforce_constraints( const QList<std::shared_ptr<Const
     }
 
     // check constraints .........................................
-    a_check_constraints( constr, bi, maps, mapc);
+    a_check_constraints( constr, Bi, maps, mapc);
 
     return true;
 }
 
 
 void AdjustmentFramework::a_Jacobian(
-        const QList<std::shared_ptr<ConstraintBase> > * constr,
+        const QVector<std::shared_ptr<Constraint::ConstraintBase> > *constr,
         const IncidenceMatrix * Bi,
         SparseMatrix<double, Eigen::ColMajor> & BBr,
         VectorXd & g0,
@@ -316,7 +315,7 @@ void AdjustmentFramework::a_Jacobian(
 }
 
 void AdjustmentFramework::a_check_constraints(
-        const QList<std::shared_ptr<Constraint::ConstraintBase> > * constr,
+        const QVector<std::shared_ptr<Constraint::ConstraintBase> > *constr,
         const IncidenceMatrix * bi,
         const Eigen::RowVectorXi & maps,
         const Eigen::RowVectorXi & mapc) const
diff --git a/src/adjustment.h b/src/adjustment.h
@@ -59,8 +59,8 @@ class AdjustmentFramework
     AdjustmentFramework & operator= ( AdjustmentFramework &&) = delete;
 
     //! Enforce the constraints of a subtask (adjustment)
-    bool enforce_constraints( const QList<std::shared_ptr<ConstraintBase> > *constr,
-                              const Graph::IncidenceMatrix *bi,
+    bool enforce_constraints(const QVector<std::shared_ptr<ConstraintBase> > *constr,
+                              const Graph::IncidenceMatrix *Bi,
                               const RowVectorXi &maps,
                               const RowVectorXi &mapc);
 
@@ -84,18 +84,17 @@ class AdjustmentFramework
     void reset() { l0_ = l_;}
     void update( Index start, const VectorXd &x );
 
-    void a_Jacobian( const QList<std::shared_ptr<ConstraintBase> > *constr,
+    void a_Jacobian( const QVector<std::shared_ptr<ConstraintBase> > *constr,
                      const Graph::IncidenceMatrix *Bi,
-                     SparseMatrix<double,
-                     Eigen::ColMajor> & BBr,
+                     SparseMatrix<double, Eigen::ColMajor> & BBr,
                      VectorXd & g0,
                      const RowVectorXi & maps,
                      const RowVectorXi & mapc) const;
 
-    void a_check_constraints( const QList<std::shared_ptr<ConstraintBase> > *constr,
+    void a_check_constraints( const QVector<std::shared_ptr<ConstraintBase> > *constr,
                               const Graph::IncidenceMatrix *bi,
                               const RowVectorXi & maps,
-                              const RowVectorXi  &mapc ) const;
+                              const RowVectorXi & mapc ) const;
 
     bool verbose = false;
     VectorXd l0_;             // vector of approximate/estimated observations
diff --git a/src/state.cpp b/src/state.cpp
