Merge pull request #93 from AntoineLafon/CovarianceFit_Fix

Fix - add missing Weight ponderation in covarience fit
poncateam · Jun 16, 2023 · c6afa7b · c6afa7b
2 parents 93a0125 + 8db69b2
commit c6afa7b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -14,6 +14,7 @@ improved doc.
 - Bug-fixes and code improvements
     - [spatialPartitioning] Fix unwanted function hiding with DryFit::setWeightFunc (#86)
     - [fitting] Fix a potential bug when using multi-pass fitting (#89)
+    - [fitting] Fix a bug in CovarianceFit (#93)
     - [fitting] Remove deadcode in Basket (#86)
     - [ci] Fix Compiler is out of heap space error on Github (MSVC), by splitting tests (#87)
 

diff --git a/Ponca/src/Fitting/covarianceFit.hpp b/Ponca/src/Fitting/covarianceFit.hpp
@@ -23,7 +23,7 @@ CovarianceFitBase<DataPoint, _WFunctor, T>::addLocalNeighbor(Scalar w,
                                                               const DataPoint &attributes)
 {
     if( Base::addLocalNeighbor(w, localQ, attributes) ) {
-        m_cov  += localQ * localQ.transpose();
+        m_cov  += w * localQ * localQ.transpose();
         return true;
     }
     return false;

diff --git a/doc/src/ponca.mdoc b/doc/src/ponca.mdoc
@@ -52,7 +52,7 @@
   - <b> Nicolas Dupont, Carl Delrieu, Dorian Verge</b>: add Wendland and Singular weight kernels, as described in \cite Alexa:2009:Hermite<br/>
   - <b> Thibault Lejemble </b>: implementation of several fitting primitives, differential estimators, and original
   version of the Spatial Partitioning code<br/>
-  - <b> Jules Vidal </b>: bug fixes<br/>
+  - <b> Jules Vidal, Antoine Lafon </b>: bug fixes<br/>
   - <b> Amael Marquez </b>: KdTree API improvements <br/>
 
   \subsection ponca_credits_subsection_grenaille Patate/Grenaille crew and contributors