new method augment to obey DRY principle

jmeidow · jmeidow · commit 0ab7587f6dc6 · 2026-03-19T12:50:32.000+01:00
diff --git a/src/state.cpp b/src/state.cpp
@@ -275,6 +275,8 @@ class impl {
     void establish_orthogonal( Index a, Index b );
     void establish_copunctual( Index a, Index b, Index c );
 
+    void augment();
+
     [[nodiscard]] std::pair<Eigen::VectorXd, SparseMatrix<double> >
     a_Maker( const ArrayXi & maps_ ) const;
 
@@ -537,14 +539,14 @@ void impl::findAdjacenciesRecentSegment(const Quantiles::Snapping &snap)
 {
     for ( int i=0; i<m_segm.length()-1; i++)
     {
-         bool are_adjacent = false;
-
         // pre-check (culling) via axis-aligned bounding boxes
         if ( !m_segm.at(i)->bounding_box().overlaps(
                  m_segm.last()->bounding_box()) ) {
             continue;
         }
 
+        bool are_adjacent = false;
+
         if ( m_segm.last()->touchedBy( m_segm.at(i)->ux(),
                                       snap.quantile_stdNormDistr(),
                                       snap.quantile_chi2_1dof()) ) {
@@ -961,6 +963,20 @@ bool impl::are_identical( const Index a, const Index b)
 }
 
 
+// augment state with new, unevaluated constraint
+void impl::augment()
+{
+    // append an empty column
+    Rel.conservativeResize(Rel.rows(), Rel.cols()+1);
+
+    m_status.conservativeResize(m_status.size()+1);
+    m_status(last) = Attribute::Unevaluated;
+
+    m_enforced.conservativeResize(m_enforced.size()+1);
+    m_enforced(last) = false;
+}
+
+
 void impl::establish_parallel( const Index a,
                                const Index b)
 {
@@ -975,77 +991,51 @@ void impl::establish_parallel( const Index a,
     m_qConstraint.append( QConstraint::QParallel::create() );
     m_constr.append( std::make_shared<Parallel>() );
 
-    Rel.conservativeResize( Rel.rows(), Rel.cols()+1); //   append a column
+    augment();
     Rel.set( a, last );
     Rel.set( b, last );
-
-    m_status.conservativeResize(m_status.size()+1);
-    m_status(last) = Attribute::Unevaluated;
-
-    m_enforced.conservativeResize(m_enforced.size()+1);
-    m_enforced(last) = false;
 }
 
+
 void impl::establish_vertical( const Index a)
 {
     m_qConstraint.append( QConstraint::QAligned::create());
     m_constr.append( std::make_shared<Vertical>() );
 
-    Rel.conservativeResize( Rel.rows(), Rel.cols()+1); //  append a column
+    augment();
     Rel.set( a, last );
-
-    m_status.conservativeResize(m_status.size()+1);
-    m_status(last) = Attribute::Unevaluated;
-
-    m_enforced.conservativeResize(m_enforced.size()+1);
-    m_enforced(last) = false;
 }
 
+
 void impl::establish_horizontal( const Index a)
 {
     m_qConstraint.append( QConstraint::QAligned::create());
     m_constr.append( std::make_shared<Horizontal>() );
 
-    Rel.conservativeResize( Rel.rows(), Rel.cols()+1); //  append a column
+    augment();
     Rel.set( a, last );
-
-    m_status.conservativeResize(m_status.size()+1);
-    m_status(last) = Attribute::Unevaluated;
-
-    m_enforced.conservativeResize(m_enforced.size()+1);
-    m_enforced(last) = false;
 }
 
+
 void impl::establish_diagonal( const Index a)
 {
     m_qConstraint.append( QConstraint::QAligned::create());
     m_constr.append( std::make_shared<Diagonal>() );
 
-    Rel.conservativeResize( Rel.rows(), Rel.cols()+1); //  append a column
+    augment();
     Rel.set( a, last );
-
-    m_status.conservativeResize(m_status.size()+1);
-    m_status(last) = Attribute::Unevaluated;
-
-    m_enforced.conservativeResize(m_enforced.size()+1);
-    m_enforced(last) = false;
 }
 
+
 void impl::establish_orthogonal( const Index a,
                                  const Index b)
 {
     m_qConstraint.append( QConstraint::QOrthogonal::create());
     m_constr.append( std::make_shared<Orthogonal>() );
 
-    Rel.conservativeResize( Rel.rows(), Rel.cols()+1); //  append a column
+    augment();
     Rel.set( a, last );
     Rel.set( b, last );
-
-    m_status.conservativeResize(m_status.size()+1);
-    m_status(last) = Attribute::Unevaluated;
-
-    m_enforced.conservativeResize(m_enforced.size()+1);
-    m_enforced(last) = false;
 }
 
 
@@ -1056,16 +1046,10 @@ void impl::establish_copunctual( const Index a,
     m_qConstraint.append( QConstraint::QCopunctual::create() );
     m_constr.append( std::make_shared<Copunctual>() );
 
-    Rel.conservativeResize( Rel.rows(), Rel.cols()+1) ; // append a column
+    augment();
     Rel.set( a, last );
     Rel.set( b, last );
     Rel.set( c, last );
-
-    m_status.conservativeResize(m_status.size()+1);
-    m_status(last) = Attribute::Unevaluated;
-
-    m_enforced.conservativeResize(m_enforced.size()+1);
-    m_enforced(last) = false;
 }
 
 
