0028569: Improve the performance of 2d classifier (CSLib_Class2d)

changes: CSLib_Class2d (header and source file)

src/CSLib/CSLib_Class2d.cxx

@@ -18,6 +18,7 @@
 
 #include <CSLib_Class2d.hxx>
 #include <gp_Pnt2d.hxx>
+#include <Standard.hxx>
 #include <Standard_ConstructionError.hxx>
 
 static inline 
@@ -30,47 +31,92 @@ static inline
 //purpose  : 
 //=======================================================================
 CSLib_Class2d::CSLib_Class2d(const TColgp_Array1OfPnt2d& TP2d,
-			     const Standard_Real aTolu,
+			     const Standard_Real theTolu,
-			     const Standard_Real aTolv,
+			     const Standard_Real theTolv,
 			     const Standard_Real umin,
 			     const Standard_Real vmin,
 			     const Standard_Real umax,
 			     const Standard_Real vmax) 
+  : MyPnts2d    (NULL),
+    MyBoxes1d   (NULL),
+    mySizeBox   (0),
+    myNBoxes    (0),
+    N           (0)
 {
-  Umin=umin;
-  Vmin=vmin;
-  Umax=umax;
-  Vmax=vmax;
   //
-  if(umax<=umin || vmax<=vmin) { 
+  if(umax > umin && vmax > vmin)
-    MyPnts2dX=NULL;
+  {
-    MyPnts2dY=NULL;
-    N=0;
-  }
-  //
-  else {
     Standard_Integer i, iLower;
     Standard_Real du,dv,*Pnts2dX,*Pnts2dY, aPrc;
+    Umin=umin;
+    Vmin=vmin;
+    Umax=umax;
+    Vmax=vmax;
     //
     aPrc=1.e-10;
     N = TP2d.Length();
-    Tolu = aTolu;
+    Tolu = theTolu;
-    Tolv = aTolv;
+    Tolv = theTolv;
-    MyPnts2dX = new Standard_Real [N+1];
+    MyPnts2d = new Standard_Real [2*N+2];
-    MyPnts2dY = new Standard_Real [N+1];
+    MyBoxes1d = NULL;
+    Pnts2dX = MyPnts2d;
+    Pnts2dY = Pnts2dX + 1;
+
     du=umax-umin;
     dv=vmax-vmin;
-    Pnts2dX = (Standard_Real *)MyPnts2dX;
+
-    Pnts2dY = (Standard_Real *)MyPnts2dY;
-    //
     iLower=TP2d.Lower();
-    for(i = 0; i<N; ++i) { 
+
-      const gp_Pnt2d& aP2D=TP2d(i+iLower);
+    if (N > 63) {
-      Pnts2dX[i] = Transform2d(aP2D.X(), umin, du);
+      const Standard_Integer aDegBox = static_cast<Standard_Integer>
-      Pnts2dY[i] = Transform2d(aP2D.Y(), vmin, dv);
+        (0.5 * log2(static_cast<Standard_Real>(N-1)));
+      mySizeBox = 1 << aDegBox;
+      myNBoxes = (N + mySizeBox - 1) / mySizeBox;
+      MyBoxes1d = new Standard_Real[2 * myNBoxes];
+
+      Standard_Integer iBox(0), maskBox(mySizeBox-1);
+      const gp_Pnt2d& aP0 = TP2d(iLower);
+      Pnts2dX[0] = Transform2d(aP0.X(), umin, du);
+      Pnts2dY[0] = Transform2d(aP0.Y(), vmin, dv);
+      MyBoxes1d[0] = Pnts2dY[0];
+      MyBoxes1d[1] = Pnts2dY[0];
+
+      for (i = 1; i<N; ++i) { 
+        const gp_Pnt2d& aP2D=TP2d(i+iLower);
+        Pnts2dX[2*i] = Transform2d(aP2D.X(), umin, du);
+        const Standard_Real anY = Transform2d(aP2D.Y(), vmin, dv);
+        Pnts2dY[2*i] = anY;
+        if ((i & maskBox) == 0) {
+          if (anY < MyBoxes1d[iBox])
+            MyBoxes1d[iBox] = anY;
+          if (anY > MyBoxes1d[iBox+1])
+            MyBoxes1d[iBox+1] = anY;
+          iBox+=2;
+          MyBoxes1d[iBox] = anY;
+          MyBoxes1d[iBox+1] = anY;
+        }
+        else if (anY < MyBoxes1d[iBox])
+          MyBoxes1d[iBox] = anY;
+        else if (anY > MyBoxes1d[iBox+1])
+          MyBoxes1d[iBox+1] = anY;
+      }
+      Pnts2dX[2*N]=Pnts2dX[0];
+      Pnts2dY[2*N]=Pnts2dY[0];
+      // now iBox must be equal to 2*myNBoxes-2
+      if (Pnts2dY[0] < MyBoxes1d[iBox])
+        MyBoxes1d[iBox] = Pnts2dY[0];
+      if (Pnts2dY[0] > MyBoxes1d[iBox+1])
+        MyBoxes1d[iBox+1] = Pnts2dY[0];
+    }
+    else {
+      for(i = 0; i<N; ++i) {
+        const gp_Pnt2d& aP2D=TP2d(i+iLower);
+        Pnts2dX[2*i] = Transform2d(aP2D.X(), umin, du);
+        Pnts2dY[2*i] = Transform2d(aP2D.Y(), vmin, dv);
+      }
+      Pnts2dX[2*N]=Pnts2dX[0];
+      Pnts2dY[2*N]=Pnts2dY[0];
     }
-    Pnts2dX[N]=Pnts2dX[0];
-    Pnts2dY[N]=Pnts2dY[0];
     //
     if(du>aPrc) {
       Tolu/=du;
@@ -85,13 +131,13 @@ CSLib_Class2d::CSLib_Class2d(const TColgp_Array1OfPnt2d& TP2d,
 //purpose  : 
 //=======================================================================
 void CSLib_Class2d::Destroy() { 
-  if(MyPnts2dX) { 
+  if(MyPnts2d) { 
-    delete [] (Standard_Real *)MyPnts2dX;
+    delete [] MyPnts2d;
-    MyPnts2dX=NULL;
+    MyPnts2d=NULL;
   }
-  if(MyPnts2dY) { 
+  if(MyBoxes1d) { 
-    delete [] (Standard_Real *)MyPnts2dY;
+    delete [] MyBoxes1d;
-    MyPnts2dY=NULL;
+    MyBoxes1d=NULL;
   }
 }
 
@@ -186,41 +232,73 @@ Standard_Integer CSLib_Class2d::SiDans_OnMode(const gp_Pnt2d& P,
 Standard_Integer CSLib_Class2d::InternalSiDans(const Standard_Real Px,
 					       const Standard_Real Py) const
 { 
-  Standard_Integer nbc, i, ip1, SH, NH;
+  Standard_Integer nbc, i, SH, NH;
   Standard_Real *Pnts2dX, *Pnts2dY;
   Standard_Real  x, y, nx, ny;
   //
   nbc = 0;
   i   = 0;
-  ip1 = 1;
+  Pnts2dX = MyPnts2d;
-  Pnts2dX = (Standard_Real *)MyPnts2dX;
+  Pnts2dY = Pnts2dX + 1;
-  Pnts2dY = (Standard_Real *)MyPnts2dY;
+  if (MyBoxes1d == NULL)
-  x   = (Pnts2dX[i]-Px);
+  {
-  y   = (Pnts2dY[i]-Py);
+    x   = (Pnts2dX[0]-Px);
-  SH  = (y<0.)? -1 : 1;
+    y   = (Pnts2dY[0]-Py);
-  //
+    SH  = (y<0.)? -1 : 1;
-  for(i=0; i<N ; i++,ip1++) { 
+    //
-    nx = Pnts2dX[ip1] - Px;
+    for(i=0; i<N ; i++) { 
-    ny = Pnts2dY[ip1] - Py;
+      nx = Pnts2dX[2*(i+1)] - Px;
+      ny = Pnts2dY[2*(i+1)] - Py;
     
-    NH = (ny<0.)? -1 : 1;
+      NH = (ny<0.)? -1 : 1;
-    if(NH!=SH) { 
+      if(NH!=SH) {
-      if(x>0. && nx>0.) {
+        if(x>0. && nx>0.) {
-	nbc++;
+          nbc++;
+        }
+        else {
+          if(x>0.0 || nx>0.) {
+            if((x-y*(nx-x)/(ny-y))>0.) {
+              nbc++;
+            }
+          }
+        }
+        SH = NH;
+      }
+      x = nx; y = ny;
+    }
+  }
+  else
+  {
+    // Find Y-boxes that include Py. Box with index iBox refers the range of
+    // points starting from iBox*sizeBox.  
+    for (Standard_Integer iBox = 0; iBox < myNBoxes; iBox++) {
+      if ((MyBoxes1d[2*iBox] - Tolv - Py) * (MyBoxes1d[2*iBox+1] + Tolv - Py) < 0.)
+      {
+        Standard_Integer lastBox = (iBox + 1) * mySizeBox;
+        if (lastBox > N)
+          lastBox = N;
+        x = (Pnts2dX[2*iBox*mySizeBox]-Px);
+        y = (Pnts2dY[2*iBox*mySizeBox]-Py);
+        for (i = iBox*mySizeBox; i < lastBox; i++)
+        {
+          nx = Pnts2dX[2*(i+1)] - Px;
+          ny = Pnts2dY[2*(i+1)] - Py;
+          if (ny * y < 0.) {
+            if (x > 0. && nx > 0.)
+              nbc++;
+            else if (x > 0.0 || nx > 0.) {
+              if ((x - y*(nx-x)/(ny-y)) > 0.)
+                nbc++;
+            }
+          }
+          x = nx; y = ny;
+        }
       }
-      else { 
-	if(x>0.0 || nx>0.) { 
-	  if((x-y*(nx-x)/(ny-y))>0.) {
-	    nbc++;
-	  }
-	}
-      }
-      SH = NH;
     }
-    x = nx; y = ny;
   }
   return(nbc&1);
 }
+
 //modified by NIZNHY-PKV Fri Jan 15 09:03:48 2010f
 //=======================================================================
 //function : InternalSiDansOuOn
@@ -229,71 +307,117 @@ Standard_Integer CSLib_Class2d::InternalSiDans(const Standard_Real Px,
 Standard_Integer CSLib_Class2d::InternalSiDansOuOn(const Standard_Real Px,
 						   const Standard_Real Py) const 
 { 
-  Standard_Integer nbc, i, ip1, SH, NH, iRet;
+  Standard_Integer nbc, i, ip1, SH, NH, iRet = 0;
   Standard_Real *Pnts2dX, *Pnts2dY;
   Standard_Real x, y, nx, ny, aX;
-  Standard_Real aYmin;
   //
   nbc = 0;
   i   = 0;
   ip1 = 1;
-  Pnts2dX = (Standard_Real *)MyPnts2dX;
+  Pnts2dX = MyPnts2d;
-  Pnts2dY = (Standard_Real *)MyPnts2dY;
+  Pnts2dY = Pnts2dX + 1;
-  x   = (Pnts2dX[i]-Px);
+  if (MyBoxes1d == NULL)
-  y   = (Pnts2dY[i]-Py);
+  {
-  aYmin=y;
+    x   = (Pnts2dX[0]-Px);
-  SH  = (y<0.)? -1 : 1;
+    y   = (Pnts2dY[0]-Py);
-  for(i=0; i<N ; i++, ip1++) { 
+    SH  = (y<0.)? -1 : 1;
-   
+    for(i=0; i<N ; i++, ip1++)
-    nx = Pnts2dX[ip1] - Px;
-    ny = Pnts2dY[ip1] - Py;
-    //-- le 14 oct 97 
-    if(nx<Tolu && nx>-Tolu && ny<Tolv && ny>-Tolv) { 
-      iRet=-1;
-      return iRet;
-    }
-    //find Y coordinate of polyline for current X gka
-    //in order to detect possible status ON
-    Standard_Real aDx = (Pnts2dX[ip1] - Pnts2dX[ip1-1]);
-    if( (Pnts2dX[ip1-1] - Px) * nx < 0.)
     { 
-     
+      nx = Pnts2dX[2*ip1] - Px;
-      Standard_Real aCurPY =  Pnts2dY[ip1] - (Pnts2dY[ip1] - Pnts2dY[ip1-1])/aDx *nx;
+      ny = Pnts2dY[2*ip1] - Py;
-      Standard_Real aDeltaY = aCurPY - Py;
+      //-- le 14 oct 97 
-      if(aDeltaY >= -Tolv && aDeltaY <= Tolv)
+      if(nx<Tolu && nx>-Tolu && ny<Tolv && ny>-Tolv) { 
+        iRet=-1;
+        return iRet;
+      }
+      //find Y coordinate of polyline for current X gka
+      //in order to detect possible status ON
+      Standard_Real aDx = (Pnts2dX[2*ip1] - Pnts2dX[2*(ip1-1)]);
+      if( (Pnts2dX[2*(ip1-1)] - Px) * nx < 0.)
       {
-         iRet=-1;
-         return iRet;
-      }
-    }
-    //
      
-    NH = (ny<0.)? -1 : 1;
+        Standard_Real aCurPY =
-    if(NH!=SH) { 
+          Pnts2dY[2*ip1] - (Pnts2dY[2*ip1] - Pnts2dY[2*(ip1-1)])/aDx *nx;
-      if(x>0. && nx>0.) {
+        Standard_Real aDeltaY = aCurPY - Py;
-	nbc++;
+        if(aDeltaY >= -Tolv && aDeltaY <= Tolv)
+        {
+          iRet=-1;
+          return iRet;
+        }
       }
-      else { 
+      //
-	if(x>0. || nx>0.) { 
-	  aX=x-y*(nx-x)/(ny-y);
-	  if(aX>0.){
-	    nbc++;
-	  }
-	}
-      }
-      SH = NH;
-    }
-    else {// y has same sign as ny  
-      if (ny<aYmin) {
-	aYmin=ny;
-      }
-    }
-    x = nx; y = ny; 
-  }// for(i=0; i<N ; i++,ip1++) { 
       
-  iRet=nbc&1;
+      NH = (ny<0.)? -1 : 1;
+      if(NH!=SH) { 
+        if(x>0. && nx>0.) {
+          nbc++;
+        }
+        else { 
+          if(x>0. || nx>0.) { 
+            aX=x-y*(nx-x)/(ny-y);
+            if(aX>0.){
+              nbc++;
+            }
+          }
+        }
+        SH = NH;
+      }
+      x = nx; y = ny; 
+    }// for(i=0; i<N ; i++,ip1++) { 
+  }
+  else
+  {
+    const Standard_Real aTolu2(Tolu * Tolu);
+    const Standard_Real aTolv2(Tolv * Tolv);
+
+    // Find Y-boxes that include Py. Box with index iBox refers the range of
+    // points starting from iBox*sizeBox.  
+    for (Standard_Integer iBox = 0; iBox < myNBoxes; iBox++) {
+      if ((MyBoxes1d[2*iBox] - Tolv - Py) * (MyBoxes1d[2*iBox+1] + Tolv - Py) < 0.)
+      {
+        Standard_Integer lastBox = (iBox + 1) * mySizeBox;
+        if (lastBox > N)
+          lastBox = N;
+        x = (Pnts2dX[2*iBox*mySizeBox]-Px);
+        y = (Pnts2dY[2*iBox*mySizeBox]-Py);
+        for (i = iBox*mySizeBox; i < lastBox; i++)
+        {
+          nx = Pnts2dX[2*(i+1)] - Px;
+          ny = Pnts2dY[2*(i+1)] - Py;
+          if (nx * nx < aTolu2 && ny * ny < aTolv2) {
+            iRet = -1;
+            break;
+          }
+          //find Y coordinate of polyline for current X gka
+          //in order to detect possible status ON
+          if (x /*(Pnts2dX[2*(ip1-1)] - Px)*/ * nx < 0.)
+          {
+            const Standard_Real aDeltaY = ny - (ny - y)/(nx - x) * nx;
+            if (aDeltaY*aDeltaY <= aTolv2) {
+              iRet = -1;
+              break;
+            }
+          }
+          if (ny * y < 0.) {
+            if (x > 0. && nx > 0.)
+              nbc++;
+            else if (x > 0. || nx > 0.) {
+              if ((x - y*(nx-x)/(ny-y)) > 0.)
+                nbc++;
+            }
+          }
+          x = nx; y = ny;
+        } // for(.. i ..)
+        if (iRet < 0)
+          break;
+      }
+    } // for(.. iBox ..)
+  }
+  if (iRet == 0)
+    iRet = nbc&1;
   return iRet;
 }
+
 //modified by NIZNHY-PKV Fri Jan 15 09:03:55 2010t
 //=======================================================================
 //function : Copy

src/CSLib/CSLib_Class2d.hxx

@@ -73,8 +73,10 @@ private:
 
 
 
-  Standard_Address MyPnts2dX;
+  Standard_Real  * MyPnts2d;
-  Standard_Address MyPnts2dY;
+  Standard_Real  * MyBoxes1d;
+  Standard_Integer mySizeBox;
+  Standard_Integer myNBoxes;
   Standard_Real Tolu;
   Standard_Real Tolv;
   Standard_Integer N;