diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2006-03-23 19:27:17 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2006-03-23 19:27:17 (GMT) |
| commit | 61b46d4b546ab3f587aed2b4016ecde02ec04948 (patch) | |
| tree | 596539e43011cd102f185c2cc19b3112ea11a136 /tools/h5diff | |
| parent | 76a70bc1110cf9db2d1e6d181601e04ca6f90895 (diff) | |
| download | hdf5-61b46d4b546ab3f587aed2b4016ecde02ec04948.zip hdf5-61b46d4b546ab3f587aed2b4016ecde02ec04948.tar.gz hdf5-61b46d4b546ab3f587aed2b4016ecde02ec04948.tar.bz2 | |
[svn-r12146] Purpose:
bug fix
Description:
percent relative error was done using integer arythmetic; use floating point instead
added the case for unsigned long long integer to float conversion
Solution:
Platforms tested:
linux (32,64)
AIX
solaris
Misc. update:
Diffstat (limited to 'tools/h5diff')
| -rwxr-xr-x | tools/h5diff/testh5diff.sh | 5 | ||||
| -rw-r--r-- | tools/h5diff/testh5diff_basic.c | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/tools/h5diff/testh5diff.sh b/tools/h5diff/testh5diff.sh index 20b0f9b..4cbad3f 100755 --- a/tools/h5diff/testh5diff.sh +++ b/tools/h5diff/testh5diff.sh @@ -276,9 +276,12 @@ TOOLTEST h5diff_17.txt file1.h5 file2.h5 -v # 1.8 quiet mode TOOLTEST h5diff_18.txt file1.h5 file2.h5 -q -# 1.9 with -p (int) +# 1.9.1 with -p (int) TOOLTEST h5diff_191.txt file1.h5 file1.h5 -v -p 0.02 g1/dset5 g1/dset6 +# 1.9.2 with -p (unsigned long_long) +TOOLTEST h5diff_192.txt file1.h5 file1.h5 -v -p 0.02 g1/dset7 g1/dset8 + # ############################################################################## # # not comparable types diff --git a/tools/h5diff/testh5diff_basic.c b/tools/h5diff/testh5diff_basic.c index 389744d..4a99c84 100644 --- a/tools/h5diff/testh5diff_basic.c +++ b/tools/h5diff/testh5diff_basic.c @@ -251,6 +251,8 @@ int test_basic(const char *file1, const char *file2) double data4[3][2] = {{110,100},{90,80},{140,200}}; 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}}; /*------------------------------------------------------------------------- * Create two files @@ -271,9 +273,12 @@ int test_basic(const char *file1, const char *file2) write_dset(group2_id,2,dims,"dset4",H5T_NATIVE_DOUBLE,data4); write_dset(group2_id,2,dims,"dset1",H5T_NATIVE_DOUBLE,data2); - /* integer relative */ + /* relative (int) */ write_dset(group1_id,2,dims,"dset5",H5T_NATIVE_INT,data5); write_dset(group1_id,2,dims,"dset6",H5T_NATIVE_INT,data6); + /* relative (unsigned long_long) */ + write_dset(group1_id,2,dims,"dset7",H5T_NATIVE_ULLONG,data7); + write_dset(group1_id,2,dims,"dset8",H5T_NATIVE_ULLONG,data8); /*------------------------------------------------------------------------- * Close |