Revision: 76744
http://sourceforge.net/p/brlcad/code/76744
Author: starseeker
Date: 2020-08-13 19:36:14 +0000 (Thu, 13 Aug 2020)
Log Message:
-----------
Add a couple tolerance tests
Modified Paths:
--------------
brlcad/branches/RELEASE/regress/gdiff/gdiff.ref
brlcad/branches/RELEASE/regress/gdiff/moss_2.g
brlcad/branches/RELEASE/regress/gdiff/regress-gdiff.cmake.in
Modified: brlcad/branches/RELEASE/regress/gdiff/gdiff.ref
===================================================================
--- brlcad/branches/RELEASE/regress/gdiff/gdiff.ref 2020-08-13 19:27:49 UTC
(rev 76743)
+++ brlcad/branches/RELEASE/regress/gdiff/gdiff.ref 2020-08-13 19:36:14 UTC
(rev 76744)
@@ -2,6 +2,7 @@
Test 0: gdiff moss_1.g moss_2.g
M cone.r
+M box.s
D box.r
M all.g
D tor
@@ -19,6 +20,7 @@
M cone.r
D box2.r
D tor.s
+M box.s
M all.g
A box.r
A tor
@@ -27,6 +29,20 @@
- "cone.r" id(p): 3000
+ "cone.r" id(p): 0
D "cone.r" region_id(a): 3000
+- "box.s" V8(p): 3.235580444340001804448548 -5.211529731749999783119165
10.41366577147999805674772
++ "box.s" V8(p): 10.66460871784945751983287 1.319221728134169824286914
15.5285715161760045077699
+- "box.s" V7(p): 3.235580444340001804448548 21.58122539520000060520033
10.41366577147999805674772
++ "box.s" V7(p): 18.29593194105197184740064 26.99460533281936491789565
14.90462447677827739767054
+- "box.s" V6(p): 3.235580444340001804448548 21.58122539520000060520033
-16.37908935547000055521494
++ "box.s" V6(p): 12.61326357652689544863733 28.04785477355226674944788
-11.25736461363911544708571
+- "box.s" V5(p): 3.235580444340001804448548 -5.211529731749999783119165
-16.37908935547000055521494
++ "box.s" V5(p): 4.981940353324379344712725 2.372471168867078539221893
-10.63341757424140077148422
+- "box.s" V4(p): 30.0283355712900004164112 -5.211529731749999783119165
10.41366577147999805674772
++ "box.s" V4(p): 35.71100393581505727524927 -6.264779172482906943741909
9.782899734947383407757115
+- "box.s" V3(p): 30.0283355712900004164112 21.58122539520000060520033
10.41366577147999805674772
++ "box.s" V3(p): 43.34232715901755739196233 19.41060443220228037830566
9.158952695549666955798784
+- "box.s" V2(p): 30.0283355712900004164112 21.58122539520000060520033
-16.37908935547000055521494
++ "box.s" V2(p): 37.65965879449250053312426 20.46385387293518576257156
-17.00303639486770990174591
D box.r
- "all.g" tree(p): u {u {u {l platform.r} {l box.r {1 0 0 -23.69892883301 0 1
0 13.40998744965 0 0 1 8.023991584778 0 0 0 1}}} {u {l cone.r {1 0 0
22.0492401123 0 1 0 12.23486709595 0 0 1 2.111249841619e-07 0 0 0 1}} {l
ellipse.r {1 0 0 14.67929267883 0 1 0 -41.60771179199 0 0 1 38.79878234863 0
0 0 1}}}} {u {l tor.r} {l light.r}}
+ "all.g" tree(p): u {u {u {l platform.r} {l box2.r {1 0 0 -23.69892883301 0
1 0 13.40998744965 0 0 1 8.023991584778 0 0 0 1}}} {u {l cone.r {1 0 0
22.0492401123 0 1 0 12.23486709595 0 0 1 2.111249841619e-07 0 0 0 1}} {l
ellipse.r {1 0 0 14.67929267883 0 1 0 -41.60771179199 0 0 1 38.79878234863 0
0 0 1}}}} {u {l tor.r} {l light.r}}
@@ -38,6 +54,20 @@
- "cone.r" id(p): 3000
+ "cone.r" id(p): 0
D "cone.r" region_id(a): 3000
+- "box.s" V8(p): 3.235580444340001804448548 -5.211529731749999783119165
10.41366577147999805674772
++ "box.s" V8(p): 10.66460871784945751983287 1.319221728134169824286914
15.5285715161760045077699
+- "box.s" V7(p): 3.235580444340001804448548 21.58122539520000060520033
10.41366577147999805674772
++ "box.s" V7(p): 18.29593194105197184740064 26.99460533281936491789565
14.90462447677827739767054
+- "box.s" V6(p): 3.235580444340001804448548 21.58122539520000060520033
-16.37908935547000055521494
++ "box.s" V6(p): 12.61326357652689544863733 28.04785477355226674944788
-11.25736461363911544708571
+- "box.s" V5(p): 3.235580444340001804448548 -5.211529731749999783119165
-16.37908935547000055521494
++ "box.s" V5(p): 4.981940353324379344712725 2.372471168867078539221893
-10.63341757424140077148422
+- "box.s" V4(p): 30.0283355712900004164112 -5.211529731749999783119165
10.41366577147999805674772
++ "box.s" V4(p): 35.71100393581505727524927 -6.264779172482906943741909
9.782899734947383407757115
+- "box.s" V3(p): 30.0283355712900004164112 21.58122539520000060520033
10.41366577147999805674772
++ "box.s" V3(p): 43.34232715901755739196233 19.41060443220228037830566
9.158952695549666955798784
+- "box.s" V2(p): 30.0283355712900004164112 21.58122539520000060520033
-16.37908935547000055521494
++ "box.s" V2(p): 37.65965879449250053312426 20.46385387293518576257156
-17.00303639486770990174591
D "box.r" tree(p): l box.s
D "box.r" rgb(p): 100 190 190
D "box.r" id(p): 2000
@@ -81,24 +111,43 @@
tor.r
box.r
-Test 8: gdiff -F "-type region" moss_1.g moss_2.g
+Test 8: gdiff -t 10 moss_1.g moss_2.g
M cone.r
+M box.s
D box.r
+M all.g
+D tor
A box2.r
+A tor.s
-Test 9: gdiff -F "-type region" -a -d moss_1.g moss_2.g
+Test 9: gdiff -t 100 moss_1.g moss_2.g
+M cone.r
D box.r
+M all.g
+D tor
A box2.r
+A tor.s
-Test 10: gdiff -F "! -attr region_id" -a -d moss_1.g moss_2.g
+Test 10: gdiff -F "-type region" moss_1.g moss_2.g
+M cone.r
+D box.r
+A box2.r
+
+Test 11: gdiff -F "-type region" -a -d moss_1.g moss_2.g
+D box.r
+A box2.r
+
+Test 12: gdiff -F "! -attr region_id" -a -d moss_1.g moss_2.g
+M box.s
M all.g
D tor
A tor.s
-Test 11: gdiff moss_2.g moss_1.g moss_3.g
+Test 13: gdiff moss_2.g moss_1.g moss_3.g
M ellipse.r
M cone.s
M cone.r
+M box.s
D(L) box.r
M all.g
C tor
@@ -105,7 +154,7 @@
A(L) box2.r
A(L) tor.s
-Test 12: gdiff -v moss_2.g moss_1.g moss_3.g
+Test 14: gdiff -v moss_2.g moss_1.g moss_3.g
A(R) "ellipse.r" prop1(p): 1
M(R) "cone.s" D(p): 4.997601260198356598607461 4.997601260198356598607461 0
M(R) "cone.s" C(p): 4.997601260198356598607461 -4.997601260198356598607461 0
@@ -112,6 +161,13 @@
M(R) "cone.s" V(p): 19.38951648775079661390919 -42.80785935392668761778623
-10.87609632321004937693942
M(L) "cone.r" id(p): 0
D(L) "cone.r" region_id(p): 3000
+M(L) "box.s" V8(p): 10.66460871784945751983287 1.319221728134169824286914
15.5285715161760045077699
+M(L) "box.s" V7(p): 18.29593194105197184740064 26.99460533281936491789565
14.90462447677827739767054
+M(L) "box.s" V6(p): 12.61326357652689544863733 28.04785477355226674944788
-11.25736461363911544708571
+M(L) "box.s" V5(p): 4.981940353324379344712725 2.372471168867078539221893
-10.63341757424140077148422
+M(L) "box.s" V4(p): 35.71100393581505727524927 -6.264779172482906943741909
9.782899734947383407757115
+M(L) "box.s" V3(p): 43.34232715901755739196233 19.41060443220228037830566
9.158952695549666955798784
+M(L) "box.s" V2(p): 37.65965879449250053312426 20.46385387293518576257156
-17.00303639486770990174591
D(L) box.r
M(L) "all.g" tree(p): u {u {u {l platform.r} {l box2.r {1 0 0 -23.69892883301
0 1 0 13.40998744965 0 0 1 8.023991584778 0 0 0 1}}} {u {l cone.r {1 0 0
22.0492401123 0 1 0 12.23486709595 0 0 1 2.111249841619e-07 0 0 0 1}} {l
ellipse.r {1 0 0 14.67929267883 0 1 0 -41.60771179199 0 0 1 38.79878234863 0
0 0 1}}}} {u {l tor.r} {l light.r}}
C(LD,RM) tor
@@ -118,7 +174,7 @@
A(L) box2.r
A(L) tor.s
-Test 13: gdiff -vv moss_2.g moss_1.g moss_3.g
+Test 15: gdiff -vv moss_2.g moss_1.g moss_3.g
A(R) "ellipse.r" prop1(p): 1
M(R) "cone.s" D(p): 4.997601260198356598607461 4.997601260198356598607461 0
M(R) "cone.s" C(p): 4.997601260198356598607461 -4.997601260198356598607461 0
@@ -125,6 +181,13 @@
M(R) "cone.s" V(p): 19.38951648775079661390919 -42.80785935392668761778623
-10.87609632321004937693942
M(L) "cone.r" id(p): 0
D(L) "cone.r" region_id(p): 3000
+M(L) "box.s" V8(p): 10.66460871784945751983287 1.319221728134169824286914
15.5285715161760045077699
+M(L) "box.s" V7(p): 18.29593194105197184740064 26.99460533281936491789565
14.90462447677827739767054
+M(L) "box.s" V6(p): 12.61326357652689544863733 28.04785477355226674944788
-11.25736461363911544708571
+M(L) "box.s" V5(p): 4.981940353324379344712725 2.372471168867078539221893
-10.63341757424140077148422
+M(L) "box.s" V4(p): 35.71100393581505727524927 -6.264779172482906943741909
9.782899734947383407757115
+M(L) "box.s" V3(p): 43.34232715901755739196233 19.41060443220228037830566
9.158952695549666955798784
+M(L) "box.s" V2(p): 37.65965879449250053312426 20.46385387293518576257156
-17.00303639486770990174591
D(L) "box.r" tree(p): l box.s
D(L) "box.r" rgb(p): 100 190 190
D(L) "box.r" id(p): 2000
Modified: brlcad/branches/RELEASE/regress/gdiff/moss_2.g
===================================================================
(Binary files differ)
Modified: brlcad/branches/RELEASE/regress/gdiff/regress-gdiff.cmake.in
===================================================================
--- brlcad/branches/RELEASE/regress/gdiff/regress-gdiff.cmake.in
2020-08-13 19:27:49 UTC (rev 76743)
+++ brlcad/branches/RELEASE/regress/gdiff/regress-gdiff.cmake.in
2020-08-13 19:36:14 UTC (rev 76744)
@@ -102,6 +102,22 @@
)
GDIFF_CHECK_RESULT(gdiff_result)
+GDIFF_CHECK_INIT("\nTest ${TN}: gdiff -t 10 moss_1.g moss_2.g\n")
+execute_process(
+ COMMAND "${GDIFF}" -t 10 "${CSDIR}/moss_1.g" "${CSDIR}/moss_2.g"
+ RESULT_VARIABLE gdiff_result OUTPUT_VARIABLE gdiff_log ERROR_VARIABLE
gdiff_log
+ WORKING_DIRECTORY ${CBDIR}
+ )
+GDIFF_CHECK_RESULT(gdiff_result)
+
+GDIFF_CHECK_INIT("\nTest ${TN}: gdiff -t 100 moss_1.g moss_2.g\n")
+execute_process(
+ COMMAND "${GDIFF}" -t 100 "${CSDIR}/moss_1.g" "${CSDIR}/moss_2.g"
+ RESULT_VARIABLE gdiff_result OUTPUT_VARIABLE gdiff_log ERROR_VARIABLE
gdiff_log
+ WORKING_DIRECTORY ${CBDIR}
+ )
+GDIFF_CHECK_RESULT(gdiff_result)
+
GDIFF_CHECK_INIT("\nTest ${TN}: gdiff -F \"-type region\" moss_1.g moss_2.g\n")
execute_process(
COMMAND "${GDIFF}" -F "-type region" "${CSDIR}/moss_1.g" "${CSDIR}/moss_2.g"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
