use Dim for stability check

poncateam · Aug 4, 2023 · d1ae906 · d1ae906
1 parent 5e2777f
commit d1ae906
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Ponca/src/Fitting/covarianceFit.hpp b/Ponca/src/Fitting/covarianceFit.hpp
@@ -37,8 +37,8 @@ CovarianceFitBase<DataPoint, _WFunctor, T>::finalize ()
     // handle specific configurations
     if(Base::finalize() != STABLE) 
         return Base::m_eCurrentState;
-    // With less than 3 neighbors the fitting is undefined
-    if(Base::getNumNeighbors() < 3)
+    // With less than Dim neighbors the fitting is undefined
+    if(Base::getNumNeighbors() < Base::Dim)
         return Base::m_eCurrentState = UNDEFINED;
 
     // Center the covariance on the centroid

diff --git a/Ponca/src/Fitting/orientedSphereFit.hpp b/Ponca/src/Fitting/orientedSphereFit.hpp
@@ -43,12 +43,12 @@ OrientedSphereFitImpl<DataPoint, _WFunctor, T>::finalize ()
     // Compute status
     if(Base::finalize() != STABLE)
         return Base::m_eCurrentState;
-    if(Base::getNumNeighbors() < 3)
+    if(Base::getNumNeighbors() < Base::Dim)
         return Base::m_eCurrentState = UNDEFINED;
     if (Base::algebraicSphere().isValid())
         Base::m_eCurrentState = CONFLICT_ERROR_FOUND;
     else
-        Base::m_eCurrentState = Base::getNumNeighbors() < 6 ? UNSTABLE : STABLE;
+        Base::m_eCurrentState = Base::getNumNeighbors() < 2*Base::Dim ? UNSTABLE : STABLE;
 
     // 1. finalize sphere fitting
     Scalar epsilon = Eigen::NumTraits<Scalar>::dummy_precision();

diff --git a/Ponca/src/Fitting/sphereFit.hpp b/Ponca/src/Fitting/sphereFit.hpp
@@ -43,12 +43,12 @@ SphereFitImpl<DataPoint, _WFunctor, T>::finalize ()
     // Compute status
     if(Base::finalize() != STABLE)
         return Base::m_eCurrentState;
-    if(Base::getNumNeighbors() < 3)
+    if(Base::getNumNeighbors() < Base::Dim)
         return Base::m_eCurrentState = UNDEFINED;
     if (Base::algebraicSphere().isValid())
         Base::m_eCurrentState = CONFLICT_ERROR_FOUND;
     else
-        Base::m_eCurrentState = Base::getNumNeighbors() < 6 ? UNSTABLE : STABLE;
+        Base::m_eCurrentState = Base::getNumNeighbors() < 2*Base::Dim ? UNSTABLE : STABLE;
 
     MatrixA matC;
     matC.setIdentity();

diff --git a/Ponca/src/Fitting/unorientedSphereFit.hpp b/Ponca/src/Fitting/unorientedSphereFit.hpp
@@ -92,12 +92,12 @@ UnorientedSphereFitImpl<DataPoint, _WFunctor, T>::finalize ()
     // Compute status
     if(Base::finalize() != STABLE)
         return Base::m_eCurrentState;
-    if(Base::getNumNeighbors() < 3)
+    if(Base::getNumNeighbors() < Base::Dim)
         return Base::m_eCurrentState = UNDEFINED;
     if (Base::algebraicSphere().isValid())
         Base::m_eCurrentState = CONFLICT_ERROR_FOUND;
     else
-        Base::m_eCurrentState = Base::getNumNeighbors() < 6 ? UNSTABLE : STABLE;
+        Base::m_eCurrentState = Base::getNumNeighbors() < 2*Base::Dim ? UNSTABLE : STABLE;
 
     // 1. finalize sphere fitting
     Scalar invSumW = Scalar(1.) / Base::getWeightSum();