From 2f943aacd69af8a9135de16d745855d50bc9c402 Mon Sep 17 00:00:00 2001 From: Pedro Vicente Nunes Date: Mon, 26 Feb 2007 16:22:08 -0500 Subject: [PATCH] [svn-r13400] Revision of the percent tests to have all the same data --- tools/h5diff/h5diffgentest.c | 48 ++++++++++-------- tools/h5diff/testh5diff.sh | 17 +++++-- tools/testfiles/h5diff_161.txt | 16 ++++++ tools/testfiles/h5diff_162.txt | 16 ++++++ .../{h5diff_16.txt => h5diff_163.txt} | 2 +- tools/testfiles/h5diff_191.txt | 12 ----- tools/testfiles/h5diff_192.txt | 12 ----- tools/testfiles/h5diff_attr1.h5 | Bin 19136 -> 19136 bytes tools/testfiles/h5diff_attr2.h5 | Bin 19136 -> 19136 bytes tools/testfiles/h5diff_basic1.h5 | Bin 8008 -> 8008 bytes tools/testfiles/h5diff_basic2.h5 | Bin 4240 -> 4240 bytes tools/testfiles/h5diff_dset1.h5 | Bin 19888 -> 19888 bytes tools/testfiles/h5diff_dset2.h5 | Bin 19888 -> 19888 bytes tools/testfiles/h5diff_dtypes.h5 | Bin 10776 -> 10776 bytes tools/testfiles/h5diff_hyper1.h5 | Bin 1052720 -> 1052720 bytes tools/testfiles/h5diff_hyper2.h5 | Bin 1052720 -> 1052720 bytes tools/testfiles/h5diff_types.h5 | Bin 4016 -> 4874 bytes 17 files changed, 73 insertions(+), 50 deletions(-) create mode 100644 tools/testfiles/h5diff_161.txt create mode 100644 tools/testfiles/h5diff_162.txt rename tools/testfiles/{h5diff_16.txt => h5diff_163.txt} (89%) delete mode 100644 tools/testfiles/h5diff_191.txt delete mode 100644 tools/testfiles/h5diff_192.txt diff --git a/tools/h5diff/h5diffgentest.c b/tools/h5diff/h5diffgentest.c index 1695a014ef..1ab61fd20c 100644 --- a/tools/h5diff/h5diffgentest.c +++ b/tools/h5diff/h5diffgentest.c @@ -133,27 +133,33 @@ int test_basic(const char *fname1, hsize_t dims[2] = { 3,2 }; /* Test */ - double data1[3][2] = {{1,1}, {1,1}, {0,0}}; - double data2[3][2] = {{0,1.1},{1.01,1.001},{0,1}}; - int data5[3][2] = {{100,100},{100,100},{100,100}}; - int data6[3][2] = {{101,102},{103,104},{150,200}}; - unsigned long_long data7[3][2] = {{100,100},{100,100},{100,100}}; - unsigned long_long data8[3][2] = {{101,102},{103,104},{150,200}}; - double data3[3][2] = {{100,100},{100,100},{100,100}}; - double data4[3][2] = {{105,120},{160,95},{80,40}}; - double data9[3][2] = {{100,100},{100,0},{0,100}}; - /* compare divide by zero */ - /* compare both zero */ - double data10[3][2] ={{120,80},{0,100},{0,50}}; - /* -A B 1-B/A % -100 120 0.2 20 -100 80 0.2 20 -100 0 1 100 -0 100 #DIV/0! #DIV/0! -0 0 #DIV/0! #DIV/0! -100 50 0.5 50 -*/ + double data1[3][2] = {{1,1}, {1,1}, {0,0}}; + double data2[3][2] = {{0,1.1},{1.01,1.001},{0,1}}; + double data3[3][2] = {{100,100},{100,100},{100,100}}; + double data4[3][2] = {{105,120},{160,95},{80,40}}; + +/*------------------------------------------------------------------------- + * relative error, compare divide by zero, both zero + *------------------------------------------------------------------------- + */ + + int data5[3][2] = {{100,100},{100,0},{0,100}}; + int data6[3][2] = {{120,80}, {0,100},{0,50}}; + unsigned long_long data7[3][2] = {{100,100},{100,0},{0,100}}; + unsigned long_long data8[3][2] = {{120,80}, {0,100},{0,50}}; + double data9[3][2] = {{100,100},{100,0},{0,100}}; + double data10[3][2] ={{120,80}, {0,100},{0,50}}; + +/*------------------------------------------------------------------------- + A B 1-B/A % + 100 120 0.2 20 + 100 80 0.2 20 + 100 0 1 100 + 0 100 #DIV/0! #DIV/0! + 0 0 #DIV/0! #DIV/0! + 100 50 0.5 50 + *------------------------------------------------------------------------- + */ /* floating point comparison , epsilon = 0.00001 */ float data11[3][2] ={{0.00000f,0.00001f},{0.00001f, 0.00000f},{0.00001f,0.00001f}}; diff --git a/tools/h5diff/testh5diff.sh b/tools/h5diff/testh5diff.sh index 3dc40ef837..5841855d97 100755 --- a/tools/h5diff/testh5diff.sh +++ b/tools/h5diff/testh5diff.sh @@ -286,8 +286,17 @@ TOOLTEST h5diff_14.txt $FILE1 $FILE2 -r g1/dset1 g1/dset2 # 1.5 with -d TOOLTEST h5diff_15.txt $FILE1 $FILE2 -r -d 5 g1/dset3 g1/dset4 -# 1.6 with -p (test divide by zero case) -TOOLTEST h5diff_16.txt $FILE1 $FILE1 g1/dset9 g1/dset10 -p 0.01 -v +# 1.6 with -p (double) +#TOOLTEST h5diff_16.txt $FILE1 $FILE1 g1/dset9 g1/dset10 -p 0.01 -v + +# 1.6.1 with -p (int) +TOOLTEST h5diff_161.txt $FILE1 $FILE1 -v -p 0.02 g1/dset5 g1/dset6 + +# 1.6.2 with -p (unsigned long_long) +TOOLTEST h5diff_162.txt $FILE1 $FILE1 -v -p 0.02 g1/dset7 g1/dset8 + +# 1.6.3 with -p (double) +TOOLTEST h5diff_163.txt $FILE1 $FILE1 -v -p 0.02 g1/dset9 g1/dset10 # 1.7 verbose mode TOOLTEST h5diff_17.txt $FILE1 $FILE2 -v @@ -296,10 +305,10 @@ TOOLTEST h5diff_17.txt $FILE1 $FILE2 -v TOOLTEST h5diff_18.txt $FILE1 $FILE2 -q # 1.9.1 with -p (int) -TOOLTEST h5diff_191.txt $FILE1 $FILE1 -v -p 0.02 g1/dset5 g1/dset6 +#TOOLTEST h5diff_191.txt $FILE1 $FILE1 -v -p 0.02 g1/dset5 g1/dset6 # 1.9.2 with -p (unsigned long_long) -TOOLTEST h5diff_192.txt $FILE1 $FILE1 -v -p 0.02 g1/dset7 g1/dset8 +#TOOLTEST h5diff_192.txt $FILE1 $FILE1 -v -p 0.02 g1/dset7 g1/dset8 # ############################################################################## diff --git a/tools/testfiles/h5diff_161.txt b/tools/testfiles/h5diff_161.txt new file mode 100644 index 0000000000..b29d93cef3 --- /dev/null +++ b/tools/testfiles/h5diff_161.txt @@ -0,0 +1,16 @@ +############################# +Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 -v -p 0.02 g1/dset5 g1/dset6' +############################# +dataset: and +size: [3x2] [3x2] +position dset5 dset6 difference relative +------------------------------------------------------------------------ +[ 0 0 ] 100 120 20 0.200000 +[ 0 1 ] 100 80 20 0.200000 +[ 1 0 ] 100 0 100 1.000000 +[ 1 1 ] 0 100 100 not comparable +[ 2 1 ] 100 50 50 0.500000 +5 differences found +-------------------------------- +Some objects are not comparable +-------------------------------- diff --git a/tools/testfiles/h5diff_162.txt b/tools/testfiles/h5diff_162.txt new file mode 100644 index 0000000000..02bc972db3 --- /dev/null +++ b/tools/testfiles/h5diff_162.txt @@ -0,0 +1,16 @@ +############################# +Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 -v -p 0.02 g1/dset7 g1/dset8' +############################# +dataset: and +size: [3x2] [3x2] +position dset7 dset8 difference relative +------------------------------------------------------------------------ +[ 0 0 ] 100 120 20 0.200000 +[ 0 1 ] 100 80 20 0.200000 +[ 1 0 ] 100 0 100 1.000000 +[ 1 1 ] 0 100 100 not comparable +[ 2 1 ] 100 50 50 0.500000 +5 differences found +-------------------------------- +Some objects are not comparable +-------------------------------- diff --git a/tools/testfiles/h5diff_16.txt b/tools/testfiles/h5diff_163.txt similarity index 89% rename from tools/testfiles/h5diff_16.txt rename to tools/testfiles/h5diff_163.txt index d68cd47430..be5eb1eee6 100644 --- a/tools/testfiles/h5diff_16.txt +++ b/tools/testfiles/h5diff_163.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 g1/dset9 g1/dset10 -p 0.01 -v' +Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 -v -p 0.02 g1/dset9 g1/dset10' ############################# dataset: and size: [3x2] [3x2] diff --git a/tools/testfiles/h5diff_191.txt b/tools/testfiles/h5diff_191.txt deleted file mode 100644 index 3fa0834474..0000000000 --- a/tools/testfiles/h5diff_191.txt +++ /dev/null @@ -1,12 +0,0 @@ -############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 -v -p 0.02 g1/dset5 g1/dset6' -############################# -dataset: and -size: [3x2] [3x2] -position dset5 dset6 difference relative ------------------------------------------------------------------------- -[ 1 0 ] 100 103 3 0.030000 -[ 1 1 ] 100 104 4 0.040000 -[ 2 0 ] 100 150 50 0.500000 -[ 2 1 ] 100 200 100 1.000000 -4 differences found diff --git a/tools/testfiles/h5diff_192.txt b/tools/testfiles/h5diff_192.txt deleted file mode 100644 index 38948a58e6..0000000000 --- a/tools/testfiles/h5diff_192.txt +++ /dev/null @@ -1,12 +0,0 @@ -############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 -v -p 0.02 g1/dset7 g1/dset8' -############################# -dataset: and -size: [3x2] [3x2] -position dset7 dset8 difference relative ------------------------------------------------------------------------- -[ 1 0 ] 100 103 3 0.030000 -[ 1 1 ] 100 104 4 0.040000 -[ 2 0 ] 100 150 50 0.500000 -[ 2 1 ] 100 200 100 1.000000 -4 differences found diff --git a/tools/testfiles/h5diff_attr1.h5 b/tools/testfiles/h5diff_attr1.h5 index 65e274376598889413021b42c8cff7ddce4b888d..e2614867de67508bb0fefe244435dd133371778a 100644 GIT binary patch delta 249 zcmX>wmGQt-#tloDnV-fy-n^XokX$|AT22NCaA5vX2W1L4u;%{S58+5Su;;te97GEsX38@#m^p~UB`h2y z;TBjqNb6Kj&NtCx(yyL8-$YCrF5}{$3D@E3pbfNo@&yx7CU%C+^~#$R_)xvH+1{m* F4FFQ`G35XN delta 303 zcmX>wmGQt-#tloDnO_8EZ(h!PNUr{N7bgP*I52;`3}p&9u%7jzz^4J;2;Rq$-rRbAZ&OY$}@2gg|a3Gn8?YW@^85p=A%A6h4udr}H*e(v5aP_VZ+V5cIyE*9o|NkGN a#@#`m?+KW>xkY)c0v~EXY_@l4WCH-G5I(m6 diff --git a/tools/testfiles/h5diff_attr2.h5 b/tools/testfiles/h5diff_attr2.h5 index bcf597b2f972250a744c508be9be3bd62fde9f86..0a59fc58401497605094bedaa1d4fb7ac583d454 100644 GIT binary patch delta 199 zcmX>wmGQt-#tloDnV-fy-n^XokX$m~T22NS_)!OAF)-x*+7IXCA+euLf(tYJt46Sq z)i5w{!6ks^Omq}wE&x+}$hvi^Cx2wpW74ml=qSeYY!Z-U1{wlX%*4*Hxn6mb0w1c| PHh&ZmWZWF!TEGebQ|~Q% delta 252 zcmX>wmGQt-#tloDnO_8EZ(h!PNG|+#7bgP@e7y`~F)*C|zaP$-_YBTtID;hq3Q0Y( zI8g6IM^Prj>ytk+>G6L?Qgx?`6DSjQ4#^N?X$A%^xJ_4BIN)q#_3x03`~UwxTn*oo X&GpKg6!=g*w7F4Tka2T>YXK_&iElR# diff --git a/tools/testfiles/h5diff_basic1.h5 b/tools/testfiles/h5diff_basic1.h5 index 0ece8761dda513f0540163151d18e2bcb64b1d23..bacf18a04ec6a6e97ae51663f8d690393f431f16 100644 GIT binary patch delta 259 zcmX?McfxMN5q9RMF^?z9b2U!BAjPpcfa44!NMN%(7b_z>km1U}&@k~}>*NjGEy&yh zJSf}?yeQlUd_7=O^ZEZOGC)BJkgfpY03<$$X*9W4KzgEwfFVc$2!IrU08Al-$G`xS yhw+Uj3kr&E{wL4}_QB?U30{cH=S#9OgKh7ZSUq_cr^Dn)vPvlYMRE{6(9ZyI>P{^H delta 260 zcmX?McfxMN5q9Pmf!UMgxf&;5kmA@Jz;T8VB(PbYitCST%Jf^j!qn7}xhL!biy;SCe| delta 47 vcmbQBI6-kk4;S-`!0gTaT%k-L#^ipk#z|aRlP~cq!MGbQOkkYMAi_@$&j0}q%#WI&OaTYh{9pSa90><@s3-%2 zf&(X9T*ZM~uNo?&;lO*Dg#*ITao~rWY2YB33p2;aL70Jo3!=uvK@_SJsL9Mh9H?k= z6}MtN+;BSwc{tm_LGi)o?GW{j4$90$P_0f5s!$dKgR_JB8eS;R#X%D;?&_eeQViv} zIq1ebc7<@<9rT|~f{J@MXfQ*Vo27Uzv4DbS^Lv3rQ-xv z)vxmxte{^PYTtW(R)|V};mwm*876^c`Hi5C&^JzHWP> zy!n(V6U5c$&21qJek)Okar(y9lNVXf0vl&<;|i9YoG-F?vX(u>j(&TnN`9-AlLH(f zo;$BuIQfIfqRF?Mg20yOJI@81aNgMz78nteH!{agZm@Kkyvh}Uw8UuJC?0%_4A%FK!F1@jKv_}!1}I>6T+2nV27(waNxWR z6IXHIR=N(=q2a)L`u~0iN5_Hx42*5yAPCoM4 z-9aDD_HfXE`h2q#&m|U6@N9lB5X%H+_zTN2f*JWDsf_GEDOUytg~^P}s*}V@zybMQ zVCG~2@fHYMf8%5i2_KmFW&_DN0$|POHJ5@-nappraqB?}T(Ak}olRkZ5ixlqbL`{>OQ*@JT)~Pq|96F&1k^n-fMfFncNa*S16fz) MT?97az4t*z00h^*l>h($ diff --git a/tools/testfiles/h5diff_dset2.h5 b/tools/testfiles/h5diff_dset2.h5 index d93edcf9e98365c849a112b9341569556dfc195c..1f14d29313abbf7ec6584ba87114d3067aea0583 100644 GIT binary patch delta 618 zcmdlmn{fjWEn#MU8uNH^zwY$Sb}U=jr2qf_&j16DnqVvjhWuaqCpwDS11Y$eUNxM_ zaG8Yz&OtUJ7fC$>0~gQ;W}whyMrK7dWTTMT4?b^)8^v5S(NT=)056b~QYnTDGsHZ0 zg>#-wn*5(#a&mx{0v0SVxj>6&^F1Cu7LYeLzZZyQ0yF%DWf{SYe34W}cAyl{JO!Y$ zR40j*fCJ>cz|6@4;w=!i{>I535*7EQk86a= delta 594 zcmdlmn{fjWEn#MU5tu!>Uw8UuJC?0%O!J;ibQDXz)y2sG1M{B2SPTrek;Ij*Bg9Yt z-w)@UL1H88?Yjb3!T?k=c_XtcKeF08U7QmgMWtC0su)fqS=SJ?eKI4n!ej?6gUJC} z3TRkha)B1l=6gJREFkY}elHNq1ZMaP%QAu)`68)|>_9131_lM7IjWPyO28g}FEDem zfOrdpt-o=yhlCGIe6xY%909QA^O{S+rcCBH+BkWEo6=-29Vf7=ex1Ky1^v2E``+ub zLR9(-Z=Sr$FbOQnZv=IOzHure8^jTl53nKNL8 zoAc#ZAv)eGZ=I~85P@)yBEA3yl#W4EzgOmkF#fAR8T@Lw5UcAoAR?33Gj{?2 Don>@| delta 254 zcmbOcG9zTe8fNAff!UkaGlw#P7?a;CZ<@T5EgHn}mQ)s;y-FI!Zk#M2&aruc%o(u4 z&G~Yy5FPK8w@%hkh(NeU5n}#&=KjrUO2;6o-z)P%82?qE41Tp-h}HEP5Ru92nL7bz CENO)R diff --git a/tools/testfiles/h5diff_hyper1.h5 b/tools/testfiles/h5diff_hyper1.h5 index c3de508d733c3d7d463e514551fea8b40a023fa9..ceeff803e364107766ccc8b4089f44967422e71a 100644 GIT binary patch delta 93 zcmdn6z+nRr?O|qq8uNJbe&)HX%!YQ1n-e+Dvo-4pwCf2l0x=U1GXpUT5VHa?8xXSt bF$WNH0x=g5a|1CC5c2{t9}x31{r?XDWC9uY delta 93 zcmdn6z+nRr?O|qq5tzMsKl5Bx=AAB#n-e+Dvo-4pwCf2l0x=U1GXpUT5VHa?8xXSt bF$WNH0x=g5a|1CC5c2{t9}x31{r?XDWP=(7 diff --git a/tools/testfiles/h5diff_hyper2.h5 b/tools/testfiles/h5diff_hyper2.h5 index d2c628a374d7c9125b09f3d0cfbd7cd61107de52..05a2eb16db6ebeadbce110481b1d1528ba409a51 100644 GIT binary patch delta 92 zcmdn6z+nRr?O|qq7V~)Xe&)HX%!YQ1n-e+Db2aOUwCjm50x=U1GXpUT5VHa?8xXSt bF$WNH0x=g5a|1CC5c2{t-*!C_ex^SFRQ?%i delta 92 zcmdn6z+nRr?O|qq8JN9!Kl5Bx=AAB#n-e+Db2aOUwCjm50x=U1GXpUT5VHa?8xXSt bF$WNH0x=g5a|1CC5c2{t-*!C_ex^SFRdE@3 diff --git a/tools/testfiles/h5diff_types.h5 b/tools/testfiles/h5diff_types.h5 index ecbcc764227d9ff54432af221c67eb835c933e75..805ef5f453e5d90d1622553831b556d8c9f27c77 100644 GIT binary patch delta 626 zcmdlW-=#J|gNaLcqLu|a8v`Q)1B1fEOnH7F4F(}WuC5FWjFam*BsncuAYvMu7jpb( z)Y<@55&)%ta6=dZ3<6-r3LXewf^qUGCJn9wybx{>-$X}|$r{Wx>`!AJ1I_N3+{oA~ z6zu2k!pOkRzyVRjpus%RQH~2@5CcO4D~KlnmGj^L@}dl&y#G+Z1m#;mX&B`IWuU9` zfGL2|3Q$^r8)TOTl(&Ez=sdT{4Xgnu-sfkU{DOT0icm8XBkN>U?tUP-mD@QIs-GdH zIJE@CPB(;zq#Hr#5-7g}%FltxL+Ko-I7~e#W$CE?^jgL>L)47}ywC;K9bg z@B=9Sck&NzHKq!_$qGC%CS35i+_e1pI;Rj17Y0@aU|@k_D@B7#5M(F=11AtdfKRN{ zO>W~Qh3AOez52?r=$df~wax8Pt`h6<Y{EQE=~-v_y)-= RUUbrO`r`65!xrWaI$Ku>mp2UJx4w9!xy=bTOA8 F69DZ{KqCME