diff --git a/src/DrawResources/CheckCommands.tcl b/src/DrawResources/CheckCommands.tcl index 1caf323fc9..bfb47c2f22 100644 --- a/src/DrawResources/CheckCommands.tcl +++ b/src/DrawResources/CheckCommands.tcl @@ -543,21 +543,15 @@ proc checkprops {shape args} { _check_args ${args} ${options} "checkprops" if { ${length} != -1 || ${equal_check} == 1 } { - set CommandName lprops - set mass $length - set prop "length" + lappend CommandNames {lprops} set equal_check 0 } if { ${area} != -1 || ${equal_check} == 1 } { - set CommandName sprops - set mass $area - set prop "area" + lappend CommandNames {sprops} set equal_check 0 } if { ${volume} != -1 || ${equal_check} == 1 } { - set CommandName vprops - set mass $volume - set prop "volume" + lappend CommandNames {vprops} set equal_check 0 } @@ -565,41 +559,47 @@ proc checkprops {shape args} { if { $skip } { set skip_option "-skip" } - - regexp {Mass +: +([-0-9.+eE]+)} [eval ${CommandName} ${shape} ${epsilon} $skip_option] full m - - if { ${compared_equal_shape} != -1 } { - upvar ${compared_equal_shape} ${compared_equal_shape} - regexp {Mass +: +([-0-9.+eE]+)} [eval ${CommandName} ${compared_equal_shape} ${epsilon} $skip_option] full compared_m - if { $compared_m != $m } { - puts "Error: Shape ${compared_equal_shape} is not equal to shape ${shape}" + foreach CommandName ${CommandNames} { + switch $CommandName { + "lprops" { set mass ${length}; set prop "length" } + "sprops" { set mass ${area}; set prop "area" } + "vprops" { set mass ${volume}; set prop "volume" } } - } + regexp {Mass +: +([-0-9.+eE]+)} [eval ${CommandName} ${shape} ${epsilon} $skip_option] full m - if { ${compared_notequal_shape} != -1 } { - upvar ${compared_notequal_shape} ${compared_notequal_shape} - regexp {Mass +: +([-0-9.+eE]+)} [eval ${CommandName} ${compared_notequal_shape} ${epsilon} $skip_option] full compared_m - if { $compared_m == $m } { - puts "Error: Shape ${compared_notequal_shape} is equal shape to ${shape}" + if { ${compared_equal_shape} != -1 } { + upvar ${compared_equal_shape} ${compared_equal_shape} + regexp {Mass +: +([-0-9.+eE]+)} [eval ${CommandName} ${compared_equal_shape} ${epsilon} $skip_option] full compared_m + if { $compared_m != $m } { + puts "Error: Shape ${compared_equal_shape} is not equal to shape ${shape}" + } } - } - if { ${compared_equal_shape} == -1 && ${compared_notequal_shape} == -1 } { - if { [string compare "$mass" "empty"] != 0 } { - if { $m == 0 } { - puts "Error : The command is not valid. The $prop is 0." + if { ${compared_notequal_shape} != -1 } { + upvar ${compared_notequal_shape} ${compared_notequal_shape} + regexp {Mass +: +([-0-9.+eE]+)} [eval ${CommandName} ${compared_notequal_shape} ${epsilon} $skip_option] full compared_m + if { $compared_m == $m } { + puts "Error: Shape ${compared_notequal_shape} is equal shape to ${shape}" } - if { $mass > 0 } { - puts "The expected $prop is $mass" - } - #check of change of area is < 1% - if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } { - puts "Error : The $prop of result shape is $m" - } - } else { - if { $m != 0 } { - puts "Error : The command is not valid. The $prop is $m" + } + + if { ${compared_equal_shape} == -1 && ${compared_notequal_shape} == -1 } { + if { [string compare "$mass" "empty"] != 0 } { + if { $m == 0 } { + puts "Error : The command is not valid. The $prop is 0." + } + if { $mass > 0 } { + puts "The expected $prop is $mass" + } + #check of change of area is < 1% + if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } { + puts "Error : The $prop of result shape is $m" + } + } else { + if { $m != 0 } { + puts "Error : The command is not valid. The $prop is $m" + } } } } diff --git a/tests/pipe/specific/K4 b/tests/pipe/specific/K4 index 3af79c4fcc..5e58641db1 100755 --- a/tests/pipe/specific/K4 +++ b/tests/pipe/specific/K4 @@ -25,6 +25,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 32493.7 -v 108899 +checkprops result -s 30670.1 -v 108899 checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18 diff --git a/tests/pipe/specific/K7 b/tests/pipe/specific/K7 index 33e94dd3ae..5359091af7 100755 --- a/tests/pipe/specific/K7 +++ b/tests/pipe/specific/K7 @@ -25,6 +25,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 34206.6 -v 117501 +checkprops result -s 32766.2 -v 117501 checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18 diff --git a/tests/pipe/specific/K8 b/tests/pipe/specific/K8 index 76f795740c..46cfff083a 100755 --- a/tests/pipe/specific/K8 +++ b/tests/pipe/specific/K8 @@ -25,6 +25,6 @@ if [catch { buildsweep result -R -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 35327.9 -v 124779 +checkprops result -s 33884 -v 124779 checknbshapes result -vertex 3 -edge 8 -wire 5 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 23 diff --git a/tests/pipe/specific/L1 b/tests/pipe/specific/L1 index 691d5c2934..5d19a4444a 100755 --- a/tests/pipe/specific/L1 +++ b/tests/pipe/specific/L1 @@ -25,6 +25,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 32535.9 -v 103756 +checkprops result -s 30548.1 -v 103756 checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18 diff --git a/tests/pipe/specific/L4 b/tests/pipe/specific/L4 index 724a02cb13..1e7a7515e2 100755 --- a/tests/pipe/specific/L4 +++ b/tests/pipe/specific/L4 @@ -25,6 +25,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 34072.6 -v 112329 +checkprops result -s 32485.2 -v 112329 checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18 diff --git a/tests/pipe/specific/L5 b/tests/pipe/specific/L5 index 30cb0c2301..3adf96b3c2 100755 --- a/tests/pipe/specific/L5 +++ b/tests/pipe/specific/L5 @@ -25,6 +25,6 @@ if [catch { buildsweep result -R -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 38315.9 -v 147866 +checkprops result -s 36725.8 -v 147866 checknbshapes result -vertex 4 -edge 9 -wire 5 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 25 diff --git a/tests/pipe/specific/L7 b/tests/pipe/specific/L7 index 753c9a465e..be687bd095 100755 --- a/tests/pipe/specific/L7 +++ b/tests/pipe/specific/L7 @@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 30092.2 -v 80775.2 +checkprops result -s 28294.2 -v 80775.2 checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18 diff --git a/tests/pipe/specific/L9 b/tests/pipe/specific/L9 index 3fe4fad097..f7a122bca2 100755 --- a/tests/pipe/specific/L9 +++ b/tests/pipe/specific/L9 @@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 32179.2 -v 90680.2 +checkprops result -s 31041.8 -v 90680.2 checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18 diff --git a/tests/pipe/specific/M2 b/tests/pipe/specific/M2 index 57bc35fa31..daeffb2d39 100755 --- a/tests/pipe/specific/M2 +++ b/tests/pipe/specific/M2 @@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 32535.9 -v 103756 +checkprops result -s 30532.5 -v 103756 checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18 diff --git a/tests/pipe/specific/M4 b/tests/pipe/specific/M4 index ba47b293fb..86146edf1b 100755 --- a/tests/pipe/specific/M4 +++ b/tests/pipe/specific/M4 @@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 34439.8 -v 112768 +checkprops result -s 33191 -v 112768 checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18 diff --git a/tests/pipe/specific/M6 b/tests/pipe/specific/M6 index 2d594df96f..a6e11a45fa 100755 --- a/tests/pipe/specific/M6 +++ b/tests/pipe/specific/M6 @@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 32493.7 -v 108899 +checkprops result -s 30670.1 -v 108899 checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18 diff --git a/tests/pipe/specific/M9 b/tests/pipe/specific/M9 index 3fff633487..e4234ababe 100755 --- a/tests/pipe/specific/M9 +++ b/tests/pipe/specific/M9 @@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 34206.6 -v 117501 +checkprops result -s 32766.2 -v 117501 checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18 diff --git a/tests/pipe/specific/N1 b/tests/pipe/specific/N1 index 5d77b47c2d..7bf7bf53b7 100755 --- a/tests/pipe/specific/N1 +++ b/tests/pipe/specific/N1 @@ -26,6 +26,6 @@ if [catch { buildsweep result -R -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 35327.9 -v 124779 +checkprops result -s 33884 -v 124779 checknbshapes result -vertex 3 -edge 8 -wire 5 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 23 diff --git a/tests/pipe/specific/N4 b/tests/pipe/specific/N4 index 8dc2f2c909..ae61cba9ba 100755 --- a/tests/pipe/specific/N4 +++ b/tests/pipe/specific/N4 @@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 34072.6 -v 112329 +checkprops result -s 32485.2 -v 112329 checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18 diff --git a/tests/pipe/specific/N5 b/tests/pipe/specific/N5 index dc5fd4ec71..d6360074e1 100755 --- a/tests/pipe/specific/N5 +++ b/tests/pipe/specific/N5 @@ -26,6 +26,6 @@ if [catch { buildsweep result -R -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 38315.9 -v 147866 +checkprops result -s 36725.8 -v 147866 checknbshapes result -vertex 4 -edge 9 -wire 5 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 25 diff --git a/tests/pipe/specific/N7 b/tests/pipe/specific/N7 index 56f4b76614..97311a3777 100755 --- a/tests/pipe/specific/N7 +++ b/tests/pipe/specific/N7 @@ -25,6 +25,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 30006.2 -v 80709.6 +checkprops result -s 28316.4 -v 80709.6 checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66 diff --git a/tests/pipe/specific/N9 b/tests/pipe/specific/N9 index 3fee63bd08..9938ccc85a 100755 --- a/tests/pipe/specific/N9 +++ b/tests/pipe/specific/N9 @@ -25,6 +25,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 30965.4 -v 84188.2 +checkprops result -s 29604.4 -v 84188.2 checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66 diff --git a/tests/pipe/specific/O2 b/tests/pipe/specific/O2 index b70bd6c59a..dc215ee6b3 100755 --- a/tests/pipe/specific/O2 +++ b/tests/pipe/specific/O2 @@ -25,6 +25,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 30073 -v 76901 +checkprops result -s 28233.3 -v 76901 checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66 diff --git a/tests/pipe/specific/O4 b/tests/pipe/specific/O4 index 05c13aa4fa..f335082e3c 100755 --- a/tests/pipe/specific/O4 +++ b/tests/pipe/specific/O4 @@ -25,6 +25,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 31054.5 -v 80305.2 +checkprops result -s 29574.7 -v 80305.2 checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66 diff --git a/tests/pipe/specific/O6 b/tests/pipe/specific/O6 index 2ad3332b6b..83969004f5 100755 --- a/tests/pipe/specific/O6 +++ b/tests/pipe/specific/O6 @@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 27815.3 -v 59871 +checkprops result -s 26124.2 -v 59871 checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66 diff --git a/tests/pipe/specific/O8 b/tests/pipe/specific/O8 index a6d9175854..42dff9b213 100755 --- a/tests/pipe/specific/O8 +++ b/tests/pipe/specific/O8 @@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 27676 -v 59042 +checkprops result -s 25730.5 -v 59042 checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66 diff --git a/tests/pipe/specific/P1 b/tests/pipe/specific/P1 index 134576185d..a2c84b30b8 100755 --- a/tests/pipe/specific/P1 +++ b/tests/pipe/specific/P1 @@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 30041.6 -v 76900.9 +checkprops result -s 28191 -v 76900.9 checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66 diff --git a/tests/pipe/specific/P3 b/tests/pipe/specific/P3 index eccd237345..0775524d5b 100755 --- a/tests/pipe/specific/P3 +++ b/tests/pipe/specific/P3 @@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 29572.9 -v 74167.4 +checkprops result -s 27592.2 -v 74167.4 checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66 diff --git a/tests/pipe/specific/P5 b/tests/pipe/specific/P5 index 9aafc9f293..371d4d6690 100755 --- a/tests/pipe/specific/P5 +++ b/tests/pipe/specific/P5 @@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 30006.2 -v 80709.6 +checkprops result -s 28316.4 -v 80709.6 checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66 diff --git a/tests/pipe/specific/P7 b/tests/pipe/specific/P7 index 53eda4e646..9025abac43 100755 --- a/tests/pipe/specific/P7 +++ b/tests/pipe/specific/P7 @@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 30965.4 -v 84188.2 +checkprops result -s 29604.4 -v 84188.2 checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66 diff --git a/tests/pipe/specific/P9 b/tests/pipe/specific/P9 index cb84d2c639..a4febe8cc0 100755 --- a/tests/pipe/specific/P9 +++ b/tests/pipe/specific/P9 @@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 30073 -v 76901 +checkprops result -s 28233.3 -v 76901 checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66 diff --git a/tests/pipe/specific/Q2 b/tests/pipe/specific/Q2 index 060e7c2cab..1ddd301f5e 100755 --- a/tests/pipe/specific/Q2 +++ b/tests/pipe/specific/Q2 @@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 31054.5 -v 80305.2 +checkprops result -s 29574.7 -v 80305.2 checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66 diff --git a/tests/pipe/specific/Q4 b/tests/pipe/specific/Q4 index b7b76be348..564c07a1c8 100755 --- a/tests/pipe/specific/Q4 +++ b/tests/pipe/specific/Q4 @@ -25,6 +25,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 29030.2 -v 68648 +checkprops result -s 27397.8 -v 68648 checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54 diff --git a/tests/pipe/specific/Q6 b/tests/pipe/specific/Q6 index a18035666b..5dd64bce04 100755 --- a/tests/pipe/specific/Q6 +++ b/tests/pipe/specific/Q6 @@ -25,6 +25,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 30092 -v 72386.2 +checkprops result -s 28696.8 -v 72386.2 checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54 diff --git a/tests/pipe/specific/Q8 b/tests/pipe/specific/Q8 index 3fed5d94d0..322b4095ef 100755 --- a/tests/pipe/specific/Q8 +++ b/tests/pipe/specific/Q8 @@ -25,6 +25,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 29331.9 -v 65400.7 +checkprops result -s 27552.3 -v 65400.7 checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54 diff --git a/tests/pipe/specific/R1 b/tests/pipe/specific/R1 index 72037f4d91..9be04414d1 100755 --- a/tests/pipe/specific/R1 +++ b/tests/pipe/specific/R1 @@ -25,6 +25,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 30287 -v 69136.9 +checkprops result -s 28751 -v 69136.9 checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54 diff --git a/tests/pipe/specific/R3 b/tests/pipe/specific/R3 index a8e5b14842..48a220f7b0 100755 --- a/tests/pipe/specific/R3 +++ b/tests/pipe/specific/R3 @@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 27417.2 -v 50977.6 +checkprops result -s 25784.5 -v 50977.6 checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54 diff --git a/tests/pipe/specific/R5 b/tests/pipe/specific/R5 index 3091ba4779..bdb9192b34 100755 --- a/tests/pipe/specific/R5 +++ b/tests/pipe/specific/R5 @@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 28684.4 -v 55282.1 +checkprops result -s 27472.6 -v 55282.1 checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54 diff --git a/tests/pipe/specific/R7 b/tests/pipe/specific/R7 index 6b54e6fb07..d0eab06c46 100755 --- a/tests/pipe/specific/R7 +++ b/tests/pipe/specific/R7 @@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 29343.7 -v 65439.6 +checkprops result -s 27557.6 -v 65439.6 checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54 diff --git a/tests/pipe/specific/R9 b/tests/pipe/specific/R9 index 78f1400ba0..c4fa69459f 100755 --- a/tests/pipe/specific/R9 +++ b/tests/pipe/specific/R9 @@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 30505.5 -v 69371.6 +checkprops result -s 29200.6 -v 69371.6 checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54 diff --git a/tests/pipe/specific/S2 b/tests/pipe/specific/S2 index 1081e26f50..1f6688a880 100755 --- a/tests/pipe/specific/S2 +++ b/tests/pipe/specific/S2 @@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 29030.2 -v 68648 +checkprops result -s 27397.8 -v 68648 checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54 diff --git a/tests/pipe/specific/S4 b/tests/pipe/specific/S4 index 4cd476378e..e613400b48 100755 --- a/tests/pipe/specific/S4 +++ b/tests/pipe/specific/S4 @@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 30092 -v 72386.2 +checkprops result -s 28696.8 -v 72386.2 checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54 diff --git a/tests/pipe/specific/S6 b/tests/pipe/specific/S6 index 80dc1d1a40..5d4dd850ce 100755 --- a/tests/pipe/specific/S6 +++ b/tests/pipe/specific/S6 @@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 29331.9 -v 65400.7 +checkprops result -s 27552.3 -v 65400.7 checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54 diff --git a/tests/pipe/specific/S7 b/tests/pipe/specific/S7 index ef36c23fd4..ad8af50442 100755 --- a/tests/pipe/specific/S7 +++ b/tests/pipe/specific/S7 @@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] { puts "Faulty OCC1477: buildsweep is wrong" } -checkprops result -s 30287 -v 69136.9 +checkprops result -s 28751 -v 69136.9 checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54