diff --git a/tests/bugs/modalg_5/bug24472 b/tests/bugs/modalg_5/bug24472 index b140618514..567e60af7d 100755 --- a/tests/bugs/modalg_5/bug24472 +++ b/tests/bugs/modalg_5/bug24472 @@ -6,23 +6,6 @@ puts "" ## Wrong section curves ############################### -proc checkList {List Tolerance D_good} { - set L1 [llength ${List}] - set L2 10 - set L3 5 - set N [expr (${L1} - ${L2})/${L3} + 1] - - for {set i 1} {${i} <= ${N}} {incr i} { - set j1 [expr ${L2} + (${i}-1)*${L3}] - set j2 [expr ${j1} + 2] - set T [lindex ${List} ${j1}] - set D [lindex ${List} ${j2}] - #puts "i=${i} j1=${j1} j2=${j2} T=${T} D=${D}" - if { [expr abs(${D} - ${D_good})] > ${Tolerance} } { - puts "Error: i=${i} T=${T} D=${D}" - } - } -} restore [locate_data_file bug24472_Pipe_1.brep] b1 explode b1 f @@ -48,7 +31,8 @@ set Log1 [dlog get] set List1 [split ${Log1} {TD= \t\n}] set Tolerance 1.0e-7 set D_good 0. -checkList ${List1} ${Tolerance} ${D_good} +set Limit_Tol 1.0e-7 +checkList ${List1} ${Tolerance} ${D_good} ${Limit_Tol} puts "" puts "Second test" @@ -69,7 +53,8 @@ set Log2 [dlog get] set List2 [split ${Log2} {TD= \t\n}] set Tolerance 1.0e-12 set D_good 0. -checkList ${List2} ${Tolerance} ${D_good} +set Limit_Tol 1.0e-7 +checkList ${List2} ${Tolerance} ${D_good} ${Limit_Tol} puts "" puts "Third test" @@ -86,7 +71,8 @@ set Log3 [dlog get] set List3 [split ${Log3} {TD= \t\n}] set Tolerance 1.0e-6 set D_good 0. -checkList ${List3} ${Tolerance} ${D_good} +set Limit_Tol 1.0e-7 +checkList ${List3} ${Tolerance} ${D_good} ${Limit_Tol} puts "" puts "Fourth test" @@ -107,4 +93,5 @@ set Log4 [dlog get] set List4 [split ${Log4} {TD= \t\n}] set Tolerance 1.0e-12 set D_good 0. -checkList ${List4} ${Tolerance} ${D_good} +set Limit_Tol 1.0e-7 +checkList ${List4} ${Tolerance} ${D_good} ${Limit_Tol} diff --git a/tests/bugs/modalg_5/bug24915 b/tests/bugs/modalg_5/bug24915 index 4c9d065352..1b2951c5ad 100755 --- a/tests/bugs/modalg_5/bug24915 +++ b/tests/bugs/modalg_5/bug24915 @@ -6,28 +6,6 @@ puts "" ## Wrong intersection curves between two cylinders ############################### -proc checkList {List Tolerance D_good Limit_Tol} { - set L1 [llength ${List}] - set L2 10 - set L3 5 - set N [expr (${L1} - ${L2})/${L3} + 1] - - for {set i 1} {${i} <= ${N}} {incr i} { - set j1 [expr ${L2} + (${i}-1)*${L3}] - set j2 [expr ${j1} + 2] - set T [lindex ${List} ${j1}] - set D [lindex ${List} ${j2}] - #puts "i=${i} j1=${j1} j2=${j2} T=${T} D=${D}" - if { [expr abs(${D} - ${D_good})] > ${Tolerance} } { - puts "Error : T=${T} D=${D}" - } - if { [expr abs(${D} - ${D_good})] > ${Limit_Tol} - && [expr abs(${D} - ${D_good})] <= ${Tolerance} } { - puts "Attention (critical value of tolerance) : T=${T} D=${D}" - } - } -} - puts "##############################" puts "#!!!Searh \"Attention\" keyword on this web-page for additinal checking!!!" puts "##############################" diff --git a/tests/bugs/modalg_5/bug25488 b/tests/bugs/modalg_5/bug25488 index 668b109d08..4a937ac459 100644 --- a/tests/bugs/modalg_5/bug25488 +++ b/tests/bugs/modalg_5/bug25488 @@ -8,6 +8,7 @@ puts "" set Tolerance 3.0e-7 set D_good 0. +set Limit_Tol 1.0e-7 restore [locate_data_file OCC25488_sb1_1t.draw] sb1 restore [locate_data_file OCC25488_sb2_1t.draw] sb2 @@ -22,12 +23,12 @@ while {$i != [llength $bug_info]} { xdistcs ${res_i} sb1 0 1 10 set BugLog [dlog get] set BugList [split ${BugLog} {TD= \t\n}] - checkList ${BugList} ${Tolerance} ${D_good} + checkList ${BugList} ${Tolerance} ${D_good} ${Limit_Tol} dlog reset dlog on xdistcs ${res_i} sb2 0 1 10 set BugLog [dlog get] set BugList [split ${BugLog} {TD= \t\n}] - checkList ${BugList} ${Tolerance} ${D_good} + checkList ${BugList} ${Tolerance} ${D_good} ${Limit_Tol} set i [expr {$i + 1}] }