Add test for .mesh file format

[tools/medcoupling.git] / src / INTERP_KERNEL / BBTreePts.txx

diff --git a/src/INTERP_KERNEL/BBTreePts.txx b/src/INTERP_KERNEL/BBTreePts.txx
index e6eb029f1de27627b00cf9f4480f69f0d9ba39e1..eb03b58377245e89cce20e65199b18a1c2463695 100644 (file)
--- a/src/INTERP_KERNEL/BBTreePts.txx
+++ b/src/INTERP_KERNEL/BBTreePts.txx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2024  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -90,9 +90,9 @@ public:
     new_elems_right.reserve(nbelems/2+1);
     double max_left = -std::numeric_limits<double>::max();
     double min_right=  std::numeric_limits<double>::max();
-    for(int i=0;i<nbelems;i++)
+    for(ConnType i=0;i<nbelems;i++)
       {
-        int elem;
+        ConnType elem;
         if(elems!=0)
           elem= elems[i];
         else
@@ -115,11 +115,11 @@ public:
     tmp=0;
     if(!new_elems_left.empty())
       tmp=&(new_elems_left[0]);
-    _left=new BBTreePts(pts, tmp, level+1, (int)new_elems_left.size(),_epsilon);
+    _left=new BBTreePts(pts, tmp, level+1, (ConnType)new_elems_left.size(),_epsilon);
     tmp=0;
     if(!new_elems_right.empty())
       tmp=&(new_elems_right[0]);
-    _right=new BBTreePts(pts, tmp, level+1, (int)new_elems_right.size(),_epsilon);
+    _right=new BBTreePts(pts, tmp, level+1, (ConnType)new_elems_right.size(),_epsilon);
   }
 
 
@@ -130,12 +130,12 @@ public:
     delete _right;
   }
 
-  /*! returns in \a elems the list of elements potentially containing the point pointed to by \a xx
+  /*! returns in \a elem an element potentially containing the point pointed to by \a xx
       Contrary to BBTreePts::getElementsAroundPoint the norm 2 is used here.
 
-    \param [in] xx pointer to query point coords
-    \param [in] threshold
-    \param elems list of elements (given in 0-indexing) intersecting the bounding box
+    \param[in] xx pointer to query point coords
+    \param[in] threshold detection precision
+    \param[out] elem the element intersecting the bounding box
     \sa BBTreePts::getElementsAroundPoint
   */
   double getElementsAroundPoint2(const double *xx, double threshold, ConnType& elem) const
@@ -164,7 +164,7 @@ public:
       return _left->getElementsAroundPoint2(xx,threshold,elem);
     if(xx[_level%dim]-s>_max_left)
       return _right->getElementsAroundPoint2(xx,threshold,elem);
-    int eleml,elemr;
+    ConnType eleml,elemr;
     double retl=_left->getElementsAroundPoint2(xx,threshold,eleml);
     double retr=_right->getElementsAroundPoint2(xx,threshold,elemr);
     if(retl<retr)
@@ -174,10 +174,12 @@ public:
   }
  
   /*! returns in \a elems the list of elements potentially containing the point pointed to by \a xx
-    \param xx pointer to query point coords
-    \param elems list of elements (given in 0-indexing) intersecting the bounding box
-    \sa BBTreePts::getElementsAroundPoint2
-  */
+   * ** Infinite norm is used here not norm 2 ! ***
+   * 
+   *  \param xx pointer to query point coords
+   *  \param elems list of elements (given in 0-indexing) intersecting the bounding box
+   * \sa BBTreePts::getElementsAroundPoint2
+   */
   void getElementsAroundPoint(const double* xx, std::vector<ConnType>& elems) const
   {
     //  terminal node : return list of elements intersecting bb
@@ -188,8 +190,7 @@ public:
             const double* const bb_ptr=_pts+_elems[i]*dim;
             bool intersects = true;
             for(int idim=0;idim<dim;idim++)
-              if(std::abs(bb_ptr[idim]-xx[idim])>_epsilon)
-                intersects=false;
+              intersects=intersects && (std::abs(bb_ptr[idim]-xx[idim])<=_epsilon);
             if(intersects)
               elems.push_back(_elems[i]);
           }
@@ -210,7 +211,7 @@ public:
     _right->getElementsAroundPoint(xx,elems);
   }
   
-  int size() const
+  ConnType size() const
   {
     if(_terminal)
       return _nbelems;