OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0025742: A partition of 2 shapes stresses a performance issue

Browse Source 
1. Algorithm of aStepU1 computing was changed.
2. Interface to allow convert gp_XY(Z) to the math_Vector has been added.
3. Algorithm of point in V-boundaries computing has been changed.
4. Situation when intersection line walks along V-boundary of cylinder(s) is processed better.
5. Intersection lines are created with their individual step along U1 parameter.
6. Points processing has been moved to the assembly level.
7. Extend output of "bfuseblend" and "bcutblend" DRAW-command.
8. New option for "bfuseblend" and "bcutblend" command has been added.

Update Test cases

Test cases for issue CR25742
This commit is contained in:
nbv 2015-04-07 17:41:37 +03:00 committed by bugmaster
parent 536d98e224
commit b5ef9d9151
11 changed files with 1368 additions and 584 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/BRepTest/BRepTest_FilletCommands.cxx
View File

@ -378,7 +378,11 @@ Standard_Integer topoblend(Draw_Interpretor& di, Standard_Integer narg, const ch
Standard_Integer boptopoblend(Draw_Interpretor& di, Standard_Integer narg, const char** a)
{
printtolblend(di);
if(narg != 5) return 1;
if(narg < 5)
{
cout << "Use <command name> result shape1 shape2 radius [-d]" << endl;
return 1;
}
Standard_Boolean fuse = !strcmp(a[0],"bfuseblend");
TopoDS_Shape S1 = DBRep::Get(a[2]);
@ -388,6 +392,15 @@ Standard_Integer boptopoblend(Draw_Interpretor& di, Standard_Integer narg, const
return 1;
}
Standard_Real Rad = Draw::Atof(a[4]);
Standard_Boolean isDebug = Standard_False;
if(narg == 6)
{
if(!strcmp(a[5], "-d"))
{
isDebug = Standard_True;
}
}
BOPAlgo_PaveFiller theDSFiller;
BOPCol_ListOfShape aLS;
@ -410,44 +423,67 @@ Standard_Integer boptopoblend(Draw_Interpretor& di, Standard_Integer narg, const
Standard_Boolean anIsDone = pBuilder->IsDone();
if (!anIsDone)
{
printf("boolean operation not done ErrorStatus()=%d\n", pBuilder->ErrorStatus());
return 1;
}
{
printf("boolean operation not done ErrorStatus()=%d\n", pBuilder->ErrorStatus());
return 1;
}
TopoDS_Shape ResultOfBop = pBuilder->Shape();
delete pBuilder;
const int aStrLen = 1000;
char aBuff[aStrLen];
if(isDebug)
{
strcpy(aBuff, a[1]);
DBRep::Set( strcat(aBuff, "_bop"), ResultOfBop );
di << "Intermediate result of BOP-operation is saved to \"" << aBuff << "\" variable\n";
}
pBuilder = new BRepAlgoAPI_Section( S1, S2, theDSFiller );
TopoDS_Shape theSection = pBuilder->Shape();
if(isDebug)
{
strcpy(aBuff, a[1]);
DBRep::Set( strcat(aBuff, "_sec"), theSection );
di << "Intermediate bopsection result is saved to \"" << aBuff << "\" variable\n";
}
TopoDS_Compound result;
BRep_Builder BB;
BB.MakeCompound(result);
TopExp_Explorer Explo( ResultOfBop, TopAbs_SOLID );
for (; Explo.More(); Explo.Next())
{
const TopoDS_Shape& aSolid = Explo.Current();
BRepFilletAPI_MakeFillet Blender(aSolid);
Blender.SetParams(ta,t3d,t2d,t3d,t2d,fl);
Blender.SetContinuity( blend_cont, tapp_angle );
TopExp_Explorer expsec( theSection, TopAbs_EDGE );
for (; expsec.More(); expsec.Next())
{
const TopoDS_Shape& aSolid = Explo.Current();
BRepFilletAPI_MakeFillet Blender(aSolid);
Blender.SetParams(ta,t3d,t2d,t3d,t2d,fl);
Blender.SetContinuity( blend_cont, tapp_angle );
TopExp_Explorer expsec( theSection, TopAbs_EDGE );
for (; expsec.More(); expsec.Next())
{
TopoDS_Edge anEdge = TopoDS::Edge(expsec.Current());
Blender.Add( Rad, anEdge );
}
Blender.Build();
if (Blender.IsDone())
BB.Add( result, Blender.Shape() );
else
BB.Add( result, aSolid );
TopoDS_Edge anEdge = TopoDS::Edge(expsec.Current());
Blender.Add( Rad, anEdge );
}
Blender.Build();
if (Blender.IsDone())
BB.Add( result, Blender.Shape() );
else
{
di << "Error: Cannot find the result of BLEND-operation."
" The result of BOP operation will be returned.\n";
BB.Add( result, aSolid );
}
}
delete pBuilder;
DBRep::Set( a[1], result );
return 0;
@ -759,11 +795,11 @@ void BRepTest::FilletCommands(Draw_Interpretor& theCommands)
topoblend,g);
theCommands.Add("bfuseblend",
"bfuseblend result shape1 shape2 radius",__FILE__,
"bfuseblend result shape1 shape2 radius [-d]",__FILE__,
boptopoblend,g);
theCommands.Add("bcutblend",
"bcutblend result shape tool radius",__FILE__,
"bcutblend result shape1 tool radius [-d]",__FILE__,
boptopoblend,g);
theCommands.Add("blend1",

1510
src/IntPatch/IntPatch_ImpImpIntersection_4.gxx
View File

File diff suppressed because it is too large Load Diff

19
src/math/math_Vector.cxx
View File

@ -51,6 +51,25 @@ math_Vector::math_Vector(const Standard_Address theTab,
Standard_RangeError_Raise_if((theLower > theUpper) , "");
}
math_Vector::math_Vector(const gp_XY& theOther):
LowerIndex(1),
UpperIndex(2),
Array(1,2)
{
Array(1) = theOther.X();
Array(2) = theOther.Y();
}
math_Vector::math_Vector(const gp_XYZ& theOther):
LowerIndex(1),
UpperIndex(3),
Array(1, 3)
{
Array(1) = theOther.X();
Array(2) = theOther.Y();
Array(3) = theOther.Z();
}
void math_Vector::Init(const Standard_Real theInitialValue)
{
Array.Init(theInitialValue);

8
src/math/math_Vector.hxx
View File

@ -16,6 +16,8 @@
#define _math_Vector_HeaderFile
#include <math_SingleTab.hxx>
#include <gp_XY.hxx>
#include <gp_XYZ.hxx>
class Standard_DimensionError;
class Standard_DivideByZero;
@ -69,6 +71,12 @@ public:
//! with the "c array" theTab.
Standard_EXPORT math_Vector(const Standard_Address theTab, const Standard_Integer theLower, const Standard_Integer theUpper);
//! Constructor for converting gp_XY to math_Vector
Standard_EXPORT math_Vector(const gp_XY& Other);
//! Constructor for converting gp_XYZ to math_Vector
Standard_EXPORT math_Vector(const gp_XYZ& Other);
//! Initialize all the elements of a vector with "theInitialValue".
Standard_EXPORT void Init(const Standard_Real theInitialValue);

2
tests/blend/bfuseblend/B7
View File

@ -1,3 +1,5 @@
puts "TODO OCC26009 All: Error: Cannot find the result of BLEND-operation."
pcylinder s1 3 15
pcylinder s2 3 15
trotate s2 0 0 0 1 0 0 90

2
tests/blend/simple/K3
View File

@ -8,4 +8,4 @@ tscale s 0 0 0 SCALE1
nexplode s e
blend result s 0.5*SCALE1 s_4
set square 73213.2
set square 72440.6

23
tests/bugs/modalg_5/bug24915
View File

@ -1,4 +1,4 @@
puts "TODO OCC25597 ALL: Error: Tolerance is too big!"
puts "TODO OCC25929 ALL: Error: Tolerance is too big!"
puts "========="
puts "CR24915"
puts "========="
@ -36,34 +36,23 @@ if {${Toler} > ${MaxTol}} {
}
for {set i 1} {$i <= ${NbCurv}} {incr i} {
set log [dump c_$i]
regexp {Degree +([-0-9.+eE]+), +([-0-9.+eE]+) Poles, +([-0-9.+eE]+)} ${log} full Degree Poles KnotsPoles
set Knot 1
set exp_string "Knots :\n\n +${Knot} : +(\[-0-9.+eE\]+) +(\[-0-9.+eE\]+)"
regexp ${exp_string} ${log} full U1 Mult1
set Knot ${KnotsPoles}
set exp_string " +${Knot} : +(\[-0-9.+eE\]+) +(\[-0-9.+eE\]+)"
regexp ${exp_string} ${log} full U2 Mult2
bounds c_$i U1 U2
dlog reset
dlog on
xdistcs c_$i s1 ${U1} ${U2} 100
xdistcs c_$i s1 U1 U2 100
set Log2 [dlog get]
set List2 [split ${Log2} {TD= \t\n}]
set Tolerance 1.6e-6
set Tolerance 2.0e-5
set Limit_Tol 1.0e-7
set D_good 0.
catch {checkList ${List2} ${Tolerance} ${D_good} ${Limit_Tol}}
dlog reset
dlog on
xdistcs c_$i s2 ${U1} ${U2} 100
xdistcs c_$i s2 U1 U2 100
set Log2 [dlog get]
set List2 [split ${Log2} {TD= \t\n}]
set Tolerance 1.6e-6
set Tolerance 2.0e-5
set Limit_Tol 1.0e-7
set D_good 0.
catch {checkList ${List2} ${Tolerance} ${D_good} ${Limit_Tol}}

1
tests/bugs/modalg_5/bug25292_32
View File

@ -1,4 +1,3 @@
puts "TODO OCC25597 ALL: Error: Tolerance is too big!"
puts "================"
puts "OCC25292"
puts "================"

154
tests/bugs/modalg_5/bug25292_35
View File

@ -6,27 +6,6 @@ puts ""
# Face/Face intersection algorithm gives different results for different order of the arguments
#######################################################################
proc GetRange { curve } {
global U1
global U2
set log [uplevel dump $curve]
regexp {Degree +([-0-9.+eE]+), +([-0-9.+eE]+) Poles, +([-0-9.+eE]+)} ${log} full Degree Poles KnotsPoles
puts "Degree=${Degree}"
puts "Poles=${Poles}"
puts "KnotsPoles=${KnotsPoles}"
puts ""
set Knot 1
set exp_string "Knots :\n\n +${Knot} : +(\[-0-9.+eE\]+) +(\[-0-9.+eE\]+)"
regexp ${exp_string} ${log} full U1 Mult1
set Knot ${KnotsPoles}
set exp_string " +${Knot} : +(\[-0-9.+eE\]+) +(\[-0-9.+eE\]+)"
regexp ${exp_string} ${log} full U2 Mult2
}
puts "##############################"
puts "#!!!Search \"Attention\" keyword on this web-page for additional checking!!!"
puts "##############################"
@ -59,91 +38,56 @@ set ind [string first "3d curve" $che]
if {${ind} >= 0} {
#Only variable "res" exists
if { $GoodNbCurv == 1 } {
puts "OK: Curve Number is good!"
copy res res_1
}
set ic 1
set AllowRepeate 1
while { $AllowRepeate != 0 } {
set che [whatis res_$ic]
set ind [string first "3d curve" $che]
if {${ind} < 0} {
set AllowRepeate 0
} else {
puts "Error: Curve Number is bad!"
}
set U1 0.0
set U2 0.0
GetRange res
puts "U1 = ${U1}"
puts "U2 = ${U2}"
if {[expr {$U2 - $U1}] < 1.0e-20} {
puts "Error: Wrong curve's range!"
}
dlog reset
dlog on
xdistcs res s1 ${U1} ${U2} 10
set Log1 [dlog get]
set List1 [split ${Log1} {TD= \t\n}]
set Tolerance 1.0e-7
set Limit_Tol 1.0e-7
set D_good 0.
checkList ${List1} ${Tolerance} ${D_good} ${Limit_Tol}
dlog reset
dlog on
xdistcs res s2 ${U1} ${U2} 10
set Log1 [dlog get]
set List1 [split ${Log1} {TD= \t\n}]
set Tolerance 1.0e-7
set Limit_Tol 1.0e-7
set D_good 0.
checkList ${List1} ${Tolerance} ${D_good} ${Limit_Tol}
} else {
set ic 1
set AllowRepeate 1
while { $AllowRepeate != 0 } {
set che [whatis res_$ic]
set ind [string first "3d curve" $che]
if {${ind} < 0} {
set AllowRepeate 0
} else {
set U1 0.0
set U2 0.0
GetRange res_$ic
puts "U1 = ${U1}"
puts "U2 = ${U2}"
if {[expr {$U2 - $U1}] < 1.0e-20} {
puts "Error: Wrong curve's range!"
}
dlog reset
dlog on
xdistcs res_$ic s1 ${U1} ${U2} 10
set Log1 [dlog get]
set List1 [split ${Log1} {TD= \t\n}]
set Tolerance 1.0e-7
set Limit_Tol 1.0e-7
set D_good 0.
checkList ${List1} ${Tolerance} ${D_good} ${Limit_Tol}
dlog reset
dlog on
xdistcs res_$ic s2 0 1 10
set Log1 [dlog get]
set List1 [split ${Log1} {TD= \t\n}]
set Tolerance 1.0e-7
set Limit_Tol 1.0e-7
set D_good 0.
checkList ${List1} ${Tolerance} ${D_good} ${Limit_Tol}
incr ic
set le [length res_$ic]
regexp "The length res_$ic is +(\[-0-9.+eE\]+)" ${le} full ll
if { $ll < 1.0e-7 } {
puts "Error: Curve is too small!"
}
}
if {[expr {$ic - 1}] == $GoodNbCurv} {
puts "OK: Curve Number is good!"
} else {
puts "Error: Curve Number is bad!"
bounds res_$ic U1 U2
if {[dval U2-U1] < 1.0e-9} {
puts "Error: Wrong curve's range!"
}
dlog reset
dlog on
xdistcs res_$ic s1 U1 U2 10
set Log1 [dlog get]
set List1 [split ${Log1} {TD= \t\n}]
set Tolerance 1.0e-7
set Limit_Tol 1.0e-7
set D_good 0.
checkList ${List1} ${Tolerance} ${D_good} ${Limit_Tol}
dlog reset
dlog on
xdistcs res_$ic s2 U1 U2 10
set Log1 [dlog get]
set List1 [split ${Log1} {TD= \t\n}]
set Tolerance 1.0e-7
set Limit_Tol 1.0e-7
set D_good 0.
checkList ${List1} ${Tolerance} ${D_good} ${Limit_Tol}
incr ic
}
}
if {[expr {$ic - 1}] == $GoodNbCurv} {
puts "OK: Curve Number is good!"
} else {
puts "Error: Curve Number is bad!"
}

65
tests/bugs/modalg_5/bug25742_1 Executable file
View File

@ -0,0 +1,65 @@
puts "============"
puts "OCC25742"
puts "============"
puts ""
###############################
## A partition of 2 shapes stresses a performance issue
###############################
if { [regexp {Debug mode} [dversion]] } {
if { [regexp {Windows} [dversion]] } {
set max_time 150
} else {
set max_time 100
}
} else {
if { [regexp {Windows} [dversion]] } {
set max_time 30
} else {
set max_time 20
}
}
restore [locate_data_file bug25742_pipeFiss.brep] b1
restore [locate_data_file bug25742_shellFiss.brep] b2
bclearobjects
bcleartools
baddobjects b1
baddtools b2
dchrono h reset
dchrono h start
bfillds
bbuild result
dchrono h stop
set q [dchrono h show]
regexp {CPU user time: ([-0-9.+eE]+) seconds} $q full z
puts "$z"
if { $z > ${max_time} } {
puts "Elapsed time of bbuild is more than ${max_time} seconds - Error"
} else {
puts "Elapsed time of bbuild is less than ${max_time} seconds - OK"
}
set square 280627
set nbshapes_expected "
Number of shapes in shape
VERTEX : 14
EDGE : 24
WIRE : 11
FACE : 10
SHELL : 1
SOLID : 0
COMPSOLID : 0
COMPOUND : 1
SHAPE : 61
"
checknbshapes result ${nbshapes_expected} 1 "Partition of 2 shapes"
set 3dviewer 1

82
tests/bugs/modalg_5/bug25742_2 Executable file
View File

@ -0,0 +1,82 @@
puts "============"
puts "OCC25742"
puts "============"
puts ""
###############################
## A partition of 2 shapes stresses a performance issue
###############################
if { [regexp {Debug mode} [dversion]] } {
if { [regexp {Windows} [dversion]] } {
set max_time 10
set max_time2 10
} else {
set max_time 10
set max_time2 10
}
} else {
if { [regexp {Windows} [dversion]] } {
set max_time 1
set max_time2 1
} else {
set max_time 1
set max_time2 1
}
}
restore [locate_data_file bug25742_pipeFiss.brep] b1
restore [locate_data_file bug25742_shellFiss.brep] b2
explode b1 f
explode b2 f
smallview
donly b1_4 b2_1
fit
dchrono h reset
dchrono h start
bopcurves b1_4 b2_1 -2d
dchrono h stop
set q [dchrono h show]
regexp {CPU user time: ([-0-9.+eE]+) seconds} $q full z
puts "$z"
if { $z > ${max_time} } {
puts "Elapsed time of bopcurves is more than ${max_time} seconds - Error"
} else {
puts "Elapsed time of bopcurves is less than ${max_time} seconds - OK"
}
mksurface s1 b1_4
mksurface s2 b2_1
dchrono h2 stop
set q2 [dchrono h2 show]
set CurveNumb [intersect i s1 s2]
dchrono h2 stop
set q2 [dchrono h2 show]
regexp {CPU user time: ([-0-9.+eE]+) seconds} $q2 full z2
puts "$z2"
if { $z2 > ${max_time2} } {
puts "Elapsed time of intersect is more than ${max_time2} seconds - Faulty"
} else {
puts "Elapsed time of intersect is less than ${max_time2} seconds - OK"
}
if { [llength ${CurveNumb}] < 1 } {
puts "Error : Bad intersection"
} else {
puts "OK : Good intersection"
}
set only_screen_axo 1