0027463: Checkprops can not be used with several properties

Added possibility to use several properties in one checkprops command

Modified test cases according to changes in checkprops command

diff --git a/src/DrawResources/CheckCommands.tcl b/src/DrawResources/CheckCommands.tcl
index 1caf323fc9c49c95281cdbb0905ee81932fbafb6..bfb47c2f22a0b1861a63a875fbe35b5f0d6fb214 100644 (file)
--- 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 3af79c4fcc2456cf9847a14115b5548de2fa0278..5e58641db10c0f73ba299101c7954398a7f347c1 100755 (executable)
--- 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 33e94dd3aec8331a8ccff09f627bdcc9a530e454..5359091af7a8db6b0f1fd4c3cc653094e5f374ba 100755 (executable)
--- 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 76f795740c8801eeb41ded9c5ae6cb2930422c6c..46cfff083a391a1954083d55263d83e5ea4141a3 100755 (executable)
--- 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 691d5c29343a8cc3545607e6b869cfe5a4dd84e9..5d19a4444a9241385a259e3831dbdd317812254d 100755 (executable)
--- 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 724a02cb13f7c7ce4905e2bba8cf4840eb67e604..1e7a7515e22504af14d283f75f083b8fc2948e77 100755 (executable)
--- 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 30cb0c23019280adef19661cbf76af517ce22434..3adf96b3c200ce35bb68200251dcb611cb49fac7 100755 (executable)
--- 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 753c9a465e9c889cd356b97cf337accbffb09741..be687bd095b1c754372ded7c6c6f33281c98da58 100755 (executable)
--- 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 3fe4fad0975677f959a8caba94354ee010183f47..f7a122bca2e53383cb43f91e0c7de698554bed05 100755 (executable)
--- 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 57bc35fa31f17b4826b3984fd8f9decc49983ac3..daeffb2d396845864266bf83d76e31a8450d4e7e 100755 (executable)
--- 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 ba47b293fbd18229c7358bc33acc62d97b83acd7..86146edf1b9708c0db7bfd91bf1eb78c7fef1e91 100755 (executable)
--- 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 2d594df96f72f570232204a752b2dc5334ebe2a1..a6e11a45fa7e9a4ad547f5facffb776dfc175829 100755 (executable)
--- 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 3fff633487e206806762a6193df817691160c7fd..e4234ababea99339eff8a4714b6841735333fc09 100755 (executable)
--- 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 5d77b47c2da8df43907fe7c94889a9c08eac5ee2..7bf7bf53b7f037eaac27b1aed3c442c022028fe6 100755 (executable)
--- 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 8dc2f2c9090337eab388a804754a7090d57d5a33..ae61cba9ba228f9875b7724df743c9f39196c186 100755 (executable)
--- 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 dc5fd4ec71e366d419ec3f7c757dc29067fa2345..d6360074e13c6eabe3b7fee96768329272d0e502 100755 (executable)
--- 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 56f4b76614f5e6d5ab8d2467220fbe3c7d3120e8..97311a3777a6f9e06a2fca8223c2683c17c09425 100755 (executable)
--- 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 3fee63bd085ba7ac17dcd10dd9df311b02933c02..9938ccc85add82c38424c67cba39f6aee4101f68 100755 (executable)
--- 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 b70bd6c59a4e87de560152e4c1cd3a44d15d5dd5..dc215ee6b3a85c30a04c23786d720c21e8f5f459 100755 (executable)
--- 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 05c13aa4fad2d3043c6e47db48999d71ec2e86ae..f335082e3cae8e087e427e04e0c4a8816d8c82ef 100755 (executable)
--- 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 2ad3332b6ba7028e74450f78f5c9a374ec66381c..83969004f5639de4a83868f095a1a33d547be227 100755 (executable)
--- 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 a6d91758546584c7e7e265f88fe548d679d88167..42dff9b2137aef28db1ce15eea1ad28120406b9a 100755 (executable)
--- 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 134576185d4bb34f80de188edc6d1540b2725120..a2c84b30b8caf89f3579e53bf883be9d4cce3140 100755 (executable)
--- 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 eccd2373455f8832c4d812c0b1f8960c4790e4c6..0775524d5bf37590b6668c57972245982a70ddd1 100755 (executable)
--- 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 9aafc9f293f0cdda9ac05ec3b56757c24e99990f..371d4d6690c852ae42829dc41d629f602ebcab24 100755 (executable)
--- 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 53eda4e646229bc6a1aceeb008f223c83d147f72..9025abac4353fc6e3f6d06fd1741f09a760be465 100755 (executable)
--- 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 cb84d2c63961a6ec94d70d17281a13604ffe4a6f..a4febe8cc0067220aad7a9d20ecb19bdf106de80 100755 (executable)
--- 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 060e7c2cabfa0fa0cf6a22c78ce311303506eae6..1ddd301f5ec8bcf252034accedfd00e7472c8ad6 100755 (executable)
--- 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 b7b76be348cd13a2e8eadac1266b939141c64b44..564c07a1c8a4f562cb6cf3f0941f7ff87fbaf125 100755 (executable)
--- 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 a18035666b9e05665f9fefcb48df63402e4870be..5dd64bce04eb7a516b7575fe65e15d06aa71ed8b 100755 (executable)
--- 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 3fed5d94d05bd26faf15772e4be7dbf52aeb48b5..322b4095ef3b57305c179914a2c10ed2f0a2b281 100755 (executable)
--- 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 72037f4d9162153c93705de5a3ce36eb91f1a531..9be04414d1db5f027f786b239d646667e3ffce8f 100755 (executable)
--- 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 a8e5b14842089cf3b0b2d751bf5e16cc03f99166..48a220f7b08b5c2eee8fbfc7be708da72ec2ee0e 100755 (executable)
--- 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 3091ba4779534f74167966fbbbef37235919965d..bdb9192b3485bb571121e9746c7f632b79fbb1fd 100755 (executable)
--- 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 6b54e6fb0743fe77771c085477f4b07257a22e7f..d0eab06c4658660394bf23e46c6140e5a37b851b 100755 (executable)
--- 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 78f1400ba094fc62a29577b45f24a941fbf6a840..c4fa69459fb9ae997aded38569d769f7cc10b3c1 100755 (executable)
--- 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 1081e26f50972ff738da3a7181247fb1caf565c9..1f6688a880d5008a1602615f389bde6f61d52838 100755 (executable)
--- 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 4cd476378ea13031ba224bfa6eea19a4b717fb59..e613400b4842835f787ec7fb66e94e93e7fce243 100755 (executable)
--- 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 80dc1d1a4013aeedb392738b2ccd318ce29be9c7..5d4dd850cebacf87fc6ca1daca95fe2dce6705aa 100755 (executable)
--- 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 ef36c23fd4f20a2b57e7eaedc7a51552bcdb18af..ad8af5044228572ee32720d55994e987738533c2 100755 (executable)
--- 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