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

0026235: Command tolmax works wrong

Browse Source 
Command tolmax was removed.
Tcl command checkmaxtol is used now in test cases to check maximum tolerance.
Reference values in test cases were updated.
This commit is contained in:
ski 2015-06-26 11:03:58 +03:00
parent d437b80dd7
commit fb60057d23
780 changed files with 843 additions and 956 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dox/dev_guides/tests/tests.md
View File

@ -1043,18 +1043,17 @@ regexp { *VERTEX +: +MAX=([-0-9.+eE]+)} $tolerance dummy max_vertex
It is possible to use command *checkmaxtol* to check maximal tolerance of shape and compare it with reference value.
Use: checkmaxtol shape ref_value [source_shapes={}] [options...]
Use: checkmaxtol shape [options...]
Allowed options are:
* -ref: reference value of maximum tolerance
* -source: list of shapes to compare with
* -min_tol: minimum tolerance for comparison
* -multi_tol: tolerance multiplier
Argument "source_shapes" is a list of shapes to compare with.
It can be empty to skip comparison of tolerance with these shapes.
The default syntax of *checkmaxtol* command for comparison with the reference value:
~~~~~
checkmaxtol result 0.00001
checkmaxtol result -ref 0.00001
~~~~~
There is an opportunity to compare max tolerance of resulting shape with max tolerance of source shape.
@ -1063,11 +1062,17 @@ Then it chooses the maximum value between founded tolerance and value -min_tol (
and multiply it on the coefficient -multi_tol (i.e. 2):
~~~~~
checkmaxtol result 0.00001 {a_1 a_2} -min_tol 0.000001 -multi_tol 2
checkmaxtol result -source {a_1 a_2} -min_tol 0.000001 -multi_tol 2
~~~~~
If the value of maximum tolerance more than founded tolerance for comparison, the command will return an error.
Also, command *checkmaxtol* can be used to get max tolerance of the shape:
~~~~~
set maxtol [checkmaxtol result]
~~~~~
@subsubsection testmanual_5_3_3 Shape volume, area, or length
Use command *vprops, sprops,* or *lprops* to correspondingly measure volume, area, or length of the shape produced by the test. The value can be extracted from the result of the command by *regexp*.

66
src/DrawResources/CheckCommands.tcl
View File

@ -351,26 +351,33 @@ proc checkfreebounds {shape ref_value args} {
}
help checkmaxtol {
Compare max tolerance of shape with ref_value.
Argument "source_shapes" is a list of used for sewing shapes.
It can be empty to skip comparison of tolerance with source shapes.
Compare max tolerance of shape with reference value.
Command returns max tolerance of the shape.
Use: checkmaxtol shape ref_value [source_shapes={}] [options...]
Use: checkmaxtol shape [options...]
Allowed options are:
-min_tol: minimum tolerance for comparison
-multi_tol: tolerance multiplier
-ref: reference value of maximum tolerance.
-source: list of shapes to compare with, e.g.: -source {shape1 shape2 shape3}
-min_tol: minimum tolerance for comparison.
-multi_tol: tolerance multiplier.
}
proc checkmaxtol {shape ref_value {source_shapes {}} args} {
puts "checkmaxtol ${shape} ${ref_value} ${source_shapes} ${args}"
proc checkmaxtol {shape args} {
puts "checkmaxtol ${shape} ${args}"
upvar ${shape} ${shape}
set ref_value ""
set source_shapes {}
set min_tol 0
set tol_multiplier 0
# check arguments
for {set narg 0} {$narg < [llength $args]} {incr narg} {
set arg [lindex $args $narg]
if {[_check_arg "-min_tol" min_tol 1] ||
[_check_arg "-multi_tol" tol_multiplier 1]
[_check_arg "-multi_tol" tol_multiplier 1] ||
[_check_arg "-source" source_shapes 1] ||
[_check_arg "-ref" ref_value 1]
} {
continue
}
@ -382,26 +389,33 @@ proc checkmaxtol {shape ref_value {source_shapes {}} args} {
}
# get max tol of shape
regexp {max tol = ([-0-9.+eE]+)} [tolmax ${shape}] full max_tol
set max_tol 0
if {[regexp "Tolerance MAX=(\[-0-9.+eE\]+)" [tolerance ${shape}] full maxtol_temp]} {
set max_tol ${maxtol_temp}
} else {
error "Error: cannot get tolerances of shape \"${shape}\""
}
checkreal "Max tolerance" $max_tol $ref_value 0.0001 0.01
if {[llength $source_shapes]} {
# find max tol of source shapes
foreach source_shape $source_shapes {
upvar ${source_shape} ${source_shape}
regexp {max tol = ([-0-9.+eE]+)} [tolmax $source_shape] full _src_max_tol
if { ${_src_max_tol} > ${min_tol} } {
set min_tol ${_src_max_tol}
}
}
if {${tol_multiplier}} {
set min_tol [expr ${tol_multiplier} * ${_src_max_tol}]
}
# compare max tol of source shapes with max tol of sewing_result
if { ${max_tol} > ${min_tol} } {
puts "Error: tolerance of \"${shape}\" (${max_tol}) is greater than max tolerance of source shapes (${min_tol})"
# find max tol of source shapes
foreach source_shape ${source_shapes} {
upvar ${source_shape} ${source_shape}
set _src_max_tol [checkmaxtol ${source_shape}]
if { [expr ${_src_max_tol} > ${min_tol} ] } {
set min_tol ${_src_max_tol}
}
}
# apply -multi_tol option
if {${tol_multiplier}} {
set min_tol [expr ${tol_multiplier} * ${_src_max_tol}]
}
# compare max tol of source shapes with checking tolerance
if { ${min_tol} && [expr ${max_tol} > ${min_tol}] } {
puts "Error: tolerance of \"${shape}\" (${max_tol}) is greater than checking tolerance (${min_tol})"
}
if { ${ref_value} != "" } {
checkreal "Max tolerance" ${max_tol} ${ref_value} 0.0001 0.01
}
return ${max_tol}
}
help checkfaults {

11
src/TestTopOpe/TestTopOpe_CORCommands.cxx
View File

@ -714,16 +714,6 @@ static Standard_Integer projponf(Draw_Interpretor& di, Standard_Integer n, const
return 0;
}
static Standard_Integer tolmax(Draw_Interpretor& di, Standard_Integer n, const char** a)
{
if (n < 2) return 1;
TopoDS_Shape s = DBRep::Get(a[1]);
if (s.IsNull()) {di<<"null shape"<<"\n"; return 1;}
Standard_Real tol = FUN_tool_maxtol(s);
di<<"max tol = "<<tol<<"\n";
return 0;
}
static Standard_Integer solidclassifier(Draw_Interpretor& di, Standard_Integer n, const char** a)
{
if (n < 4) return 1;
@ -903,7 +893,6 @@ void TestTopOpe::CORCommands(Draw_Interpretor& theCommands)
theCommands.Add("projponf",
"projponf f pnt [extrema flag: -min/-max/-minmax] [extrema algo: -g(grad)/-t(tree)]",
__FILE__, projponf, g);
theCommands.Add("tolmax", "tolmax s", __FILE__, tolmax, g);
theCommands.Add("normal", "normal f p3d length", __FILE__, normal, g);
theCommands.Add("curvature", "curvature f x y z", __FILE__, curvature , g);

35
src/TopOpeBRepTool/TopOpeBRepTool_TOPOLOGY.cxx
View File

@ -856,7 +856,6 @@ Standard_EXPORT Standard_Boolean FUN_tool_findPinE(const TopoDS_Shape& E,gp_Pnt&
Standard_EXPORT Standard_Boolean FUN_tool_maxtol(const TopoDS_Shape& S,const TopAbs_ShapeEnum& typ,Standard_Real& maxtol)
// purpose : returns maxtol of <S>'s shapes of type <typ>
{
maxtol = 0.;
Standard_Boolean face = (typ == TopAbs_FACE);
Standard_Boolean edge = (typ == TopAbs_EDGE);
Standard_Boolean vertex = (typ == TopAbs_VERTEX);
@ -878,37 +877,9 @@ Standard_EXPORT Standard_Real FUN_tool_maxtol(const TopoDS_Shape& S)
// purpose : returns maxtol between <S>'s shapes.
{
Standard_Real maxtol = 0.;
if (S.IsNull()) return maxtol;
Standard_Boolean hasfa = FUN_tool_maxtol(S,TopAbs_FACE,maxtol);
if (hasfa) {
TopExp_Explorer exf(S,TopAbs_FACE);
for (; exf.More(); exf.Next()){
const TopoDS_Shape& ff = exf.Current();
Standard_Boolean hasedge = FUN_tool_maxtol(ff,TopAbs_EDGE,maxtol);
if (hasedge) {
TopExp_Explorer exe(S,TopAbs_FACE);
for (; exe.More(); exe.Next())
{
const TopoDS_Shape& ee = exe.Current();
FUN_tool_maxtol(ee,TopAbs_VERTEX,maxtol);
}
}
}
}
if (!hasfa) {
Standard_Boolean hasedge = FUN_tool_maxtol(S,TopAbs_EDGE,maxtol);
if (hasedge) {
TopExp_Explorer exe(S,TopAbs_FACE);
for (; exe.More(); exe.Next())
{
const TopoDS_Shape& ee = exe.Current();
FUN_tool_maxtol(ee,TopAbs_VERTEX,maxtol);
}
}
if (!hasedge) {
FUN_tool_maxtol(S,TopAbs_VERTEX,maxtol);
}
}
FUN_tool_maxtol(S,TopAbs_FACE,maxtol);
FUN_tool_maxtol(S,TopAbs_EDGE,maxtol);
FUN_tool_maxtol(S,TopAbs_VERTEX,maxtol);
return maxtol;
}

2
tests/bugs/iges/bug306
View File

@ -28,7 +28,7 @@ if { ($tri != 6409 || $nod != 6195) } {
puts "Shading problem may be, nb tri & nod"
}
checkmaxtol result 0.00061050555357809982
checkmaxtol result -ref 0.92213088179312575
checknbshapes result -shell 1
checkfreebounds result 265

2
tests/bugs/modalg_1/buc60523
View File

@ -7,7 +7,7 @@ restore [locate_data_file buc60523a.brep] a
checkshape a
sewing result 1.e-7 a
checkmaxtol result 0.0010002000000000001
checkmaxtol result -ref 0.001
checknbshapes result -shell 1
checkfreebounds result 2

2
tests/bugs/modalg_1/buc60905
View File

@ -20,7 +20,7 @@ vdisplay result
# checkshape res
checkmaxtol result 0.0022960682613350899
checkmaxtol result -ref 1.56901e+001
checknbshapes result -shell 2
checkfreebounds result 115

2
tests/bugs/modalg_2/bug22500
View File

@ -14,7 +14,7 @@ if { [catch {sewing result 0.01 a} catch_result] } {
puts "Faulty ${BugNumber} : function Sewing works wrongly"
}
checkmaxtol result 4.3455205172376901e-006
checkmaxtol result -ref 4.5583792019775401e-006
checknbshapes result -shell 1
checkfreebounds result 28

2
tests/bugs/modalg_2/bug22717
View File

@ -18,7 +18,7 @@ if [catch {sewing result 0.019 shape_8h} catch_result] {
checkshape result f
}
checkmaxtol result 0.99457631799307555
checkmaxtol result -ref 0.99057887669774025
checknbshapes result -shell 1
checkfreebounds result 13

2
tests/bugs/modalg_2/bug22765
View File

@ -13,7 +13,7 @@ sewing result 0.1 a
checkshape result f
checkmaxtol result 2.0000280013370992e-005
checkmaxtol result -ref 1.0000280013370991e-005
checknbshapes result -shell 1
checkfreebounds result 456

2
tests/bugs/modalg_2/bug22770_1
View File

@ -36,7 +36,7 @@ set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 6
checkmaxtol result 9.9999999999999995e-008
checkmaxtol result -ref 0.0050001000000007819
checknbshapes result -shell 0
checkfreebounds result 0

8
tests/bugs/modalg_2/bug22770_10
View File

@ -12,11 +12,6 @@ restore [locate_data_file 22770-tramp.brep] a
restore [locate_data_file 22770-trans.brep] b
sewing result +t 0.01 a b +mint 0.01 -a
set square 1.88469e+07
checkmaxtol result 0.00087010032709666047
checkfreebounds result 12
set nbshapes_expected "
Number of shapes in shape
VERTEX : 479
@ -30,5 +25,8 @@ Number of shapes in shape
SHAPE : 1762
"
checknbshapes result -ref ${nbshapes_expected} -t -m "sewing result"
checkmaxtol result -ref 0.066338232054955981
checkfreebounds result 12
set square 1.88469e+07
set 3dviewer 1

2
tests/bugs/modalg_2/bug22770_11
View File

@ -24,7 +24,7 @@ set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 1759
checkmaxtol result 0.00087010032709666047
checkmaxtol result -ref 0.066338232054955981
checknbshapes result -shell 2
checkfreebounds result 6

2
tests/bugs/modalg_2/bug22770_12
View File

@ -24,7 +24,7 @@ set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 2871
checkmaxtol result 0.000126867229511314
checkmaxtol result -ref 0.0451323239933289
checknbshapes result -shell 22
checkfreebounds result 1031

2
tests/bugs/modalg_2/bug22770_13
View File

@ -40,7 +40,7 @@ set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 2737
checkmaxtol result 0.000126867229511314
checkmaxtol result -ref 0.046734236640099257
checknbshapes result -shell 18
checkfreebounds result 926

2
tests/bugs/modalg_2/bug22770_14
View File

@ -24,7 +24,7 @@ set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 3476
checkmaxtol result 0.00077119287499509003
checkmaxtol result -ref 0.0451323239933289
checknbshapes result -shell 0
checkfreebounds result 1469

2
tests/bugs/modalg_2/bug22770_15
View File

@ -40,7 +40,7 @@ set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 2737
checkmaxtol result 0.000126867229511314
checkmaxtol result -ref 0.046734236640099257
checknbshapes result -shell 18
checkfreebounds result 926

2
tests/bugs/modalg_2/bug22770_16
View File

@ -28,7 +28,7 @@ set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 6
checkmaxtol result 0
checkmaxtol result -ref 0.0050001000000007819
checknbshapes result -shell 0
checkfreebounds result 0

2
tests/bugs/modalg_2/bug22770_17
View File

@ -28,7 +28,7 @@ set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 7
checkmaxtol result 0
checkmaxtol result -ref 9.9999999999999995e-008
checknbshapes result -shell 0
checkfreebounds result 0

2
tests/bugs/modalg_2/bug22770_18
View File

@ -27,7 +27,7 @@ set nb_compsol_good 0
set nb_compound_good 0
set nb_shape_good 13
checkmaxtol result 1.5
checkmaxtol result -ref 1.5
checknbshapes result -shell 1
checkfreebounds result 0

2
tests/bugs/modalg_2/bug22770_19
View File

@ -27,7 +27,7 @@ set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 21
checkmaxtol result 0
checkmaxtol result -ref 9.9999999999999995e-008
checknbshapes result -shell 0
checkfreebounds result 8

2
tests/bugs/modalg_2/bug22770_2
View File

@ -36,7 +36,7 @@ set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 7
checkmaxtol result 0
checkmaxtol result -ref 9.9999999999999995e-008
checknbshapes result -shell 0
checkfreebounds result 0

2
tests/bugs/modalg_2/bug22770_20
View File

@ -27,7 +27,7 @@ set nb_compsol_good 0
set nb_compound_good 0
set nb_shape_good 13
checkmaxtol result 1.5
checkmaxtol result -ref 1.5
checknbshapes result -shell 1
checkfreebounds result 0

2
tests/bugs/modalg_2/bug22770_21
View File

@ -27,7 +27,7 @@ set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 29
checkmaxtol result 0
checkmaxtol result -ref 9.9999999999999995e-008
checknbshapes result -shell 1
checkfreebounds result 10

2
tests/bugs/modalg_2/bug22770_22
View File

@ -27,7 +27,7 @@ set nb_compsol_good 0
set nb_compound_good 0
set nb_shape_good 25
checkmaxtol result 1.9999999999999999e-007
checkmaxtol result -ref 9.9999999999999995e-008
checknbshapes result -shell 1
checkfreebounds result 6

2
tests/bugs/modalg_2/bug22770_23
View File

@ -25,7 +25,7 @@ set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 1756
checkmaxtol result 0.00087010032709666047
checkmaxtol result -ref 0.080878557461246572
checknbshapes result -shell 2
checkfreebounds result 0

2
tests/bugs/modalg_2/bug22770_24
View File

@ -27,7 +27,7 @@ set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 1759
checkmaxtol result 0.00087010032709666047
checkmaxtol result -ref 0.080878557461246572
checknbshapes result -shell 2
checkfreebounds result 0

2
tests/bugs/modalg_2/bug22770_25
View File

@ -27,7 +27,7 @@ set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 1761
checkmaxtol result 0.00087010032709666047
checkmaxtol result -ref 0.080878557461246572
checknbshapes result -shell 2
checkfreebounds result 6

2
tests/bugs/modalg_2/bug22770_26
View File

@ -27,7 +27,7 @@ set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 1759
checkmaxtol result 0.00087010032709666047
checkmaxtol result -ref 0.080878557461246572
checknbshapes result -shell 2
checkfreebounds result 0

2
tests/bugs/modalg_2/bug22770_27
View File

@ -25,7 +25,7 @@ set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 1762
checkmaxtol result 0.00087010032709666047
checkmaxtol result -ref 0.080645000662448688
checknbshapes result -shell 2
checkfreebounds result 9

2
tests/bugs/modalg_2/bug22770_28
View File

@ -25,7 +25,7 @@ set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 1756
checkmaxtol result 0.00087010032709666047
checkmaxtol result -ref 0.080878557461246572
checknbshapes result -shell 2
checkfreebounds result 0

2
tests/bugs/modalg_2/bug22770_29
View File

@ -25,7 +25,7 @@ set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 3476
checkmaxtol result 0.00077119287499509003
checkmaxtol result -ref 0.0451323239933289
checknbshapes result -shell 0
checkfreebounds result 1469

2
tests/bugs/modalg_2/bug22770_3
View File

@ -33,7 +33,7 @@ set nb_compsol_good 0
set nb_compound_good 0
set nb_shape_good 13
checkmaxtol result 1.5
checkmaxtol result -ref 1.5
checknbshapes result -shell 1
checkfreebounds result 0

2
tests/bugs/modalg_2/bug22770_30
View File

@ -25,7 +25,7 @@ set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 1756
checkmaxtol result 0.00087010032709666047
checkmaxtol result -ref 0.080878557461246572
checknbshapes result -shell 2
checkfreebounds result 0

2
tests/bugs/modalg_2/bug22770_4
View File

@ -25,7 +25,7 @@ set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 21
checkmaxtol result 0
checkmaxtol result -ref 9.9999999999999995e-008
checknbshapes result -shell 0
checkfreebounds result 8

2
tests/bugs/modalg_2/bug22770_5
View File

@ -25,7 +25,7 @@ set nb_compsol_good 0
set nb_compound_good 0
set nb_shape_good 13
checkmaxtol result 1.5
checkmaxtol result -ref 1.5
checknbshapes result -shell 1
checkfreebounds result 0

2
tests/bugs/modalg_2/bug22770_6
View File

@ -25,7 +25,7 @@ set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 29
checkmaxtol result 0
checkmaxtol result -ref 9.9999999999999995e-008
checknbshapes result -shell 1
checkfreebounds result 10

2
tests/bugs/modalg_2/bug22770_7
View File

@ -25,7 +25,7 @@ set nb_compsol_good 0
set nb_compound_good 0
set nb_shape_good 25
checkmaxtol result 1.9999999999999999e-007
checkmaxtol result -ref 9.9999999999999995e-008
checknbshapes result -shell 1
checkfreebounds result 6

2
tests/bugs/modalg_2/bug22770_8
View File

@ -26,7 +26,7 @@ set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 1761
checkmaxtol result 0.00087010032709666047
checkmaxtol result -ref 0.066338232054955981
checknbshapes result -shell 2
checkfreebounds result 6

2
tests/bugs/modalg_2/bug22770_9
View File

@ -24,7 +24,7 @@ set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 1759
checkmaxtol result 0.00087010032709666047
checkmaxtol result -ref 0.066338232054955981
checknbshapes result -shell 2
checkfreebounds result 6

2
tests/bugs/modalg_2/bug22804
View File

@ -53,7 +53,7 @@ if { ${IsOk} == 0 } {
puts "${BugNumber}: OK"
}
checkmaxtol result 2279.641703013865
checkmaxtol result -ref 2279.641703013865
checknbshapes result -shell 1
checkfreebounds result 5

2
tests/bugs/modalg_2/bug22881
View File

@ -24,7 +24,7 @@ set nb_compsol_good 0
set nb_compound_good 0
set nb_shape_good 19
checkmaxtol result 2.5976619580820199e-005
checkmaxtol result -ref 1.6856648382486999e-005
checknbshapes result -shell 1
checkfreebounds result 0

2
tests/bugs/modalg_2/bug322
View File

@ -24,7 +24,7 @@ set y_coord 232
checkcolor $x_coord $y_coord 1 1 0
checkmaxtol result 2.0002007833605686e-007
checkmaxtol result -ref 1.0001007808605688e-007
checknbshapes result -shell 1
checkfreebounds result 6

12
tests/bugs/modalg_2/bug5805_1
View File

@ -32,17 +32,7 @@ if { [catch { offsetshape result rthru2 -0.5 rthru2_3 rthru2_4 } catch_result] }
puts "Faulty ${BugNumber} : offsetshape is wrong"
}
if { [catch { set tolmaxres [tolmax result] } catch_result] } {
puts "Faulty ${BugNumber} : tolmax is wrong"
}
regexp {max tol = ([-0-9.+eE]+)} $tolmaxres full maxtolerance
if { [catch { expr $maxtolerance } res] } {
puts "Faulty ${BugNumber} : maxtolerance is wrong (1)."
}
if { $maxtolerance > 1. } {
puts "Faulty ${BugNumber} : maxtolerance is wrong (2)."
}
checkmaxtol result -min_tol 1.
set square 981.941

11
tests/bugs/modalg_2/bug5805_2
View File

@ -28,16 +28,7 @@ if { [catch { offsetshape result rthru2 -0.5 rthru2_2 rthru2_3 } catch_result] }
puts "Faulty ${BugNumber} : offsetshape is wrong"
}
if { [catch { set tolmaxres [tolmax result] } catch_result] } {
puts "Faulty ${BugNumber} : tolmax is wrong"
}
regexp {max tol = ([-0-9.+eE]+)} $tolmaxres full maxtolerance
if { [catch { expr $maxtolerance } catch_result] } {
puts "Faulty ${BugNumber} : maxtolerance is wrong (1)."
}
if { $maxtolerance > 1. } {
puts "Faulty ${BugNumber} : maxtolerance is wrong (2)."
}
checkmaxtol result -min_tol 1.
set square 982.254

12
tests/bugs/modalg_2/bug5805_3
View File

@ -23,17 +23,7 @@ if { [catch { offsetshape result a -1 a_6 } catch_result] } {
puts "Faulty ${BugNumber} : offsetshape is wrong"
}
if { [catch { set tolmaxres [tolmax result] } catch_result] } {
puts "Faulty ${BugNumber} : tolmax is wrong"
}
regexp {max tol = ([-0-9.+eE]+)} $tolmaxres full maxtolerance
if { [catch { expr $maxtolerance } catch_result] } {
puts "Faulty ${BugNumber} : maxtolerance is wrong (1)."
}
if { $maxtolerance > 1. } {
puts "Faulty ${BugNumber} : maxtolerance is wrong (2)."
}
checkmaxtol result -min_tol 1.
set square 1185.03

14
tests/bugs/modalg_2/bug5805_4
View File

@ -1,7 +1,6 @@
puts "TODO OCC25925 ALL: ERROR. offsetperform operation not done."
puts "TODO OCC25925 ALL: Faulty OCC5805 : offsetshape is wrong"
puts "TODO OCC25925 ALL: Faulty OCC5805 : tolmax is wrong"
puts "TODO OCC25925 ALL: Tcl Exception: can't read"
puts "TODO OCC25925 ALL: Tcl Exception:"
puts "TODO OCC25925 ALL: TEST INCOMPLETE"
puts "============"
@ -33,16 +32,7 @@ if { [catch { offsetperform result } catch_result] } {
puts "Faulty ${BugNumber} : offsetshape is wrong"
}
if { [catch { set tolmaxres [tolmax result] } catch_result] } {
puts "Faulty ${BugNumber} : tolmax is wrong"
}
regexp {max tol = ([-0-9.+eE]+)} $tolmaxres full maxtolerance
if { [catch { expr $maxtolerance } catch_result] } {
puts "Faulty ${BugNumber} : maxtolerance is wrong (1)."
}
if { $maxtolerance > 1. } {
puts "Faulty ${BugNumber} : maxtolerance is wrong (2)."
}
checkmaxtol result -min_tol 1.
set square 1185.03

11
tests/bugs/modalg_2/bug5805_5
View File

@ -26,16 +26,7 @@ if { [catch { offsetperform result } catch_result] } {
puts "Faulty ${BugNumber} : offsetshape is wrong"
}
if { [catch { set tolmaxres [tolmax result] } catch_result]} {
puts "Faulty ${BugNumber} : tolmax is wrong"
}
regexp {max tol = ([-0-9.+eE]+)} $tolmaxres full maxtolerance
if { [catch { expr $maxtolerance } catch_result] } {
puts "Faulty ${BugNumber} : maxtolerance is wrong (1)."
}
if { $maxtolerance > 1. } {
puts "Faulty ${BugNumber} : maxtolerance is wrong (2)."
}
checkmaxtol result -min_tol 1.
set square 876.584

11
tests/bugs/modalg_3/bug5805_6
View File

@ -21,16 +21,7 @@ if { [catch { offsetshape result a -1 } catch_result] } {
puts "Faulty ${BugNumber} : offsetshape is wrong"
}
if { [catch { set tolmaxres [tolmax result] } catch_result] } {
puts "Faulty ${BugNumber} : tolmax is wrong"
}
regexp {max tol = ([-0-9.+eE]+)} $tolmaxres full maxtolerance
if { [catch { expr $maxtolerance } catch_result] } {
puts "Faulty ${BugNumber} : maxtolerance is wrong (1)."
}
if { $maxtolerance > 1. } {
puts "Faulty ${BugNumber} : maxtolerance is wrong (2)"
}
checkmaxtol result -min_tol 1.
set square 876.584

11
tests/bugs/modalg_4/bug5806
View File

@ -28,16 +28,7 @@ if { [catch { offsetshape result resthru -0.5 resthru_6 resthru_7 } catch_result
puts "Faulty ${BugNumber} : offsetshape is wrong"
}
if { [catch { set tolmaxres [tolmax result] } catch_result] } {
puts "Faulty ${BugNumber} : tolmax is wrong"
}
regexp {max tol = ([-0-9.+eE]+)} $tolmaxres full maxtolerance
if { [catch { expr $maxtolerance } catch_result] } {
puts "Faulty ${BugNumber} : maxtolerance is wrong (1)."
}
if { $maxtolerance > 1. } {
puts "Faulty ${BugNumber} : maxtolerance is wrong (2)."
}
checkmaxtol result -min_tol 1.
set square 1116.06

2
tests/bugs/modalg_4/bug714
View File

@ -29,7 +29,7 @@ if { $ve1 != $ve2 || $ed1 != $ed2 || $we1 != $we2} {
puts "OK OCC714: SEWING operation was made PROPERLY"
}
checkmaxtol result 0.00016588397833094108
checkmaxtol result -ref 0.25619311354638169
checknbshapes result -shell 1
checkfreebounds result 0

2
tests/bugs/modalg_5/bug22747
View File

@ -29,7 +29,7 @@ if { [regexp "Progress:" $List2] != 1 } {
puts "Mode +t works properly"
}
checkmaxtol result 2.0000280013370992e-005
checkmaxtol result -ref 1.0000280013370991e-005
checknbshapes result -shell 1
checkfreebounds result 456

2
tests/bugs/modalg_5/bug23375_1
View File

@ -14,7 +14,7 @@ explode v
sewing result 0.01 v_1 v_2
checkshape result
checkmaxtol result 3.1397023587080346e-005 {v_1 v_2} -min_tol 1.e-4
checkmaxtol result -ref 6.7739238740616194e-005 -source {v_1 v_2} -min_tol 1.e-4
checknbshapes result -shell 1
checkfreebounds result 8

13
tests/bugs/modalg_5/bug23845
View File

@ -16,16 +16,9 @@ set CMP_TOL 1.e-6
# 1
checkshape aa
set tolmaxres [tolmax aa]
regexp {max tol = ([-0-9.+eE]+)} $tolmaxres full MaxTolerance
if { ${MaxTolerance} > ${CMP_TOL} } {
puts "Error: invalid tolerance of first wire"
}
checkmaxtol aa -min_tol ${CMP_TOL}
# 2
checkshape bb
set tolmaxres [tolmax bb]
regexp {max tol = ([-0-9.+eE]+)} $tolmaxres full MaxTolerance
if { ${MaxTolerance} > ${CMP_TOL} } {
puts "Error: invalid tolerance of second wire"
}
checkmaxtol bb -min_tol ${CMP_TOL}

2
tests/bugs/modalg_5/bug24036
View File

@ -14,7 +14,7 @@ explode v
sewing result 0.00001 v_1 v_2
checkshape result
checkmaxtol result 2.0000004260026293e-007 {v_1 v_2} -min_tol 1.e-4
checkmaxtol result -ref 1.0000002593655894e-007 -source {v_1 v_2} -min_tol 1.e-4
checknbshapes result -shell 1
checkfreebounds result 2

11
tests/bugs/modalg_5/bug24107
View File

@ -11,13 +11,4 @@ restore [locate_data_file bug24107_wire.brep] w
concatC0wire result w
checkshape result
set tolmax_w [tolmax w]
regexp {max tol = ([-0-9.+eE]+)} ${tolmax_w} full CMP_TOL
set tolmax_result [tolmax result]
regexp {max tol = ([-0-9.+eE]+)} ${tolmax_result} full MaxTolerance
if { ${MaxTolerance} > [expr 2 * ${CMP_TOL}] } {
puts "Error: invalid tolerance of result wire"
}
checkmaxtol result -source {w} -multi_tol 2.

2
tests/bugs/modalg_5/bug24174_1
View File

@ -14,7 +14,7 @@ explode a
sewing result 0.1 a_1 a_2
checkshape result
checkmaxtol result 8.2074631917183755e-005 {a_1 a_2}
checkmaxtol result -ref 0.076388434959049206 -source {a_1 a_2}
checknbshapes result -shell 1
checkfreebounds result 12

2
tests/bugs/modalg_5/bug24174_2
View File

@ -13,7 +13,7 @@ restore [locate_data_file bug24174_stitch.brep] a
sewing result 0.1 a
checkshape result
checkmaxtol result 0.58022137281123598 {a}
checkmaxtol result -ref 0.58022137281123598 -source {a}
checknbshapes result -shell 1
checkfreebounds result 9

12
tests/bugs/modalg_5/bug24204
View File

@ -20,15 +20,11 @@ addsweep w2
buildsweep result
set log_result [tolmax result]
regexp {max tol = ([-0-9.+eE]+)} ${log_result} full tolmax_result
set tolmax_result [checkmaxtol result]
set log_w1 [tolmax w1]
regexp {max tol = ([-0-9.+eE]+)} ${log_w1} full tolmax_w1
set log_w2 [tolmax w2]
regexp {max tol = ([-0-9.+eE]+)} ${log_w2} full tolmax_w2
set log_sp [tolmax sp]
regexp {max tol = ([-0-9.+eE]+)} ${log_sp} full tolmax_sp
set tolmax_w1 [checkmaxtol w1]
set tolmax_w2 [checkmaxtol w2]
set tolmax_sp [checkmaxtol sp]
set tolmax_s ${tolmax_w1}
if { ${tolmax_w2} > ${tolmax_s} } {

2
tests/bugs/modalg_5/bug24390_1
View File

@ -18,7 +18,7 @@ restore [locate_data_file bug24390_face_5.brep] f6
sewing result f1 f2 f3 f4 f5 f6
checkshape result
checkmaxtol result 6.1606205182399194e-005 {f1 f2 f3 f4 f5 f6} -min_tol 0 -multi_tol 5.
checkmaxtol result -ref 2.0535401727466399e-005 -source {f1 f2 f3 f4 f5 f6} -min_tol 0 -multi_tol 5.
checknbshapes result -shell 1
checkfreebounds result 0

2
tests/bugs/modalg_5/bug24390_2
View File

@ -14,7 +14,7 @@ restore [locate_data_file bug24390_face2.brep] f2
sewing result f1 f2
checkshape result
checkmaxtol result 0.016556973295771653 {f1 f2} -min_tol 0 -multi_tol 5.
checkmaxtol result -ref 0.016556973295771653 -source {f1 f2} -min_tol 0 -multi_tol 5.
checknbshapes result -shell 1
checkfreebounds result 6

4
tests/bugs/modalg_5/bug24817
View File

@ -132,10 +132,10 @@ donly sr2
fit
xwd $imagedir/${test_image}_2.png
checkmaxtol sr1 2.0000000024492936e-007
checkmaxtol sr1 -ref 1.0000000015308085e-007
checknbshapes sr1 -shell 1
checkfreebounds sr1 2
checkmaxtol sr2 3.0000000042603855e-007
checkmaxtol sr2 -ref 1.0000000015308085e-007
checknbshapes sr2 -shell 1
checkfreebounds sr2 0

2
tests/bugs/modalg_5/bug25175
View File

@ -12,7 +12,7 @@ igesread [locate_data_file bug25175_3.igs] a *
sewing result 0.1 a
checkmaxtol result 0.0076621571738049385
checkmaxtol result -ref 0.21794517334615857
checknbshapes result -shell 1
checkfreebounds result 0

2
tests/bugs/moddata_1/bug135
View File

@ -10,7 +10,7 @@ checkshape sh
sewing result 1 sh
checkshape result
checkmaxtol result 0.0030000000000000001
checkmaxtol result -ref 0.0030000000000000001
checknbshapes result -shell 1
checkfreebounds result 0

2
tests/bugs/moddata_1/bug20904_1
View File

@ -45,7 +45,7 @@ if { ${status} != 0 } {
puts "OK ${BugNumber}"
}
checkmaxtol result 9.9999999999999995e-008
checkmaxtol result -ref 9.9999999999999995e-008
checknbshapes result -shell 0
checkfreebounds result 2

2
tests/bugs/moddata_1/bug20904_2
View File

@ -44,7 +44,7 @@ if { ${status} != 0 } {
puts "OK ${BugNumber}"
}
checkmaxtol result 9.9999999999999995e-008
checkmaxtol result -ref 1.0000006355287399e-007
checknbshapes result -shell 1
checkfreebounds result 8

2
tests/bugs/moddata_1/bug20904_3
View File

@ -45,7 +45,7 @@ if { ${status} != 0 } {
puts "OK ${BugNumber}"
}
checkmaxtol result 2.5602765785712274e-006
checkmaxtol result -ref 4.8601049330873404e-006
checknbshapes result -shell 1
checkfreebounds result 5

2
tests/bugs/moddata_2/bug326
View File

@ -14,7 +14,7 @@ if [catch { sewing result a } catch_result] {
puts "OCC326 OK: Sewing is ok, there is no except"
}
checkmaxtol result 54.6751898398187
checkmaxtol result -ref 411.37576056225498
checknbshapes result -shell 1
checkfreebounds result 254

4
tests/bugs/moddata_2/bug343
View File

@ -18,7 +18,7 @@ if [catch {igesbrep $filepath a *} catch_result] {
#
sewing result1 100. a
checkmaxtol result1 0.20874930847108514
checkmaxtol result1 -ref 9.43897e+001
checknbshapes result1 -shell 1
checkfreebounds result1 86
@ -71,7 +71,7 @@ if [catch {igesbrep $filepath a *} catch_result] {
tpcompound a
sewing result2 100. a
checkmaxtol result2 0.20874930847108514
checkmaxtol result2 -ref 9.43897e+001
checknbshapes result2 -shell 1
checkfreebounds result2 86

2
tests/bugs/moddata_2/bug36
View File

@ -24,7 +24,7 @@ if [catch { igesbrep $filepath a * } res] {
puts "Elapsed time is less then 30 seconds - OK"
}
checkmaxtol result 2.5472812372261969e-005
checkmaxtol result -ref 0.96087447225733291
checknbshapes result -shell 13
checkfreebounds result 1247
}

2
tests/bugs/moddata_2/bug42
View File

@ -34,7 +34,7 @@ if { [llength $closed_wires] != 1} {
puts "Error : Amount of free closed wires is not equal 1"
}
checkmaxtol result 0.20874930847108514
checkmaxtol result -ref 9.43897e+001
checknbshapes result -shell 1
checkfreebounds result 86

2
tests/bugs/moddata_3/buc60898
View File

@ -18,7 +18,7 @@ if [catch { igesbrep $filepath a *} result] {
puts " BUC60898 OK: function SEWING works without except"
}
checkmaxtol result 0.0002494807463576937
checkmaxtol result -ref 0.077930308575156593
checknbshapes result -shell 4
checkfreebounds result 1725

7
tests/bugs/moddata_3/bug24065
View File

@ -11,11 +11,8 @@ restore [locate_data_file bug24065_e.brep] e
# 1
set CMP_TOL 1.e-7
set facetolmax [tolmax f]
regexp {max tol = ([-0-9.+eE]+)} ${facetolmax} full FaceMaxTolerance
if { ${FaceMaxTolerance} > ${CMP_TOL} } {
puts "Error: invalid tolerance of face"
}
checkmaxtol f -min_tol ${CMP_TOL}
mksurface s f
mkcurve c e

3
tests/bugs/moddata_3/bug24138
View File

@ -24,8 +24,7 @@ puts "vproj=${vproj}"
puts "proj1=${proj1}"
puts "proj2=${proj2}"
set tolmax_f [tolmax f]
regexp {max tol = ([-0-9.+eE]+)} ${tolmax_f} full CMP_TOL
set CMP_TOL [checkmaxtol f]
puts "CMP_TOL=${CMP_TOL}"

3
tests/bugs/moddata_3/bug25223
View File

@ -42,8 +42,7 @@ puts "vproj=${vproj}"
puts "proj1=${proj1}"
puts "proj2=${proj2}"
set tolmax_f [tolmax f]
regexp {max tol = ([-0-9.+eE]+)} ${tolmax_f} full CMP_TOL
set CMP_TOL [checkmaxtol f]
puts "CMP_TOL=${CMP_TOL}"

2
tests/bugs/xde/bug184
View File

@ -62,7 +62,7 @@ if { ${square2} != ${square1} } {
puts "Error : Square is not valid"
}
checkmaxtol result 9.9999999999999995e-008
checkmaxtol result -ref 9.9999999999999995e-008
checknbshapes result -shell 0
checkfreebounds result 2

2
tests/bugs/xde/bug547_2
View File

@ -29,7 +29,7 @@ if { ${face2} > ${face1} || ${edge2} > ${edge1} || ${vert2} > ${vert1} } {
puts "Tolerance valed. Function FixShape works CORRECTLY"
}
checkmaxtol result 0.03895270570799534
checkmaxtol result -ref 1.59071e+000
checknbshapes result -shell 1
checkfreebounds result 227

2
tests/bugs/xde/bug6491
View File

@ -21,7 +21,7 @@ if { ${res_faces} != ${good_faces} } {
puts "Faulty ${BugNumber}"
}
checkmaxtol result 105.192615242296
checkmaxtol result -ref 185.91005891234283
checknbshapes result -shell 1
checkfreebounds result 73

2
tests/bugs/xde/bug6675
View File

@ -15,7 +15,7 @@ set tolerance 1.00000e-07
sewing result ${tolerance} a
checkshape result
checkmaxtol result 2.0021528498807746e-005
checkmaxtol result -ref 1.0021647610996499e-005
checknbshapes result -shell 1
checkfreebounds result 0

2
tests/bugs/xde/bug859
View File

@ -20,7 +20,7 @@ if {[llength ${list}] > 4} {
puts "Faulty OCC859: here is sewing problem"
}
checkmaxtol result 0.00025118948696105701
checkmaxtol result -ref 0.00025118948696105701
checknbshapes result -shell 1
checkfreebounds result 6

2
tests/sewing/tol_0_01/A1
View File

@ -2,7 +2,7 @@ restore [locate_data_file CCH_001_ahdb.rle] a
sewing result $tol a
checkmaxtol result 9.9999999999999995e-008
checkmaxtol result -ref 9.9999999999999995e-008
checknbshapes result -shell 1
checkfreebounds result 0
checkfaults result a 0

2
tests/sewing/tol_0_01/A2
View File

@ -2,7 +2,7 @@ restore [locate_data_file CCH_001_ahev.rle] a
sewing result $tol a
checkmaxtol result 9.9999999999999995e-008
checkmaxtol result -ref 9.9999999999999995e-008
checknbshapes result -shell 1
checkfreebounds result 0
checkfaults result a 0

2
tests/sewing/tol_0_01/A3
View File

@ -2,7 +2,7 @@ restore [locate_data_file BUC60328.rle] a
sewing result $tol a
checkmaxtol result 995.10214705587305
checkmaxtol result -ref 1359413.47384844
checknbshapes result -shell 1
checkfreebounds result 0
checkfaults result a 0

2
tests/sewing/tol_0_01/A4
View File

@ -2,7 +2,7 @@ restore [locate_data_file BUC60329.rle] a
sewing result $tol a
checkmaxtol result 658.98901006989695
checkmaxtol result -ref 5957311123.3524904
checknbshapes result -shell 1
checkfreebounds result 0
checkfaults result a 0

2
tests/sewing/tol_0_01/A5
View File

@ -2,7 +2,7 @@ restore [locate_data_file BUC60391.rle] a
sewing result $tol a
checkmaxtol result 1.2190703625960401e-005
checkmaxtol result -ref 1.2306084135791399e-005
checknbshapes result -shell 1
checkfreebounds result 0
checkfaults result a 0

2
tests/sewing/tol_0_01/A6
View File

@ -2,7 +2,7 @@ restore [locate_data_file mal_vis.brep] a
sewing result $tol a
checkmaxtol result 9.9999999999999995e-008
checkmaxtol result -ref 9.9999999999999995e-008
checknbshapes result -shell 1
checkfreebounds result 0
checkfaults result a 0

2
tests/sewing/tol_0_01/A7
View File

@ -2,7 +2,7 @@ restore [locate_data_file CFE900_ger50gdb.rle] a
sewing result $tol a
checkmaxtol result 0.0001
checkmaxtol result -ref 0.016759665225791299
checknbshapes result -shell 1
checkfreebounds result 0
checkfaults result a 0

2
tests/sewing/tol_0_01/A8
View File

@ -2,7 +2,7 @@ restore [locate_data_file BUC60394.rle] a
sewing result $tol a
checkmaxtol result 9.9999999999999995e-008
checkmaxtol result -ref 9.9999999999999995e-008
checknbshapes result -shell 1
checkfreebounds result 0
checkfaults result a 0

2
tests/sewing/tol_0_01/A9
View File

@ -2,7 +2,7 @@ restore [locate_data_file CHE_bb11.rle] a
sewing result $tol a
checkmaxtol result 9.9999999999999995e-008
checkmaxtol result -ref 9.9999999999999995e-008
checknbshapes result -shell 1
checkfreebounds result 0
checkfaults result a 0

2
tests/sewing/tol_0_01/B1
View File

@ -2,7 +2,7 @@ restore [locate_data_file CCH_001_ahew.rle] a
sewing result $tol a
checkmaxtol result 9.9999999999999995e-008
checkmaxtol result -ref 9.9999999999999995e-008
checknbshapes result -shell 1
checkfreebounds result 0
checkfaults result a 0

2
tests/sewing/tol_0_01/B2
View File

@ -2,7 +2,7 @@ restore [locate_data_file CCH_001_bhdc.rle] a
sewing result $tol a
checkmaxtol result 4.9999999999999998e-007
checkmaxtol result -ref 4.9999999999999998e-007
checknbshapes result -shell 1
checkfreebounds result 0
checkfaults result a 0

2
tests/sewing/tol_0_01/B3
View File

@ -2,7 +2,7 @@ restore [locate_data_file CCH_001_chde.rle] a
sewing result $tol a
checkmaxtol result 4.9999999999999998e-007
checkmaxtol result -ref 4.9999999999999998e-007
checknbshapes result -shell 1
checkfreebounds result 0
checkfaults result a 0

2
tests/sewing/tol_0_01/B4
View File

@ -2,7 +2,7 @@ restore [locate_data_file CCH_001_chez.rle] a
sewing result $tol a
checkmaxtol result 9.9999999999999995e-008
checkmaxtol result -ref 9.9999999999999995e-008
checknbshapes result -shell 1
checkfreebounds result 0
checkfaults result a 0

2
tests/sewing/tol_0_01/B5
View File

@ -2,7 +2,7 @@ restore [locate_data_file CCH_001_chfa.rle] a
sewing result $tol a
checkmaxtol result 9.9999999999999995e-008
checkmaxtol result -ref 9.9999999999999995e-008
checknbshapes result -shell 1
checkfreebounds result 0
checkfaults result a 0

2
tests/sewing/tol_0_01/B6
View File

@ -2,7 +2,7 @@ restore [locate_data_file CCH_001_dhdd.rle] a
sewing result $tol a
checkmaxtol result 9.9999999999999995e-008
checkmaxtol result -ref 9.9999999999999995e-008
checknbshapes result -shell 1
checkfreebounds result 0
checkfaults result a 0

2
tests/sewing/tol_0_01/B7
View File

@ -2,7 +2,7 @@ restore [locate_data_file CCH_001_ehdg.rle] a
sewing result $tol a
checkmaxtol result 9.9999999999999995e-008
checkmaxtol result -ref 9.9999999999999995e-008
checknbshapes result -shell 1
checkfreebounds result 0
checkfaults result a 0

2
tests/sewing/tol_0_01/B8
View File

@ -2,7 +2,7 @@ restore [locate_data_file CCH_001_ghdh.rle] a
sewing result $tol a
checkmaxtol result 9.9999999999999995e-008
checkmaxtol result -ref 9.9999999999999995e-008
checknbshapes result -shell 1
checkfreebounds result 0
checkfaults result a 0

2
tests/sewing/tol_0_01/B9
View File

@ -2,7 +2,7 @@ restore [locate_data_file CCH_001_ghfb.rle] a
sewing result $tol a
checkmaxtol result 9.9999999999999995e-008
checkmaxtol result -ref 9.9999999999999995e-008
checknbshapes result -shell 1
checkfreebounds result 0
checkfaults result a 0

2
tests/sewing/tol_0_01/C1
View File

@ -2,7 +2,7 @@ restore [locate_data_file CCH_001_hhdi.rle] a
sewing result $tol a
checkmaxtol result 9.9999999999999995e-008
checkmaxtol result -ref 9.9999999999999995e-008
checknbshapes result -shell 1
checkfreebounds result 0
checkfaults result a 0

2
tests/sewing/tol_0_01/C2
View File

@ -2,7 +2,7 @@ restore [locate_data_file CCH_001_ihdj.rle] a
sewing result $tol a
checkmaxtol result 9.9999999999999995e-008
checkmaxtol result -ref 9.9999999999999995e-008
checknbshapes result -shell 1
checkfreebounds result 0
checkfaults result a 0

Some files were not shown because too many files have changed in this diff Show More