[fitting] Add convertToGlobalBasis in DistWeightFunc

poncateam · Jul 10, 2024 · 88a95cd · 88a95cd
1 parent 6cee05d
commit 88a95cd
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 9 deletions.
diff --git a/Ponca/src/Fitting/algebraicSphere.h b/Ponca/src/Fitting/algebraicSphere.h
@@ -214,7 +214,7 @@ class AlgebraicSphere : public T
         }
 
         Scalar b = Scalar(1.)/m_uq;
-        return (Scalar(-0.5)*b)*m_ul + Base::m_w.basisCenter();
+        return Base::m_w.convertToGlobalBasis((Scalar(-0.5)*b)*m_ul);
     }
 
     //! \brief State indicating when the sphere has been normalized

diff --git a/Ponca/src/Fitting/algebraicSphere.hpp b/Ponca/src/Fitting/algebraicSphere.hpp
@@ -26,7 +26,7 @@ AlgebraicSphere<DataPoint, _WFunctor, T>::project(const VectorType& _q) const
     {
         t = - (norm - sqrt(norm*norm - Scalar(4) * m_uq * potential)) / (Scalar(2) * m_uq * norm);
     }
-    return Base::m_w.basisCenter() + lq + t * grad;
+    return Base::m_w.convertToGlobalBasis( lq + t * grad );
 }
 
 template < class DataPoint, class _WFunctor, typename T>
@@ -53,7 +53,7 @@ AlgebraicSphere<DataPoint, _WFunctor, T>::projectDescent( const VectorType& _q,
         delta = -(m_uc + proj.dot(m_ul) + m_uq * proj.squaredNorm())*min(ilg,Scalar(1.));
         proj += dir*delta;
     }
-    return proj + Base::m_w.basisCenter();
+    return Base::m_w.convertToGlobalBasis( proj );
 }
 
 template < class DataPoint, class _WFunctor, typename T>

diff --git a/Ponca/src/Fitting/covariancePlaneFit.hpp b/Ponca/src/Fitting/covariancePlaneFit.hpp
@@ -40,7 +40,7 @@ CovariancePlaneFitImpl<DataPoint, _WFunctor, T>::tangentPlaneToWorld (const Vect
   if (ignoreTranslation)
     return Base::m_solver.eigenvectors().transpose().inverse() * _lq;
   else {
-    return Base::m_solver.eigenvectors().transpose().inverse() * _lq + Base::m_w.basisCenter();
+    return Base::m_w.convertToGlobalBasis(Base::m_solver.eigenvectors().transpose().inverse() * _lq);
   }
 }
 

diff --git a/Ponca/src/Fitting/linePrimitive.h b/Ponca/src/Fitting/linePrimitive.h
@@ -112,7 +112,7 @@ PONCA_FITTING_DECLARE_DEFAULT_TYPES
     PONCA_MULTIARCH inline VectorType project (const VectorType& _q) const
     {
         // Project on the normal vector and add the offset value
-        return EigenBase::projection(Base::m_w.convertToLocalBasis(_q)) + Base::m_w.basisCenter();
+        return Base::m_w.convertToGlobalBasis(EigenBase::projection(Base::m_w.convertToLocalBasis(_q)));
     }
 }; //class Line
 

diff --git a/Ponca/src/Fitting/mean.h b/Ponca/src/Fitting/mean.h
@@ -38,7 +38,7 @@ namespace Ponca {
         /// Defined as \f$ b(\mathbf{x}) = \frac{\sum_i w_\mathbf{x}(\mathbf{p_i}) \mathbf{p_i}}{\sum_i w_\mathbf{x}(\mathbf{p_i})} \f$,
         ///  where \f$\left[\mathbf{p_i} \in \text{neighborhood}(\mathbf{x})\right]\f$ are all the point samples in \f$\mathbf{x}\f$'s neighborhood
         PONCA_MULTIARCH inline VectorType barycenter() const {
-            return barycenterLocal() + Base::m_w.basisCenter();
+            return Base::m_w.convertToGlobalBasis( barycenterLocal() );
         }
 
     protected:

diff --git a/Ponca/src/Fitting/plane.h b/Ponca/src/Fitting/plane.h
@@ -105,7 +105,7 @@ class Plane : public T,
     PONCA_MULTIARCH inline VectorType project (const VectorType& _q) const
     {
         // Project on the normal vector and add the offset value
-        return EigenBase::projection(Base::m_w.convertToLocalBasis(_q)) + Base::m_w.basisCenter();
+        return Base::m_w.convertToGlobalBasis(EigenBase::projection(Base::m_w.convertToLocalBasis(_q)));
     }
 
     //! \brief Scalar field gradient direction at the evaluation point

diff --git a/Ponca/src/Fitting/weightFunc.h b/Ponca/src/Fitting/weightFunc.h
@@ -58,11 +58,18 @@ class DistWeightFunc
         m_p = _evalPos;
     }
 
-    /// \todo add convertToGlobalBasis, and remove this function
+    /// \brief Get access to basis center location in global coordinate system
     PONCA_MULTIARCH inline const VectorType& basisCenter() const { return m_p; }
 
     /*!
-     * \brief Convert query from global to local coordinate system
+     * \brief Convert position from local to global coordinate system
+     * @param _q Position in local coordinate
+     * @return Position expressed independently of the local basis center
+     */
+    PONCA_MULTIARCH inline VectorType convertToGlobalBasis(const VectorType& _q) const;
+
+    /*!
+     * \brief Convert query from global to local coordinate system (used internally(
      * @param _q Query in global coordinate
      * @return Query expressed relatively to the basis center
      */

diff --git a/Ponca/src/Fitting/weightFunc.hpp b/Ponca/src/Fitting/weightFunc.hpp
@@ -5,6 +5,13 @@
 */
 
 
+template <class DataPoint, class WeightKernel>
+typename DistWeightFunc<DataPoint, WeightKernel>::VectorType
+DistWeightFunc<DataPoint, WeightKernel>::convertToGlobalBasis(const VectorType& _q) const
+{
+    return _q + m_p;
+}
+
 template <class DataPoint, class WeightKernel>
 typename DistWeightFunc<DataPoint, WeightKernel>::VectorType
 DistWeightFunc<DataPoint, WeightKernel>::convertToLocalBasis(const VectorType& _q) const