OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0028030: Algorith GeomLib_CheckCurveOnSurface takes too much time for Bspline curves with big number of knots

Browse Source 
Checking of number of knots is added. If number of knots more then allowed value, algorithm does not search distance between curves for each knot interval, but uses predefined sample point distribution.

This change was born in the scope of work on the issue 26329, but does not have direct connection to it. Therefore it has been postponed to be integrated later in its own context.

Test case for issue #28030
This commit is contained in:
ifv 2016-11-07 16:38:53 +03:00 committed by apn
parent 579f2938a8
commit e841c38c71
2 changed files with 158 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
src/GeomLib/GeomLib_CheckCurveOnSurface.cxx
View File

@ -33,6 +33,7 @@
#include <OSD_Parallel.hxx>
#include <Standard_ErrorHandler.hxx>
#include <TColStd_Array1OfReal.hxx>
#include <TColStd_HArray1OfReal.hxx>
class GeomLib_CheckCurveOnSurface_TargetFunc;
@ -461,12 +462,14 @@ Standard_Integer FillSubIntervals(const Handle(Geom_Curve)& theCurve3d,
Standard_Integer &theNbParticles,
TColStd_Array1OfReal* const theSubIntervals)
{
const Standard_Integer aMaxKnots = 101;
const Standard_Real anArrTempC[2] = {theFirst, theLast};
const TColStd_Array1OfReal anArrTemp(anArrTempC[0], 1, 2);
theNbParticles = 3;
Handle(Geom2d_BSplineCurve) aBS2DCurv;
Handle(Geom_BSplineCurve) aBS3DCurv;
Standard_Boolean isTrimmed3D = Standard_False, isTrimmed2D = Standard_False;
//
if (theCurve3d->IsKind(STANDARD_TYPE(Geom_TrimmedCurve)))
@ -474,6 +477,7 @@ Standard_Integer FillSubIntervals(const Handle(Geom_Curve)& theCurve3d,
aBS3DCurv = Handle(Geom_BSplineCurve)::
DownCast(Handle(Geom_TrimmedCurve)::
DownCast(theCurve3d)->BasisCurve());
isTrimmed3D = Standard_True;
}
else
{
@ -485,37 +489,135 @@ Standard_Integer FillSubIntervals(const Handle(Geom_Curve)& theCurve3d,
aBS2DCurv = Handle(Geom2d_BSplineCurve)::
DownCast(Handle(Geom2d_TrimmedCurve)::
DownCast(theCurve2d)->BasisCurve());
isTrimmed2D = Standard_True;
}
else
{
aBS2DCurv = Handle(Geom2d_BSplineCurve)::DownCast(theCurve2d);
}
const TColStd_Array1OfReal &anArrKnots3D = !aBS3DCurv.IsNull() ?
aBS3DCurv->Knots() :
anArrTemp;
const TColStd_Array1OfReal &anArrKnots2D = !aBS2DCurv.IsNull() ?
aBS2DCurv->Knots() :
anArrTemp;
Handle(TColStd_HArray1OfReal) anArrKnots3D, anArrKnots2D;
if(!aBS3DCurv.IsNull())
{
if(aBS3DCurv->NbKnots() <= aMaxKnots)
{
anArrKnots3D = new TColStd_HArray1OfReal(aBS3DCurv->Knots());
}
else
{
Standard_Integer KnotCount;
if(isTrimmed3D)
{
Standard_Integer i;
KnotCount = 0;
const TColStd_Array1OfReal& aKnots = aBS3DCurv->Knots();
for(i = aBS3DCurv->FirstUKnotIndex(); i <= aBS3DCurv->LastUKnotIndex(); ++i)
{
if(aKnots(i) > theFirst && aKnots(i) < theLast)
{
++KnotCount;
}
}
KnotCount += 2;
}
else
{
KnotCount = aBS3DCurv->LastUKnotIndex() - aBS3DCurv->FirstUKnotIndex() + 1;
}
if(KnotCount <= aMaxKnots)
{
anArrKnots3D = new TColStd_HArray1OfReal(aBS3DCurv->Knots());
}
else
{
anArrKnots3D = new TColStd_HArray1OfReal(1, aMaxKnots);
anArrKnots3D->SetValue(1, theFirst);
anArrKnots3D->SetValue(aMaxKnots, theLast);
Standard_Integer i;
Standard_Real dt = (theLast - theFirst) / (aMaxKnots - 1);
Standard_Real t = theFirst + dt;
for(i = 2; i < aMaxKnots; ++i, t += dt)
{
anArrKnots3D->SetValue(i, t);
}
}
}
}
else
{
anArrKnots3D = new TColStd_HArray1OfReal(anArrTemp);
}
if(!aBS2DCurv.IsNull())
{
if(aBS2DCurv->NbKnots() <= aMaxKnots)
{
anArrKnots2D = new TColStd_HArray1OfReal(aBS2DCurv->Knots());
}
else
{
Standard_Integer KnotCount;
if(isTrimmed2D)
{
Standard_Integer i;
KnotCount = 0;
const TColStd_Array1OfReal& aKnots = aBS2DCurv->Knots();
for(i = aBS2DCurv->FirstUKnotIndex(); i <= aBS2DCurv->LastUKnotIndex(); ++i)
{
if(aKnots(i) > theFirst && aKnots(i) < theLast)
{
++KnotCount;
}
}
KnotCount += 2;
}
else
{
KnotCount = aBS2DCurv->LastUKnotIndex() - aBS2DCurv->FirstUKnotIndex() + 1;
}
if(KnotCount <= aMaxKnots)
{
anArrKnots2D = new TColStd_HArray1OfReal(aBS2DCurv->Knots());
}
else
{
anArrKnots2D = new TColStd_HArray1OfReal(1, aMaxKnots);
anArrKnots2D->SetValue(1, theFirst);
anArrKnots2D->SetValue(aMaxKnots, theLast);
Standard_Integer i;
Standard_Real dt = (theLast - theFirst) / (aMaxKnots - 1);
Standard_Real t = theFirst + dt;
for(i = 2; i < aMaxKnots; ++i, t += dt)
{
anArrKnots2D->SetValue(i, t);
}
}
}
}
else
{
anArrKnots2D = new TColStd_HArray1OfReal(anArrTemp);
}
Standard_Integer aNbSubIntervals = 1;
try
{
OCC_CATCH_SIGNALS
const Standard_Integer anIndMax3D = anArrKnots3D.Upper(),
anIndMax2D = anArrKnots2D.Upper();
const Standard_Integer anIndMax3D = anArrKnots3D->Upper(),
anIndMax2D = anArrKnots2D->Upper();
Standard_Integer anIndex3D = anArrKnots3D.Lower(),
anIndex2D = anArrKnots2D.Lower();
Standard_Integer anIndex3D = anArrKnots3D->Lower(),
anIndex2D = anArrKnots2D->Lower();
if(theSubIntervals)
theSubIntervals->ChangeValue(aNbSubIntervals) = theFirst;
while((anIndex3D <= anIndMax3D) && (anIndex2D <= anIndMax2D))
{
const Standard_Real aVal3D = anArrKnots3D.Value(anIndex3D),
aVal2D = anArrKnots2D.Value(anIndex2D);
const Standard_Real aVal3D = anArrKnots3D->Value(anIndex3D),
aVal2D = anArrKnots2D->Value(anIndex2D);
const Standard_Real aDelta = aVal3D - aVal2D;
if(aDelta < Precision::PConfusion())

44
tests/bugs/modalg_6/bug28030 Normal file
View File

@ -0,0 +1,44 @@
puts "========"
puts "OCC28030"
puts "========"
puts ""
########################################################################################################
# Algorith GeomLib_CheckCurveOnSurface takes too much time for Bspline curves with big number of knots
########################################################################################################
beziercurve c 4 0 0 0 1 1 0 2 1 0 3 0 0
convert c1 c
set i 1
repeat 98 {insertknot c1 0.01*$i 1; incr i 1}
mkedge e1 c1
prism p1 e1 0 0 1
explode p1 e
dchrono cpu reset
dchrono cpu start
xdistef p1_3 p1
dchrono cpu stop
puts [dchrono cpu show]
set q1 [dchrono cpu show]
regexp {CPU user time: ([-0-9.+eE]+) seconds} ${q1} full t1
convert c2 c
set i 1
repeat 1000 {insertknot c2 0.00098*$i 1; incr i 1}
mkedge e2 c2
prism p2 e2 0 0 1
explode p2 e
dchrono cpu reset
dchrono cpu start
xdistef p2_3 p2
dchrono cpu stop
puts [dchrono cpu show]
set q2 [dchrono cpu show]
regexp {CPU user time: ([-0-9.+eE]+) seconds} ${q2} full t2
set max_ratio 5
if { ${t2} > ${max_ratio}*${t1} } {
puts "Elapsed time is too much - Faulty"
} else {
puts "Elapsed time is OK"
}