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

0027114: [Regression to 6.7] DistShapeShape does not find a solution edge-face

Browse Source 
Extrema Curve / Surface algorithm changed to perform more accurate search.

test case bug25232_8 - improvement, one additional intersection point is detected now.
test case bug23830 - normal behavior, position of extrema is changed.

test case for original issue added.
This commit is contained in:
aml 2016-01-29 09:11:46 +03:00 committed by abv
parent 5d7a048985
commit fa6d1712fd
5 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Extrema/Extrema_ExtCS.cxx
View File

@ -192,7 +192,10 @@ void Extrema_ExtCS::Perform(const Adaptor3d_Curve& C,
}
if (myS->IsUPeriodic())
NbU = 13;
if (myS->IsVPeriodic())
NbV = 13;
Extrema_GenExtCS Ext(C, *myS, NbT, NbU, NbV, cfirst, clast, ufirst, ulast,
vfirst, vlast, mytolC, mytolS);
@ -248,7 +251,9 @@ void Extrema_ExtCS::Perform(const Adaptor3d_Curve& C,
Ext.Perform(C, NbT, tmin, tmax, mytolC); // to avoid overflow
}
else {
if(myCtype == GeomAbs_Circle && NbT < 13) {
if((myCtype == GeomAbs_Circle && NbT < 13) ||
(myCtype == GeomAbs_BSplineCurve && NbT < 13) )
{
NbT = 13;
}
Ext.Perform(C, NbT, mytolC);

2
src/Extrema/Extrema_GenExtCS.cxx
View File

@ -211,7 +211,7 @@ void Extrema_GenExtCS::Perform (const Adaptor3d_Curve& C,
TUVsup(3) = trimvsup;
// Number of particles used in PSO algorithm (particle swarm optimization).
const Standard_Integer aNbParticles = 32;
const Standard_Integer aNbParticles = 48;
math_PSOParticlesPool aParticles(aNbParticles, 3);

26
tests/bugs/fclasses/bug27114 Normal file
View File

@ -0,0 +1,26 @@
puts "========"
puts "OCC27114"
puts "========"
puts ""
##############################################
# DistShapeShape gives not all solutions
# Correct result is 2 solutions
##############################################
restore [locate_data_file bug27114.brep] aShape
explode aShape
set anInfo [distmini d aShape_1 aShape_2]
# Check number of solutions
if { [llength $anInfo] != 9 } {
puts "ERROR: Incorrect number of solutions"
} else {
puts "OK: Two solutions is found"
}
# Check extrema distance
set absTol 1.0e-10
set relTol 0.001
set aDist_Exp 0.0
set aDist [dval d_val]
checkreal "Distance value check" $aDist $aDist_Exp $absTol $relTol

2
tests/bugs/modalg_5/bug25232_8
View File

@ -27,5 +27,5 @@ mkvolume result fcon3 fp
checkprops result -s 1706.51
checkshape result
checknbshapes result -vertex 4 -edge 5 -wire 2 -face 2 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 15
checknbshapes result -vertex 5 -edge 6 -wire 2 -face 2 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 17
checkview -display result -2d -path ${imagedir}/${test_image}.png

2
tests/bugs/moddata_3/bug23830
View File

@ -18,7 +18,7 @@ foreach i ${Indices} {
if { [isdraw ext_1] } {
mkedge e ext_1
regexp {Mass +: +([-0-9.+eE]+)} [lprops e] full l
if {$l > 1e-12} {
if {$l > 2.5e-12} {
puts "Error: invalid result"
}
renamevar ext_1 r_$i