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

0032874: IsParallel() method of Extrema_ExtCC does not give same results in OCC 7.6.0 vs OCC 7.5.0

Browse Source 
Use precision depending on radii of participating circles.
This commit is contained in:
azv 2022-04-07 14:28:03 +03:00 committed by smoskvin
parent 1fff4ad5a7
commit ee6581adbe
6 changed files with 124 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Extrema/Extrema_ExtCC.cxx
View File

@ -602,6 +602,9 @@ void Extrema_ExtCC::PrepareParallelResult(const Standard_Real theUt11,
const Bnd_Range aRange(theUt21, theUt22);
Bnd_Range aProjRng1;
// Precision of the calculation depends on circles radii
const Standard_Real aPrecision = Max(Epsilon(myC[0]->Circle().Radius()), Epsilon(myC[1]->Circle().Radius()));
// Project arc of the 1st circle between points theUt11 and theUt12 to the
// 2nd circle. It is necessary to chose correct arc from two possible ones.
@ -678,7 +681,7 @@ void Extrema_ExtCC::PrepareParallelResult(const Standard_Real theUt11,
aMinSqD = Min(aMinSqD, ExtPCir.SquareDistance(anExtID));
}
if (aMinSqD <= aMinSquareDist + (1. + aMinSqD) * Epsilon(1. + aMinSqD))
if (aMinSqD <= aMinSquareDist + (1. + aMinSqD) * aPrecision)
{
ClearSolutions();
mySqDist.Append(aMinSqD);
@ -778,7 +781,7 @@ void Extrema_ExtCC::PrepareParallelResult(const Standard_Real theUt11,
imin = k;
}
}
if (aDmin <= aMinSquareDist + (1. + aDmin) * Epsilon(1. + aDmin))
if (aDmin <= aMinSquareDist + (1. + aDmin) * aPrecision)
{
if (imin == 0)
{

0
tests/bugs/modalg_7/bug32874 → tests/bugs/modalg_7/bug32874_1
View File

29
tests/bugs/modalg_7/bug32874_2 Normal file
View File

@ -0,0 +1,29 @@
puts "================================================="
puts "0032874: IsParallel() method of Extrema_ExtCC does not give same results in OCC 7.6.0 vs OCC 7.5.0"
puts "================================================="
puts ""
set distExpected 3.5
circle c1 0 0 0 100
circle c2 0 0 0 100+$distExpected
set start {0.0 0.5*pi pi 1.5*pi 2.0*pi}
set delta {pi/4.0 pi/3.0 pi/2.0 0.55*pi 0.99*pi pi 1.1*pi}
foreach f $start {
foreach d $delta {
trim cc1 c1 $f $f+$d
trim cc2 c2 $f $f+$d
set extr [extrema cc1 cc2]
if {[regexp {Infinite number of extremas, distance = ([-0-9.+eE]+)} $extr full dist]} {
if {[expr abs($dist - $distExpected)] < 1.e-7} {
puts "OK"
} else {
puts "Error: wrong distance $dist instead of $distExpected expected"
}
} else {
puts "Error: non-parallel curves"
}
}
}

30
tests/bugs/modalg_7/bug32874_3 Normal file
View File

@ -0,0 +1,30 @@
puts "================================================="
puts "0032874: IsParallel() method of Extrema_ExtCC does not give same results in OCC 7.6.0 vs OCC 7.5.0"
puts "================================================="
puts ""
set radius 0.001
set distExpected 0.00001
circle c1 0 0 0 $radius
circle c2 0 0 0 $radius+$distExpected
set start {0.0 0.5*pi pi 1.5*pi 2.0*pi}
set delta {pi/4.0 pi/3.0 pi/2.0 0.55*pi 0.99*pi pi 1.1*pi}
foreach f $start {
foreach d $delta {
trim cc1 c1 $f $f+$d
trim cc2 c2 $f $f+$d
set extr [extrema cc1 cc2]
if {[regexp {Infinite number of extremas, distance = ([-0-9.+eE]+)} $extr full dist]} {
if {[expr abs($dist - $distExpected)] < 1.e-7} {
puts "OK"
} else {
puts "Error: wrong distance $dist instead of $distExpected expected"
}
} else {
puts "Error: non-parallel curves"
}
}
}

30
tests/bugs/modalg_7/bug32874_4 Normal file
View File

@ -0,0 +1,30 @@
puts "================================================="
puts "0032874: IsParallel() method of Extrema_ExtCC does not give same results in OCC 7.6.0 vs OCC 7.5.0"
puts "================================================="
puts ""
set radius 0.001
set distExpected 1000.0
circle c1 0 0 0 $radius
circle c2 0 0 0 $radius+$distExpected
set start {0.0 0.5*pi pi 1.5*pi 2.0*pi}
set delta {pi/4.0 pi/3.0 pi/2.0 0.55*pi 0.99*pi pi 1.1*pi}
foreach f $start {
foreach d $delta {
trim cc1 c1 $f $f+$d
trim cc2 c2 $f $f+$d
set extr [extrema cc1 cc2]
if {[regexp {Infinite number of extremas, distance = ([-0-9.+eE]+)} $extr full dist]} {
if {[expr abs($dist - $distExpected)] < 1.e-7} {
puts "OK"
} else {
puts "Error: wrong distance $dist instead of $distExpected expected"
}
} else {
puts "Error: non-parallel curves"
}
}
}

30
tests/bugs/modalg_7/bug32874_5 Normal file
View File

@ -0,0 +1,30 @@
puts "================================================="
puts "0032874: IsParallel() method of Extrema_ExtCC does not give same results in OCC 7.6.0 vs OCC 7.5.0"
puts "================================================="
puts ""
set radius 1000.0
set distExpected 1.e-5
circle c1 0 0 0 $radius
circle c2 0 0 0 $radius-$distExpected
set start {0.0 0.5*pi pi 1.5*pi 2.0*pi}
set delta {pi/4.0 pi/3.0 pi/2.0 0.55*pi 0.99*pi pi 1.1*pi}
foreach f $start {
foreach d $delta {
trim cc1 c1 $f $f+$d
trim cc2 c2 $f $f+$d
set extr [extrema cc1 cc2]
if {[regexp {Infinite number of extremas, distance = ([-0-9.+eE]+)} $extr full dist]} {
if {[expr abs($dist - $distExpected)] < 1.e-7} {
puts "OK"
} else {
puts "Error: wrong distance $dist instead of $distExpected expected"
}
} else {
puts "Error: non-parallel curves"
}
}
}