diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2006-03-22 20:53:05 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2006-03-22 20:53:05 (GMT) |
| commit | b269dbf0aef643eac98a8d9ee521a99d65a64768 (patch) | |
| tree | e869d57ee0745f95b3f50850a62bd15d4618f617 /tools/testfiles | |
| parent | 433fdf2bf8f299c686df35bad083b13c8c3d7136 (diff) | |
| download | hdf5-b269dbf0aef643eac98a8d9ee521a99d65a64768.zip hdf5-b269dbf0aef643eac98a8d9ee521a99d65a64768.tar.gz hdf5-b269dbf0aef643eac98a8d9ee521a99d65a64768.tar.bz2 | |
[svn-r12134] Purpose:
bug fix
Description:
1) added a more explainative usage message
2) the percent relative error for the integer type (division) was being done using integer arythmetic; use floating point arythmetic instead
3) added a new test for integer percent
Solution:
Platforms tested:
linux (32,64)
AIX
solaris
Misc. update:
Diffstat (limited to 'tools/testfiles')
27 files changed, 65 insertions, 18 deletions
diff --git a/tools/testfiles/file1.h5 b/tools/testfiles/file1.h5 Binary files differindex fedeac4..4069a04 100644 --- a/tools/testfiles/file1.h5 +++ b/tools/testfiles/file1.h5 diff --git a/tools/testfiles/file2.h5 b/tools/testfiles/file2.h5 Binary files differindex 18c0b01..3226343 100644 --- a/tools/testfiles/file2.h5 +++ b/tools/testfiles/file2.h5 diff --git a/tools/testfiles/file3.h5 b/tools/testfiles/file3.h5 Binary files differindex 1431f3a..1554d66 100644 --- a/tools/testfiles/file3.h5 +++ b/tools/testfiles/file3.h5 diff --git a/tools/testfiles/file4.h5 b/tools/testfiles/file4.h5 Binary files differindex b85c07e..714f472 100644 --- a/tools/testfiles/file4.h5 +++ b/tools/testfiles/file4.h5 diff --git a/tools/testfiles/file5.h5 b/tools/testfiles/file5.h5 Binary files differindex 2cf5163..91c64ea 100644 --- a/tools/testfiles/file5.h5 +++ b/tools/testfiles/file5.h5 diff --git a/tools/testfiles/file6.h5 b/tools/testfiles/file6.h5 Binary files differindex d421db6..08889b0 100644 --- a/tools/testfiles/file6.h5 +++ b/tools/testfiles/file6.h5 diff --git a/tools/testfiles/file7.h5 b/tools/testfiles/file7.h5 Binary files differindex 0fa727e..c792216 100644 --- a/tools/testfiles/file7.h5 +++ b/tools/testfiles/file7.h5 diff --git a/tools/testfiles/file8.h5 b/tools/testfiles/file8.h5 Binary files differindex ff2c51b..8f4af70 100644 --- a/tools/testfiles/file8.h5 +++ b/tools/testfiles/file8.h5 diff --git a/tools/testfiles/h5diff_10.txt b/tools/testfiles/h5diff_10.txt index 44622f3..223e3fa 100644 --- a/tools/testfiles/h5diff_10.txt +++ b/tools/testfiles/h5diff_10.txt @@ -17,7 +17,7 @@ file2 File name of the second HDF5 file [-p relative] Print difference when it is greater than a relative limit Items in [] are optional -[obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes) +[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links) The 'count' value must be a positive integer The 'delta' and 'relative' values must be positive numbers The -d compare criteria is |a - b| > delta @@ -48,3 +48,5 @@ Note) file1 and file2 can be the same file. Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare '/g1/dset1' and '/g1/dset2' in the same file + +If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value diff --git a/tools/testfiles/h5diff_191.txt b/tools/testfiles/h5diff_191.txt new file mode 100644 index 0000000..cc349dc --- /dev/null +++ b/tools/testfiles/h5diff_191.txt @@ -0,0 +1,11 @@ +############################# +Expected output for 'h5diff file1.h5 file1.h5 -v -p 0.02 g1/dset5 g1/dset6' +############################# +Dataset: </g1/dset5> and </g1/dset6> +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_600.txt b/tools/testfiles/h5diff_600.txt index ec56f73..709ef79 100644 --- a/tools/testfiles/h5diff_600.txt +++ b/tools/testfiles/h5diff_600.txt @@ -18,7 +18,7 @@ file2 File name of the second HDF5 file [-p relative] Print difference when it is greater than a relative limit Items in [] are optional -[obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes) +[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links) The 'count' value must be a positive integer The 'delta' and 'relative' values must be positive numbers The -d compare criteria is |a - b| > delta @@ -49,3 +49,5 @@ Note) file1 and file2 can be the same file. Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare '/g1/dset1' and '/g1/dset2' in the same file + +If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value diff --git a/tools/testfiles/h5diff_601.txt b/tools/testfiles/h5diff_601.txt index 285ed72..5054cce 100644 --- a/tools/testfiles/h5diff_601.txt +++ b/tools/testfiles/h5diff_601.txt @@ -18,7 +18,7 @@ file2 File name of the second HDF5 file [-p relative] Print difference when it is greater than a relative limit Items in [] are optional -[obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes) +[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links) The 'count' value must be a positive integer The 'delta' and 'relative' values must be positive numbers The -d compare criteria is |a - b| > delta @@ -49,3 +49,5 @@ Note) file1 and file2 can be the same file. Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare '/g1/dset1' and '/g1/dset2' in the same file + +If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value diff --git a/tools/testfiles/h5diff_602.txt b/tools/testfiles/h5diff_602.txt index d7d3883..372b72f 100644 --- a/tools/testfiles/h5diff_602.txt +++ b/tools/testfiles/h5diff_602.txt @@ -18,7 +18,7 @@ file2 File name of the second HDF5 file [-p relative] Print difference when it is greater than a relative limit Items in [] are optional -[obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes) +[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links) The 'count' value must be a positive integer The 'delta' and 'relative' values must be positive numbers The -d compare criteria is |a - b| > delta @@ -49,3 +49,5 @@ Note) file1 and file2 can be the same file. Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare '/g1/dset1' and '/g1/dset2' in the same file + +If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value diff --git a/tools/testfiles/h5diff_603.txt b/tools/testfiles/h5diff_603.txt index c386e09..17d2ee7 100644 --- a/tools/testfiles/h5diff_603.txt +++ b/tools/testfiles/h5diff_603.txt @@ -18,7 +18,7 @@ file2 File name of the second HDF5 file [-p relative] Print difference when it is greater than a relative limit Items in [] are optional -[obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes) +[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links) The 'count' value must be a positive integer The 'delta' and 'relative' values must be positive numbers The -d compare criteria is |a - b| > delta @@ -49,3 +49,5 @@ Note) file1 and file2 can be the same file. Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare '/g1/dset1' and '/g1/dset2' in the same file + +If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value diff --git a/tools/testfiles/h5diff_604.txt b/tools/testfiles/h5diff_604.txt index 5ae0b91..403ea84 100644 --- a/tools/testfiles/h5diff_604.txt +++ b/tools/testfiles/h5diff_604.txt @@ -18,7 +18,7 @@ file2 File name of the second HDF5 file [-p relative] Print difference when it is greater than a relative limit Items in [] are optional -[obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes) +[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links) The 'count' value must be a positive integer The 'delta' and 'relative' values must be positive numbers The -d compare criteria is |a - b| > delta @@ -49,3 +49,5 @@ Note) file1 and file2 can be the same file. Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare '/g1/dset1' and '/g1/dset2' in the same file + +If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value diff --git a/tools/testfiles/h5diff_605.txt b/tools/testfiles/h5diff_605.txt index 887e3b2..6f6965a 100644 --- a/tools/testfiles/h5diff_605.txt +++ b/tools/testfiles/h5diff_605.txt @@ -18,7 +18,7 @@ file2 File name of the second HDF5 file [-p relative] Print difference when it is greater than a relative limit Items in [] are optional -[obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes) +[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links) The 'count' value must be a positive integer The 'delta' and 'relative' values must be positive numbers The -d compare criteria is |a - b| > delta @@ -49,3 +49,5 @@ Note) file1 and file2 can be the same file. Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare '/g1/dset1' and '/g1/dset2' in the same file + +If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value diff --git a/tools/testfiles/h5diff_606.txt b/tools/testfiles/h5diff_606.txt index 0566ec7..d4497d5 100644 --- a/tools/testfiles/h5diff_606.txt +++ b/tools/testfiles/h5diff_606.txt @@ -18,7 +18,7 @@ file2 File name of the second HDF5 file [-p relative] Print difference when it is greater than a relative limit Items in [] are optional -[obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes) +[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links) The 'count' value must be a positive integer The 'delta' and 'relative' values must be positive numbers The -d compare criteria is |a - b| > delta @@ -49,3 +49,5 @@ Note) file1 and file2 can be the same file. Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare '/g1/dset1' and '/g1/dset2' in the same file + +If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value diff --git a/tools/testfiles/h5diff_611.txt b/tools/testfiles/h5diff_611.txt index f18b753..5d9710f 100644 --- a/tools/testfiles/h5diff_611.txt +++ b/tools/testfiles/h5diff_611.txt @@ -18,7 +18,7 @@ file2 File name of the second HDF5 file [-p relative] Print difference when it is greater than a relative limit Items in [] are optional -[obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes) +[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links) The 'count' value must be a positive integer The 'delta' and 'relative' values must be positive numbers The -d compare criteria is |a - b| > delta @@ -49,3 +49,5 @@ Note) file1 and file2 can be the same file. Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare '/g1/dset1' and '/g1/dset2' in the same file + +If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value diff --git a/tools/testfiles/h5diff_612.txt b/tools/testfiles/h5diff_612.txt index 9666af3..21fc94e 100644 --- a/tools/testfiles/h5diff_612.txt +++ b/tools/testfiles/h5diff_612.txt @@ -18,7 +18,7 @@ file2 File name of the second HDF5 file [-p relative] Print difference when it is greater than a relative limit Items in [] are optional -[obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes) +[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links) The 'count' value must be a positive integer The 'delta' and 'relative' values must be positive numbers The -d compare criteria is |a - b| > delta @@ -49,3 +49,5 @@ Note) file1 and file2 can be the same file. Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare '/g1/dset1' and '/g1/dset2' in the same file + +If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value diff --git a/tools/testfiles/h5diff_613.txt b/tools/testfiles/h5diff_613.txt index 5043115..7e6a228 100644 --- a/tools/testfiles/h5diff_613.txt +++ b/tools/testfiles/h5diff_613.txt @@ -18,7 +18,7 @@ file2 File name of the second HDF5 file [-p relative] Print difference when it is greater than a relative limit Items in [] are optional -[obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes) +[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links) The 'count' value must be a positive integer The 'delta' and 'relative' values must be positive numbers The -d compare criteria is |a - b| > delta @@ -49,3 +49,5 @@ Note) file1 and file2 can be the same file. Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare '/g1/dset1' and '/g1/dset2' in the same file + +If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value diff --git a/tools/testfiles/h5diff_614.txt b/tools/testfiles/h5diff_614.txt index 4f1783c..1be05ff 100644 --- a/tools/testfiles/h5diff_614.txt +++ b/tools/testfiles/h5diff_614.txt @@ -18,7 +18,7 @@ file2 File name of the second HDF5 file [-p relative] Print difference when it is greater than a relative limit Items in [] are optional -[obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes) +[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links) The 'count' value must be a positive integer The 'delta' and 'relative' values must be positive numbers The -d compare criteria is |a - b| > delta @@ -49,3 +49,5 @@ Note) file1 and file2 can be the same file. Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare '/g1/dset1' and '/g1/dset2' in the same file + +If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value diff --git a/tools/testfiles/h5diff_615.txt b/tools/testfiles/h5diff_615.txt index fb04fed..9e85b76 100644 --- a/tools/testfiles/h5diff_615.txt +++ b/tools/testfiles/h5diff_615.txt @@ -18,7 +18,7 @@ file2 File name of the second HDF5 file [-p relative] Print difference when it is greater than a relative limit Items in [] are optional -[obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes) +[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links) The 'count' value must be a positive integer The 'delta' and 'relative' values must be positive numbers The -d compare criteria is |a - b| > delta @@ -49,3 +49,5 @@ Note) file1 and file2 can be the same file. Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare '/g1/dset1' and '/g1/dset2' in the same file + +If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value diff --git a/tools/testfiles/h5diff_620.txt b/tools/testfiles/h5diff_620.txt index 9201dd1..a470c6c 100644 --- a/tools/testfiles/h5diff_620.txt +++ b/tools/testfiles/h5diff_620.txt @@ -18,7 +18,7 @@ file2 File name of the second HDF5 file [-p relative] Print difference when it is greater than a relative limit Items in [] are optional -[obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes) +[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links) The 'count' value must be a positive integer The 'delta' and 'relative' values must be positive numbers The -d compare criteria is |a - b| > delta @@ -49,3 +49,5 @@ Note) file1 and file2 can be the same file. Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare '/g1/dset1' and '/g1/dset2' in the same file + +If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value diff --git a/tools/testfiles/h5diff_621.txt b/tools/testfiles/h5diff_621.txt index 2566846..e4c0e05 100644 --- a/tools/testfiles/h5diff_621.txt +++ b/tools/testfiles/h5diff_621.txt @@ -18,7 +18,7 @@ file2 File name of the second HDF5 file [-p relative] Print difference when it is greater than a relative limit Items in [] are optional -[obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes) +[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links) The 'count' value must be a positive integer The 'delta' and 'relative' values must be positive numbers The -d compare criteria is |a - b| > delta @@ -49,3 +49,5 @@ Note) file1 and file2 can be the same file. Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare '/g1/dset1' and '/g1/dset2' in the same file + +If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value diff --git a/tools/testfiles/h5diff_622.txt b/tools/testfiles/h5diff_622.txt index 20613a5..0f6c12d 100644 --- a/tools/testfiles/h5diff_622.txt +++ b/tools/testfiles/h5diff_622.txt @@ -18,7 +18,7 @@ file2 File name of the second HDF5 file [-p relative] Print difference when it is greater than a relative limit Items in [] are optional -[obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes) +[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links) The 'count' value must be a positive integer The 'delta' and 'relative' values must be positive numbers The -d compare criteria is |a - b| > delta @@ -49,3 +49,5 @@ Note) file1 and file2 can be the same file. Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare '/g1/dset1' and '/g1/dset2' in the same file + +If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value diff --git a/tools/testfiles/h5diff_623.txt b/tools/testfiles/h5diff_623.txt index 92f3e55..ea7b892 100644 --- a/tools/testfiles/h5diff_623.txt +++ b/tools/testfiles/h5diff_623.txt @@ -18,7 +18,7 @@ file2 File name of the second HDF5 file [-p relative] Print difference when it is greater than a relative limit Items in [] are optional -[obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes) +[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links) The 'count' value must be a positive integer The 'delta' and 'relative' values must be positive numbers The -d compare criteria is |a - b| > delta @@ -49,3 +49,5 @@ Note) file1 and file2 can be the same file. Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare '/g1/dset1' and '/g1/dset2' in the same file + +If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value diff --git a/tools/testfiles/h5diff_624.txt b/tools/testfiles/h5diff_624.txt index 069c65b..f23c33c 100644 --- a/tools/testfiles/h5diff_624.txt +++ b/tools/testfiles/h5diff_624.txt @@ -18,7 +18,7 @@ file2 File name of the second HDF5 file [-p relative] Print difference when it is greater than a relative limit Items in [] are optional -[obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes) +[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links) The 'count' value must be a positive integer The 'delta' and 'relative' values must be positive numbers The -d compare criteria is |a - b| > delta @@ -49,3 +49,5 @@ Note) file1 and file2 can be the same file. Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare '/g1/dset1' and '/g1/dset2' in the same file + +If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value |