From: nbv <nbv@opencascade.com>
Date: Wed, 20 Jun 2018 09:24:23 +0000 (+0300)
Subject: tests
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=cadb9817be95865b20d4ae59443e57527375a82e;p=occt-copy.git

tests
---

diff --git a/tests/evolved/voluved/HMC007 b/tests/evolved/voluved/HMC007
index 83158f3b73..3e7101721f 100644
--- a/tests/evolved/voluved/HMC007
+++ b/tests/evolved/voluved/HMC007
@@ -16,7 +16,7 @@ if {[regexp "Faulties" [bopargcheck result]]} {
   puts "Error: bopargcheck has found some faulties in res2"
 }
 
-checkmaxtol result -ref 4.7e-6
+checkmaxtol result -ref 0.0001726334921841044
 
 smallview
 don result sw tw
diff --git a/tests/evolved/voluved/HMC008 b/tests/evolved/voluved/HMC008
index 77cd8f8e8a..fe964ad95d 100644
--- a/tests/evolved/voluved/HMC008
+++ b/tests/evolved/voluved/HMC008
@@ -2,23 +2,219 @@ puts "=========="
 puts "OCC29523"
 puts "=========="
 
+puts "TODO OCC111 ALL: Error: bopargcheck has found some faulties in result"
+
 cpulimit 100
 
 restore [locate_data_file bug29523_cut_extrudewire07.brep] sw 
 restore [locate_data_file bug29523_cut_toolwire07.brep] tw
 
+# Indeed the source shapes are invalid for evolved algorithm
+# (they contain gaps and discontinuous wire). Therefore, we
+# make them valid with following script.
+
+# Clear variables
+foreach a [directory cur_*] {unset $a}
+foreach a [directory ee*] {unset $a}
+
+# Obtain edges from the wire sw and copy their geometry (3D-curve cur_*) to the new edges ee*
+set NbEdges [llength [ explode sw e ]]
+for {set i 1} { $i <= $NbEdges} {incr i} { mkcurve cur_$i sw_$i } 
+for {set i 1} { $i <= $NbEdges} {incr i} { mkedge ee$i cur_$i } 
+
+# Extend every 3D-curve to cover the gap
+trim cur_1 cur_1 4.71239090823492 5.53811019613953
+trim cur_2 cur_2 -0.134931759799294 7999.99999936156
+trim cur_3 cur_3 1.57079573067402 2.39667036644493
+trim cur_4 cur_4 2.3157179964798 3.14159386656777
+trim cur_6 cur_6 3.14159205618886 3.96746669323983
+trim cur_7 cur_7 3.8865143232747 4.71239019354553
+trim cur_9 cur_9 4.71238838316655 5.53826302003487
+trim cur_10 cur_10 1.49677804444134e-010 357.366033033755
+trim cur_11 cur_11 5.467579522113 6.28318530589953
+trim cur_12 cur_12 -4.48015052825212e-005 496000.040846485
+trim cur_13 cur_13 5.83654858656781e-007 0.826061103391988
+
+
+foreach a {{1 2} {3 4} {6 7} {9 10} {10 11} {12 13} {1 13}} {
+  set i [lindex $a 0]
+  set j [lindex $a 1]
+
+  explode sw_$i v
+  explode sw_$j v
+
+  mkedge ee$i cur_$i
+  mkedge ee$j cur_$j
+  emptycopy ee$i ee$i
+  emptycopy ee$j ee$j
+
+  if {[regexp "REVERSED" [whatis sw_$i]]} {
+    orientation ee$i R
+  } else {
+    orientation ee$i F  
+  }
+  
+  if {[regexp "REVERSED" [whatis sw_$j]]} {
+    orientation ee$j R
+  } else {
+    orientation ee$j F  
+  }
+
+  add sw_${i}_1 ee$i
+  add sw_${i}_2 ee$i
+  add sw_${j}_1 ee$j
+  add sw_${j}_2 ee$j 
+}
+
+# Create new wire without any gaps
+
+bclearobjects 
+bcleartools
+eval baddobjects [directory ee*]
+bfillds
+bbuild rr
+edgestowire ww rr
+
+settolerance ww 1.0e-7
+
+mkplane pl ww
+explode pl w
+copy pl_1 sw
+
+# Eliminate not smoothness joint between two circles.
+# For that, every pair of circles will be joined by their common tangent.
+# So, smoothness joint will be provided automatically.
+
+# Clear variables
+foreach a [directory cur_*] {unset $a}
+foreach a [directory ee*] {unset $a}
+foreach a [directory sw_*] {unset $a}
+
+# Obtain edges from the wire sw and copy their geometry (3D-curve cur_*) to the new edges ee*
+set NbEdges [llength [ explode sw e ]]
+for {set i 1} { $i <= $NbEdges} {incr i} { mkcurve cur_$i sw_$i } 
+for {set i 1} { $i <= $NbEdges} {incr i} { mkedge ee$i cur_$i } 
+
+# Empty compound
+compound ce
+
+#Process circles sw_1 and sw_2
+
+# Trim every circle to the tangent point
+trim cur_1 cur_1 4.71239090823492 5.49761669005051
+trim cur_2 cur_2 5.83654858656781e-007 0.785568617129074
+
+# Fill the created gap by line
+line ccf1l2 -24754.1762623319 0 34741.3413352011 2003.1995336714681 0 2003.8825557731907
+trim ccf1l2 ccf1l2 0 2833.43495937946
+
+# Recreate necessary edges
+mkedge ee1 cur_1
+mkedge ee2 cur_2
+mkedge el12 ccf1l2
+
+# Add new (linear edge to compound)
+add el12 ce
+
+# Process circles sw_4 and sw_6.
+# Note that these circles are joined by the line sw_5.
+# This line is too small. Therefore it should be eliminated.
+
+unset ee5
+
+# Trim every circle to the tangent point
+trim cur_4 cur_4 5.49750649442623 6.28318530589953
+trim cur_6 cur_6 4.71238838316655 5.49750649442623
+
+# Fill the created gap by line
+line ccf4l6 522755.595179584 0 36741.7037941423 2000.8085436843103 0 -2001.9319102431036
+trim ccf4l6 ccf4l6 0 2830.365029767315
+
+# Recreate necessary edges
+mkedge ee4 cur_4
+mkedge ee6 cur_6
+mkedge el46 ccf4l6
+
+# Add new (linear edge to compound)
+add el46 ce
+
+# Process circles sw_8 and sw_9."
+# It is made analogically to the step 11.1.
+
+# Trim every circle to the tangent point
+trim cur_8 cur_8 3.92695569467718 4.71239019354553
+trim cur_9 cur_9 3.14159205618886 3.92695569467718
+
+# Fill the created gap by line
+line ccf8l9 522745.848826566 0 -24750.3286992239 2002.755997602304 0 2002.754818110996
+trim ccf8l9 ccf8l9 0 2832.3238599070564
+
+# Recreate necessary edges
+mkedge ee8 cur_8
+mkedge ee9 cur_9
+mkedge el89 ccf8l9
+
+# Add new (linear edge to compound)
+add el89 ce
+
+# Process circles sw_11 and sw_12
+# It is made analogically to the step 11.1.
+
+# Trim every circle to the tangent point
+trim cur_11 cur_11 2.3561593678824 3.14159386656777
+trim cur_12 cur_12 1.57079573067402 2.3561593678824
+
+# Fill the created gap by line
+line ccf11l12 -24750.328699221 0 -22745.8488265693 2002.7548181108614 0 -2002.7559976021548
+trim ccf11l12 ccf11l12 0 2832.323859906856
+
+# Recreate necessary edges
+mkedge ee11 cur_11
+mkedge ee12 cur_12
+mkedge el1112 ccf11l12
+
+# Add new (linear edge to compound)
+add el1112 ce
+
+# Build wire from compound of edges"
+foreach a [directory ee*] {add $a ce}
+
+bclearobjects 
+bcleartools
+eval baddcompound ce
+bfillds
+bbuild rr
+edgestowire ww rr
+
+# Check planarity
+mkplane pl ww
+explode pl w
+copy pl_1 sw
+
+
+tscale sw 0 0 0 1.0e-3
+tscale tw 0 0 0 1.0e-3
+removeloc sw sw
+removeloc tw tw
+
 evolved result -s sw -p tw -solid -a -v
 
+tscale result 0 0 0 1000
+
 checkprops result -s 1.99565e+011 -v 6.75431e+014
 checkshape result
 
 checknbshapes result -solid 1 -shell 1
 
 if {[regexp "Faulties" [bopargcheck result]]} {
-  puts "Error: bopargcheck has found some faulties in res2"
+  puts "Error: bopargcheck has found some faulties in result"
 }
 
-checkmaxtol result -ref 4.7e-6
+# Attention. Tolerance > 1 is quite big. However,
+# the dimensions of the shape "result" are about 1.0e+5.
+# So, this tolerance seems to be OK.
+
+checkmaxtol result -ref 19.057145113355674
 
 smallview
 don result sw tw
diff --git a/tests/evolved/voluved/HMC009 b/tests/evolved/voluved/HMC009
index c239295839..015d1fd882 100644
--- a/tests/evolved/voluved/HMC009
+++ b/tests/evolved/voluved/HMC009
@@ -2,14 +2,224 @@ puts "=========="
 puts "OCC29523"
 puts "=========="
 
-cpulimit 100
+cpulimit 120
 
 restore [locate_data_file bug29523_cut_extrudewire08.brep] sw 
 restore [locate_data_file bug29523_cut_toolwire08.brep] tw
 
+# Indeed the source shapes are invalid for evolved algorithm
+# (they contain gaps and discontinuous wire). Therefore, we
+# make them valid with following script.
+
+# Clear variables
+foreach a [directory cur_*] {unset $a}
+foreach a [directory ee*] {unset $a}
+
+# Obtain edges from the wire sw and copy their geometry (3D-curve cur_*) to the new edges ee*
+set NbEdges [llength [ explode sw e ]]
+for {set i 1} { $i <= $NbEdges} {incr i} { mkcurve cur_$i sw_$i } 
+for {set i 1} { $i <= $NbEdges} {incr i} { mkedge ee$i cur_$i } 
+
+trim cur_1 cur_1 6.57409148379884e-010 25541.868037099
+trim cur_2 cur_2 0.488694408745945 1.07405488703373
+trim cur_3 cur_3 0.985620666922634 1.57079843167744
+trim cur_5 cur_5 1.57079573067402 2.39667036644493
+trim cur_6 cur_6 2.3157179964798 3.14159386656777
+trim cur_8 cur_8 3.14159205618886 3.96746669323982
+trim cur_9 cur_9 3.88651432327475 4.7123901935455
+trim cur_11 cur_11 4.71238838316667 5.53826302003462
+trim cur_12 cur_12 -7.31217388895948e-010 357.366033033913
+trim cur_13 cur_13 5.46757952211301 6.28318530589953
+trim cur_14 cur_14 -4.48015052825212e-005 473931.684018372
+trim cur_15 cur_15 1.20053942593701e-006 0.486331243523059
+
+foreach a {{1 2} {2 3} {5 6} {8 9} {11 12} {12 13} {14 15} {1 15}} {
+  set i [lindex $a 0]
+  set j [lindex $a 1]
+
+  explode sw_$i v
+  explode sw_$j v
+
+  mkedge ee$i cur_$i
+  mkedge ee$j cur_$j
+  emptycopy ee$i ee$i
+  emptycopy ee$j ee$j
+
+  if {[regexp "REVERSED" [whatis sw_$i]]} {
+    orientation ee$i R
+  } else {
+    orientation ee$i F  
+  }
+  
+  if {[regexp "REVERSED" [whatis sw_$j]]} {
+    orientation ee$j R
+  } else {
+    orientation ee$j F  
+  }
+
+  add sw_${i}_1 ee$i
+  add sw_${i}_2 ee$i
+  add sw_${j}_1 ee$j
+  add sw_${j}_2 ee$j 
+}
+
+# Step 11. Create new wire without any gaps
+
+bclearobjects 
+bcleartools
+eval baddobjects [directory ee*]
+bfillds
+bbuild rr
+edgestowire ww rr
+
+settolerance ww 1.0e-7
+
+mkplane pl ww
+explode pl w
+copy pl_1 sw
+
+# Step 12. Eliminate not smoothness joint between two circles.
+# For that, every pair of circles will be joined by their common tangent.
+# So, smoothness joint will be provided automatically.
+
+# Clear variables
+foreach a [directory cur_*] {unset $a}
+foreach a [directory ee*] {unset $a}
+foreach a [directory sw_*] {unset $a}
+
+# Obtain edges from the wire sw and copy their geometry (3D-curve cur_*) to the new edges ee*
+set NbEdges [llength [ explode sw e ]]
+for {set i 1} { $i <= $NbEdges} {incr i} { mkcurve cur_$i sw_$i } 
+for {set i 1} { $i <= $NbEdges} {incr i} { mkedge ee$i cur_$i } 
+
+# Empty compound
+compound ce
+
+# Step 12.1. Process circles sw_3 and sw_5.
+# Note that these circles are joined by the line sw_4.
+# This line is too small. Therefore it should be eliminated.
+
+unset ee4
+
+# Trim every circle to the tangent point
+trim cur_3 cur_3 5.49750649442626 6.28318530589953
+trim cur_5 cur_5 4.71238838316667 5.49750649442626
+
+# Fill the created gap by line
+line ccf3l5 522755.595179583 0 84741.703794143 2000.808543679188 0 -2001.9319102384907
+trim ccf3l5 ccf3l5 0 2830.365029760431
+
+# Recreate necessary edges
+mkedge ee3 cur_3
+mkedge ee5 cur_5
+
+mkedge el35 ccf3l5
+
+# Add new (linear) edge to compound
+add el35 ce
+
+# Step 12.2. Process circles sw_7 and sw_8 
+
+# Trim every circle to the tangent point
+trim cur_7 cur_7 3.92695569468046 4.7123901935455
+trim cur_8 cur_8 3.14159205618886 3.92695569468046
+
+# Fill the created gap by line
+line ccf7l8 524748.604824248 0 -22747.573881033 -2002.755997600907 0 -2002.7548181097663
+trim ccf7l8 ccf7l8 0 2832.3238599051992
+
+# Recreate necessary edges
+mkedge ee7 cur_7
+mkedge ee8 cur_8
+
+mkedge el78 ccf7l8
+
+# Add new (linear) edge to compound
+add el78 ce
+
+# Step 11.3. Process circles sw_10 and sw_11.
+# It is made analogically to the step 12.2.
+
+# Trim every circle to the tangent point
+trim cur_10 cur_10 2.3561593678821 3.14159386656777
+trim cur_11 cur_11 1.57079573067402 2.3561593678821
+
+# Fill the created gap by line
+line ccf10l11 -24750.3286992284 0 -22745.8488265618 2002.7548181109923 0 -2002.7559976022822
+trim ccf10l11 ccf10l11 0 2832.3238599070387
+
+# Recreate necessary edges
+mkedge ee10 cur_10
+mkedge ee11 cur_11
+mkedge el1011 ccf10l11
+
+# Add new (linear edge to compound)
+add el1011 ce
+
+# Step 12.4. Process circles sw_13 and sw_14.
+# It is made analogically to the step 12.2.
+
+# Trim every circle to the tangent point
+trim cur_13 cur_13 1.02983856973504 1.57079843167744
+trim cur_14 cur_14 0.488694408745945 1.02983856973504
+
+# Fill the created gap by line
+line ccf13l14 -28409.9420261742 0 66073.105965381 -1593.2045777171916 0 -2652.1042208640938
+trim ccf13l14 ccf13l14 0 3093.8580485833795
+
+# Recreate necessary edges
+mkedge ee13 cur_13
+mkedge ee14 cur_14
+mkedge el1314 ccf13l14
+
+# Add new (linear edge to compound)
+add el1314 ce
+
+# Step 13. Join two lines (sw_15 and sw_2 with "smooth circle")
+trim cur_2 cur_2 -4.48015052825212e-005 473931.43880149431
+trim cur_15 cur_15 81.530450931155428 25541.868037099
+
+circle cur_1 2.406856119850569e+004, 0.000000000000000e+000, 6.000556224103060e+004 0 1 0 34994.3148920752
+trim cur_1 cur_1 -0.4886661927028566 0
+
+mkedge ee1 cur_1
+mkedge ee2 cur_2
+mkedge ee15 cur_15
+
+
+# Step 14. Build wire from compound of edges
+foreach a [directory ee*] {add $a ce}
+
+bclearobjects 
+bcleartools
+eval baddcompound ce
+bfillds
+bbuild rr
+edgestowire ww rr
+
+# Step 15. Check planarity
+mkplane pl ww
+explode pl w
+copy pl_1 sw
+
+#Step 15. Process of profile
+
+settolerance tw 1.0e-7
+mkplane pl tw
+explode pl w
+copy pl_1 tw
+
+tscale sw 0 0 0 1.0e-3
+tscale tw 0 0 0 1.0e-3
+removeloc sw sw
+removeloc tw tw
+
 evolved result -s sw -p tw -solid -a -v
 
-checkprops result -s 1.99565e+011 -v 6.75431e+014
+tscale result 0 0 0 1000
+
+
+checkprops result -s 2.13384e+011 -v 7.22142e+014
 checkshape result
 
 checknbshapes result -solid 1 -shell 1
@@ -18,7 +228,7 @@ if {[regexp "Faulties" [bopargcheck result]]} {
   puts "Error: bopargcheck has found some faulties in res2"
 }
 
-checkmaxtol result -ref 4.7e-6
+checkmaxtol result -ref 3.5169018900217868
 
 smallview
 don result sw tw
diff --git a/tests/evolved/voluved/HMC010 b/tests/evolved/voluved/HMC010
new file mode 100644
index 0000000000..d7d3edbd00
--- /dev/null
+++ b/tests/evolved/voluved/HMC010
@@ -0,0 +1,28 @@
+puts "=========="
+puts "OCC29523"
+puts "=========="
+
+cpulimit 60
+
+restore [locate_data_file bug29523_cut_extrudewire09.brep] sw 
+restore [locate_data_file bug29523_cut_toolwire09.brep] tw
+
+evolved result -s sw -p tw -solid -a -v
+
+checkprops result -s 21088.8 -v 75993.1
+checkshape result
+
+checknbshapes result -solid 1 -shell 1
+
+if {[regexp "Faulties" [bopargcheck result]]} {
+  puts "Error: bopargcheck has found some faulties in res2"
+}
+
+checkmaxtol result -ref 1.1373615770110343e-007
+
+smallview
+don result sw tw
+fit
+
+checkview -screenshot -2d -path ${imagedir}/${test_image}.png
+