diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2006-11-27 20:10:53 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2006-11-27 20:10:53 (GMT) |
| commit | 124ef64faf9e3feecdc0d3d28967a222859f915d (patch) | |
| tree | d3f37c6d74bbe73ac471dfda3e22bfceb3f6edfe /tools/testfiles | |
| parent | 957a5082d12873eb4238a962ce0193adeac5a1dc (diff) | |
| download | hdf5-124ef64faf9e3feecdc0d3d28967a222859f915d.zip hdf5-124ef64faf9e3feecdc0d3d28967a222859f915d.tar.gz hdf5-124ef64faf9e3feecdc0d3d28967a222859f915d.tar.bz2 | |
[svn-r12984]
Added a relative error formula to deal with floating point uncertainty
in the comparison of floats and double types.
Added new tests for this feature to the file generator program and to
the shell script
Diffstat (limited to 'tools/testfiles')
22 files changed, 250 insertions, 221 deletions
diff --git a/tools/testfiles/h5diff_101.txt b/tools/testfiles/h5diff_101.txt new file mode 100644 index 0000000..a35ffb6 --- /dev/null +++ b/tools/testfiles/h5diff_101.txt @@ -0,0 +1,11 @@ +############################# +Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 /g1/d1 g1/d2 -v' +############################# +Dataset: </g1/d1> and </g1/d2> +position d1 d2 difference +------------------------------------------------------------ +[ 0 1 ] 1e-09 2e-09 1e-09 +[ 1 0 ] 1e-09 9e-10 1e-10 +[ 1 1 ] 0 1e-09 1e-09 +[ 2 0 ] 1e-09 0 1e-09 +4 differences found diff --git a/tools/testfiles/h5diff_102.txt b/tools/testfiles/h5diff_102.txt new file mode 100644 index 0000000..da3ead2 --- /dev/null +++ b/tools/testfiles/h5diff_102.txt @@ -0,0 +1,11 @@ +############################# +Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 /g1/fp1 g1/fp2 -v' +############################# +Dataset: </g1/fp1> and </g1/fp2> +position fp1 fp2 difference +------------------------------------------------------------ +[ 0 1 ] 1e-05 2e-05 1e-05 +[ 1 0 ] 1e-05 9e-06 9.99999e-07 +[ 1 1 ] 0 1e-05 1e-05 +[ 2 0 ] 1e-05 0 1e-05 +4 differences found diff --git a/tools/testfiles/h5diff_11.txt b/tools/testfiles/h5diff_11.txt index c1fa079..c5659f3 100644 --- a/tools/testfiles/h5diff_11.txt +++ b/tools/testfiles/h5diff_11.txt @@ -2,4 +2,4 @@ Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5' ############################# Dataset: </g1/dset1> and </g1/dset1> -4 differences found +5 differences found diff --git a/tools/testfiles/h5diff_12.txt b/tools/testfiles/h5diff_12.txt index 8527642..882f4b5 100644 --- a/tools/testfiles/h5diff_12.txt +++ b/tools/testfiles/h5diff_12.txt @@ -2,4 +2,4 @@ Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 g1/dset1 g1/dset2' ############################# Dataset: </g1/dset1> and </g1/dset2> -4 differences found +5 differences found diff --git a/tools/testfiles/h5diff_13.txt b/tools/testfiles/h5diff_13.txt index 2c269e7..897222c 100644 --- a/tools/testfiles/h5diff_13.txt +++ b/tools/testfiles/h5diff_13.txt @@ -4,8 +4,9 @@ Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -r' Dataset: </g1/dset1> and </g1/dset1> position dset1 dset1 difference ------------------------------------------------------------ -[ 0 1 ] 1.000000 1.100000 0.100000 -[ 1 0 ] 1.000000 1.010000 0.010000 -[ 1 1 ] 1.000000 1.001000 0.001000 -[ 2 0 ] 1.000000 1.000100 0.000100 -4 differences found +[ 0 0 ] 1 0 1 +[ 0 1 ] 1 1.1 0.1 +[ 1 0 ] 1 1.01 0.01 +[ 1 1 ] 1 1.001 0.001 +[ 2 1 ] 0 1 1 +5 differences found diff --git a/tools/testfiles/h5diff_14.txt b/tools/testfiles/h5diff_14.txt index 98a4c81..b5431cf 100644 --- a/tools/testfiles/h5diff_14.txt +++ b/tools/testfiles/h5diff_14.txt @@ -4,8 +4,9 @@ Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -r g1/dset1 g1/dse Dataset: </g1/dset1> and </g1/dset2> position dset1 dset2 difference ------------------------------------------------------------ -[ 0 1 ] 1.000000 1.100000 0.100000 -[ 1 0 ] 1.000000 1.010000 0.010000 -[ 1 1 ] 1.000000 1.001000 0.001000 -[ 2 0 ] 1.000000 1.000100 0.000100 -4 differences found +[ 0 0 ] 1 0 1 +[ 0 1 ] 1 1.1 0.1 +[ 1 0 ] 1 1.01 0.01 +[ 1 1 ] 1 1.001 0.001 +[ 2 1 ] 0 1 1 +5 differences found diff --git a/tools/testfiles/h5diff_15.txt b/tools/testfiles/h5diff_15.txt index 30f5aa2..caf34ec 100644 --- a/tools/testfiles/h5diff_15.txt +++ b/tools/testfiles/h5diff_15.txt @@ -4,8 +4,8 @@ Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -r -d 5 g1/dset3 g Dataset: </g1/dset3> and </g1/dset4> position dset3 dset4 difference ------------------------------------------------------------ -[ 0 1 ] 100.000000 120.000000 20.000000 -[ 1 0 ] 100.000000 160.000000 60.000000 -[ 2 0 ] 100.000000 80.000000 20.000000 -[ 2 1 ] 100.000000 40.000000 60.000000 +[ 0 1 ] 100 120 20 +[ 1 0 ] 100 160 60 +[ 2 0 ] 100 80 20 +[ 2 1 ] 100 40 60 4 differences found diff --git a/tools/testfiles/h5diff_17.txt b/tools/testfiles/h5diff_17.txt index 1119ebb..3701655 100644 --- a/tools/testfiles/h5diff_17.txt +++ b/tools/testfiles/h5diff_17.txt @@ -5,6 +5,8 @@ Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -v' file1 file2 --------------------------------------- x x /g1 + x /g1/d1 + x /g1/d2 x x /g1/dset1 x /g1/dset10 x /g1/dset2 @@ -15,6 +17,8 @@ file1 file2 x /g1/dset7 x /g1/dset8 x /g1/dset9 + x /g1/fp1 + x /g1/fp2 x /g2 Group: </g1> and </g1> @@ -22,10 +26,11 @@ Group: </g1> and </g1> Dataset: </g1/dset1> and </g1/dset1> position dset1 dset1 difference ------------------------------------------------------------ -[ 0 1 ] 1.000000 1.100000 0.100000 -[ 1 0 ] 1.000000 1.010000 0.010000 -[ 1 1 ] 1.000000 1.001000 0.001000 -[ 2 0 ] 1.000000 1.000100 0.000100 -4 differences found +[ 0 0 ] 1 0 1 +[ 0 1 ] 1 1.1 0.1 +[ 1 0 ] 1 1.01 0.01 +[ 1 1 ] 1 1.001 0.001 +[ 2 1 ] 0 1 1 +5 differences found Group: </> and </> 0 differences found diff --git a/tools/testfiles/h5diff_55.txt b/tools/testfiles/h5diff_55.txt index dd9b2e2..736c2d5 100644 --- a/tools/testfiles/h5diff_55.txt +++ b/tools/testfiles/h5diff_55.txt @@ -4,8 +4,8 @@ Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset5a dset5b' Dataset: </dset5a> and </dset5b> position dset5a dset5b difference ------------------------------------------------------------ -[ 1 0 ] 1.000000 3.000000 2.000000 -[ 1 1 ] 1.000000 4.000000 3.000000 -[ 2 0 ] 1.000000 5.000000 4.000000 -[ 2 1 ] 1.000000 6.000000 5.000000 +[ 1 0 ] 1 3 2 +[ 1 1 ] 1 4 3 +[ 2 0 ] 1 5 4 +[ 2 1 ] 1 6 5 4 differences found diff --git a/tools/testfiles/h5diff_56.txt b/tools/testfiles/h5diff_56.txt index 9834418..02c7169 100644 --- a/tools/testfiles/h5diff_56.txt +++ b/tools/testfiles/h5diff_56.txt @@ -4,8 +4,8 @@ Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset6a dset6b' Dataset: </dset6a> and </dset6b> position dset6a dset6b difference ------------------------------------------------------------ -[ 1 0 ] 1.000000 3.000000 2.000000 -[ 1 1 ] 1.000000 4.000000 3.000000 -[ 2 0 ] 1.000000 5.000000 4.000000 -[ 2 1 ] 1.000000 6.000000 5.000000 +[ 1 0 ] 1 3 2 +[ 1 1 ] 1 4 3 +[ 2 0 ] 1 5 4 +[ 2 1 ] 1 6 5 4 differences found diff --git a/tools/testfiles/h5diff_70.txt b/tools/testfiles/h5diff_70.txt index 5242f1d..3a8ebac 100644 --- a/tools/testfiles/h5diff_70.txt +++ b/tools/testfiles/h5diff_70.txt @@ -36,9 +36,9 @@ Attribute: <compound of </g1>> and <compound of </g1>> position compound of </g1> compound of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 -[ 0 ] 2.000000 0.000000 2.000000 +[ 0 ] 2 0 2 [ 1 ] 3 0 3 -[ 1 ] 4.000000 0.000000 4.000000 +[ 1 ] 4 0 4 4 differences found Attribute: <enum of </g1>> and <enum of </g1>> position enum of </g1> enum of </g1> difference @@ -72,8 +72,8 @@ position integer of </g1> integer of </g1> difference Attribute: <float of </g1>> and <float of </g1>> position float of </g1> float of </g1> difference ------------------------------------------------------------ -[ 0 ] 1.000000 0.000000 1.000000 -[ 1 ] 2.000000 0.000000 2.000000 +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 2 differences found Attribute: <string2D of </g1>> and <string2D of </g1>> position string2D of </g1> string2D of </g1> difference @@ -115,17 +115,17 @@ Attribute: <compound2D of </g1>> and <compound2D of </g1>> position compound2D of </g1> compound2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 -[ 0 0 ] 2.000000 0.000000 2.000000 +[ 0 0 ] 2 0 2 [ 0 1 ] 3 0 3 -[ 0 1 ] 4.000000 0.000000 4.000000 +[ 0 1 ] 4 0 4 [ 1 0 ] 5 0 5 -[ 1 0 ] 6.000000 0.000000 6.000000 +[ 1 0 ] 6 0 6 [ 1 1 ] 7 0 7 -[ 1 1 ] 8.000000 0.000000 8.000000 +[ 1 1 ] 8 0 8 [ 2 0 ] 9 0 9 -[ 2 0 ] 10.000000 0.000000 10.000000 +[ 2 0 ] 10 0 10 [ 2 1 ] 11 0 11 -[ 2 1 ] 12.000000 0.000000 12.000000 +[ 2 1 ] 12 0 12 12 differences found Attribute: <enum2D of </g1>> and <enum2D of </g1>> position enum2D of </g1> enum2D of </g1> difference @@ -187,12 +187,12 @@ position integer2D of </g1> integer2D of </g1> difference Attribute: <float2D of </g1>> and <float2D of </g1>> position float2D of </g1> float2D of </g1> difference ------------------------------------------------------------ -[ 0 0 ] 1.000000 0.000000 1.000000 -[ 0 1 ] 2.000000 0.000000 2.000000 -[ 1 0 ] 3.000000 0.000000 3.000000 -[ 1 1 ] 4.000000 0.000000 4.000000 -[ 2 0 ] 5.000000 0.000000 5.000000 -[ 2 1 ] 6.000000 0.000000 6.000000 +[ 0 0 ] 1 0 1 +[ 0 1 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 2 0 ] 5 0 5 +[ 2 1 ] 6 0 6 6 differences found Attribute: <string3D of </g1>> and <string3D of </g1>> position string3D of </g1> string3D of </g1> difference @@ -305,53 +305,53 @@ Attribute: <compound3D of </g1>> and <compound3D of </g1>> position compound3D of </g1> compound3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 -[ 0 0 0 ] 2.000000 0.000000 2.000000 +[ 0 0 0 ] 2 0 2 [ 0 0 1 ] 3 0 3 -[ 0 0 1 ] 4.000000 0.000000 4.000000 +[ 0 0 1 ] 4 0 4 [ 0 1 0 ] 5 0 5 -[ 0 1 0 ] 6.000000 0.000000 6.000000 +[ 0 1 0 ] 6 0 6 [ 0 1 1 ] 7 0 7 -[ 0 1 1 ] 8.000000 0.000000 8.000000 +[ 0 1 1 ] 8 0 8 [ 0 2 0 ] 9 0 9 -[ 0 2 0 ] 10.000000 0.000000 10.000000 +[ 0 2 0 ] 10 0 10 [ 0 2 1 ] 11 0 11 -[ 0 2 1 ] 12.000000 0.000000 12.000000 +[ 0 2 1 ] 12 0 12 [ 1 0 0 ] 13 0 13 -[ 1 0 0 ] 14.000000 0.000000 14.000000 +[ 1 0 0 ] 14 0 14 [ 1 0 1 ] 15 0 15 -[ 1 0 1 ] 16.000000 0.000000 16.000000 +[ 1 0 1 ] 16 0 16 [ 1 1 0 ] 17 0 17 -[ 1 1 0 ] 18.000000 0.000000 18.000000 +[ 1 1 0 ] 18 0 18 [ 1 1 1 ] 19 0 19 -[ 1 1 1 ] 20.000000 0.000000 20.000000 +[ 1 1 1 ] 20 0 20 [ 1 2 0 ] 21 0 21 -[ 1 2 0 ] 22.000000 0.000000 22.000000 +[ 1 2 0 ] 22 0 22 [ 1 2 1 ] 23 0 23 -[ 1 2 1 ] 24.000000 0.000000 24.000000 +[ 1 2 1 ] 24 0 24 [ 2 0 0 ] 25 0 25 -[ 2 0 0 ] 26.000000 0.000000 26.000000 +[ 2 0 0 ] 26 0 26 [ 2 0 1 ] 27 0 27 -[ 2 0 1 ] 28.000000 0.000000 28.000000 +[ 2 0 1 ] 28 0 28 [ 2 1 0 ] 29 0 29 -[ 2 1 0 ] 30.000000 0.000000 30.000000 +[ 2 1 0 ] 30 0 30 [ 2 1 1 ] 31 0 31 -[ 2 1 1 ] 32.000000 0.000000 32.000000 +[ 2 1 1 ] 32 0 32 [ 2 2 0 ] 33 0 33 -[ 2 2 0 ] 34.000000 0.000000 34.000000 +[ 2 2 0 ] 34 0 34 [ 2 2 1 ] 35 0 35 -[ 2 2 1 ] 36.000000 0.000000 36.000000 +[ 2 2 1 ] 36 0 36 [ 3 0 0 ] 37 0 37 -[ 3 0 0 ] 38.000000 0.000000 38.000000 +[ 3 0 0 ] 38 0 38 [ 3 0 1 ] 39 0 39 -[ 3 0 1 ] 40.000000 0.000000 40.000000 +[ 3 0 1 ] 40 0 40 [ 3 1 0 ] 41 0 41 -[ 3 1 0 ] 42.000000 0.000000 42.000000 +[ 3 1 0 ] 42 0 42 [ 3 1 1 ] 43 0 43 -[ 3 1 1 ] 44.000000 0.000000 44.000000 +[ 3 1 1 ] 44 0 44 [ 3 2 0 ] 45 0 45 -[ 3 2 0 ] 46.000000 0.000000 46.000000 +[ 3 2 0 ] 46 0 46 [ 3 2 1 ] 47 0 47 -[ 3 2 1 ] 48.000000 0.000000 48.000000 +[ 3 2 1 ] 48 0 48 48 differences found Attribute: <enum3D of </g1>> and <enum3D of </g1>> position enum3D of </g1> enum3D of </g1> difference @@ -551,30 +551,30 @@ position integer3D of </g1> integer3D of </g1> difference Attribute: <float3D of </g1>> and <float3D of </g1>> position float3D of </g1> float3D of </g1> difference ------------------------------------------------------------ -[ 0 0 0 ] 1.000000 0.000000 1.000000 -[ 0 0 1 ] 2.000000 0.000000 2.000000 -[ 0 1 0 ] 3.000000 0.000000 3.000000 -[ 0 1 1 ] 4.000000 0.000000 4.000000 -[ 0 2 0 ] 5.000000 0.000000 5.000000 -[ 0 2 1 ] 6.000000 0.000000 6.000000 -[ 1 0 0 ] 7.000000 0.000000 7.000000 -[ 1 0 1 ] 8.000000 0.000000 8.000000 -[ 1 1 0 ] 9.000000 0.000000 9.000000 -[ 1 1 1 ] 10.000000 0.000000 10.000000 -[ 1 2 0 ] 11.000000 0.000000 11.000000 -[ 1 2 1 ] 12.000000 0.000000 12.000000 -[ 2 0 0 ] 13.000000 0.000000 13.000000 -[ 2 0 1 ] 14.000000 0.000000 14.000000 -[ 2 1 0 ] 15.000000 0.000000 15.000000 -[ 2 1 1 ] 16.000000 0.000000 16.000000 -[ 2 2 0 ] 17.000000 0.000000 17.000000 -[ 2 2 1 ] 18.000000 0.000000 18.000000 -[ 3 0 0 ] 19.000000 0.000000 19.000000 -[ 3 0 1 ] 20.000000 0.000000 20.000000 -[ 3 1 0 ] 21.000000 0.000000 21.000000 -[ 3 1 1 ] 22.000000 0.000000 22.000000 -[ 3 2 0 ] 23.000000 0.000000 23.000000 -[ 3 2 1 ] 24.000000 0.000000 24.000000 +[ 0 0 0 ] 1 0 1 +[ 0 0 1 ] 2 0 2 +[ 0 1 0 ] 3 0 3 +[ 0 1 1 ] 4 0 4 +[ 0 2 0 ] 5 0 5 +[ 0 2 1 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 1 0 ] 9 0 9 +[ 1 1 1 ] 10 0 10 +[ 1 2 0 ] 11 0 11 +[ 1 2 1 ] 12 0 12 +[ 2 0 0 ] 13 0 13 +[ 2 0 1 ] 14 0 14 +[ 2 1 0 ] 15 0 15 +[ 2 1 1 ] 16 0 16 +[ 2 2 0 ] 17 0 17 +[ 2 2 1 ] 18 0 18 +[ 3 0 0 ] 19 0 19 +[ 3 0 1 ] 20 0 20 +[ 3 1 0 ] 21 0 21 +[ 3 1 1 ] 22 0 22 +[ 3 2 0 ] 23 0 23 +[ 3 2 1 ] 24 0 24 24 differences found Group: </> and </> 0 differences found @@ -602,9 +602,9 @@ Attribute: <compound of </>> and <compound of </>> position compound of </> compound of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 -[ 0 ] 2.000000 0.000000 2.000000 +[ 0 ] 2 0 2 [ 1 ] 3 0 3 -[ 1 ] 4.000000 0.000000 4.000000 +[ 1 ] 4 0 4 4 differences found Attribute: <enum of </>> and <enum of </>> position enum of </> enum of </> difference @@ -638,8 +638,8 @@ position integer of </> integer of </> difference Attribute: <float of </>> and <float of </>> position float of </> float of </> difference ------------------------------------------------------------ -[ 0 ] 1.000000 0.000000 1.000000 -[ 1 ] 2.000000 0.000000 2.000000 +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 2 differences found Attribute: <string2D of </>> and <string2D of </>> position string2D of </> string2D of </> difference @@ -681,17 +681,17 @@ Attribute: <compound2D of </>> and <compound2D of </>> position compound2D of </> compound2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 -[ 0 0 ] 2.000000 0.000000 2.000000 +[ 0 0 ] 2 0 2 [ 0 1 ] 3 0 3 -[ 0 1 ] 4.000000 0.000000 4.000000 +[ 0 1 ] 4 0 4 [ 1 0 ] 5 0 5 -[ 1 0 ] 6.000000 0.000000 6.000000 +[ 1 0 ] 6 0 6 [ 1 1 ] 7 0 7 -[ 1 1 ] 8.000000 0.000000 8.000000 +[ 1 1 ] 8 0 8 [ 2 0 ] 9 0 9 -[ 2 0 ] 10.000000 0.000000 10.000000 +[ 2 0 ] 10 0 10 [ 2 1 ] 11 0 11 -[ 2 1 ] 12.000000 0.000000 12.000000 +[ 2 1 ] 12 0 12 12 differences found Attribute: <enum2D of </>> and <enum2D of </>> position enum2D of </> enum2D of </> difference @@ -753,12 +753,12 @@ position integer2D of </> integer2D of </> difference Attribute: <float2D of </>> and <float2D of </>> position float2D of </> float2D of </> difference ------------------------------------------------------------ -[ 0 0 ] 1.000000 0.000000 1.000000 -[ 0 1 ] 2.000000 0.000000 2.000000 -[ 1 0 ] 3.000000 0.000000 3.000000 -[ 1 1 ] 4.000000 0.000000 4.000000 -[ 2 0 ] 5.000000 0.000000 5.000000 -[ 2 1 ] 6.000000 0.000000 6.000000 +[ 0 0 ] 1 0 1 +[ 0 1 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 2 0 ] 5 0 5 +[ 2 1 ] 6 0 6 6 differences found Attribute: <string3D of </>> and <string3D of </>> position string3D of </> string3D of </> difference @@ -871,53 +871,53 @@ Attribute: <compound3D of </>> and <compound3D of </>> position compound3D of </> compound3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 -[ 0 0 0 ] 2.000000 0.000000 2.000000 +[ 0 0 0 ] 2 0 2 [ 0 0 1 ] 3 0 3 -[ 0 0 1 ] 4.000000 0.000000 4.000000 +[ 0 0 1 ] 4 0 4 [ 0 1 0 ] 5 0 5 -[ 0 1 0 ] 6.000000 0.000000 6.000000 +[ 0 1 0 ] 6 0 6 [ 0 1 1 ] 7 0 7 -[ 0 1 1 ] 8.000000 0.000000 8.000000 +[ 0 1 1 ] 8 0 8 [ 0 2 0 ] 9 0 9 -[ 0 2 0 ] 10.000000 0.000000 10.000000 +[ 0 2 0 ] 10 0 10 [ 0 2 1 ] 11 0 11 -[ 0 2 1 ] 12.000000 0.000000 12.000000 +[ 0 2 1 ] 12 0 12 [ 1 0 0 ] 13 0 13 -[ 1 0 0 ] 14.000000 0.000000 14.000000 +[ 1 0 0 ] 14 0 14 [ 1 0 1 ] 15 0 15 -[ 1 0 1 ] 16.000000 0.000000 16.000000 +[ 1 0 1 ] 16 0 16 [ 1 1 0 ] 17 0 17 -[ 1 1 0 ] 18.000000 0.000000 18.000000 +[ 1 1 0 ] 18 0 18 [ 1 1 1 ] 19 0 19 -[ 1 1 1 ] 20.000000 0.000000 20.000000 +[ 1 1 1 ] 20 0 20 [ 1 2 0 ] 21 0 21 -[ 1 2 0 ] 22.000000 0.000000 22.000000 +[ 1 2 0 ] 22 0 22 [ 1 2 1 ] 23 0 23 -[ 1 2 1 ] 24.000000 0.000000 24.000000 +[ 1 2 1 ] 24 0 24 [ 2 0 0 ] 25 0 25 -[ 2 0 0 ] 26.000000 0.000000 26.000000 +[ 2 0 0 ] 26 0 26 [ 2 0 1 ] 27 0 27 -[ 2 0 1 ] 28.000000 0.000000 28.000000 +[ 2 0 1 ] 28 0 28 [ 2 1 0 ] 29 0 29 -[ 2 1 0 ] 30.000000 0.000000 30.000000 +[ 2 1 0 ] 30 0 30 [ 2 1 1 ] 31 0 31 -[ 2 1 1 ] 32.000000 0.000000 32.000000 +[ 2 1 1 ] 32 0 32 [ 2 2 0 ] 33 0 33 -[ 2 2 0 ] 34.000000 0.000000 34.000000 +[ 2 2 0 ] 34 0 34 [ 2 2 1 ] 35 0 35 -[ 2 2 1 ] 36.000000 0.000000 36.000000 +[ 2 2 1 ] 36 0 36 [ 3 0 0 ] 37 0 37 -[ 3 0 0 ] 38.000000 0.000000 38.000000 +[ 3 0 0 ] 38 0 38 [ 3 0 1 ] 39 0 39 -[ 3 0 1 ] 40.000000 0.000000 40.000000 +[ 3 0 1 ] 40 0 40 [ 3 1 0 ] 41 0 41 -[ 3 1 0 ] 42.000000 0.000000 42.000000 +[ 3 1 0 ] 42 0 42 [ 3 1 1 ] 43 0 43 -[ 3 1 1 ] 44.000000 0.000000 44.000000 +[ 3 1 1 ] 44 0 44 [ 3 2 0 ] 45 0 45 -[ 3 2 0 ] 46.000000 0.000000 46.000000 +[ 3 2 0 ] 46 0 46 [ 3 2 1 ] 47 0 47 -[ 3 2 1 ] 48.000000 0.000000 48.000000 +[ 3 2 1 ] 48 0 48 48 differences found Attribute: <enum3D of </>> and <enum3D of </>> position enum3D of </> enum3D of </> difference @@ -1117,30 +1117,30 @@ position integer3D of </> integer3D of </> difference Attribute: <float3D of </>> and <float3D of </>> position float3D of </> float3D of </> difference ------------------------------------------------------------ -[ 0 0 0 ] 1.000000 0.000000 1.000000 -[ 0 0 1 ] 2.000000 0.000000 2.000000 -[ 0 1 0 ] 3.000000 0.000000 3.000000 -[ 0 1 1 ] 4.000000 0.000000 4.000000 -[ 0 2 0 ] 5.000000 0.000000 5.000000 -[ 0 2 1 ] 6.000000 0.000000 6.000000 -[ 1 0 0 ] 7.000000 0.000000 7.000000 -[ 1 0 1 ] 8.000000 0.000000 8.000000 -[ 1 1 0 ] 9.000000 0.000000 9.000000 -[ 1 1 1 ] 10.000000 0.000000 10.000000 -[ 1 2 0 ] 11.000000 0.000000 11.000000 -[ 1 2 1 ] 12.000000 0.000000 12.000000 -[ 2 0 0 ] 13.000000 0.000000 13.000000 -[ 2 0 1 ] 14.000000 0.000000 14.000000 -[ 2 1 0 ] 15.000000 0.000000 15.000000 -[ 2 1 1 ] 16.000000 0.000000 16.000000 -[ 2 2 0 ] 17.000000 0.000000 17.000000 -[ 2 2 1 ] 18.000000 0.000000 18.000000 -[ 3 0 0 ] 19.000000 0.000000 19.000000 -[ 3 0 1 ] 20.000000 0.000000 20.000000 -[ 3 1 0 ] 21.000000 0.000000 21.000000 -[ 3 1 1 ] 22.000000 0.000000 22.000000 -[ 3 2 0 ] 23.000000 0.000000 23.000000 -[ 3 2 1 ] 24.000000 0.000000 24.000000 +[ 0 0 0 ] 1 0 1 +[ 0 0 1 ] 2 0 2 +[ 0 1 0 ] 3 0 3 +[ 0 1 1 ] 4 0 4 +[ 0 2 0 ] 5 0 5 +[ 0 2 1 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 1 0 ] 9 0 9 +[ 1 1 1 ] 10 0 10 +[ 1 2 0 ] 11 0 11 +[ 1 2 1 ] 12 0 12 +[ 2 0 0 ] 13 0 13 +[ 2 0 1 ] 14 0 14 +[ 2 1 0 ] 15 0 15 +[ 2 1 1 ] 16 0 16 +[ 2 2 0 ] 17 0 17 +[ 2 2 1 ] 18 0 18 +[ 3 0 0 ] 19 0 19 +[ 3 0 1 ] 20 0 20 +[ 3 1 0 ] 21 0 21 +[ 3 1 1 ] 22 0 22 +[ 3 2 0 ] 23 0 23 +[ 3 2 1 ] 24 0 24 24 differences found -------------------------------- Some objects are not comparable diff --git a/tools/testfiles/h5diff_80.txt b/tools/testfiles/h5diff_80.txt index 9d87639..7a85488 100644 --- a/tools/testfiles/h5diff_80.txt +++ b/tools/testfiles/h5diff_80.txt @@ -205,77 +205,77 @@ Dataset: </g1/compound> and </g1/compound> position compound compound difference ------------------------------------------------------------ [ 0 ] 1 0 1 -[ 0 ] 2.000000 0.000000 2.000000 +[ 0 ] 2 0 2 [ 1 ] 3 0 3 -[ 1 ] 4.000000 0.000000 4.000000 +[ 1 ] 4 0 4 4 differences found Dataset: </g1/compound2D> and </g1/compound2D> position compound2D compound2D difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 -[ 0 0 ] 2.000000 0.000000 2.000000 +[ 0 0 ] 2 0 2 [ 0 1 ] 3 0 3 -[ 0 1 ] 4.000000 0.000000 4.000000 +[ 0 1 ] 4 0 4 [ 1 0 ] 5 0 5 -[ 1 0 ] 6.000000 0.000000 6.000000 +[ 1 0 ] 6 0 6 [ 1 1 ] 7 0 7 -[ 1 1 ] 8.000000 0.000000 8.000000 +[ 1 1 ] 8 0 8 [ 2 0 ] 9 0 9 -[ 2 0 ] 10.000000 0.000000 10.000000 +[ 2 0 ] 10 0 10 [ 2 1 ] 11 0 11 -[ 2 1 ] 12.000000 0.000000 12.000000 +[ 2 1 ] 12 0 12 12 differences found Dataset: </g1/compound3D> and </g1/compound3D> position compound3D compound3D difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 -[ 0 0 0 ] 2.000000 0.000000 2.000000 +[ 0 0 0 ] 2 0 2 [ 0 0 1 ] 3 0 3 -[ 0 0 1 ] 4.000000 0.000000 4.000000 +[ 0 0 1 ] 4 0 4 [ 0 1 0 ] 5 0 5 -[ 0 1 0 ] 6.000000 0.000000 6.000000 +[ 0 1 0 ] 6 0 6 [ 0 1 1 ] 7 0 7 -[ 0 1 1 ] 8.000000 0.000000 8.000000 +[ 0 1 1 ] 8 0 8 [ 0 2 0 ] 9 0 9 -[ 0 2 0 ] 10.000000 0.000000 10.000000 +[ 0 2 0 ] 10 0 10 [ 0 2 1 ] 11 0 11 -[ 0 2 1 ] 12.000000 0.000000 12.000000 +[ 0 2 1 ] 12 0 12 [ 1 0 0 ] 13 0 13 -[ 1 0 0 ] 14.000000 0.000000 14.000000 +[ 1 0 0 ] 14 0 14 [ 1 0 1 ] 15 0 15 -[ 1 0 1 ] 16.000000 0.000000 16.000000 +[ 1 0 1 ] 16 0 16 [ 1 1 0 ] 17 0 17 -[ 1 1 0 ] 18.000000 0.000000 18.000000 +[ 1 1 0 ] 18 0 18 [ 1 1 1 ] 19 0 19 -[ 1 1 1 ] 20.000000 0.000000 20.000000 +[ 1 1 1 ] 20 0 20 [ 1 2 0 ] 21 0 21 -[ 1 2 0 ] 22.000000 0.000000 22.000000 +[ 1 2 0 ] 22 0 22 [ 1 2 1 ] 23 0 23 -[ 1 2 1 ] 24.000000 0.000000 24.000000 +[ 1 2 1 ] 24 0 24 [ 2 0 0 ] 25 0 25 -[ 2 0 0 ] 26.000000 0.000000 26.000000 +[ 2 0 0 ] 26 0 26 [ 2 0 1 ] 27 0 27 -[ 2 0 1 ] 28.000000 0.000000 28.000000 +[ 2 0 1 ] 28 0 28 [ 2 1 0 ] 29 0 29 -[ 2 1 0 ] 30.000000 0.000000 30.000000 +[ 2 1 0 ] 30 0 30 [ 2 1 1 ] 31 0 31 -[ 2 1 1 ] 32.000000 0.000000 32.000000 +[ 2 1 1 ] 32 0 32 [ 2 2 0 ] 33 0 33 -[ 2 2 0 ] 34.000000 0.000000 34.000000 +[ 2 2 0 ] 34 0 34 [ 2 2 1 ] 35 0 35 -[ 2 2 1 ] 36.000000 0.000000 36.000000 +[ 2 2 1 ] 36 0 36 [ 3 0 0 ] 37 0 37 -[ 3 0 0 ] 38.000000 0.000000 38.000000 +[ 3 0 0 ] 38 0 38 [ 3 0 1 ] 39 0 39 -[ 3 0 1 ] 40.000000 0.000000 40.000000 +[ 3 0 1 ] 40 0 40 [ 3 1 0 ] 41 0 41 -[ 3 1 0 ] 42.000000 0.000000 42.000000 +[ 3 1 0 ] 42 0 42 [ 3 1 1 ] 43 0 43 -[ 3 1 1 ] 44.000000 0.000000 44.000000 +[ 3 1 1 ] 44 0 44 [ 3 2 0 ] 45 0 45 -[ 3 2 0 ] 46.000000 0.000000 46.000000 +[ 3 2 0 ] 46 0 46 [ 3 2 1 ] 47 0 47 -[ 3 2 1 ] 48.000000 0.000000 48.000000 +[ 3 2 1 ] 48 0 48 48 differences found Dataset: </g1/enum> and </g1/enum> position enum enum difference @@ -291,46 +291,46 @@ Dataset: </g1/enum3D> and </g1/enum3D> Dataset: </g1/float> and </g1/float> position float float difference ------------------------------------------------------------ -[ 0 ] 1.000000 0.000000 1.000000 -[ 1 ] 2.000000 0.000000 2.000000 +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 2 differences found Dataset: </g1/float2D> and </g1/float2D> position float2D float2D difference ------------------------------------------------------------ -[ 0 0 ] 1.000000 0.000000 1.000000 -[ 0 1 ] 2.000000 0.000000 2.000000 -[ 1 0 ] 3.000000 0.000000 3.000000 -[ 1 1 ] 4.000000 0.000000 4.000000 -[ 2 0 ] 5.000000 0.000000 5.000000 -[ 2 1 ] 6.000000 0.000000 6.000000 +[ 0 0 ] 1 0 1 +[ 0 1 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 2 0 ] 5 0 5 +[ 2 1 ] 6 0 6 6 differences found Dataset: </g1/float3D> and </g1/float3D> position float3D float3D difference ------------------------------------------------------------ -[ 0 0 0 ] 1.000000 0.000000 1.000000 -[ 0 0 1 ] 2.000000 0.000000 2.000000 -[ 0 1 0 ] 3.000000 0.000000 3.000000 -[ 0 1 1 ] 4.000000 0.000000 4.000000 -[ 0 2 0 ] 5.000000 0.000000 5.000000 -[ 0 2 1 ] 6.000000 0.000000 6.000000 -[ 1 0 0 ] 7.000000 0.000000 7.000000 -[ 1 0 1 ] 8.000000 0.000000 8.000000 -[ 1 1 0 ] 9.000000 0.000000 9.000000 -[ 1 1 1 ] 10.000000 0.000000 10.000000 -[ 1 2 0 ] 11.000000 0.000000 11.000000 -[ 1 2 1 ] 12.000000 0.000000 12.000000 -[ 2 0 0 ] 13.000000 0.000000 13.000000 -[ 2 0 1 ] 14.000000 0.000000 14.000000 -[ 2 1 0 ] 15.000000 0.000000 15.000000 -[ 2 1 1 ] 16.000000 0.000000 16.000000 -[ 2 2 0 ] 17.000000 0.000000 17.000000 -[ 2 2 1 ] 18.000000 0.000000 18.000000 -[ 3 0 0 ] 19.000000 0.000000 19.000000 -[ 3 0 1 ] 20.000000 0.000000 20.000000 -[ 3 1 0 ] 21.000000 0.000000 21.000000 -[ 3 1 1 ] 22.000000 0.000000 22.000000 -[ 3 2 0 ] 23.000000 0.000000 23.000000 -[ 3 2 1 ] 24.000000 0.000000 24.000000 +[ 0 0 0 ] 1 0 1 +[ 0 0 1 ] 2 0 2 +[ 0 1 0 ] 3 0 3 +[ 0 1 1 ] 4 0 4 +[ 0 2 0 ] 5 0 5 +[ 0 2 1 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 1 0 ] 9 0 9 +[ 1 1 1 ] 10 0 10 +[ 1 2 0 ] 11 0 11 +[ 1 2 1 ] 12 0 12 +[ 2 0 0 ] 13 0 13 +[ 2 0 1 ] 14 0 14 +[ 2 1 0 ] 15 0 15 +[ 2 1 1 ] 16 0 16 +[ 2 2 0 ] 17 0 17 +[ 2 2 1 ] 18 0 18 +[ 3 0 0 ] 19 0 19 +[ 3 0 1 ] 20 0 20 +[ 3 1 0 ] 21 0 21 +[ 3 1 1 ] 22 0 22 +[ 3 2 0 ] 23 0 23 +[ 3 2 1 ] 24 0 24 24 differences found Dataset: </g1/integer> and </g1/integer> position integer integer difference diff --git a/tools/testfiles/h5diff_attr1.h5 b/tools/testfiles/h5diff_attr1.h5 Binary files differindex 35dd598..65e2743 100644 --- a/tools/testfiles/h5diff_attr1.h5 +++ b/tools/testfiles/h5diff_attr1.h5 diff --git a/tools/testfiles/h5diff_attr2.h5 b/tools/testfiles/h5diff_attr2.h5 Binary files differindex 42d1786..bcf597b 100644 --- a/tools/testfiles/h5diff_attr2.h5 +++ b/tools/testfiles/h5diff_attr2.h5 diff --git a/tools/testfiles/h5diff_basic1.h5 b/tools/testfiles/h5diff_basic1.h5 Binary files differindex 5609a56..0ece876 100644 --- a/tools/testfiles/h5diff_basic1.h5 +++ b/tools/testfiles/h5diff_basic1.h5 diff --git a/tools/testfiles/h5diff_basic2.h5 b/tools/testfiles/h5diff_basic2.h5 Binary files differindex 0bd9ee1..908b0b3 100644 --- a/tools/testfiles/h5diff_basic2.h5 +++ b/tools/testfiles/h5diff_basic2.h5 diff --git a/tools/testfiles/h5diff_dset1.h5 b/tools/testfiles/h5diff_dset1.h5 Binary files differindex 441dabd..749e0ca 100644 --- a/tools/testfiles/h5diff_dset1.h5 +++ b/tools/testfiles/h5diff_dset1.h5 diff --git a/tools/testfiles/h5diff_dset2.h5 b/tools/testfiles/h5diff_dset2.h5 Binary files differindex bc92333..d93edcf 100644 --- a/tools/testfiles/h5diff_dset2.h5 +++ b/tools/testfiles/h5diff_dset2.h5 diff --git a/tools/testfiles/h5diff_dtypes.h5 b/tools/testfiles/h5diff_dtypes.h5 Binary files differindex fb4d993..592c28f 100644 --- a/tools/testfiles/h5diff_dtypes.h5 +++ b/tools/testfiles/h5diff_dtypes.h5 diff --git a/tools/testfiles/h5diff_hyper1.h5 b/tools/testfiles/h5diff_hyper1.h5 Binary files differindex bfcb56a..c3de508 100644 --- a/tools/testfiles/h5diff_hyper1.h5 +++ b/tools/testfiles/h5diff_hyper1.h5 diff --git a/tools/testfiles/h5diff_hyper2.h5 b/tools/testfiles/h5diff_hyper2.h5 Binary files differindex ae76aa5..d2c628a 100644 --- a/tools/testfiles/h5diff_hyper2.h5 +++ b/tools/testfiles/h5diff_hyper2.h5 diff --git a/tools/testfiles/h5diff_types.h5 b/tools/testfiles/h5diff_types.h5 Binary files differindex af1427c..ecbcc76 100644 --- a/tools/testfiles/h5diff_types.h5 +++ b/tools/testfiles/h5diff_types.h5 |