mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-03 17:56:21 +03:00
4bc805bfc6
In the algorithm math_FunctionRoots, improve the case when it is needed to find the extremum of the function. Earlier, to solve this task the method of gold section was used. With the patch, firstly the algorithm tries to find zero value of the derivative function. In most cases it gives precise result. Secondly, the algorithm tries to find zero value of the function using the old approach. The algorithm chooses the best solution among two computed by different methods. In the method PutStickPavesOnCurve of BOPAlgo_PaveFiller, forbid putting a vertex to the end of the curve if this end already has a vertex assigned to it. This allows getting rid of unwanted colliding of vertices. In the method UpdatePaveBlocks of BOPAlgo_PaveFiller, make the check for micro edges more precise. New category of tests "lowalgos" has been added. Tests for low level algorithms are to be put there. "2dinter" is a new group of tests in this category. Introduction of the new key for "2dintersect" command, allowing printing the intersection state for each point. It has the following syntax now: "2dintersect curve1 [curve2] [-tol tol] [-state]" Options: -tol - allows changing the intersection tolerance (default value is 1.e-3); -state - allows printing the intersection state for each point. Correct the test case bugs/modalg_7/bug28274 to make proper checks of the result.
61 lines
2.0 KiB
Plaintext
Executable File
61 lines
2.0 KiB
Plaintext
Executable File
puts "============"
|
|
puts "OCC25593"
|
|
puts "============"
|
|
puts ""
|
|
#########################################################################
|
|
# Number of intersection points for 2d curves depends on the order of arguments in command "2dintersect"
|
|
#########################################################################
|
|
|
|
restore [locate_data_file bug25593_face1.brep] b
|
|
pcurve b
|
|
|
|
puts "Intersection 1"
|
|
set info1 [2dintersect b_2 b_3 -tol 1.e-10]
|
|
regexp {Intersection point 1 : +([-0-9.+eE]+) +([-0-9.+eE]+)} $info1 full p1x p1y
|
|
regexp {parameter on the fist: +([-0-9.+eE]+) +parameter on the second: +([-0-9.+eE]+)} $info1 full par1f par1s
|
|
|
|
puts "Intersection 2"
|
|
set info2 [2dintersect b_3 b_2 -tol 1.e-10]
|
|
regexp {Intersection point 1 : +([-0-9.+eE]+) +([-0-9.+eE]+)} $info2 full p2x p2y
|
|
regexp {parameter on the fist: +([-0-9.+eE]+) +parameter on the second: +([-0-9.+eE]+)} $info2 full par2f par2s
|
|
|
|
set NbIP1 1
|
|
if { [regexp "Intersection point 1" $info1] != 1 } {
|
|
puts "Error : Intersection 1 should have one point"
|
|
set NbIP1 0
|
|
}
|
|
if { [regexp "Intersection point 2" $info1] == 1 } {
|
|
puts "Error : Intersection 1 should have one point"
|
|
set NbIP1 2
|
|
}
|
|
puts "NbIP1=$NbIP1"
|
|
|
|
set NbIP2 1
|
|
if { [regexp "Intersection point 1" $info2] != 1 } {
|
|
puts "Error : Intersection 2 should have one point"
|
|
set NbIP2 0
|
|
}
|
|
if { [regexp "Intersection point 2" $info2] == 1 } {
|
|
puts "Error : Intersection 2 should have one point"
|
|
set NbIP2 2
|
|
}
|
|
puts "NbIP2=$NbIP2"
|
|
|
|
if { $NbIP1 != 1 || $NbIP2 != 1 } {
|
|
puts "ERROR: Wrong solutions number"
|
|
} else {
|
|
puts "p1x=$p1x p1y=$p1y par1f=$par1f $par1s"
|
|
puts "p2x=$p2x p2y=$p2y par2f=$par2f $par2s"
|
|
set sqd [expr ($p1x-$p2x)*($p1x-$p2x)+($p1y-$p2y)*($p1y-$p2y)]
|
|
if { $sqd > 1.0e-14 } {
|
|
puts "ERROR: Intersection points are different"
|
|
} else {
|
|
puts "OK: Intersection points are equal"
|
|
}
|
|
if { (abs($par1f - $par2s) > 1.0e-9) || (abs($par1s - $par2f) > 1.0e-9) } {
|
|
puts "ERROR: Parameters on intersecting curves are not coincided"
|
|
} else {
|
|
puts "OK: Parameters on intersecting curves are coincided"
|
|
}
|
|
}
|