diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2012-03-21 15:10:17 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-03-21 15:10:17 (GMT) |
| commit | eb89d7b53ab95623ab454186a602e1cafc7391f0 (patch) | |
| tree | ceafe458b3011e38853e765352d3c7e59bbecce1 /tools/testfiles | |
| parent | 3e468e6ff65d540a439e99ea568a6bff7add7cea (diff) | |
| download | hdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.zip hdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.tar.gz hdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.tar.bz2 | |
[svn-r22105] Description:
Bring r20557:22085 from trunk to this branch, also fixing some other
issues/failures in the branch simultaneously. The h5repack tests are still
failing, but Neil will be checking into those, so the branch can be fully
functional again.
Tested on:
Mac OSX/64 10.7.3 (amazon) w/debug
Diffstat (limited to 'tools/testfiles')
295 files changed, 15344 insertions, 3112 deletions
diff --git a/tools/testfiles/file_space.ddl b/tools/testfiles/file_space.ddl index 37b3922..bed5349 100644 --- a/tools/testfiles/file_space.ddl +++ b/tools/testfiles/file_space.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -B file_space.h5' -############################# HDF5 "file_space.h5" { SUPER_BLOCK { SUPERBLOCK_VERSION 2 @@ -14,9 +11,9 @@ SUPER_BLOCK { ISTORE_K 32 FILE_SPACE_STRATEGY H5F_FILE_SPACE_AGGR_VFD FREE_SPACE_THRESHOLD 10 -} -USER_BLOCK { - USERBLOCK_SIZE 0 + USER_BLOCK { + USERBLOCK_SIZE 0 + } } GROUP "/" { } diff --git a/tools/testfiles/filter_fail.ddl b/tools/testfiles/filter_fail.ddl index 354ac0f..75534e2 100644 --- a/tools/testfiles/filter_fail.ddl +++ b/tools/testfiles/filter_fail.ddl @@ -1,13 +1,10 @@ -############################# -Expected output for 'h5dump --enable-error-stack filter_fail.h5' -############################# HDF5 "filter_fail.h5" { GROUP "/" { DATASET "dset_fail" { DATATYPE H5T_STD_I32LE DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { - } + } } } } @@ -24,7 +21,11 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): #003: (file name) line (number) in H5D_chunk_lock(): data pipeline read failed major: Data filters minor: Filter operation failed - #004: (file name) line (number) in H5Z_pipeline(): required filter is not registered + #004: (file name) line (number) in H5Z_pipeline(): required filter 'filter_fail_test' is not registered major: Data filters minor: Read failed h5dump error: unable to print data +H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs): + #000: (file name) line (number) in h5tools_dump_simple_dset(): H5Dread failed + major: Failure in tools library + minor: error in function diff --git a/tools/testfiles/tnofilename.ddl b/tools/testfiles/h5dump-help.txt index 0e78217..f04ed48 100644 --- a/tools/testfiles/tnofilename.ddl +++ b/tools/testfiles/h5dump-help.txt @@ -1,7 +1,4 @@ -############################# -Expected output for 'h5dump ' -############################# -usage: h5dump [OPTIONS] file +usage: h5dump [OPTIONS] files OPTIONS -h, --help Print a usage message and exit -n, --contents Print a list of the file contents and exit @@ -28,6 +25,12 @@ usage: h5dump [OPTIONS] file -m T, --format=T Set the floating point output format -q Q, --sort_by=Q Sort groups and attributes by index Q -z Z, --sort_order=Z Sort groups and attributes by order Z + -M L, --packedbits=L Print packed bits as unsigned integers, using mask + format L for an integer dataset specified with + option -d. L is a list of offset,length values, + separated by commas. Offset is the beginning bit in + the data value and length is the number of bits of + the mask. -R, --region Print dataset pointed by region references -x, --xml Output in XML using Schema -u, --use-dtd Output in XML using DTD @@ -37,6 +40,8 @@ usage: h5dump [OPTIONS] file E.g., to dump a file called `-f', use h5dump -- -f --enable-error-stack Prints messages from the HDF5 error stack as they occur. + --no-compact-subset Disable compact form of subsetting and allow the use + of "[" in datset names. Subsetting is available by using the following options with a dataset attribute. Subsetting is done by selecting a hyperslab from the data. @@ -74,7 +79,7 @@ usage: h5dump [OPTIONS] file 1) Attribute foo of the group /bar_none in file quux.h5 - h5dump -a /bar_none/foo quux.h5 + h5dump -a /bar_none/foo quux.h5 2) Selecting a subset from dataset /foo in file quux.h5 @@ -85,3 +90,11 @@ usage: h5dump [OPTIONS] file h5dump -d /dset -b LE -o out.bin quux.h5 + 4) Display two packed bits (bits 0-1 and bits 4-6) in the dataset /dset + + h5dump -d /dset -M 0,1,4,3 quux.h5 + + 5) Dataset foo in files multi1.h5 multi2.h5 multi3.h5 + + h5dump -d /foo multi1.h5 multi2.h5 multi3.h5 + diff --git a/tools/testfiles/help-1.ls b/tools/testfiles/help-1.ls index e15a88b..aaba608 100644 --- a/tools/testfiles/help-1.ls +++ b/tools/testfiles/help-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -h' -############################# usage: h5ls [OPTIONS] [OBJECTS...] OPTIONS -h, -?, --help Print a usage message and exit diff --git a/tools/testfiles/help-2.ls b/tools/testfiles/help-2.ls index 7d035c0..aaba608 100644 --- a/tools/testfiles/help-2.ls +++ b/tools/testfiles/help-2.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -help' -############################# usage: h5ls [OPTIONS] [OBJECTS...] OPTIONS -h, -?, --help Print a usage message and exit diff --git a/tools/testfiles/help-3.ls b/tools/testfiles/help-3.ls index 8de1003..aaba608 100644 --- a/tools/testfiles/help-3.ls +++ b/tools/testfiles/help-3.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -?' -############################# usage: h5ls [OPTIONS] [OBJECTS...] OPTIONS -h, -?, --help Print a usage message and exit diff --git a/tools/testfiles/nosuchfile.ls b/tools/testfiles/nosuchfile.ls index 8d5855e..8c4ee42 100644 --- a/tools/testfiles/nosuchfile.ls +++ b/tools/testfiles/nosuchfile.ls @@ -1,4 +1 @@ -############################# - output for 'h5ls nosuchfile.h5' -############################# nosuchfile.h5: unable to open file diff --git a/tools/testfiles/packedbits.ddl b/tools/testfiles/packedbits.ddl index 91bd63b..1bca459 100644 --- a/tools/testfiles/packedbits.ddl +++ b/tools/testfiles/packedbits.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump packedbits.h5' -############################# HDF5 "packedbits.h5" { GROUP "/" { DATASET "DS08BITS" { diff --git a/tools/testfiles/tall-1.ddl b/tools/testfiles/tall-1.ddl index 9a72484..ae375c4 100644 --- a/tools/testfiles/tall-1.ddl +++ b/tools/testfiles/tall-1.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tall.h5' -############################# HDF5 "tall.h5" { GROUP "/" { ATTRIBUTE "attr1" { diff --git a/tools/testfiles/tall-1.ls b/tools/testfiles/tall-1.ls index 6bdb7e7..91b89e6 100644 --- a/tools/testfiles/tall-1.ls +++ b/tools/testfiles/tall-1.ls @@ -1,5 +1,2 @@ -############################# - output for 'h5ls -w80 tall.h5' -############################# g1 Group g2 Group diff --git a/tools/testfiles/tall-2.ddl b/tools/testfiles/tall-2.ddl index 50844df..d669639 100644 --- a/tools/testfiles/tall-2.ddl +++ b/tools/testfiles/tall-2.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump --header -g /g1/g1.1 -a attr2 tall.h5' -############################# HDF5 "tall.h5" { GROUP "/g1/g1.1" { DATASET "dset1.1.1" { diff --git a/tools/testfiles/tall-2.ls b/tools/testfiles/tall-2.ls index 61b8cfb..2d3d66b 100644 --- a/tools/testfiles/tall-2.ls +++ b/tools/testfiles/tall-2.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -d tall.h5' -############################# / Group /g1 Group /g1/g1.1 Group diff --git a/tools/testfiles/tall-2A.ddl b/tools/testfiles/tall-2A.ddl index c6ff136..0ae5210 100644 --- a/tools/testfiles/tall-2A.ddl +++ b/tools/testfiles/tall-2A.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -A tall.h5' -############################# HDF5 "tall.h5" { GROUP "/" { ATTRIBUTE "attr1" { diff --git a/tools/testfiles/tall-2A.h5.xml b/tools/testfiles/tall-2A.h5.xml index ce9df3a..d118a69 100644 --- a/tools/testfiles/tall-2A.h5.xml +++ b/tools/testfiles/tall-2A.h5.xml @@ -1,8 +1,5 @@ -############################# -Expected output for 'h5dump --xml -A tall.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/"> <hdf5:Attribute Name="attr1"> <hdf5:Dataspace> @@ -17,7 +14,16 @@ Expected output for 'h5dump --xml -A tall.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 97 98 99 100 101 102 103 104 105 0 + 97 + 98 + 99 + 100 + 101 + 102 + 103 + 104 + 105 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> @@ -35,8 +41,10 @@ Expected output for 'h5dump --xml -A tall.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 1 - 2 3 + 0 + 1 + 2 + 3 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> @@ -46,9 +54,9 @@ Expected output for 'h5dump --xml -A tall.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -75,8 +83,33 @@ Expected output for 'h5dump --xml -A tall.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 49 115 116 32 97 116 116 114 105 98 117 116 101 32 111 102 32 - 100 115 101 116 49 46 49 46 49 0 + 49 + 115 + 116 + 32 + 97 + 116 + 116 + 114 + 105 + 98 + 117 + 116 + 101 + 32 + 111 + 102 + 32 + 100 + 115 + 101 + 116 + 49 + 46 + 49 + 46 + 49 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> @@ -93,8 +126,33 @@ Expected output for 'h5dump --xml -A tall.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 50 110 100 32 97 116 116 114 105 98 117 116 101 32 111 102 32 - 100 115 101 116 49 46 49 46 49 0 + 50 + 110 + 100 + 32 + 97 + 116 + 116 + 114 + 105 + 98 + 117 + 116 + 101 + 32 + 111 + 102 + 32 + 100 + 115 + 101 + 116 + 49 + 46 + 49 + 46 + 49 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> @@ -106,9 +164,9 @@ Expected output for 'h5dump --xml -A tall.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -138,9 +196,9 @@ Expected output for 'h5dump --xml -A tall.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -161,9 +219,9 @@ Expected output for 'h5dump --xml -A tall.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> diff --git a/tools/testfiles/tall-2B.ddl b/tools/testfiles/tall-2B.ddl index 5642d2c..dc8aab7 100644 --- a/tools/testfiles/tall-2B.ddl +++ b/tools/testfiles/tall-2B.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -A -r tall.h5' -############################# HDF5 "tall.h5" { GROUP "/" { ATTRIBUTE "attr1" { @@ -27,14 +24,14 @@ GROUP "/" { DATATYPE H5T_STD_I8BE DATASPACE SIMPLE { ( 27 ) / ( 27 ) } DATA { - "1st attribute of dset1.1.1\000" + "1st attribute of dset1.1.1\000" } } ATTRIBUTE "attr2" { DATATYPE H5T_STD_I8BE DATASPACE SIMPLE { ( 27 ) / ( 27 ) } DATA { - "2nd attribute of dset1.1.1\000" + "2nd attribute of dset1.1.1\000" } } } diff --git a/tools/testfiles/tall-3.ddl b/tools/testfiles/tall-3.ddl index 7d8e432..1c54e6d 100644 --- a/tools/testfiles/tall-3.ddl +++ b/tools/testfiles/tall-3.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -d /g2/dset2.1 -l /g1/g1.2/g1.2.1/slink tall.h5' -############################# HDF5 "tall.h5" { DATASET "/g2/dset2.1" { DATATYPE H5T_IEEE_F32BE diff --git a/tools/testfiles/tall-4s.ddl b/tools/testfiles/tall-4s.ddl index 71675bc..36cb659 100644 --- a/tools/testfiles/tall-4s.ddl +++ b/tools/testfiles/tall-4s.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump --dataset=/g1/g1.1/dset1.1.1 --start=1,1 --stride=2,3 --count=3,2 --block=1,1 tall.h5' -############################# HDF5 "tall.h5" { DATASET "/g1/g1.1/dset1.1.1" { DATATYPE H5T_STD_I32BE diff --git a/tools/testfiles/tall-5s.ddl b/tools/testfiles/tall-5s.ddl index 95e4d63..b35be18 100644 --- a/tools/testfiles/tall-5s.ddl +++ b/tools/testfiles/tall-5s.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -d /g1/g1.1/dset1.1.2[0;2;10;] tall.h5' -############################# HDF5 "tall.h5" { DATASET "/g1/g1.1/dset1.1.2" { DATATYPE H5T_STD_I32BE diff --git a/tools/testfiles/tall.h5.xml b/tools/testfiles/tall.h5.xml index e8d39a4..a74ccbe 100644 --- a/tools/testfiles/tall.h5.xml +++ b/tools/testfiles/tall.h5.xml @@ -1,8 +1,5 @@ -############################# -Expected output for 'h5dump --xml tall.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/"> <hdf5:Attribute Name="attr1"> <hdf5:Dataspace> @@ -17,7 +14,16 @@ Expected output for 'h5dump --xml tall.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 97 98 99 100 101 102 103 104 105 0 + 97 + 98 + 99 + 100 + 101 + 102 + 103 + 104 + 105 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> @@ -35,8 +41,10 @@ Expected output for 'h5dump --xml tall.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 1 - 2 3 + 0 + 1 + 2 + 3 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> @@ -46,9 +54,9 @@ Expected output for 'h5dump --xml tall.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -75,8 +83,33 @@ Expected output for 'h5dump --xml tall.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 49 115 116 32 97 116 116 114 105 98 117 116 101 32 111 102 32 - 100 115 101 116 49 46 49 46 49 0 + 49 + 115 + 116 + 32 + 97 + 116 + 116 + 114 + 105 + 98 + 117 + 116 + 101 + 32 + 111 + 102 + 32 + 100 + 115 + 101 + 116 + 49 + 46 + 49 + 46 + 49 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> @@ -93,23 +126,138 @@ Expected output for 'h5dump --xml tall.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 50 110 100 32 97 116 116 114 105 98 117 116 101 32 111 102 32 - 100 115 101 116 49 46 49 46 49 0 + 50 + 110 + 100 + 32 + 97 + 116 + 116 + 114 + 105 + 98 + 117 + 116 + 101 + 32 + 111 + 102 + 32 + 100 + 115 + 101 + 116 + 49 + 46 + 49 + 46 + 49 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 0 0 0 0 0 0 - 0 1 2 3 4 5 6 7 8 9 - 0 2 4 6 8 10 12 14 16 18 - 0 3 6 9 12 15 18 21 24 27 - 0 4 8 12 16 20 24 28 32 36 - 0 5 10 15 20 25 30 35 40 45 - 0 6 12 18 24 30 36 42 48 54 - 0 7 14 21 28 35 42 49 56 63 - 0 8 16 24 32 40 48 56 64 72 - 0 9 18 27 36 45 54 63 72 81 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 2 + 4 + 6 + 8 + 10 + 12 + 14 + 16 + 18 + 0 + 3 + 6 + 9 + 12 + 15 + 18 + 21 + 24 + 27 + 0 + 4 + 8 + 12 + 16 + 20 + 24 + 28 + 32 + 36 + 0 + 5 + 10 + 15 + 20 + 25 + 30 + 35 + 40 + 45 + 0 + 6 + 12 + 18 + 24 + 30 + 36 + 42 + 48 + 54 + 0 + 7 + 14 + 21 + 28 + 35 + 42 + 49 + 56 + 63 + 0 + 8 + 16 + 24 + 32 + 40 + 48 + 56 + 64 + 72 + 0 + 9 + 18 + 27 + 36 + 45 + 54 + 63 + 72 + 81 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -117,9 +265,9 @@ Expected output for 'h5dump --xml tall.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -134,7 +282,26 @@ Expected output for 'h5dump --xml tall.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -151,9 +318,9 @@ Expected output for 'h5dump --xml tall.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -168,7 +335,16 @@ Expected output for 'h5dump --xml tall.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 1 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 + 1 + 1.1 + 1.2 + 1.3 + 1.4 + 1.5 + 1.6 + 1.7 + 1.8 + 1.9 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -176,9 +352,9 @@ Expected output for 'h5dump --xml tall.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -194,9 +370,21 @@ Expected output for 'h5dump --xml tall.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0.1 0.2 0.3 0.4 - 0 0.2 0.4 0.6 0.8 - 0 0.3 0.6 0.9 1.2 + 0 + 0.1 + 0.2 + 0.3 + 0.4 + 0 + 0.2 + 0.4 + 0.6 + 0.8 + 0 + 0.3 + 0.6 + 0.9 + 1.2 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tallfilters.ddl b/tools/testfiles/tallfilters.ddl index 16405b7..ac6762a 100644 --- a/tools/testfiles/tallfilters.ddl +++ b/tools/testfiles/tallfilters.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -H -p -d all tfilters.h5' -############################# HDF5 "tfilters.h5" { DATASET "all" { DATATYPE H5T_STD_I32LE @@ -8,7 +5,7 @@ DATASET "all" { STORAGE_LAYOUT { CHUNKED ( 10, 5 ) SIZE 458 (1.747:1 COMPRESSION) - } + } FILTERS { PREPROCESSING SHUFFLE COMPRESSION SZIP { @@ -24,7 +21,7 @@ DATASET "all" { } FILLVALUE { FILL_TIME H5D_FILL_TIME_IFSET - VALUE 0 + VALUE 0 } ALLOCATION_TIME { H5D_ALLOC_TIME_INCR diff --git a/tools/testfiles/tarray1.ddl b/tools/testfiles/tarray1.ddl index 849bc67..8ff01e1 100644 --- a/tools/testfiles/tarray1.ddl +++ b/tools/testfiles/tarray1.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tarray1.h5' -############################# HDF5 "tarray1.h5" { GROUP "/" { DATASET "Dataset1" { diff --git a/tools/testfiles/tarray1.h5.xml b/tools/testfiles/tarray1.h5.xml index cff79e3..86db36f 100644 --- a/tools/testfiles/tarray1.h5.xml +++ b/tools/testfiles/tarray1.h5.xml @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump --xml tarray1.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -30,7 +27,10 @@ Expected output for 'h5dump --xml tarray1.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 1 2 3 10 11 12 13 20 21 22 23 30 31 32 33 + 0 1 2 3 + 10 11 12 13 + 20 21 22 23 + 30 31 32 33 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tarray1.ls b/tools/testfiles/tarray1.ls index 60c002d..973a4e2 100644 --- a/tools/testfiles/tarray1.ls +++ b/tools/testfiles/tarray1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -d tarray1.h5' -############################# / Group /Dataset1 Dataset {4} Data: diff --git a/tools/testfiles/tarray1_big.ddl b/tools/testfiles/tarray1_big.ddl index a19a7c3..bb06df2 100644 --- a/tools/testfiles/tarray1_big.ddl +++ b/tools/testfiles/tarray1_big.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -R tarray1_big.h5' -############################# HDF5 "tarray1_big.h5" { GROUP "/" { DATASET "Dataset1" { diff --git a/tools/testfiles/tarray2.ddl b/tools/testfiles/tarray2.ddl index df1e0b8..5a8460a 100644 --- a/tools/testfiles/tarray2.ddl +++ b/tools/testfiles/tarray2.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tarray2.h5' -############################# HDF5 "tarray2.h5" { GROUP "/" { DATASET "Dataset1" { diff --git a/tools/testfiles/tarray2.h5.xml b/tools/testfiles/tarray2.h5.xml index f851c18..7f89b9b 100644 --- a/tools/testfiles/tarray2.h5.xml +++ b/tools/testfiles/tarray2.h5.xml @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump --xml tarray2.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -32,54 +29,10 @@ Expected output for 'h5dump --xml tarray2.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 1 2 3 4 - 10 11 12 13 14 - 20 21 22 23 24 - 30 31 32 33 34 - 100 101 102 103 104 - 110 111 112 113 114 - 120 121 122 123 124 - 130 131 132 133 134 - 200 201 202 203 204 - 210 211 212 213 214 - 220 221 222 223 224 - 230 231 232 233 234 - 1000 1001 1002 1003 1004 - 1010 1011 1012 1013 1014 - 1020 1021 1022 1023 1024 - 1030 1031 1032 1033 1034 - 1100 1101 1102 1103 1104 - 1110 1111 1112 1113 1114 - 1120 1121 1122 1123 1124 - 1130 1131 1132 1133 1134 - 1200 1201 1202 1203 1204 - 1210 1211 1212 1213 1214 - 1220 1221 1222 1223 1224 - 1230 1231 1232 1233 1234 - 2000 2001 2002 2003 2004 - 2010 2011 2012 2013 2014 - 2020 2021 2022 2023 2024 - 2030 2031 2032 2033 2034 - 2100 2101 2102 2103 2104 - 2110 2111 2112 2113 2114 - 2120 2121 2122 2123 2124 - 2130 2131 2132 2133 2134 - 2200 2201 2202 2203 2204 - 2210 2211 2212 2213 2214 - 2220 2221 2222 2223 2224 - 2230 2231 2232 2233 2234 - 3000 3001 3002 3003 3004 - 3010 3011 3012 3013 3014 - 3020 3021 3022 3023 3024 - 3030 3031 3032 3033 3034 - 3100 3101 3102 3103 3104 - 3110 3111 3112 3113 3114 - 3120 3121 3122 3123 3124 - 3130 3131 3132 3133 3134 - 3200 3201 3202 3203 3204 - 3210 3211 3212 3213 3214 - 3220 3221 3222 3223 3224 - 3230 3231 3232 3233 3234 + 0 1 2 3 4 10 11 12 13 14 20 21 22 23 24 30 31 32 33 34 100 101 102 103 104 110 111 112 113 114 120 121 122 123 124 130 131 132 133 134 200 201 202 203 204 210 211 212 213 214 220 221 222 223 224 230 231 232 233 234 + 1000 1001 1002 1003 1004 1010 1011 1012 1013 1014 1020 1021 1022 1023 1024 1030 1031 1032 1033 1034 1100 1101 1102 1103 1104 1110 1111 1112 1113 1114 1120 1121 1122 1123 1124 1130 1131 1132 1133 1134 1200 1201 1202 1203 1204 1210 1211 1212 1213 1214 1220 1221 1222 1223 1224 1230 1231 1232 1233 1234 + 2000 2001 2002 2003 2004 2010 2011 2012 2013 2014 2020 2021 2022 2023 2024 2030 2031 2032 2033 2034 2100 2101 2102 2103 2104 2110 2111 2112 2113 2114 2120 2121 2122 2123 2124 2130 2131 2132 2133 2134 2200 2201 2202 2203 2204 2210 2211 2212 2213 2214 2220 2221 2222 2223 2224 2230 2231 2232 2233 2234 + 3000 3001 3002 3003 3004 3010 3011 3012 3013 3014 3020 3021 3022 3023 3024 3030 3031 3032 3033 3034 3100 3101 3102 3103 3104 3110 3111 3112 3113 3114 3120 3121 3122 3123 3124 3130 3131 3132 3133 3134 3200 3201 3202 3203 3204 3210 3211 3212 3213 3214 3220 3221 3222 3223 3224 3230 3231 3232 3233 3234 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tarray3.ddl b/tools/testfiles/tarray3.ddl index 17ceba6..63f6d32 100644 --- a/tools/testfiles/tarray3.ddl +++ b/tools/testfiles/tarray3.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tarray3.h5' -############################# HDF5 "tarray3.h5" { GROUP "/" { DATASET "Dataset1" { @@ -12,17 +9,20 @@ GROUP "/" { 20, 21, 22, 30, 31, 32, 40, 41, 42, - 50, 51, 52 ], [ 100, 101, 102, + 50, 51, 52 ], + [ 100, 101, 102, 110, 111, 112, 120, 121, 122, 130, 131, 132, 140, 141, 142, - 150, 151, 152 ], [ 200, 201, 202, + 150, 151, 152 ], + [ 200, 201, 202, 210, 211, 212, 220, 221, 222, 230, 231, 232, 240, 241, 242, - 250, 251, 252 ], [ 300, 301, 302, + 250, 251, 252 ], + [ 300, 301, 302, 310, 311, 312, 320, 321, 322, 330, 331, 332, @@ -33,17 +33,20 @@ GROUP "/" { 1020, 1021, 1022, 1030, 1031, 1032, 1040, 1041, 1042, - 1050, 1051, 1052 ], [ 1100, 1101, 1102, + 1050, 1051, 1052 ], + [ 1100, 1101, 1102, 1110, 1111, 1112, 1120, 1121, 1122, 1130, 1131, 1132, 1140, 1141, 1142, - 1150, 1151, 1152 ], [ 1200, 1201, 1202, + 1150, 1151, 1152 ], + [ 1200, 1201, 1202, 1210, 1211, 1212, 1220, 1221, 1222, 1230, 1231, 1232, 1240, 1241, 1242, - 1250, 1251, 1252 ], [ 1300, 1301, 1302, + 1250, 1251, 1252 ], + [ 1300, 1301, 1302, 1310, 1311, 1312, 1320, 1321, 1322, 1330, 1331, 1332, @@ -54,17 +57,20 @@ GROUP "/" { 2020, 2021, 2022, 2030, 2031, 2032, 2040, 2041, 2042, - 2050, 2051, 2052 ], [ 2100, 2101, 2102, + 2050, 2051, 2052 ], + [ 2100, 2101, 2102, 2110, 2111, 2112, 2120, 2121, 2122, 2130, 2131, 2132, 2140, 2141, 2142, - 2150, 2151, 2152 ], [ 2200, 2201, 2202, + 2150, 2151, 2152 ], + [ 2200, 2201, 2202, 2210, 2211, 2212, 2220, 2221, 2222, 2230, 2231, 2232, 2240, 2241, 2242, - 2250, 2251, 2252 ], [ 2300, 2301, 2302, + 2250, 2251, 2252 ], + [ 2300, 2301, 2302, 2310, 2311, 2312, 2320, 2321, 2322, 2330, 2331, 2332, @@ -75,17 +81,20 @@ GROUP "/" { 3020, 3021, 3022, 3030, 3031, 3032, 3040, 3041, 3042, - 3050, 3051, 3052 ], [ 3100, 3101, 3102, + 3050, 3051, 3052 ], + [ 3100, 3101, 3102, 3110, 3111, 3112, 3120, 3121, 3122, 3130, 3131, 3132, 3140, 3141, 3142, - 3150, 3151, 3152 ], [ 3200, 3201, 3202, + 3150, 3151, 3152 ], + [ 3200, 3201, 3202, 3210, 3211, 3212, 3220, 3221, 3222, 3230, 3231, 3232, 3240, 3241, 3242, - 3250, 3251, 3252 ], [ 3300, 3301, 3302, + 3250, 3251, 3252 ], + [ 3300, 3301, 3302, 3310, 3311, 3312, 3320, 3321, 3322, 3330, 3331, 3332, diff --git a/tools/testfiles/tarray3.h5.xml b/tools/testfiles/tarray3.h5.xml index a620a5e..0b74db8 100644 --- a/tools/testfiles/tarray3.h5.xml +++ b/tools/testfiles/tarray3.h5.xml @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump --xml tarray3.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -36,90 +33,22 @@ Expected output for 'h5dump --xml tarray3.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 1 2 - 10 11 12 - 20 21 22 - 30 31 32 - 40 41 42 - 50 51 52 100 101 102 - 110 111 112 - 120 121 122 - 130 131 132 - 140 141 142 - 150 151 152 200 201 202 - 210 211 212 - 220 221 222 - 230 231 232 - 240 241 242 - 250 251 252 300 301 302 - 310 311 312 - 320 321 322 - 330 331 332 - 340 341 342 - 350 351 352 - 1000 1001 1002 - 1010 1011 1012 - 1020 1021 1022 - 1030 1031 1032 - 1040 1041 1042 - 1050 1051 1052 1100 1101 1102 - 1110 1111 1112 - 1120 1121 1122 - 1130 1131 1132 - 1140 1141 1142 - 1150 1151 1152 1200 1201 1202 - 1210 1211 1212 - 1220 1221 1222 - 1230 1231 1232 - 1240 1241 1242 - 1250 1251 1252 1300 1301 1302 - 1310 1311 1312 - 1320 1321 1322 - 1330 1331 1332 - 1340 1341 1342 - 1350 1351 1352 - 2000 2001 2002 - 2010 2011 2012 - 2020 2021 2022 - 2030 2031 2032 - 2040 2041 2042 - 2050 2051 2052 2100 2101 2102 - 2110 2111 2112 - 2120 2121 2122 - 2130 2131 2132 - 2140 2141 2142 - 2150 2151 2152 2200 2201 2202 - 2210 2211 2212 - 2220 2221 2222 - 2230 2231 2232 - 2240 2241 2242 - 2250 2251 2252 2300 2301 2302 - 2310 2311 2312 - 2320 2321 2322 - 2330 2331 2332 - 2340 2341 2342 - 2350 2351 2352 - 3000 3001 3002 - 3010 3011 3012 - 3020 3021 3022 - 3030 3031 3032 - 3040 3041 3042 - 3050 3051 3052 3100 3101 3102 - 3110 3111 3112 - 3120 3121 3122 - 3130 3131 3132 - 3140 3141 3142 - 3150 3151 3152 3200 3201 3202 - 3210 3211 3212 - 3220 3221 3222 - 3230 3231 3232 - 3240 3241 3242 - 3250 3251 3252 3300 3301 3302 - 3310 3311 3312 - 3320 3321 3322 - 3330 3331 3332 - 3340 3341 3342 - 3350 3351 3352 + 0 1 2 10 11 12 20 21 22 30 31 32 40 41 42 50 51 52 + 100 101 102 110 111 112 120 121 122 130 131 132 140 141 142 150 151 152 + 200 201 202 210 211 212 220 221 222 230 231 232 240 241 242 250 251 252 + 300 301 302 310 311 312 320 321 322 330 331 332 340 341 342 350 351 352 + 1000 1001 1002 1010 1011 1012 1020 1021 1022 1030 1031 1032 1040 1041 1042 1050 1051 1052 + 1100 1101 1102 1110 1111 1112 1120 1121 1122 1130 1131 1132 1140 1141 1142 1150 1151 1152 + 1200 1201 1202 1210 1211 1212 1220 1221 1222 1230 1231 1232 1240 1241 1242 1250 1251 1252 + 1300 1301 1302 1310 1311 1312 1320 1321 1322 1330 1331 1332 1340 1341 1342 1350 1351 1352 + 2000 2001 2002 2010 2011 2012 2020 2021 2022 2030 2031 2032 2040 2041 2042 2050 2051 2052 + 2100 2101 2102 2110 2111 2112 2120 2121 2122 2130 2131 2132 2140 2141 2142 2150 2151 2152 + 2200 2201 2202 2210 2211 2212 2220 2221 2222 2230 2231 2232 2240 2241 2242 2250 2251 2252 + 2300 2301 2302 2310 2311 2312 2320 2321 2322 2330 2331 2332 2340 2341 2342 2350 2351 2352 + 3000 3001 3002 3010 3011 3012 3020 3021 3022 3030 3031 3032 3040 3041 3042 3050 3051 3052 + 3100 3101 3102 3110 3111 3112 3120 3121 3122 3130 3131 3132 3140 3141 3142 3150 3151 3152 + 3200 3201 3202 3210 3211 3212 3220 3221 3222 3230 3231 3232 3240 3241 3242 3250 3251 3252 + 3300 3301 3302 3310 3311 3312 3320 3321 3322 3330 3331 3332 3340 3341 3342 3350 3351 3352 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tarray4.ddl b/tools/testfiles/tarray4.ddl index ebc265f..7fb310b 100644 --- a/tools/testfiles/tarray4.ddl +++ b/tools/testfiles/tarray4.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tarray4.h5' -############################# HDF5 "tarray4.h5" { GROUP "/" { DATASET "Dataset1" { diff --git a/tools/testfiles/tarray5.ddl b/tools/testfiles/tarray5.ddl index 49eda3e..883ee09 100644 --- a/tools/testfiles/tarray5.ddl +++ b/tools/testfiles/tarray5.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tarray5.h5' -############################# HDF5 "tarray5.h5" { GROUP "/" { DATASET "Dataset1" { @@ -13,52 +10,64 @@ GROUP "/" { (0): [ { 0, [ 0, 1, 2, 3 ] - }, { + }, + { 1, [ 2.5, 3.5, 4.5, 5.5 ] - }, { + }, + { 2, [ 5, 6, 7, 8 ] - }, { + }, + { 3, [ 7.5, 8.5, 9.5, 10.5 ] } ], (1): [ { 10, [ 10, 11, 12, 13 ] - }, { + }, + { 11, [ 12.5, 13.5, 14.5, 15.5 ] - }, { + }, + { 12, [ 15, 16, 17, 18 ] - }, { + }, + { 13, [ 17.5, 18.5, 19.5, 20.5 ] } ], (2): [ { 20, [ 20, 21, 22, 23 ] - }, { + }, + { 21, [ 22.5, 23.5, 24.5, 25.5 ] - }, { + }, + { 22, [ 25, 26, 27, 28 ] - }, { + }, + { 23, [ 27.5, 28.5, 29.5, 30.5 ] } ], (3): [ { 30, [ 30, 31, 32, 33 ] - }, { + }, + { 31, [ 32.5, 33.5, 34.5, 35.5 ] - }, { + }, + { 32, [ 35, 36, 37, 38 ] - }, { + }, + { 33, [ 37.5, 38.5, 39.5, 40.5 ] } ] diff --git a/tools/testfiles/tarray6.ddl b/tools/testfiles/tarray6.ddl index b2f95ab..5c49b0f 100644 --- a/tools/testfiles/tarray6.ddl +++ b/tools/testfiles/tarray6.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tarray6.h5' -############################# HDF5 "tarray6.h5" { GROUP "/" { DATASET "Dataset1" { diff --git a/tools/testfiles/tarray6.h5 b/tools/testfiles/tarray6.h5 Binary files differindex b4af19b..7eb078c 100644 --- a/tools/testfiles/tarray6.h5 +++ b/tools/testfiles/tarray6.h5 diff --git a/tools/testfiles/tarray6.h5.xml b/tools/testfiles/tarray6.h5.xml index 5be8371..628a342 100644 --- a/tools/testfiles/tarray6.h5.xml +++ b/tools/testfiles/tarray6.h5.xml @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump --xml tarray6.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -34,10 +31,10 @@ Expected output for 'h5dump --xml tarray6.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 10 11 20 21 22 30 31 32 33 - 100 101 110 111 112 120 121 122 123 130 131 132 133 134 - 200 201 202 210 211 212 213 220 221 222 223 224 230 231 232 233 234 235 - 300 301 302 303 310 311 312 313 314 320 321 322 323 324 325 330 331 332 333 334 335 336 + 0 10 11 20 21 22 30 31 32 33 + 100 101 110 111 112 120 121 122 123 130 131 132 133 134 + 200 201 202 210 211 212 213 220 221 222 223 224 230 231 232 233 234 235 + 300 301 302 303 310 311 312 313 314 320 321 322 323 324 325 330 331 332 333 334 335 336 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tarray7.ddl b/tools/testfiles/tarray7.ddl index a205875..229d719 100644 --- a/tools/testfiles/tarray7.ddl +++ b/tools/testfiles/tarray7.ddl @@ -1,16 +1,25 @@ -############################# -Expected output for 'h5dump tarray7.h5' -############################# HDF5 "tarray7.h5" { GROUP "/" { DATASET "Dataset1" { DATATYPE H5T_ARRAY { [4] H5T_VLEN { H5T_ARRAY { [4] H5T_STD_U32LE }} } DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { - (0): [ ([ 0, 1, 2, 3 ]), ([ 100, 101, 102, 103 ], [ 110, 111, 112, 113 ]), ([ 200, 201, 202, 203 ], [ 210, 211, 212, 213 ], [ 220, 221, 222, 223 ]), ([ 300, 301, 302, 303 ], [ 310, 311, 312, 313 ], [ 320, 321, 322, 323 ], [ 330, 331, 332, 333 ]) ], - (1): [ ([ 1000, 1001, 1002, 1003 ], [ 1010, 1011, 1012, 1013 ]), ([ 1100, 1101, 1102, 1103 ], [ 1110, 1111, 1112, 1113 ], [ 1120, 1121, 1122, 1123 ]), ([ 1200, 1201, 1202, 1203 ], [ 1210, 1211, 1212, 1213 ], [ 1220, 1221, 1222, 1223 ], [ 1230, 1231, 1232, 1233 ]), ([ 1300, 1301, 1302, 1303 ], [ 1310, 1311, 1312, 1313 ], [ 1320, 1321, 1322, 1323 ], [ 1330, 1331, 1332, 1333 ], [ 1340, 1341, 1342, 1343 ]) ], - (2): [ ([ 2000, 2001, 2002, 2003 ], [ 2010, 2011, 2012, 2013 ], [ 2020, 2021, 2022, 2023 ]), ([ 2100, 2101, 2102, 2103 ], [ 2110, 2111, 2112, 2113 ], [ 2120, 2121, 2122, 2123 ], [ 2130, 2131, 2132, 2133 ]), ([ 2200, 2201, 2202, 2203 ], [ 2210, 2211, 2212, 2213 ], [ 2220, 2221, 2222, 2223 ], [ 2230, 2231, 2232, 2233 ], [ 2240, 2241, 2242, 2243 ]), ([ 2300, 2301, 2302, 2303 ], [ 2310, 2311, 2312, 2313 ], [ 2320, 2321, 2322, 2323 ], [ 2330, 2331, 2332, 2333 ], [ 2340, 2341, 2342, 2343 ], [ 2350, 2351, 2352, 2353 ]) ], - (3): [ ([ 3000, 3001, 3002, 3003 ], [ 3010, 3011, 3012, 3013 ], [ 3020, 3021, 3022, 3023 ], [ 3030, 3031, 3032, 3033 ]), ([ 3100, 3101, 3102, 3103 ], [ 3110, 3111, 3112, 3113 ], [ 3120, 3121, 3122, 3123 ], [ 3130, 3131, 3132, 3133 ], [ 3140, 3141, 3142, 3143 ]), ([ 3200, 3201, 3202, 3203 ], [ 3210, 3211, 3212, 3213 ], [ 3220, 3221, 3222, 3223 ], [ 3230, 3231, 3232, 3233 ], [ 3240, 3241, 3242, 3243 ], [ 3250, 3251, 3252, 3253 ]), ([ 3300, 3301, 3302, 3303 ], [ 3310, 3311, 3312, 3313 ], [ 3320, 3321, 3322, 3323 ], [ 3330, 3331, 3332, 3333 ], [ 3340, 3341, 3342, 3343 ], [ 3350, 3351, 3352, 3353 ], [ 3360, 3361, 3362, 3363 ]) ] + (0): [ ([ 0, 1, 2, 3 ]), + ([ 100, 101, 102, 103 ], [ 110, 111, 112, 113 ]), + ([ 200, 201, 202, 203 ], [ 210, 211, 212, 213 ], [ 220, 221, 222, 223 ]), + ([ 300, 301, 302, 303 ], [ 310, 311, 312, 313 ], [ 320, 321, 322, 323 ], [ 330, 331, 332, 333 ]) ], + (1): [ ([ 1000, 1001, 1002, 1003 ], [ 1010, 1011, 1012, 1013 ]), + ([ 1100, 1101, 1102, 1103 ], [ 1110, 1111, 1112, 1113 ], [ 1120, 1121, 1122, 1123 ]), + ([ 1200, 1201, 1202, 1203 ], [ 1210, 1211, 1212, 1213 ], [ 1220, 1221, 1222, 1223 ], [ 1230, 1231, 1232, 1233 ]), + ([ 1300, 1301, 1302, 1303 ], [ 1310, 1311, 1312, 1313 ], [ 1320, 1321, 1322, 1323 ], [ 1330, 1331, 1332, 1333 ], [ 1340, 1341, 1342, 1343 ]) ], + (2): [ ([ 2000, 2001, 2002, 2003 ], [ 2010, 2011, 2012, 2013 ], [ 2020, 2021, 2022, 2023 ]), + ([ 2100, 2101, 2102, 2103 ], [ 2110, 2111, 2112, 2113 ], [ 2120, 2121, 2122, 2123 ], [ 2130, 2131, 2132, 2133 ]), + ([ 2200, 2201, 2202, 2203 ], [ 2210, 2211, 2212, 2213 ], [ 2220, 2221, 2222, 2223 ], [ 2230, 2231, 2232, 2233 ], [ 2240, 2241, 2242, 2243 ]), + ([ 2300, 2301, 2302, 2303 ], [ 2310, 2311, 2312, 2313 ], [ 2320, 2321, 2322, 2323 ], [ 2330, 2331, 2332, 2333 ], [ 2340, 2341, 2342, 2343 ], [ 2350, 2351, 2352, 2353 ]) ], + (3): [ ([ 3000, 3001, 3002, 3003 ], [ 3010, 3011, 3012, 3013 ], [ 3020, 3021, 3022, 3023 ], [ 3030, 3031, 3032, 3033 ]), + ([ 3100, 3101, 3102, 3103 ], [ 3110, 3111, 3112, 3113 ], [ 3120, 3121, 3122, 3123 ], [ 3130, 3131, 3132, 3133 ], [ 3140, 3141, 3142, 3143 ]), + ([ 3200, 3201, 3202, 3203 ], [ 3210, 3211, 3212, 3213 ], [ 3220, 3221, 3222, 3223 ], [ 3230, 3231, 3232, 3233 ], [ 3240, 3241, 3242, 3243 ], [ 3250, 3251, 3252, 3253 ]), + ([ 3300, 3301, 3302, 3303 ], [ 3310, 3311, 3312, 3313 ], [ 3320, 3321, 3322, 3323 ], [ 3330, 3331, 3332, 3333 ], [ 3340, 3341, 3342, 3343 ], [ 3350, 3351, 3352, 3353 ], [ 3360, 3361, 3362, 3363 ]) ] } } } diff --git a/tools/testfiles/tarray7.h5.xml b/tools/testfiles/tarray7.h5.xml index 4fb02c4..dbf5ec5 100644 --- a/tools/testfiles/tarray7.h5.xml +++ b/tools/testfiles/tarray7.h5.xml @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump --xml tarray7.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -39,10 +36,22 @@ Expected output for 'h5dump --xml tarray7.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 1 2 3 100 101 102 103 110 111 112 113 200 201 202 203 210 211 212 213 220 221 222 223 300 301 302 303 310 311 312 313 320 321 322 323 330 331 332 333 - 1000 1001 1002 1003 1010 1011 1012 1013 1100 1101 1102 1103 1110 1111 1112 1113 1120 1121 1122 1123 1200 1201 1202 1203 1210 1211 1212 1213 1220 1221 1222 1223 1230 1231 1232 1233 1300 1301 1302 1303 1310 1311 1312 1313 1320 1321 1322 1323 1330 1331 1332 1333 1340 1341 1342 1343 - 2000 2001 2002 2003 2010 2011 2012 2013 2020 2021 2022 2023 2100 2101 2102 2103 2110 2111 2112 2113 2120 2121 2122 2123 2130 2131 2132 2133 2200 2201 2202 2203 2210 2211 2212 2213 2220 2221 2222 2223 2230 2231 2232 2233 2240 2241 2242 2243 2300 2301 2302 2303 2310 2311 2312 2313 2320 2321 2322 2323 2330 2331 2332 2333 2340 2341 2342 2343 2350 2351 2352 2353 - 3000 3001 3002 3003 3010 3011 3012 3013 3020 3021 3022 3023 3030 3031 3032 3033 3100 3101 3102 3103 3110 3111 3112 3113 3120 3121 3122 3123 3130 3131 3132 3133 3140 3141 3142 3143 3200 3201 3202 3203 3210 3211 3212 3213 3220 3221 3222 3223 3230 3231 3232 3233 3240 3241 3242 3243 3250 3251 3252 3253 3300 3301 3302 3303 3310 3311 3312 3313 3320 3321 3322 3323 3330 3331 3332 3333 3340 3341 3342 3343 3350 3351 3352 3353 3360 3361 3362 3363 + 0 1 2 3 + 100 101 102 103 110 111 112 113 + 200 201 202 203 210 211 212 213 220 221 222 223 + 300 301 302 303 310 311 312 313 320 321 322 323 330 331 332 333 + 1000 1001 1002 1003 1010 1011 1012 1013 + 1100 1101 1102 1103 1110 1111 1112 1113 1120 1121 1122 1123 + 1200 1201 1202 1203 1210 1211 1212 1213 1220 1221 1222 1223 1230 1231 1232 1233 + 1300 1301 1302 1303 1310 1311 1312 1313 1320 1321 1322 1323 1330 1331 1332 1333 1340 1341 1342 1343 + 2000 2001 2002 2003 2010 2011 2012 2013 2020 2021 2022 2023 + 2100 2101 2102 2103 2110 2111 2112 2113 2120 2121 2122 2123 2130 2131 2132 2133 + 2200 2201 2202 2203 2210 2211 2212 2213 2220 2221 2222 2223 2230 2231 2232 2233 2240 2241 2242 2243 + 2300 2301 2302 2303 2310 2311 2312 2313 2320 2321 2322 2323 2330 2331 2332 2333 2340 2341 2342 2343 2350 2351 2352 2353 + 3000 3001 3002 3003 3010 3011 3012 3013 3020 3021 3022 3023 3030 3031 3032 3033 + 3100 3101 3102 3103 3110 3111 3112 3113 3120 3121 3122 3123 3130 3131 3132 3133 3140 3141 3142 3143 + 3200 3201 3202 3203 3210 3211 3212 3213 3220 3221 3222 3223 3230 3231 3232 3233 3240 3241 3242 3243 3250 3251 3252 3253 + 3300 3301 3302 3303 3310 3311 3312 3313 3320 3321 3322 3323 3330 3331 3332 3333 3340 3341 3342 3343 3350 3351 3352 3353 3360 3361 3362 3363 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tarray8.ddl b/tools/testfiles/tarray8.ddl index cf9ebc3..f482901 100644 --- a/tools/testfiles/tarray8.ddl +++ b/tools/testfiles/tarray8.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tarray8.h5' -############################# HDF5 "tarray8.h5" { GROUP "/" { DATASET "DS1" { diff --git a/tools/testfiles/tattr-1.ddl b/tools/testfiles/tattr-1.ddl index 2337fa3..b58731b 100644 --- a/tools/testfiles/tattr-1.ddl +++ b/tools/testfiles/tattr-1.ddl @@ -1,9 +1,6 @@ -############################# -Expected output for 'h5dump tattr.h5' -############################# HDF5 "tattr.h5" { GROUP "/" { - ATTRIBUTE "attr1" { + ATTRIBUTE "/attr1" { DATATYPE H5T_STD_I8BE DATASPACE SIMPLE { ( 24 ) / ( 24 ) } DATA { @@ -34,11 +31,11 @@ GROUP "/" { } ATTRIBUTE "attr5" { DATATYPE H5T_STRING { - STRSIZE 17; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 17; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SCALAR DATA { (0): "string attribute" diff --git a/tools/testfiles/tattr-2.ddl b/tools/testfiles/tattr-2.ddl index 195b9ab..328b54f 100644 --- a/tools/testfiles/tattr-2.ddl +++ b/tools/testfiles/tattr-2.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -a /attr1 --attribute /attr4 --attribute=/attr5 tattr.h5' -############################# HDF5 "tattr.h5" { ATTRIBUTE "/attr1" { DATATYPE H5T_STD_I8BE @@ -10,20 +7,20 @@ ATTRIBUTE "/attr1" { (14): 111, 111, 116, 32, 103, 114, 111, 117, 112, 0 } } -ATTRIBUTE "/attr4" { +ATTRIBUTE "attr4" { DATATYPE H5T_STD_I32BE DATASPACE SCALAR DATA { (0): 100 } } -ATTRIBUTE "/attr5" { +ATTRIBUTE "attr5" { DATATYPE H5T_STRING { - STRSIZE 17; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 17; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SCALAR DATA { (0): "string attribute" diff --git a/tools/testfiles/tattr-3.ddl b/tools/testfiles/tattr-3.ddl index 98896eb..a19f69a 100644 --- a/tools/testfiles/tattr-3.ddl +++ b/tools/testfiles/tattr-3.ddl @@ -1,12 +1,16 @@ -############################# -Expected output for 'h5dump --header -a /attr2 --attribute=/attr tattr.h5' -############################# HDF5 "tattr.h5" { -ATTRIBUTE "/attr2" { +ATTRIBUTE "attr2" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 10 ) / ( 10 ) } } -ATTRIBUTE "/attr" { - } +ATTRIBUTE "attr" { } -h5dump error: unable to open attribute "/" +} +HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): + #000: (file name) line (number) in H5Aopen(): unable to load attribute info from object header for attribute: 'attr' + major: Attribute + minor: Unable to initialize object + #001: (file name) line (number) in H5O_attr_open_by_name(): can't locate attribute: 'attr' + major: Attribute + minor: Object not found +h5dump error: unable to open attribute "attr" diff --git a/tools/testfiles/tattr-4_be.ddl b/tools/testfiles/tattr-4_be.ddl new file mode 100644 index 0000000..8b8076e --- /dev/null +++ b/tools/testfiles/tattr-4_be.ddl @@ -0,0 +1,119 @@ +HDF5 "tattr4_be.h5" { +GROUP "/" { + ATTRIBUTE "attr0" { + DATATYPE H5T_STRING { + STRSIZE 4; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } + DATASPACE SCALAR + DATA { + (0): "1234" + } + } + ATTRIBUTE "attr1" { + DATATYPE H5T_STRING { + STRSIZE 4; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } + DATASPACE SCALAR + DATA { + (0): "1234" + } + } + ATTRIBUTE "attr2" { + DATATYPE H5T_STRING { + STRSIZE 4; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } + DATASPACE SCALAR + DATA { + (0): "1234" + } + } + ATTRIBUTE "attr3" { + DATATYPE H5T_STRING { + STRSIZE 4; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } + DATASPACE SCALAR + DATA { + (0): "1234" + } + } + ATTRIBUTE "attr4" { + DATATYPE H5T_STRING { + STRSIZE 4; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } + DATASPACE SCALAR + DATA { + (0): "1234" + } + } + ATTRIBUTE "attr5" { + DATATYPE H5T_STRING { + STRSIZE 4; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } + DATASPACE SCALAR + DATA { + (0): "1234" + } + } + ATTRIBUTE "attr6" { + DATATYPE H5T_STRING { + STRSIZE 4; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } + DATASPACE SCALAR + DATA { + (0): "1234" + } + } + ATTRIBUTE "attr7" { + DATATYPE H5T_STRING { + STRSIZE 4; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } + DATASPACE SCALAR + DATA { + (0): "1234" + } + } + ATTRIBUTE "attr8" { + DATATYPE H5T_STRING { + STRSIZE 4; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } + DATASPACE SCALAR + DATA { + (0): "1234" + } + } + DATASET "data" { + DATATYPE H5T_IEEE_F32BE + DATASPACE SIMPLE { ( 1 ) / ( 1 ) } + DATA { + (0): 0 + } + } +} +} diff --git a/tools/testfiles/tattr.h5 b/tools/testfiles/tattr.h5 Binary files differindex fd14b58..d61def5 100644 --- a/tools/testfiles/tattr.h5 +++ b/tools/testfiles/tattr.h5 diff --git a/tools/testfiles/tattr.h5.xml b/tools/testfiles/tattr.h5.xml index bfde477..fceea99 100644 --- a/tools/testfiles/tattr.h5.xml +++ b/tools/testfiles/tattr.h5.xml @@ -1,10 +1,7 @@ -############################# -Expected output for 'h5dump --xml tattr.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> - <hdf5:Attribute Name="attr1"> + <hdf5:Attribute Name="/attr1"> <hdf5:Dataspace> <hdf5:SimpleDataspace Ndims="1"> <hdf5:Dimension DimSize="24" MaxDimSize="24"/> @@ -17,8 +14,30 @@ Expected output for 'h5dump --xml tattr.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 97 116 116 114 105 98 117 116 101 32 111 102 32 114 111 111 116 32 103 - 114 111 117 112 0 + 97 + 116 + 116 + 114 + 105 + 98 + 117 + 116 + 101 + 32 + 111 + 102 + 32 + 114 + 111 + 111 + 116 + 32 + 103 + 114 + 111 + 117 + 112 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> @@ -35,7 +54,16 @@ Expected output for 'h5dump --xml tattr.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 1 2 3 4 5 6 7 8 9 10 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> @@ -52,7 +80,16 @@ Expected output for 'h5dump --xml tattr.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 + 0 + 0.1 + 0.2 + 0.3 + 0.4 + 0.5 + 0.6 + 0.7 + 0.8 + 0.9 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> diff --git a/tools/testfiles/tattr2.ls b/tools/testfiles/tattr2.ls index 0448868..3c87360 100644 --- a/tools/testfiles/tattr2.ls +++ b/tools/testfiles/tattr2.ls @@ -1,37 +1,54 @@ -############################# - output for 'h5ls -w80 -v -S tattr2.h5' -############################# Opened "tattr2.h5" with sec2 driver. dset Dataset {2/2} - Attribute: array {2} + Attribute: array {2} Type: [3] 32-bit little-endian integer Data: [1,2,3], [4,5,6] - Attribute: array2D {3, 2} + Attribute: array2D {3, 2} Type: [3] 32-bit little-endian integer Data: - (0,0) [1,2,3], [4,5,6], [7,8,9], [10,11,12], [13,14,15], [16,17,18] - Attribute: array3D {4, 3, 2} + (0,0) [1,2,3], [4,5,6], + (1,0) [7,8,9], [10,11,12], + (2,0) [13,14,15], [16,17,18] + Attribute: array3D {4, 3, 2} Type: [3] 32-bit little-endian integer Data: - (0,0,0) [1,2,3], [4,5,6], [7,8,9], [10,11,12], [13,14,15], - (0,2,1) [16,17,18], [19,20,21], [22,23,24], [25,26,27], [28,29,30], - (1,2,0) [31,32,33], [34,35,36], [37,38,39], [40,41,42], [43,44,45], - (2,1,1) [46,47,48], [49,50,51], [52,53,54], [55,56,57], [58,59,60], - (3,1,0) [61,62,63], [64,65,66], [67,68,69], [70,71,72] - Attribute: bitfield {2} + (0,0,0) [1,2,3], [4,5,6], + (0,1,0) [7,8,9], [10,11,12], + (0,2,0) [13,14,15], [16,17,18], + (1,0,0) [19,20,21], [22,23,24], + (1,1,0) [25,26,27], [28,29,30], + (1,2,0) [31,32,33], [34,35,36], + (2,0,0) [37,38,39], [40,41,42], + (2,1,0) [43,44,45], [46,47,48], + (2,2,0) [49,50,51], [52,53,54], + (3,0,0) [55,56,57], [58,59,60], + (3,1,0) [61,62,63], [64,65,66], + (3,2,0) [67,68,69], [70,71,72] + Attribute: bitfield {2} Type: 8-bit bitfield Data: 0x01, 0x02 Attribute: bitfield2D {3, 2} Type: 8-bit bitfield Data: - (0,0) 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 + (0,0) 0x01, 0x02, + (1,0) 0x03, 0x04, + (2,0) 0x05, 0x06 Attribute: bitfield3D {4, 3, 2} Type: 8-bit bitfield Data: - (0,0,0) 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, - (1,2,0) 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, - (3,1,0) 0x15, 0x16, 0x17, 0x18 - Attribute: compound {2} + (0,0,0) 0x01, 0x02, + (0,1,0) 0x03, 0x04, + (0,2,0) 0x05, 0x06, + (1,0,0) 0x07, 0x08, + (1,1,0) 0x09, 0x0a, + (1,2,0) 0x0b, 0x0c, + (2,0,0) 0x0d, 0x0e, + (2,1,0) 0x0f, 0x10, + (2,2,0) 0x11, 0x12, + (3,0,0) 0x13, 0x14, + (3,1,0) 0x15, 0x16, + (3,2,0) 0x17, 0x18 + Attribute: compound {2} Type: struct { "a" +0 8-bit integer "b" +4 IEEE 64-bit little-endian float @@ -43,160 +60,264 @@ dset Dataset {2/2} "b" +4 IEEE 64-bit little-endian float } 12 bytes Data: - (0,0) {1, 2}, {3, 4}, {5, 6}, {7, 8}, {9, 10}, {11, 12} + (0,0) {1, 2}, {3, 4}, + (1,0) {5, 6}, {7, 8}, + (2,0) {9, 10}, {11, 12} Attribute: compound3D {4, 3, 2} Type: struct { "a" +0 8-bit integer "b" +4 IEEE 64-bit little-endian float } 12 bytes Data: - (0,0,0) {1, 2}, {3, 4}, {5, 6}, {7, 8}, {9, 10}, {11, 12}, {13, - (1,0,0) 14}, {15, 16}, {17, 18}, {19, 20}, {21, 22}, {23, 24}, - (2,0,0) {25, 26}, {27, 28}, {29, 30}, {31, 32}, {33, 34}, {35, 36}, - (3,0,0) {37, 38}, {39, 40}, {41, 42}, {43, 44}, {45, 46}, {47, 48} - Attribute: enum {2} + (0,0,0) {1, 2}, {3, 4}, + (0,1,0) {5, 6}, {7, 8}, + (0,2,0) {9, 10}, {11, 12}, + (1,0,0) {13, 14}, {15, 16}, + (1,1,0) {17, 18}, {19, 20}, + (1,2,0) {21, 22}, {23, 24}, + (2,0,0) {25, 26}, {27, 28}, + (2,1,0) {29, 30}, {31, 32}, + (2,2,0) {33, 34}, {35, 36}, + (3,0,0) {37, 38}, {39, 40}, + (3,1,0) {41, 42}, {43, 44}, + (3,2,0) {45, 46}, {47, 48} + Attribute: enum {2} Type: enum 32-bit little-endian integer { RED = 0 GREEN = 1 } Data: RED, RED - Attribute: enum2D {3, 2} + Attribute: enum2D {3, 2} Type: enum 32-bit little-endian integer { RED = 0 GREEN = 1 } Data: - (0,0) RED, RED, RED, RED, RED, RED - Attribute: enum3D {4, 3, 2} + (0,0) RED, RED, + (1,0) RED, RED, + (2,0) RED, RED + Attribute: enum3D {4, 3, 2} Type: enum 32-bit little-endian integer { RED = 0 GREEN = 1 } Data: - (0,0,0) RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, - (2,0,0) RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED - Attribute: float {2} + (0,0,0) RED, RED, + (0,1,0) RED, RED, + (0,2,0) RED, RED, + (1,0,0) RED, RED, + (1,1,0) RED, RED, + (1,2,0) RED, RED, + (2,0,0) RED, RED, + (2,1,0) RED, RED, + (2,2,0) RED, RED, + (3,0,0) RED, RED, + (3,1,0) RED, RED, + (3,2,0) RED, RED + Attribute: float {2} Type: IEEE 32-bit little-endian float Data: 1, 2 - Attribute: float2D {3, 2} + Attribute: float2D {3, 2} Type: IEEE 32-bit little-endian float Data: - (0,0) 1, 2, 3, 4, 5, 6 - Attribute: float3D {4, 3, 2} + (0,0) 1, 2, + (1,0) 3, 4, + (2,0) 5, 6 + Attribute: float3D {4, 3, 2} Type: IEEE 32-bit little-endian float Data: - (0,0,0) 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - (2,2,1) 18, 19, 20, 21, 22, 23, 24 - Attribute: integer {2} + (0,0,0) 1, 2, + (0,1,0) 3, 4, + (0,2,0) 5, 6, + (1,0,0) 7, 8, + (1,1,0) 9, 10, + (1,2,0) 11, 12, + (2,0,0) 13, 14, + (2,1,0) 15, 16, + (2,2,0) 17, 18, + (3,0,0) 19, 20, + (3,1,0) 21, 22, + (3,2,0) 23, 24 + Attribute: integer {2} Type: 32-bit little-endian integer Data: 1, 2 Attribute: integer2D {3, 2} Type: 32-bit little-endian integer Data: - (0,0) 1, 2, 3, 4, 5, 6 + (0,0) 1, 2, + (1,0) 3, 4, + (2,0) 5, 6 Attribute: integer3D {4, 3, 2} Type: 32-bit little-endian integer Data: - (0,0,0) 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - (2,2,1) 18, 19, 20, 21, 22, 23, 24 - Attribute: opaque {2} + (0,0,0) 1, 2, + (0,1,0) 3, 4, + (0,2,0) 5, 6, + (1,0,0) 7, 8, + (1,1,0) 9, 10, + (1,2,0) 11, 12, + (2,0,0) 13, 14, + (2,1,0) 15, 16, + (2,2,0) 17, 18, + (3,0,0) 19, 20, + (3,1,0) 21, 22, + (3,2,0) 23, 24 + Attribute: opaque {2} Type: 1-byte opaque type (tag = "1-byte opaque type") Data: 0x01, 0x02 - Attribute: opaque2D {3, 2} + Attribute: opaque2D {3, 2} Type: 1-byte opaque type (tag = "1-byte opaque type") Data: - (0,0) 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 - Attribute: opaque3D {4, 3, 2} + (0,0) 0x01, 0x02, + (1,0) 0x03, 0x04, + (2,0) 0x05, 0x06 + Attribute: opaque3D {4, 3, 2} Type: 1-byte opaque type (tag = "1-byte opaque type") Data: - (0,0,0) 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, - (1,2,0) 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, - (3,1,0) 0x15, 0x16, 0x17, 0x18 + (0,0,0) 0x01, 0x02, + (0,1,0) 0x03, 0x04, + (0,2,0) 0x05, 0x06, + (1,0,0) 0x07, 0x08, + (1,1,0) 0x09, 0x0a, + (1,2,0) 0x0b, 0x0c, + (2,0,0) 0x0d, 0x0e, + (2,1,0) 0x0f, 0x10, + (2,2,0) 0x11, 0x12, + (3,0,0) 0x13, 0x14, + (3,1,0) 0x15, 0x16, + (3,2,0) 0x17, 0x18 Attribute: reference {2} Type: object reference Data: DATASET-1:976, DATASET-1:976 Attribute: reference2D {3, 2} Type: object reference Data: - (0,0) DATASET-1:976, DATASET-1:976, DATASET-1:976, DATASET-1:976, + (0,0) DATASET-1:976, DATASET-1:976, + (1,0) DATASET-1:976, DATASET-1:976, (2,0) DATASET-1:976, DATASET-1:976 Attribute: reference3D {4, 3, 2} Type: object reference Data: - (0,0,0) DATASET-1:976, DATASET-1:976, DATASET-1:976, DATASET-1:976, - (0,2,0) DATASET-1:976, DATASET-1:976, DATASET-1:976, DATASET-1:976, - (1,1,0) DATASET-1:976, DATASET-1:976, DATASET-1:976, DATASET-1:976, - (2,0,0) DATASET-1:976, DATASET-1:976, DATASET-1:976, DATASET-1:976, - (2,2,0) DATASET-1:976, DATASET-1:976, DATASET-1:976, DATASET-1:976, - (3,1,0) DATASET-1:976, DATASET-1:976, DATASET-1:976, DATASET-1:976 - Attribute: string {2} + (0,0,0) DATASET-1:976, DATASET-1:976, + (0,1,0) DATASET-1:976, DATASET-1:976, + (0,2,0) DATASET-1:976, DATASET-1:976, + (1,0,0) DATASET-1:976, DATASET-1:976, + (1,1,0) DATASET-1:976, DATASET-1:976, + (1,2,0) DATASET-1:976, DATASET-1:976, + (2,0,0) DATASET-1:976, DATASET-1:976, + (2,1,0) DATASET-1:976, DATASET-1:976, + (2,2,0) DATASET-1:976, DATASET-1:976, + (3,0,0) DATASET-1:976, DATASET-1:976, + (3,1,0) DATASET-1:976, DATASET-1:976, + (3,2,0) DATASET-1:976, DATASET-1:976 + Attribute: string {2} Type: 2-byte null-terminated ASCII string Data: "ab", "de" - Attribute: string2D {3, 2} + Attribute: string2D {3, 2} Type: 2-byte null-terminated ASCII string Data: - (0,0) "ab", "cd", "ef", "gh", "ij", "kl" - Attribute: string3D {4, 3, 2} + (0,0) "ab", "cd", + (1,0) "ef", "gh", + (2,0) "ij", "kl" + Attribute: string3D {4, 3, 2} Type: 2-byte null-terminated ASCII string Data: - (0,0,0) "ab", "cd", "ef", "gh", "ij", "kl", "mn", "pq", "rs", "tu", - (1,2,0) "vw", "xz", "AB", "CD", "EF", "GH", "IJ", "KL", "MN", "PQ", - (3,1,0) "RS", "TU", "VW", "XZ" - Attribute: vlen {2} + (0,0,0) "ab", "cd", + (0,1,0) "ef", "gh", + (0,2,0) "ij", "kl", + (1,0,0) "mn", "pq", + (1,1,0) "rs", "tu", + (1,2,0) "vw", "xz", + (2,0,0) "AB", "CD", + (2,1,0) "EF", "GH", + (2,2,0) "IJ", "KL", + (3,0,0) "MN", "PQ", + (3,1,0) "RS", "TU", + (3,2,0) "VW", "XZ" + Attribute: vlen {2} Type: variable length of 32-bit little-endian integer Data: (1), (2,3) - Attribute: vlen2D {3, 2} + Attribute: vlen2D {3, 2} Type: variable length of 32-bit little-endian integer Data: - (0,0) (0), (1), (2,3), (4,5), (6,7,8), (9,10,11) - Attribute: vlen3D {4, 3, 2} + (0,0) (0), (1), + (1,0) (2,3), (4,5), + (2,0) (6,7,8), (9,10,11) + Attribute: vlen3D {4, 3, 2} Type: variable length of 32-bit little-endian integer Data: - (0,0,0) (0), (1), (2), (3), (4), (5), (6,7), (8,9), (10,11), - (1,1,1) (12,13), (14,15), (16,17), (18,19,20), (21,22,23), - (2,1,0) (24,25,26), (27,28,29), (30,31,32), (33,34,35), - (3,0,0) (36,37,38,39), (40,41,42,43), (44,45,46,47), (48,49,50,51), + (0,0,0) (0), (1), + (0,1,0) (2), (3), + (0,2,0) (4), (5), + (1,0,0) (6,7), (8,9), + (1,1,0) (10,11), (12,13), + (1,2,0) (14,15), (16,17), + (2,0,0) (18,19,20), (21,22,23), + (2,1,0) (24,25,26), (27,28,29), + (2,2,0) (30,31,32), (33,34,35), + (3,0,0) (36,37,38,39), (40,41,42,43), + (3,1,0) (44,45,46,47), (48,49,50,51), (3,2,0) (52,53,54,55), (56,57,58,59) Location: 1:976 Links: 1 Storage: 8 logical bytes, 0 allocated bytes Type: 32-bit little-endian integer g1 Group - Attribute: array {2} + Attribute: array {2} Type: [3] 32-bit little-endian integer Data: [1,2,3], [4,5,6] - Attribute: array2D {3, 2} + Attribute: array2D {3, 2} Type: [3] 32-bit little-endian integer Data: - (0,0) [1,2,3], [4,5,6], [7,8,9], [10,11,12], [13,14,15], [16,17,18] - Attribute: array3D {4, 3, 2} + (0,0) [1,2,3], [4,5,6], + (1,0) [7,8,9], [10,11,12], + (2,0) [13,14,15], [16,17,18] + Attribute: array3D {4, 3, 2} Type: [3] 32-bit little-endian integer Data: - (0,0,0) [1,2,3], [4,5,6], [7,8,9], [10,11,12], [13,14,15], - (0,2,1) [16,17,18], [19,20,21], [22,23,24], [25,26,27], [28,29,30], - (1,2,0) [31,32,33], [34,35,36], [37,38,39], [40,41,42], [43,44,45], - (2,1,1) [46,47,48], [49,50,51], [52,53,54], [55,56,57], [58,59,60], - (3,1,0) [61,62,63], [64,65,66], [67,68,69], [70,71,72] - Attribute: bitfield {2} + (0,0,0) [1,2,3], [4,5,6], + (0,1,0) [7,8,9], [10,11,12], + (0,2,0) [13,14,15], [16,17,18], + (1,0,0) [19,20,21], [22,23,24], + (1,1,0) [25,26,27], [28,29,30], + (1,2,0) [31,32,33], [34,35,36], + (2,0,0) [37,38,39], [40,41,42], + (2,1,0) [43,44,45], [46,47,48], + (2,2,0) [49,50,51], [52,53,54], + (3,0,0) [55,56,57], [58,59,60], + (3,1,0) [61,62,63], [64,65,66], + (3,2,0) [67,68,69], [70,71,72] + Attribute: bitfield {2} Type: 8-bit bitfield Data: 0x01, 0x02 Attribute: bitfield2D {3, 2} Type: 8-bit bitfield Data: - (0,0) 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 + (0,0) 0x01, 0x02, + (1,0) 0x03, 0x04, + (2,0) 0x05, 0x06 Attribute: bitfield3D {4, 3, 2} Type: 8-bit bitfield Data: - (0,0,0) 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, - (1,2,0) 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, - (3,1,0) 0x15, 0x16, 0x17, 0x18 - Attribute: compound {2} + (0,0,0) 0x01, 0x02, + (0,1,0) 0x03, 0x04, + (0,2,0) 0x05, 0x06, + (1,0,0) 0x07, 0x08, + (1,1,0) 0x09, 0x0a, + (1,2,0) 0x0b, 0x0c, + (2,0,0) 0x0d, 0x0e, + (2,1,0) 0x0f, 0x10, + (2,2,0) 0x11, 0x12, + (3,0,0) 0x13, 0x14, + (3,1,0) 0x15, 0x16, + (3,2,0) 0x17, 0x18 + Attribute: compound {2} Type: struct { "a" +0 8-bit integer "b" +4 IEEE 64-bit little-endian float @@ -208,108 +329,185 @@ g1 Group "b" +4 IEEE 64-bit little-endian float } 12 bytes Data: - (0,0) {1, 2}, {3, 4}, {5, 6}, {7, 8}, {9, 10}, {11, 12} + (0,0) {1, 2}, {3, 4}, + (1,0) {5, 6}, {7, 8}, + (2,0) {9, 10}, {11, 12} Attribute: compound3D {4, 3, 2} Type: struct { "a" +0 8-bit integer "b" +4 IEEE 64-bit little-endian float } 12 bytes Data: - (0,0,0) {1, 2}, {3, 4}, {5, 6}, {7, 8}, {9, 10}, {11, 12}, {13, - (1,0,0) 14}, {15, 16}, {17, 18}, {19, 20}, {21, 22}, {23, 24}, - (2,0,0) {25, 26}, {27, 28}, {29, 30}, {31, 32}, {33, 34}, {35, 36}, - (3,0,0) {37, 38}, {39, 40}, {41, 42}, {43, 44}, {45, 46}, {47, 48} - Attribute: enum {2} + (0,0,0) {1, 2}, {3, 4}, + (0,1,0) {5, 6}, {7, 8}, + (0,2,0) {9, 10}, {11, 12}, + (1,0,0) {13, 14}, {15, 16}, + (1,1,0) {17, 18}, {19, 20}, + (1,2,0) {21, 22}, {23, 24}, + (2,0,0) {25, 26}, {27, 28}, + (2,1,0) {29, 30}, {31, 32}, + (2,2,0) {33, 34}, {35, 36}, + (3,0,0) {37, 38}, {39, 40}, + (3,1,0) {41, 42}, {43, 44}, + (3,2,0) {45, 46}, {47, 48} + Attribute: enum {2} Type: enum 32-bit little-endian integer { RED = 0 GREEN = 1 } Data: RED, RED - Attribute: enum2D {3, 2} + Attribute: enum2D {3, 2} Type: enum 32-bit little-endian integer { RED = 0 GREEN = 1 } Data: - (0,0) RED, RED, RED, RED, RED, RED - Attribute: enum3D {4, 3, 2} + (0,0) RED, RED, + (1,0) RED, RED, + (2,0) RED, RED + Attribute: enum3D {4, 3, 2} Type: enum 32-bit little-endian integer { RED = 0 GREEN = 1 } Data: - (0,0,0) RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, - (2,0,0) RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED - Attribute: float {2} + (0,0,0) RED, RED, + (0,1,0) RED, RED, + (0,2,0) RED, RED, + (1,0,0) RED, RED, + (1,1,0) RED, RED, + (1,2,0) RED, RED, + (2,0,0) RED, RED, + (2,1,0) RED, RED, + (2,2,0) RED, RED, + (3,0,0) RED, RED, + (3,1,0) RED, RED, + (3,2,0) RED, RED + Attribute: float {2} Type: IEEE 32-bit little-endian float Data: 1, 2 - Attribute: float2D {3, 2} + Attribute: float2D {3, 2} Type: IEEE 32-bit little-endian float Data: - (0,0) 1, 2, 3, 4, 5, 6 - Attribute: float3D {4, 3, 2} + (0,0) 1, 2, + (1,0) 3, 4, + (2,0) 5, 6 + Attribute: float3D {4, 3, 2} Type: IEEE 32-bit little-endian float Data: - (0,0,0) 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - (2,2,1) 18, 19, 20, 21, 22, 23, 24 - Attribute: integer {2} + (0,0,0) 1, 2, + (0,1,0) 3, 4, + (0,2,0) 5, 6, + (1,0,0) 7, 8, + (1,1,0) 9, 10, + (1,2,0) 11, 12, + (2,0,0) 13, 14, + (2,1,0) 15, 16, + (2,2,0) 17, 18, + (3,0,0) 19, 20, + (3,1,0) 21, 22, + (3,2,0) 23, 24 + Attribute: integer {2} Type: 32-bit little-endian integer Data: 1, 2 Attribute: integer2D {3, 2} Type: 32-bit little-endian integer Data: - (0,0) 1, 2, 3, 4, 5, 6 + (0,0) 1, 2, + (1,0) 3, 4, + (2,0) 5, 6 Attribute: integer3D {4, 3, 2} Type: 32-bit little-endian integer Data: - (0,0,0) 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - (2,2,1) 18, 19, 20, 21, 22, 23, 24 - Attribute: opaque {2} + (0,0,0) 1, 2, + (0,1,0) 3, 4, + (0,2,0) 5, 6, + (1,0,0) 7, 8, + (1,1,0) 9, 10, + (1,2,0) 11, 12, + (2,0,0) 13, 14, + (2,1,0) 15, 16, + (2,2,0) 17, 18, + (3,0,0) 19, 20, + (3,1,0) 21, 22, + (3,2,0) 23, 24 + Attribute: opaque {2} Type: 1-byte opaque type (tag = "1-byte opaque type") Data: 0x01, 0x02 - Attribute: opaque2D {3, 2} + Attribute: opaque2D {3, 2} Type: 1-byte opaque type (tag = "1-byte opaque type") Data: - (0,0) 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 - Attribute: opaque3D {4, 3, 2} + (0,0) 0x01, 0x02, + (1,0) 0x03, 0x04, + (2,0) 0x05, 0x06 + Attribute: opaque3D {4, 3, 2} Type: 1-byte opaque type (tag = "1-byte opaque type") Data: - (0,0,0) 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, - (1,2,0) 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, - (3,1,0) 0x15, 0x16, 0x17, 0x18 - Attribute: string {2} + (0,0,0) 0x01, 0x02, + (0,1,0) 0x03, 0x04, + (0,2,0) 0x05, 0x06, + (1,0,0) 0x07, 0x08, + (1,1,0) 0x09, 0x0a, + (1,2,0) 0x0b, 0x0c, + (2,0,0) 0x0d, 0x0e, + (2,1,0) 0x0f, 0x10, + (2,2,0) 0x11, 0x12, + (3,0,0) 0x13, 0x14, + (3,1,0) 0x15, 0x16, + (3,2,0) 0x17, 0x18 + Attribute: string {2} Type: 2-byte null-terminated ASCII string Data: "ab", "de" - Attribute: string2D {3, 2} + Attribute: string2D {3, 2} Type: 2-byte null-terminated ASCII string Data: - (0,0) "ab", "cd", "ef", "gh", "ij", "kl" - Attribute: string3D {4, 3, 2} + (0,0) "ab", "cd", + (1,0) "ef", "gh", + (2,0) "ij", "kl" + Attribute: string3D {4, 3, 2} Type: 2-byte null-terminated ASCII string Data: - (0,0,0) "ab", "cd", "ef", "gh", "ij", "kl", "mn", "pq", "rs", "tu", - (1,2,0) "vw", "xz", "AB", "CD", "EF", "GH", "IJ", "KL", "MN", "PQ", - (3,1,0) "RS", "TU", "VW", "XZ" - Attribute: vlen {2} + (0,0,0) "ab", "cd", + (0,1,0) "ef", "gh", + (0,2,0) "ij", "kl", + (1,0,0) "mn", "pq", + (1,1,0) "rs", "tu", + (1,2,0) "vw", "xz", + (2,0,0) "AB", "CD", + (2,1,0) "EF", "GH", + (2,2,0) "IJ", "KL", + (3,0,0) "MN", "PQ", + (3,1,0) "RS", "TU", + (3,2,0) "VW", "XZ" + Attribute: vlen {2} Type: variable length of 32-bit little-endian integer Data: (1), (2,3) - Attribute: vlen2D {3, 2} + Attribute: vlen2D {3, 2} Type: variable length of 32-bit little-endian integer Data: - (0,0) (0), (1), (2,3), (4,5), (6,7,8), (9,10,11) - Attribute: vlen3D {4, 3, 2} + (0,0) (0), (1), + (1,0) (2,3), (4,5), + (2,0) (6,7,8), (9,10,11) + Attribute: vlen3D {4, 3, 2} Type: variable length of 32-bit little-endian integer Data: - (0,0,0) (0), (1), (2), (3), (4), (5), (6,7), (8,9), (10,11), - (1,1,1) (12,13), (14,15), (16,17), (18,19,20), (21,22,23), - (2,1,0) (24,25,26), (27,28,29), (30,31,32), (33,34,35), - (3,0,0) (36,37,38,39), (40,41,42,43), (44,45,46,47), (48,49,50,51), + (0,0,0) (0), (1), + (0,1,0) (2), (3), + (0,2,0) (4), (5), + (1,0,0) (6,7), (8,9), + (1,1,0) (10,11), (12,13), + (1,2,0) (14,15), (16,17), + (2,0,0) (18,19,20), (21,22,23), + (2,1,0) (24,25,26), (27,28,29), + (2,2,0) (30,31,32), (33,34,35), + (3,0,0) (36,37,38,39), (40,41,42,43), + (3,1,0) (44,45,46,47), (48,49,50,51), (3,2,0) (52,53,54,55), (56,57,58,59) Location: 1:2176 Links: 1 diff --git a/tools/testfiles/tattr4_be.h5 b/tools/testfiles/tattr4_be.h5 Binary files differnew file mode 100644 index 0000000..a464ac6 --- /dev/null +++ b/tools/testfiles/tattr4_be.h5 diff --git a/tools/testfiles/tattrreg.ddl b/tools/testfiles/tattrreg.ddl index 989daf7..b47ab63 100644 --- a/tools/testfiles/tattrreg.ddl +++ b/tools/testfiles/tattrreg.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tattrreg.h5' -############################# HDF5 "tattrreg.h5" { GROUP "/" { DATASET "Dataset1" { diff --git a/tools/testfiles/tattrregR.ddl b/tools/testfiles/tattrregR.ddl index 6e399c0..1c661e4 100644 --- a/tools/testfiles/tattrregR.ddl +++ b/tools/testfiles/tattrregR.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -R tattrreg.h5' -############################# HDF5 "tattrreg.h5" { GROUP "/" { DATASET "Dataset1" { @@ -25,7 +22,7 @@ GROUP "/" { (7,2): 216, 219, 222, 225, 228, 231 (0): } (0): } - (1): DATASET /Dataset2 { + (1): DATASET /Dataset2 { (1): REGION_TYPE POINT (6,9), (2,2), (8,4), (1,6), (2,8), (1): (3,2), (0,4), (9,0), (7,1), (3,3) (1): DATATYPE H5T_STD_U8BE diff --git a/tools/testfiles/tattrreg_be.ls b/tools/testfiles/tattrreg_be.ls new file mode 100644 index 0000000..8307f35 --- /dev/null +++ b/tools/testfiles/tattrreg_be.ls @@ -0,0 +1,26 @@ +Opened "tattrreg.h5" with sec2 driver. +Dataset1 Dataset {NULL} + Attribute: Attribute1 {4} + Type: dataset region reference + Data: DSET-/Dataset2 {Blk0: (2,2)-(7,7)}, DSET-/Dataset2 {Pt0: (6,9), + Pt1: (2,2), Pt2: (8,4), Pt3: (1,6), Pt4: (2,8), Pt5: (3,2), + Pt6: (0,4), Pt7: (9,0), Pt8: (7,1), Pt9: (3,3)}, NULL, NULL + Location: 1:1400 + Links: 1 + Storage: 0 logical bytes, 0 allocated bytes + Type: 32-bit little-endian integer + Data: + +Dataset2 Dataset {10/10, 10/10} + Location: 1:800 + Links: 1 + Storage: 100 logical bytes, 100 allocated bytes, 100.00% utilization + Type: native unsigned char + Data: + (0,0) 0, 3, 6, 9, 12, 15, 18, 21, 24, 27, 30, 33, 36, 39, 42, 45, 48, + (1,7) 51, 54, 57, 60, 63, 66, 69, 72, 75, 78, 81, 84, 87, 90, 93, 96, + (3,3) 99, 102, 105, 108, 111, 114, 117, 120, 123, 126, 129, 132, 135, + (4,6) 138, 141, 144, 147, 150, 153, 156, 159, 162, 165, 168, 171, 174, + (5,9) 177, 180, 183, 186, 189, 192, 195, 198, 201, 204, 207, 210, 213, + (7,2) 216, 219, 222, 225, 228, 231, 234, 237, 240, 243, 246, 249, 252, + (8,5) 255, 2, 5, 8, 11, 14, 17, 20, 23, 26, 29, 32, 35, 38, 41 diff --git a/tools/testfiles/tattrreg_le.ls b/tools/testfiles/tattrreg_le.ls new file mode 100644 index 0000000..dd0be49 --- /dev/null +++ b/tools/testfiles/tattrreg_le.ls @@ -0,0 +1,26 @@ +Opened "tattrreg.h5" with sec2 driver. +Dataset1 Dataset {NULL} + Attribute: Attribute1 {4} + Type: dataset region reference + Data: DSET-/Dataset2 {Blk0: (2,2)-(7,7)}, DSET-/Dataset2 {Pt0: (6,9), + Pt1: (2,2), Pt2: (8,4), Pt3: (1,6), Pt4: (2,8), Pt5: (3,2), + Pt6: (0,4), Pt7: (9,0), Pt8: (7,1), Pt9: (3,3)}, NULL, NULL + Location: 1:1400 + Links: 1 + Storage: 0 logical bytes, 0 allocated bytes + Type: native int + Data: + +Dataset2 Dataset {10/10, 10/10} + Location: 1:800 + Links: 1 + Storage: 100 logical bytes, 100 allocated bytes, 100.00% utilization + Type: 8-bit unsigned integer + Data: + (0,0) 0, 3, 6, 9, 12, 15, 18, 21, 24, 27, 30, 33, 36, 39, 42, 45, 48, + (1,7) 51, 54, 57, 60, 63, 66, 69, 72, 75, 78, 81, 84, 87, 90, 93, 96, + (3,3) 99, 102, 105, 108, 111, 114, 117, 120, 123, 126, 129, 132, 135, + (4,6) 138, 141, 144, 147, 150, 153, 156, 159, 162, 165, 168, 171, 174, + (5,9) 177, 180, 183, 186, 189, 192, 195, 198, 201, 204, 207, 210, 213, + (7,2) 216, 219, 222, 225, 228, 231, 234, 237, 240, 243, 246, 249, 252, + (8,5) 255, 2, 5, 8, 11, 14, 17, 20, 23, 26, 29, 32, 35, 38, 41 diff --git a/tools/testfiles/tbigdims.ddl b/tools/testfiles/tbigdims.ddl index 21e2a43..13f2052 100644 --- a/tools/testfiles/tbigdims.ddl +++ b/tools/testfiles/tbigdims.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -d dset4gb -s 4294967284 -c 22 tbigdims.h5' -############################# HDF5 "tbigdims.h5" { DATASET "dset4gb" { DATATYPE H5T_STD_I8LE diff --git a/tools/testfiles/tbitfields.h5.xml b/tools/testfiles/tbitfields.h5.xml index 28da284..73365f0 100644 --- a/tools/testfiles/tbitfields.h5.xml +++ b/tools/testfiles/tbitfields.h5.xml @@ -1,17 +1,14 @@ -############################# -Expected output for 'h5dump --xml tbitfields.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Group Name="typetests" OBJ-XID="xid_1344" H5Path="/typetests" Parents="xid_696" H5ParentPaths="/" > <hdf5:Dataset Name="bitfield_1" OBJ-XID="xid_1720" H5Path= "/typetests/bitfield_1" Parents="xid_1344" H5ParentPaths="/typetests"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -26,9 +23,38 @@ Expected output for 'h5dump --xml tbitfields.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0xff 0xfe 0xfd 0xfc 0xfb 0xfa 0xf9 0xf8 0xf7 0xf6 0xf5 0xf4 0xf3 - 0xf2 0xf1 0xf0 0xef 0xee 0xed 0xec 0xeb 0xea 0xe9 0xe8 0xe7 0xe6 - 0xe5 0xe4 0xe3 0xe2 0xe1 0xe0 + 0xff + 0xfe + 0xfd + 0xfc + 0xfb + 0xfa + 0xf9 + 0xf8 + 0xf7 + 0xf6 + 0xf5 + 0xf4 + 0xf3 + 0xf2 + 0xf1 + 0xf0 + 0xef + 0xee + 0xed + 0xec + 0xeb + 0xea + 0xe9 + 0xe8 + 0xe7 + 0xe6 + 0xe5 + 0xe4 + 0xe3 + 0xe2 + 0xe1 + 0xe0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -36,9 +62,9 @@ Expected output for 'h5dump --xml tbitfields.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -53,8 +79,22 @@ Expected output for 'h5dump --xml tbitfields.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - ff:fe fd:fc fb:fa f9:f8 f7:f6 f5:f4 f3:f2 f1:f0 ef:ee ed:ec eb:ea - e9:e8 e7:e6 e5:e4 e3:e2 e1:e0 + ff:fe + fd:fc + fb:fa + f9:f8 + f7:f6 + f5:f4 + f3:f2 + f1:f0 + ef:ee + ed:ec + eb:ea + e9:e8 + e7:e6 + e5:e4 + e3:e2 + e1:e0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tboot1.ddl b/tools/testfiles/tboot1.ddl index 8ffffc0..4758948 100644 --- a/tools/testfiles/tboot1.ddl +++ b/tools/testfiles/tboot1.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -H -B -d dset tfcontents1.h5' -############################# HDF5 "tfcontents1.h5" { SUPER_BLOCK { SUPERBLOCK_VERSION 0 @@ -14,9 +11,9 @@ SUPER_BLOCK { ISTORE_K 32 FILE_SPACE_STRATEGY H5F_FILE_SPACE_ALL FREE_SPACE_THRESHOLD 1 -} -USER_BLOCK { - USERBLOCK_SIZE 0 + USER_BLOCK { + USERBLOCK_SIZE 0 + } } DATASET "dset" { DATATYPE H5T_STD_I32BE diff --git a/tools/testfiles/tboot2.ddl b/tools/testfiles/tboot2.ddl index 51250fe..d83b92b 100644 --- a/tools/testfiles/tboot2.ddl +++ b/tools/testfiles/tboot2.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -B tfcontents2.h5' -############################# HDF5 "tfcontents2.h5" { SUPER_BLOCK { SUPERBLOCK_VERSION 0 @@ -14,9 +11,9 @@ SUPER_BLOCK { ISTORE_K 32 FILE_SPACE_STRATEGY H5F_FILE_SPACE_ALL FREE_SPACE_THRESHOLD 1 -} -USER_BLOCK { - USERBLOCK_SIZE 0 + USER_BLOCK { + USERBLOCK_SIZE 0 + } } GROUP "/" { } diff --git a/tools/testfiles/tchar1.ddl b/tools/testfiles/tchar1.ddl index cc2d838..78acaf0 100644 --- a/tools/testfiles/tchar1.ddl +++ b/tools/testfiles/tchar1.ddl @@ -1,17 +1,14 @@ -############################# -Expected output for 'h5dump -r tchar.h5' -############################# HDF5 "tchar.h5" { GROUP "/" { DATASET "Dataset1" { DATATYPE H5T_STD_I8LE DATASPACE SIMPLE { ( 308 ) / ( 308 ) } DATA { - "Four score and seven years ago our forefathers brought forth on this " - "continent a new nation, conceived in liberty and dedicated to the pro" - "position that all men are created equal. Now we are engaged in a grea" - "t civil war, testing whether that nation or any nation so conceived a" - "nd so dedicated can long endure." + "Four score and seven years ago our forefathers brought forth on th" + "is continent a new nation, conceived in liberty and dedicated to t" + "he proposition that all men are created equal. Now we are engaged " + "in a great civil war, testing whether that nation or any nation so" + " conceived and so dedicated can long endure." } } } diff --git a/tools/testfiles/tchunked.ddl b/tools/testfiles/tchunked.ddl index ba18776..b68b233 100644 --- a/tools/testfiles/tchunked.ddl +++ b/tools/testfiles/tchunked.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -H -p -d chunked tfilters.h5' -############################# HDF5 "tfilters.h5" { DATASET "chunked" { COMMENT "This is a dataset with chunked storage" @@ -9,13 +6,13 @@ COMMENT "This is a dataset with chunked storage" STORAGE_LAYOUT { CHUNKED ( 10, 5 ) SIZE 800 - } + } FILTERS { NONE } FILLVALUE { FILL_TIME H5D_FILL_TIME_IFSET - VALUE 0 + VALUE 0 } ALLOCATION_TIME { H5D_ALLOC_TIME_INCR diff --git a/tools/testfiles/tcomp-1.ddl b/tools/testfiles/tcomp-1.ddl index 0c24dc9..f86ed16 100644 --- a/tools/testfiles/tcomp-1.ddl +++ b/tools/testfiles/tcomp-1.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tcompound.h5' -############################# HDF5 "tcompound.h5" { GROUP "/" { DATATYPE "#6632" H5T_COMPOUND { diff --git a/tools/testfiles/tcomp-1.ls b/tools/testfiles/tcomp-1.ls index 9cfb47d..a3969bd 100644 --- a/tools/testfiles/tcomp-1.ls +++ b/tools/testfiles/tcomp-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -d tcompound.h5' -############################# / Group /dset1 Dataset {5} Data: diff --git a/tools/testfiles/tcomp-2.ddl b/tools/testfiles/tcomp-2.ddl index 824c753..a733a3c 100644 --- a/tools/testfiles/tcomp-2.ddl +++ b/tools/testfiles/tcomp-2.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -t /type1 --datatype /type2 --datatype=/group1/type3 tcompound.h5' -############################# HDF5 "tcompound.h5" { DATATYPE "/type1" H5T_COMPOUND { H5T_STD_I32BE "int_name"; diff --git a/tools/testfiles/tcomp-3.ddl b/tools/testfiles/tcomp-3.ddl index 538aa08..0294220 100644 --- a/tools/testfiles/tcomp-3.ddl +++ b/tools/testfiles/tcomp-3.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -t /#6632 -g /group2 tcompound.h5' -############################# HDF5 "tcompound.h5" { DATATYPE "/#6632" H5T_COMPOUND { H5T_STD_I32BE "int"; diff --git a/tools/testfiles/tcomp-4.ddl b/tools/testfiles/tcomp-4.ddl index 32212f0..4ab5191 100644 --- a/tools/testfiles/tcomp-4.ddl +++ b/tools/testfiles/tcomp-4.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tcompound_complex.h5' -############################# HDF5 "tcompound_complex.h5" { GROUP "/" { DATASET "CompoundComplex" { diff --git a/tools/testfiles/tcompact.ddl b/tools/testfiles/tcompact.ddl index f970ce5..918e2eb 100644 --- a/tools/testfiles/tcompact.ddl +++ b/tools/testfiles/tcompact.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -H -p -d compact tfilters.h5' -############################# HDF5 "tfilters.h5" { DATASET "compact" { COMMENT "This is a dataset with compact storage" @@ -15,7 +12,7 @@ COMMENT "This is a dataset with compact storage" } FILLVALUE { FILL_TIME H5D_FILL_TIME_IFSET - VALUE 0 + VALUE 0 } ALLOCATION_TIME { H5D_ALLOC_TIME_EARLY diff --git a/tools/testfiles/tcompound.h5.xml b/tools/testfiles/tcompound.h5.xml index ed255e7..10ef36e 100644 --- a/tools/testfiles/tcompound.h5.xml +++ b/tools/testfiles/tcompound.h5.xml @@ -1,8 +1,5 @@ -############################# -Expected output for 'h5dump --xml tcompound.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:NamedDataType Name="#6632" OBJ-XID="xid_18446744073709551614" Parents="xid_696" H5ParentPaths="/"> <hdf5:DataType> @@ -28,9 +25,9 @@ Expected output for 'h5dump --xml tcompound.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -66,7 +63,11 @@ Expected output for 'h5dump --xml tcompound.h5' <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 0 0 1 1 1 0.5 2 4 0.333333 3 9 0.25 4 16 0.2 + 0 0 1 + 1 1 0.5 + 2 4 0.333333 + 3 9 0.25 + 4 16 0.2 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -75,9 +76,9 @@ Expected output for 'h5dump --xml tcompound.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -89,7 +90,11 @@ Expected output for 'h5dump --xml tcompound.h5' <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 0 0 1 1.1 2 2.2 3 3.3 4 4.4 + 0 0 + 1 1.1 + 2 2.2 + 3 3.3 + 4 4.4 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -97,9 +102,9 @@ Expected output for 'h5dump --xml tcompound.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -112,96 +117,24 @@ Expected output for 'h5dump --xml tcompound.h5' <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 0 1 2 3 1 2 3 4 5 6 - 2 3 4 5 6 7 - 3 4 5 6 7 8 - 4 5 6 7 8 9 - 5 6 7 8 9 10 - 1 2 3 4 2 3 4 5 6 7 - 3 4 5 6 7 8 - 4 5 6 7 8 9 - 5 6 7 8 9 10 - 6 7 8 9 10 11 - 2 3 4 5 3 4 5 6 7 8 - 4 5 6 7 8 9 - 5 6 7 8 9 10 - 6 7 8 9 10 11 - 7 8 9 10 11 12 - 3 4 5 6 4 5 6 7 8 9 - 5 6 7 8 9 10 - 6 7 8 9 10 11 - 7 8 9 10 11 12 - 8 9 10 11 12 13 - 4 5 6 7 5 6 7 8 9 10 - 6 7 8 9 10 11 - 7 8 9 10 11 12 - 8 9 10 11 12 13 - 9 10 11 12 13 14 - 5 6 7 8 6 7 8 9 10 11 - 7 8 9 10 11 12 - 8 9 10 11 12 13 - 9 10 11 12 13 14 - 10 11 12 13 14 15 - 1 2 3 4 2 3 4 5 6 7 - 3 4 5 6 7 8 - 4 5 6 7 8 9 - 5 6 7 8 9 10 - 6 7 8 9 10 11 - 2 3 4 5 3 4 5 6 7 8 - 4 5 6 7 8 9 - 5 6 7 8 9 10 - 6 7 8 9 10 11 - 7 8 9 10 11 12 - 3 4 5 6 4 5 6 7 8 9 - 5 6 7 8 9 10 - 6 7 8 9 10 11 - 7 8 9 10 11 12 - 8 9 10 11 12 13 - 4 5 6 7 5 6 7 8 9 10 - 6 7 8 9 10 11 - 7 8 9 10 11 12 - 8 9 10 11 12 13 - 9 10 11 12 13 14 - 5 6 7 8 6 7 8 9 10 11 - 7 8 9 10 11 12 - 8 9 10 11 12 13 - 9 10 11 12 13 14 - 10 11 12 13 14 15 - 6 7 8 9 7 8 9 10 11 12 - 8 9 10 11 12 13 - 9 10 11 12 13 14 - 10 11 12 13 14 15 - 11 12 13 14 15 16 - 2 3 4 5 3 4 5 6 7 8 - 4 5 6 7 8 9 - 5 6 7 8 9 10 - 6 7 8 9 10 11 - 7 8 9 10 11 12 - 3 4 5 6 4 5 6 7 8 9 - 5 6 7 8 9 10 - 6 7 8 9 10 11 - 7 8 9 10 11 12 - 8 9 10 11 12 13 - 4 5 6 7 5 6 7 8 9 10 - 6 7 8 9 10 11 - 7 8 9 10 11 12 - 8 9 10 11 12 13 - 9 10 11 12 13 14 - 5 6 7 8 6 7 8 9 10 11 - 7 8 9 10 11 12 - 8 9 10 11 12 13 - 9 10 11 12 13 14 - 10 11 12 13 14 15 - 6 7 8 9 7 8 9 10 11 12 - 8 9 10 11 12 13 - 9 10 11 12 13 14 - 10 11 12 13 14 15 - 11 12 13 14 15 16 - 7 8 9 10 8 9 10 11 12 13 - 9 10 11 12 13 14 - 10 11 12 13 14 15 - 11 12 13 14 15 16 - 12 13 14 15 16 17 + 0 1 2 3 1 2 3 4 5 6 2 3 4 5 6 7 3 4 5 6 7 8 4 5 6 7 8 9 5 6 7 8 9 10 + 1 2 3 4 2 3 4 5 6 7 3 4 5 6 7 8 4 5 6 7 8 9 5 6 7 8 9 10 6 7 8 9 10 11 + 2 3 4 5 3 4 5 6 7 8 4 5 6 7 8 9 5 6 7 8 9 10 6 7 8 9 10 11 7 8 9 10 11 12 + 3 4 5 6 4 5 6 7 8 9 5 6 7 8 9 10 6 7 8 9 10 11 7 8 9 10 11 12 8 9 10 11 12 13 + 4 5 6 7 5 6 7 8 9 10 6 7 8 9 10 11 7 8 9 10 11 12 8 9 10 11 12 13 9 10 11 12 13 14 + 5 6 7 8 6 7 8 9 10 11 7 8 9 10 11 12 8 9 10 11 12 13 9 10 11 12 13 14 10 11 12 13 14 15 + 1 2 3 4 2 3 4 5 6 7 3 4 5 6 7 8 4 5 6 7 8 9 5 6 7 8 9 10 6 7 8 9 10 11 + 2 3 4 5 3 4 5 6 7 8 4 5 6 7 8 9 5 6 7 8 9 10 6 7 8 9 10 11 7 8 9 10 11 12 + 3 4 5 6 4 5 6 7 8 9 5 6 7 8 9 10 6 7 8 9 10 11 7 8 9 10 11 12 8 9 10 11 12 13 + 4 5 6 7 5 6 7 8 9 10 6 7 8 9 10 11 7 8 9 10 11 12 8 9 10 11 12 13 9 10 11 12 13 14 + 5 6 7 8 6 7 8 9 10 11 7 8 9 10 11 12 8 9 10 11 12 13 9 10 11 12 13 14 10 11 12 13 14 15 + 6 7 8 9 7 8 9 10 11 12 8 9 10 11 12 13 9 10 11 12 13 14 10 11 12 13 14 15 11 12 13 14 15 16 + 2 3 4 5 3 4 5 6 7 8 4 5 6 7 8 9 5 6 7 8 9 10 6 7 8 9 10 11 7 8 9 10 11 12 + 3 4 5 6 4 5 6 7 8 9 5 6 7 8 9 10 6 7 8 9 10 11 7 8 9 10 11 12 8 9 10 11 12 13 + 4 5 6 7 5 6 7 8 9 10 6 7 8 9 10 11 7 8 9 10 11 12 8 9 10 11 12 13 9 10 11 12 13 14 + 5 6 7 8 6 7 8 9 10 11 7 8 9 10 11 12 8 9 10 11 12 13 9 10 11 12 13 14 10 11 12 13 14 15 + 6 7 8 9 7 8 9 10 11 12 8 9 10 11 12 13 9 10 11 12 13 14 10 11 12 13 14 15 11 12 13 14 15 16 + 7 8 9 10 8 9 10 11 12 13 9 10 11 12 13 14 10 11 12 13 14 15 11 12 13 14 15 16 12 13 14 15 16 17 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -209,9 +142,9 @@ Expected output for 'h5dump --xml tcompound.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -223,7 +156,11 @@ Expected output for 'h5dump --xml tcompound.h5' <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 0 3 1 4 2 5 3 6 4 7 + 0 3 + 1 4 + 2 5 + 3 6 + 4 7 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -253,9 +190,9 @@ Expected output for 'h5dump --xml tcompound.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -267,7 +204,11 @@ Expected output for 'h5dump --xml tcompound.h5' <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 0 0 1 0.1 2 0.2 3 0.3 4 0.4 + 0 0 + 1 0.1 + 2 0.2 + 3 0.3 + 4 0.4 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tcompound2.h5.xml b/tools/testfiles/tcompound2.h5.xml index 53e9312..ac139d9 100644 --- a/tools/testfiles/tcompound2.h5.xml +++ b/tools/testfiles/tcompound2.h5.xml @@ -1,8 +1,5 @@ -############################# -Expected output for 'h5dump --xml tcompound2.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:NamedDataType Name="#9560" OBJ-XID="xid_18446744073709551614" Parents="xid_696" H5ParentPaths="/"> <hdf5:DataType> @@ -34,7 +31,7 @@ Expected output for 'h5dump --xml tcompound2.h5' </hdf5:StorageLayout> <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Incremental"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -70,7 +67,12 @@ Expected output for 'h5dump --xml tcompound2.h5' <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 0 0 1 1 1 0.5 2 4 0.333333 3 9 0.25 4 16 0.2 5 25 0.166667 + 0 0 1 + 1 1 0.5 + 2 4 0.333333 + 3 9 0.25 + 4 16 0.2 + 5 25 0.166667 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -85,7 +87,7 @@ Expected output for 'h5dump --xml tcompound2.h5' </hdf5:StorageLayout> <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Incremental"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -97,7 +99,12 @@ Expected output for 'h5dump --xml tcompound2.h5' <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 0 0 1 1.1 2 2.2 3 3.3 4 4.4 5 5.5 + 0 0 + 1 1.1 + 2 2.2 + 3 3.3 + 4 4.4 + 5 5.5 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -111,7 +118,7 @@ Expected output for 'h5dump --xml tcompound2.h5' </hdf5:StorageLayout> <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Incremental"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -123,7 +130,12 @@ Expected output for 'h5dump --xml tcompound2.h5' <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 0 0 1 1 2 2 3 3 4 4 5 5 + 0 0 + 1 1 + 2 2 + 3 3 + 4 4 + 5 5 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -159,7 +171,7 @@ Expected output for 'h5dump --xml tcompound2.h5' </hdf5:StorageLayout> <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Incremental"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -171,7 +183,12 @@ Expected output for 'h5dump --xml tcompound2.h5' <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 0 0 1 1 2 2 3 3 4 4 5 5 + 0 0 + 1 1 + 2 2 + 3 3 + 4 4 + 5 5 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tcompound_complex.h5.xml b/tools/testfiles/tcompound_complex.h5.xml index 99c1bff..b35193a 100644 --- a/tools/testfiles/tcompound_complex.h5.xml +++ b/tools/testfiles/tcompound_complex.h5.xml @@ -1,19 +1,16 @@ -############################# -Expected output for 'h5dump --xml tcompound_complex.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> <hdf5:Dataset Name="CompoundComplex" OBJ-XID="xid_976" H5Path= "/CompoundComplex" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillOnAlloc" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillOnAlloc" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:Data> - <!-- Compound fill not yet implemented. --> - <hdf5:NoData /> - </hdf5:Data> + <hdf5:Data> + <!-- Compound fill not yet implemented. --> + <hdf5:NoData /> + </hdf5:Data> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -93,36 +90,12 @@ Expected output for 'h5dump --xml tcompound_complex.h5' <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 0 "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." " -- Professor Cheng Man-ch'ing" "Hello!" 0 1 2 3 4 5 - 1 2 3 4 5 6 - 2 3 4 5 6 7 - 3 4 5 6 7 8 - 4 5 6 7 8 9 0 0 0 0 0 0 0 0 0 0 0 109 - 1 "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." " -- Professor Cheng Man-ch'ing" "Hello!" 1 2 3 4 5 6 - 2 3 4 5 6 7 - 3 4 5 6 7 8 - 4 5 6 7 8 9 - 5 6 7 8 9 10 0.96 1024.96 1024.96 1024.96 1024.96 1024.96 1024.96 1024.96 1024.96 1024.96 1024.96 109 - 2 "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." " -- Professor Cheng Man-ch'ing" "Hello!" 2 3 4 5 6 7 - 3 4 5 6 7 8 - 4 5 6 7 8 9 - 5 6 7 8 9 10 - 6 7 8 9 10 11 1.92 2049.93 2049.93 2049.93 2049.93 2049.93 2049.93 2049.93 2049.93 2049.93 2049.93 109 - 3 "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." " -- Professor Cheng Man-ch'ing" "Hello!" 3 4 5 6 7 8 - 4 5 6 7 8 9 - 5 6 7 8 9 10 - 6 7 8 9 10 11 - 7 8 9 10 11 12 2.88 3074.89 3074.89 3074.89 3074.89 3074.89 3074.89 3074.89 3074.89 3074.89 3074.89 109 - 4 "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." " -- Professor Cheng Man-ch'ing" "Hello!" 4 5 6 7 8 9 - 5 6 7 8 9 10 - 6 7 8 9 10 11 - 7 8 9 10 11 12 - 8 9 10 11 12 13 3.84 4099.85 4099.85 4099.85 4099.85 4099.85 4099.85 4099.85 4099.85 4099.85 4099.85 109 - 5 "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." " -- Professor Cheng Man-ch'ing" "Hello!" 5 6 7 8 9 10 - 6 7 8 9 10 11 - 7 8 9 10 11 12 - 8 9 10 11 12 13 - 9 10 11 12 13 14 4.8 5124.82 5124.82 5124.82 5124.82 5124.82 5124.82 5124.82 5124.82 5124.82 5124.82 109 + 0 "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." " -- Professor Cheng Man-ch'ing" "Hello!" 0 1 2 3 4 5 1 2 3 4 5 6 2 3 4 5 6 7 3 4 5 6 7 8 4 5 6 7 8 9 0 0 0 0 0 0 0 0 0 0 0 109 + 1 "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." " -- Professor Cheng Man-ch'ing" "Hello!" 1 2 3 4 5 6 2 3 4 5 6 7 3 4 5 6 7 8 4 5 6 7 8 9 5 6 7 8 9 10 0.96 1024.96 1024.96 1024.96 1024.96 1024.96 1024.96 1024.96 1024.96 1024.96 1024.96 109 + 2 "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." " -- Professor Cheng Man-ch'ing" "Hello!" 2 3 4 5 6 7 3 4 5 6 7 8 4 5 6 7 8 9 5 6 7 8 9 10 6 7 8 9 10 11 1.92 2049.93 2049.93 2049.93 2049.93 2049.93 2049.93 2049.93 2049.93 2049.93 2049.93 109 + 3 "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." " -- Professor Cheng Man-ch'ing" "Hello!" 3 4 5 6 7 8 4 5 6 7 8 9 5 6 7 8 9 10 6 7 8 9 10 11 7 8 9 10 11 12 2.88 3074.89 3074.89 3074.89 3074.89 3074.89 3074.89 3074.89 3074.89 3074.89 3074.89 109 + 4 "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." " -- Professor Cheng Man-ch'ing" "Hello!" 4 5 6 7 8 9 5 6 7 8 9 10 6 7 8 9 10 11 7 8 9 10 11 12 8 9 10 11 12 13 3.84 4099.85 4099.85 4099.85 4099.85 4099.85 4099.85 4099.85 4099.85 4099.85 4099.85 109 + 5 "A fight is a contract that takes two people to honor." "A combative stance means that you've accepted the contract." "In which case, you deserve what you get." " -- Professor Cheng Man-ch'ing" "Hello!" 5 6 7 8 9 10 6 7 8 9 10 11 7 8 9 10 11 12 8 9 10 11 12 13 9 10 11 12 13 14 4.8 5124.82 5124.82 5124.82 5124.82 5124.82 5124.82 5124.82 5124.82 5124.82 5124.82 109 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tcontents.ddl b/tools/testfiles/tcontents.ddl index 2bb59b9..14e12d6 100644 --- a/tools/testfiles/tcontents.ddl +++ b/tools/testfiles/tcontents.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -n tfcontents1.h5' -############################# HDF5 "tfcontents1.h5" { FILE_CONTENTS { datatype /#5616 diff --git a/tools/testfiles/tcontiguos.ddl b/tools/testfiles/tcontiguos.ddl index 2828f8c..bda7ef7 100644 --- a/tools/testfiles/tcontiguos.ddl +++ b/tools/testfiles/tcontiguos.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -H -p -d contiguous tfilters.h5' -############################# HDF5 "tfilters.h5" { DATASET "contiguous" { COMMENT "This is a dataset with contiguous storage" @@ -16,7 +13,7 @@ COMMENT "This is a dataset with contiguous storage" } FILLVALUE { FILL_TIME H5D_FILL_TIME_IFSET - VALUE 0 + VALUE 0 } ALLOCATION_TIME { H5D_ALLOC_TIME_LATE diff --git a/tools/testfiles/tdatareg.ddl b/tools/testfiles/tdatareg.ddl index d68401f..a3831f1 100644 --- a/tools/testfiles/tdatareg.ddl +++ b/tools/testfiles/tdatareg.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tdatareg.h5' -############################# HDF5 "tdatareg.h5" { GROUP "/" { DATASET "Dataset1" { diff --git a/tools/testfiles/tdatareg.h5.xml b/tools/testfiles/tdatareg.h5.xml index d7dfad8..327e213 100644 --- a/tools/testfiles/tdatareg.h5.xml +++ b/tools/testfiles/tdatareg.h5.xml @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump --xml tdatareg.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_1284" H5Path= "/Dataset1" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -34,9 +31,9 @@ Expected output for 'h5dump --xml tdatareg.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -52,16 +49,106 @@ Expected output for 'h5dump --xml tdatareg.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 3 6 9 12 15 18 21 24 27 - 30 33 36 39 42 45 48 51 54 57 - 60 63 66 69 72 75 78 81 84 87 - 90 93 96 99 102 105 108 111 114 117 - 120 123 126 129 132 135 138 141 144 147 - 150 153 156 159 162 165 168 171 174 177 - 180 183 186 189 192 195 198 201 204 207 - 210 213 216 219 222 225 228 231 234 237 - 240 243 246 249 252 255 2 5 8 11 - 14 17 20 23 26 29 32 35 38 41 + 0 + 3 + 6 + 9 + 12 + 15 + 18 + 21 + 24 + 27 + 30 + 33 + 36 + 39 + 42 + 45 + 48 + 51 + 54 + 57 + 60 + 63 + 66 + 69 + 72 + 75 + 78 + 81 + 84 + 87 + 90 + 93 + 96 + 99 + 102 + 105 + 108 + 111 + 114 + 117 + 120 + 123 + 126 + 129 + 132 + 135 + 138 + 141 + 144 + 147 + 150 + 153 + 156 + 159 + 162 + 165 + 168 + 171 + 174 + 177 + 180 + 183 + 186 + 189 + 192 + 195 + 198 + 201 + 204 + 207 + 210 + 213 + 216 + 219 + 222 + 225 + 228 + 231 + 234 + 237 + 240 + 243 + 246 + 249 + 252 + 255 + 2 + 5 + 8 + 11 + 14 + 17 + 20 + 23 + 26 + 29 + 32 + 35 + 38 + 41 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tdataregR.ddl b/tools/testfiles/tdataregR.ddl index 2d962ed..aaac92c 100644 --- a/tools/testfiles/tdataregR.ddl +++ b/tools/testfiles/tdataregR.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -R tdatareg.h5' -############################# HDF5 "tdatareg.h5" { GROUP "/" { DATASET "Dataset1" { @@ -20,7 +17,7 @@ GROUP "/" { (7,2): 216, 219, 222, 225, 228, 231 (0): } (0): } - (1): DATASET /Dataset2 { + (1): DATASET /Dataset2 { (1): REGION_TYPE POINT (6,9), (2,2), (8,4), (1,6), (2,8), (3,2), (1): (0,4), (9,0), (7,1), (3,3) (1): DATATYPE H5T_STD_U8BE diff --git a/tools/testfiles/tdataregbe.ls b/tools/testfiles/tdataregbe.ls index 47b6994..b9dd8f2 100644 --- a/tools/testfiles/tdataregbe.ls +++ b/tools/testfiles/tdataregbe.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -v tdatareg.h5' -############################# Opened "tdatareg.h5" with sec2 driver. Dataset1 Dataset {4/4} Location: 1:1284 diff --git a/tools/testfiles/tdataregle.ls b/tools/testfiles/tdataregle.ls index b07b274..915f371 100644 --- a/tools/testfiles/tdataregle.ls +++ b/tools/testfiles/tdataregle.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -v tdatareg.h5' -############################# Opened "tdatareg.h5" with sec2 driver. Dataset1 Dataset {4/4} Location: 1:1284 diff --git a/tools/testfiles/tdeflate.ddl b/tools/testfiles/tdeflate.ddl index 7f658e7..5603911 100644 --- a/tools/testfiles/tdeflate.ddl +++ b/tools/testfiles/tdeflate.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -H -p -d deflate tfilters.h5' -############################# HDF5 "tfilters.h5" { DATASET "deflate" { DATATYPE H5T_STD_I32LE @@ -8,13 +5,13 @@ DATASET "deflate" { STORAGE_LAYOUT { CHUNKED ( 10, 5 ) SIZE 385 (2.078:1 COMPRESSION) - } + } FILTERS { COMPRESSION DEFLATE { LEVEL 9 } } FILLVALUE { FILL_TIME H5D_FILL_TIME_IFSET - VALUE 0 + VALUE 0 } ALLOCATION_TIME { H5D_ALLOC_TIME_INCR diff --git a/tools/testfiles/tdset-1.ddl b/tools/testfiles/tdset-1.ddl index 55d2a44..6b9b608 100644 --- a/tools/testfiles/tdset-1.ddl +++ b/tools/testfiles/tdset-1.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tdset.h5' -############################# HDF5 "tdset.h5" { GROUP "/" { DATASET "dset1" { diff --git a/tools/testfiles/tdset-1.ls b/tools/testfiles/tdset-1.ls index b6e4671..130c3ef 100644 --- a/tools/testfiles/tdset-1.ls +++ b/tools/testfiles/tdset-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -d tdset.h5' -############################# / Group /dset1 Dataset {10, 20} Data: diff --git a/tools/testfiles/tdset-2.ddl b/tools/testfiles/tdset-2.ddl index 93c961c..2034a43 100644 --- a/tools/testfiles/tdset-2.ddl +++ b/tools/testfiles/tdset-2.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -H -d dset1 -d /dset2 --dataset=dset3 tdset.h5' -############################# HDF5 "tdset.h5" { DATASET "dset1" { DATATYPE H5T_STD_I32BE @@ -10,7 +7,37 @@ DATASET "/dset2" { DATATYPE H5T_IEEE_F64BE DATASPACE SIMPLE { ( 30, 20 ) / ( 30, 20 ) } } -DATASET "dset3" { - } } -h5dump error: unable to open dataset "dset3" +HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): + #000: (file name) line (number) in H5Dopen2(): not found + major: Dataset + minor: Object not found + #001: (file name) line (number) in H5G_loc_find(): can't find object + major: Symbol table + minor: Object not found + #002: (file name) line (number) in H5G_traverse(): internal path traversal failed + major: Symbol table + minor: Object not found + #003: (file name) line (number) in H5G_traverse_real(): traversal operator failed + major: Symbol table + minor: Callback failed + #004: (file name) line (number) in H5G_loc_find_cb(): object 'dset3' doesn't exist + major: Symbol table + minor: Object not found +HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): + #000: (file name) line (number) in H5Lget_info(): unable to get link info + major: Symbol table + minor: Object not found + #001: (file name) line (number) in H5L_get_info(): name doesn't exist + major: Symbol table + minor: Object already exists + #002: (file name) line (number) in H5G_traverse(): internal path traversal failed + major: Symbol table + minor: Object not found + #003: (file name) line (number) in H5G_traverse_real(): traversal operator failed + major: Symbol table + minor: Callback failed + #004: (file name) line (number) in H5L_get_info_cb(): name doesn't exist + major: Symbol table + minor: Object not found +h5dump error: unable to get link info from "dset3" diff --git a/tools/testfiles/tdset-3s.ddl b/tools/testfiles/tdset-3s.ddl index 5963e90..93bdac8 100644 --- a/tools/testfiles/tdset-3s.ddl +++ b/tools/testfiles/tdset-3s.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -d /dset1[1,1;;;] tdset.h5' -############################# HDF5 "tdset.h5" { DATASET "/dset1" { DATATYPE H5T_STD_I32BE diff --git a/tools/testfiles/tdset.h5.xml b/tools/testfiles/tdset.h5.xml index 7aedaf5..e914bf6 100644 --- a/tools/testfiles/tdset.h5.xml +++ b/tools/testfiles/tdset.h5.xml @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump --xml tdset.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> <hdf5:Dataset Name="dset1" OBJ-XID="xid_976" H5Path= "/dset1" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -26,16 +23,206 @@ Expected output for 'h5dump --xml tdset.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 - 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 - 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 - 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 - 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 - 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 - 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 - 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 - 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 + 22 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 + 22 + 23 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 + 22 + 23 + 24 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 + 22 + 23 + 24 + 25 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 + 22 + 23 + 24 + 25 + 26 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 + 22 + 23 + 24 + 25 + 26 + 27 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 + 22 + 23 + 24 + 25 + 26 + 27 + 28 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -43,9 +230,9 @@ Expected output for 'h5dump --xml tdset.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -61,86 +248,606 @@ Expected output for 'h5dump --xml tdset.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0.0001 0.0002 0.0003 0.0004 0.0005 0.0006 0.0007 0.0008 0.0009 0.001 - 0.0011 0.0012 0.0013 0.0014 0.0015 0.0016 0.0017 0.0018 0.0019 - 1 1.0001 1.0002 1.0003 1.0004 1.0005 1.0006 1.0007 1.0008 1.0009 1.001 - 1.0011 1.0012 1.0013 1.0014 1.0015 1.0016 1.0017 1.0018 1.0019 - 2 2.0001 2.0002 2.0003 2.0004 2.0005 2.0006 2.0007 2.0008 2.0009 2.001 - 2.0011 2.0012 2.0013 2.0014 2.0015 2.0016 2.0017 2.0018 2.0019 - 3 3.0001 3.0002 3.0003 3.0004 3.0005 3.0006 3.0007 3.0008 3.0009 3.001 - 3.0011 3.0012 3.0013 3.0014 3.0015 3.0016 3.0017 3.0018 3.0019 - 4 4.0001 4.0002 4.0003 4.0004 4.0005 4.0006 4.0007 4.0008 4.0009 4.001 - 4.0011 4.0012 4.0013 4.0014 4.0015 4.0016 4.0017 4.0018 4.0019 - 5 5.0001 5.0002 5.0003 5.0004 5.0005 5.0006 5.0007 5.0008 5.0009 5.001 - 5.0011 5.0012 5.0013 5.0014 5.0015 5.0016 5.0017 5.0018 5.0019 - 6 6.0001 6.0002 6.0003 6.0004 6.0005 6.0006 6.0007 6.0008 6.0009 6.001 - 6.0011 6.0012 6.0013 6.0014 6.0015 6.0016 6.0017 6.0018 6.0019 - 7 7.0001 7.0002 7.0003 7.0004 7.0005 7.0006 7.0007 7.0008 7.0009 7.001 - 7.0011 7.0012 7.0013 7.0014 7.0015 7.0016 7.0017 7.0018 7.0019 - 8 8.0001 8.0002 8.0003 8.0004 8.0005 8.0006 8.0007 8.0008 8.0009 8.001 - 8.0011 8.0012 8.0013 8.0014 8.0015 8.0016 8.0017 8.0018 8.0019 - 9 9.0001 9.0002 9.0003 9.0004 9.0005 9.0006 9.0007 9.0008 9.0009 9.001 - 9.0011 9.0012 9.0013 9.0014 9.0015 9.0016 9.0017 9.0018 9.0019 - 10 10.0001 10.0002 10.0003 10.0004 10.0005 10.0006 10.0007 10.0008 - 10.0009 10.001 10.0011 10.0012 10.0013 10.0014 10.0015 10.0016 10.0017 - 10.0018 10.0019 - 11 11.0001 11.0002 11.0003 11.0004 11.0005 11.0006 11.0007 11.0008 - 11.0009 11.001 11.0011 11.0012 11.0013 11.0014 11.0015 11.0016 11.0017 - 11.0018 11.0019 - 12 12.0001 12.0002 12.0003 12.0004 12.0005 12.0006 12.0007 12.0008 - 12.0009 12.001 12.0011 12.0012 12.0013 12.0014 12.0015 12.0016 12.0017 - 12.0018 12.0019 - 13 13.0001 13.0002 13.0003 13.0004 13.0005 13.0006 13.0007 13.0008 - 13.0009 13.001 13.0011 13.0012 13.0013 13.0014 13.0015 13.0016 13.0017 - 13.0018 13.0019 - 14 14.0001 14.0002 14.0003 14.0004 14.0005 14.0006 14.0007 14.0008 - 14.0009 14.001 14.0011 14.0012 14.0013 14.0014 14.0015 14.0016 14.0017 - 14.0018 14.0019 - 15 15.0001 15.0002 15.0003 15.0004 15.0005 15.0006 15.0007 15.0008 - 15.0009 15.001 15.0011 15.0012 15.0013 15.0014 15.0015 15.0016 15.0017 - 15.0018 15.0019 - 16 16.0001 16.0002 16.0003 16.0004 16.0005 16.0006 16.0007 16.0008 - 16.0009 16.001 16.0011 16.0012 16.0013 16.0014 16.0015 16.0016 16.0017 - 16.0018 16.0019 - 17 17.0001 17.0002 17.0003 17.0004 17.0005 17.0006 17.0007 17.0008 - 17.0009 17.001 17.0011 17.0012 17.0013 17.0014 17.0015 17.0016 17.0017 - 17.0018 17.0019 - 18 18.0001 18.0002 18.0003 18.0004 18.0005 18.0006 18.0007 18.0008 - 18.0009 18.001 18.0011 18.0012 18.0013 18.0014 18.0015 18.0016 18.0017 - 18.0018 18.0019 - 19 19.0001 19.0002 19.0003 19.0004 19.0005 19.0006 19.0007 19.0008 - 19.0009 19.001 19.0011 19.0012 19.0013 19.0014 19.0015 19.0016 19.0017 - 19.0018 19.0019 - 20 20.0001 20.0002 20.0003 20.0004 20.0005 20.0006 20.0007 20.0008 - 20.0009 20.001 20.0011 20.0012 20.0013 20.0014 20.0015 20.0016 20.0017 - 20.0018 20.0019 - 21 21.0001 21.0002 21.0003 21.0004 21.0005 21.0006 21.0007 21.0008 - 21.0009 21.001 21.0011 21.0012 21.0013 21.0014 21.0015 21.0016 21.0017 - 21.0018 21.0019 - 22 22.0001 22.0002 22.0003 22.0004 22.0005 22.0006 22.0007 22.0008 - 22.0009 22.001 22.0011 22.0012 22.0013 22.0014 22.0015 22.0016 22.0017 - 22.0018 22.0019 - 23 23.0001 23.0002 23.0003 23.0004 23.0005 23.0006 23.0007 23.0008 - 23.0009 23.001 23.0011 23.0012 23.0013 23.0014 23.0015 23.0016 23.0017 - 23.0018 23.0019 - 24 24.0001 24.0002 24.0003 24.0004 24.0005 24.0006 24.0007 24.0008 - 24.0009 24.001 24.0011 24.0012 24.0013 24.0014 24.0015 24.0016 24.0017 - 24.0018 24.0019 - 25 25.0001 25.0002 25.0003 25.0004 25.0005 25.0006 25.0007 25.0008 - 25.0009 25.001 25.0011 25.0012 25.0013 25.0014 25.0015 25.0016 25.0017 - 25.0018 25.0019 - 26 26.0001 26.0002 26.0003 26.0004 26.0005 26.0006 26.0007 26.0008 - 26.0009 26.001 26.0011 26.0012 26.0013 26.0014 26.0015 26.0016 26.0017 - 26.0018 26.0019 - 27 27.0001 27.0002 27.0003 27.0004 27.0005 27.0006 27.0007 27.0008 - 27.0009 27.001 27.0011 27.0012 27.0013 27.0014 27.0015 27.0016 27.0017 - 27.0018 27.0019 - 28 28.0001 28.0002 28.0003 28.0004 28.0005 28.0006 28.0007 28.0008 - 28.0009 28.001 28.0011 28.0012 28.0013 28.0014 28.0015 28.0016 28.0017 - 28.0018 28.0019 - 29 29.0001 29.0002 29.0003 29.0004 29.0005 29.0006 29.0007 29.0008 - 29.0009 29.001 29.0011 29.0012 29.0013 29.0014 29.0015 29.0016 29.0017 - 29.0018 29.0019 + 0 + 0.0001 + 0.0002 + 0.0003 + 0.0004 + 0.0005 + 0.0006 + 0.0007 + 0.0008 + 0.0009 + 0.001 + 0.0011 + 0.0012 + 0.0013 + 0.0014 + 0.0015 + 0.0016 + 0.0017 + 0.0018 + 0.0019 + 1 + 1.0001 + 1.0002 + 1.0003 + 1.0004 + 1.0005 + 1.0006 + 1.0007 + 1.0008 + 1.0009 + 1.001 + 1.0011 + 1.0012 + 1.0013 + 1.0014 + 1.0015 + 1.0016 + 1.0017 + 1.0018 + 1.0019 + 2 + 2.0001 + 2.0002 + 2.0003 + 2.0004 + 2.0005 + 2.0006 + 2.0007 + 2.0008 + 2.0009 + 2.001 + 2.0011 + 2.0012 + 2.0013 + 2.0014 + 2.0015 + 2.0016 + 2.0017 + 2.0018 + 2.0019 + 3 + 3.0001 + 3.0002 + 3.0003 + 3.0004 + 3.0005 + 3.0006 + 3.0007 + 3.0008 + 3.0009 + 3.001 + 3.0011 + 3.0012 + 3.0013 + 3.0014 + 3.0015 + 3.0016 + 3.0017 + 3.0018 + 3.0019 + 4 + 4.0001 + 4.0002 + 4.0003 + 4.0004 + 4.0005 + 4.0006 + 4.0007 + 4.0008 + 4.0009 + 4.001 + 4.0011 + 4.0012 + 4.0013 + 4.0014 + 4.0015 + 4.0016 + 4.0017 + 4.0018 + 4.0019 + 5 + 5.0001 + 5.0002 + 5.0003 + 5.0004 + 5.0005 + 5.0006 + 5.0007 + 5.0008 + 5.0009 + 5.001 + 5.0011 + 5.0012 + 5.0013 + 5.0014 + 5.0015 + 5.0016 + 5.0017 + 5.0018 + 5.0019 + 6 + 6.0001 + 6.0002 + 6.0003 + 6.0004 + 6.0005 + 6.0006 + 6.0007 + 6.0008 + 6.0009 + 6.001 + 6.0011 + 6.0012 + 6.0013 + 6.0014 + 6.0015 + 6.0016 + 6.0017 + 6.0018 + 6.0019 + 7 + 7.0001 + 7.0002 + 7.0003 + 7.0004 + 7.0005 + 7.0006 + 7.0007 + 7.0008 + 7.0009 + 7.001 + 7.0011 + 7.0012 + 7.0013 + 7.0014 + 7.0015 + 7.0016 + 7.0017 + 7.0018 + 7.0019 + 8 + 8.0001 + 8.0002 + 8.0003 + 8.0004 + 8.0005 + 8.0006 + 8.0007 + 8.0008 + 8.0009 + 8.001 + 8.0011 + 8.0012 + 8.0013 + 8.0014 + 8.0015 + 8.0016 + 8.0017 + 8.0018 + 8.0019 + 9 + 9.0001 + 9.0002 + 9.0003 + 9.0004 + 9.0005 + 9.0006 + 9.0007 + 9.0008 + 9.0009 + 9.001 + 9.0011 + 9.0012 + 9.0013 + 9.0014 + 9.0015 + 9.0016 + 9.0017 + 9.0018 + 9.0019 + 10 + 10.0001 + 10.0002 + 10.0003 + 10.0004 + 10.0005 + 10.0006 + 10.0007 + 10.0008 + 10.0009 + 10.001 + 10.0011 + 10.0012 + 10.0013 + 10.0014 + 10.0015 + 10.0016 + 10.0017 + 10.0018 + 10.0019 + 11 + 11.0001 + 11.0002 + 11.0003 + 11.0004 + 11.0005 + 11.0006 + 11.0007 + 11.0008 + 11.0009 + 11.001 + 11.0011 + 11.0012 + 11.0013 + 11.0014 + 11.0015 + 11.0016 + 11.0017 + 11.0018 + 11.0019 + 12 + 12.0001 + 12.0002 + 12.0003 + 12.0004 + 12.0005 + 12.0006 + 12.0007 + 12.0008 + 12.0009 + 12.001 + 12.0011 + 12.0012 + 12.0013 + 12.0014 + 12.0015 + 12.0016 + 12.0017 + 12.0018 + 12.0019 + 13 + 13.0001 + 13.0002 + 13.0003 + 13.0004 + 13.0005 + 13.0006 + 13.0007 + 13.0008 + 13.0009 + 13.001 + 13.0011 + 13.0012 + 13.0013 + 13.0014 + 13.0015 + 13.0016 + 13.0017 + 13.0018 + 13.0019 + 14 + 14.0001 + 14.0002 + 14.0003 + 14.0004 + 14.0005 + 14.0006 + 14.0007 + 14.0008 + 14.0009 + 14.001 + 14.0011 + 14.0012 + 14.0013 + 14.0014 + 14.0015 + 14.0016 + 14.0017 + 14.0018 + 14.0019 + 15 + 15.0001 + 15.0002 + 15.0003 + 15.0004 + 15.0005 + 15.0006 + 15.0007 + 15.0008 + 15.0009 + 15.001 + 15.0011 + 15.0012 + 15.0013 + 15.0014 + 15.0015 + 15.0016 + 15.0017 + 15.0018 + 15.0019 + 16 + 16.0001 + 16.0002 + 16.0003 + 16.0004 + 16.0005 + 16.0006 + 16.0007 + 16.0008 + 16.0009 + 16.001 + 16.0011 + 16.0012 + 16.0013 + 16.0014 + 16.0015 + 16.0016 + 16.0017 + 16.0018 + 16.0019 + 17 + 17.0001 + 17.0002 + 17.0003 + 17.0004 + 17.0005 + 17.0006 + 17.0007 + 17.0008 + 17.0009 + 17.001 + 17.0011 + 17.0012 + 17.0013 + 17.0014 + 17.0015 + 17.0016 + 17.0017 + 17.0018 + 17.0019 + 18 + 18.0001 + 18.0002 + 18.0003 + 18.0004 + 18.0005 + 18.0006 + 18.0007 + 18.0008 + 18.0009 + 18.001 + 18.0011 + 18.0012 + 18.0013 + 18.0014 + 18.0015 + 18.0016 + 18.0017 + 18.0018 + 18.0019 + 19 + 19.0001 + 19.0002 + 19.0003 + 19.0004 + 19.0005 + 19.0006 + 19.0007 + 19.0008 + 19.0009 + 19.001 + 19.0011 + 19.0012 + 19.0013 + 19.0014 + 19.0015 + 19.0016 + 19.0017 + 19.0018 + 19.0019 + 20 + 20.0001 + 20.0002 + 20.0003 + 20.0004 + 20.0005 + 20.0006 + 20.0007 + 20.0008 + 20.0009 + 20.001 + 20.0011 + 20.0012 + 20.0013 + 20.0014 + 20.0015 + 20.0016 + 20.0017 + 20.0018 + 20.0019 + 21 + 21.0001 + 21.0002 + 21.0003 + 21.0004 + 21.0005 + 21.0006 + 21.0007 + 21.0008 + 21.0009 + 21.001 + 21.0011 + 21.0012 + 21.0013 + 21.0014 + 21.0015 + 21.0016 + 21.0017 + 21.0018 + 21.0019 + 22 + 22.0001 + 22.0002 + 22.0003 + 22.0004 + 22.0005 + 22.0006 + 22.0007 + 22.0008 + 22.0009 + 22.001 + 22.0011 + 22.0012 + 22.0013 + 22.0014 + 22.0015 + 22.0016 + 22.0017 + 22.0018 + 22.0019 + 23 + 23.0001 + 23.0002 + 23.0003 + 23.0004 + 23.0005 + 23.0006 + 23.0007 + 23.0008 + 23.0009 + 23.001 + 23.0011 + 23.0012 + 23.0013 + 23.0014 + 23.0015 + 23.0016 + 23.0017 + 23.0018 + 23.0019 + 24 + 24.0001 + 24.0002 + 24.0003 + 24.0004 + 24.0005 + 24.0006 + 24.0007 + 24.0008 + 24.0009 + 24.001 + 24.0011 + 24.0012 + 24.0013 + 24.0014 + 24.0015 + 24.0016 + 24.0017 + 24.0018 + 24.0019 + 25 + 25.0001 + 25.0002 + 25.0003 + 25.0004 + 25.0005 + 25.0006 + 25.0007 + 25.0008 + 25.0009 + 25.001 + 25.0011 + 25.0012 + 25.0013 + 25.0014 + 25.0015 + 25.0016 + 25.0017 + 25.0018 + 25.0019 + 26 + 26.0001 + 26.0002 + 26.0003 + 26.0004 + 26.0005 + 26.0006 + 26.0007 + 26.0008 + 26.0009 + 26.001 + 26.0011 + 26.0012 + 26.0013 + 26.0014 + 26.0015 + 26.0016 + 26.0017 + 26.0018 + 26.0019 + 27 + 27.0001 + 27.0002 + 27.0003 + 27.0004 + 27.0005 + 27.0006 + 27.0007 + 27.0008 + 27.0009 + 27.001 + 27.0011 + 27.0012 + 27.0013 + 27.0014 + 27.0015 + 27.0016 + 27.0017 + 27.0018 + 27.0019 + 28 + 28.0001 + 28.0002 + 28.0003 + 28.0004 + 28.0005 + 28.0006 + 28.0007 + 28.0008 + 28.0009 + 28.001 + 28.0011 + 28.0012 + 28.0013 + 28.0014 + 28.0015 + 28.0016 + 28.0017 + 28.0018 + 28.0019 + 29 + 29.0001 + 29.0002 + 29.0003 + 29.0004 + 29.0005 + 29.0006 + 29.0007 + 29.0008 + 29.0009 + 29.001 + 29.0011 + 29.0012 + 29.0013 + 29.0014 + 29.0015 + 29.0016 + 29.0017 + 29.0018 + 29.0019 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tdset2.h5.xml b/tools/testfiles/tdset2.h5.xml index 3bcaef0..34f43e1 100644 --- a/tools/testfiles/tdset2.h5.xml +++ b/tools/testfiles/tdset2.h5.xml @@ -1,8 +1,5 @@ -############################# -Expected output for 'h5dump --xml tdset2.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Dataset Name="dset1" OBJ-XID="xid_744" H5Path= "/dset1" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> @@ -15,7 +12,7 @@ Expected output for 'h5dump --xml tdset2.h5' </hdf5:StorageLayout> <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Incremental"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -31,16 +28,206 @@ Expected output for 'h5dump --xml tdset2.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -55,7 +242,7 @@ Expected output for 'h5dump --xml tdset2.h5' </hdf5:StorageLayout> <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Incremental"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -71,36 +258,306 @@ Expected output for 'h5dump --xml tdset2.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tdset_idx.ls b/tools/testfiles/tdset_idx.ls index 4e6f3b5..daa14b2 100644 --- a/tools/testfiles/tdset_idx.ls +++ b/tools/testfiles/tdset_idx.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -d tdset_idx.h5' -############################# dset_btree Dataset {20/200, 10/100} Data: (0,0) 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, diff --git a/tools/testfiles/tempty-dtd-2.h5.xml b/tools/testfiles/tempty-dtd-2.h5.xml index bf5a5d2..a9b1d4f 100644 --- a/tools/testfiles/tempty-dtd-2.h5.xml +++ b/tools/testfiles/tempty-dtd-2.h5.xml @@ -1,17 +1,14 @@ -############################# -Expected output for 'h5dump --xml -u tempty.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://www.hdfgroup.org/DTDs/HDF5-File.dtd"> +<!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.dtd"> <HDF5-File> <RootGroup OBJ-XID="xid_928" H5Path="/"> <Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -31,7 +28,10 @@ Expected output for 'h5dump --xml -u tempty.h5' <!-- Note: format of VL data not specified --> <Data> <DataFromFile> - + + + + </DataFromFile> </Data> </Dataset> @@ -39,9 +39,9 @@ Expected output for 'h5dump --xml -u tempty.h5' <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -56,7 +56,10 @@ Expected output for 'h5dump --xml -u tempty.h5' </DataType> <Data> <DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </DataFromFile> </Data> </Dataset> @@ -64,9 +67,9 @@ Expected output for 'h5dump --xml -u tempty.h5' <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -81,7 +84,10 @@ Expected output for 'h5dump --xml -u tempty.h5' </DataType> <Data> <DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </DataFromFile> </Data> </Dataset> @@ -89,9 +95,9 @@ Expected output for 'h5dump --xml -u tempty.h5' <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -111,7 +117,10 @@ Expected output for 'h5dump --xml -u tempty.h5' </DataType> <Data> <DataFromFile> - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 </DataFromFile> </Data> </Dataset> @@ -119,9 +128,9 @@ Expected output for 'h5dump --xml -u tempty.h5' <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -157,7 +166,10 @@ Expected output for 'h5dump --xml -u tempty.h5' <!-- Note: format of compound data not specified --> <Data> <DataFromFile> - 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 + 0 0 0 + 0 0 0 + 0 0 0 </DataFromFile> </Data> </Dataset> diff --git a/tools/testfiles/tempty-dtd-uri.h5.xml b/tools/testfiles/tempty-dtd-uri.h5.xml index 29c63bd..d3c5e81 100644 --- a/tools/testfiles/tempty-dtd-uri.h5.xml +++ b/tools/testfiles/tempty-dtd-uri.h5.xml @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump --xml --use-dtd --xml-dtd=http://somewhere.net tempty.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://somewhere.net"> <HDF5-File> @@ -9,9 +6,9 @@ Expected output for 'h5dump --xml --use-dtd --xml-dtd=http://somewhere.net tempt <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -31,7 +28,10 @@ Expected output for 'h5dump --xml --use-dtd --xml-dtd=http://somewhere.net tempt <!-- Note: format of VL data not specified --> <Data> <DataFromFile> - + + + + </DataFromFile> </Data> </Dataset> @@ -39,9 +39,9 @@ Expected output for 'h5dump --xml --use-dtd --xml-dtd=http://somewhere.net tempt <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -56,7 +56,10 @@ Expected output for 'h5dump --xml --use-dtd --xml-dtd=http://somewhere.net tempt </DataType> <Data> <DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </DataFromFile> </Data> </Dataset> @@ -64,9 +67,9 @@ Expected output for 'h5dump --xml --use-dtd --xml-dtd=http://somewhere.net tempt <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -81,7 +84,10 @@ Expected output for 'h5dump --xml --use-dtd --xml-dtd=http://somewhere.net tempt </DataType> <Data> <DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </DataFromFile> </Data> </Dataset> @@ -89,9 +95,9 @@ Expected output for 'h5dump --xml --use-dtd --xml-dtd=http://somewhere.net tempt <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -111,7 +117,10 @@ Expected output for 'h5dump --xml --use-dtd --xml-dtd=http://somewhere.net tempt </DataType> <Data> <DataFromFile> - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 </DataFromFile> </Data> </Dataset> @@ -119,9 +128,9 @@ Expected output for 'h5dump --xml --use-dtd --xml-dtd=http://somewhere.net tempt <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -157,7 +166,10 @@ Expected output for 'h5dump --xml --use-dtd --xml-dtd=http://somewhere.net tempt <!-- Note: format of compound data not specified --> <Data> <DataFromFile> - 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 + 0 0 0 + 0 0 0 + 0 0 0 </DataFromFile> </Data> </Dataset> diff --git a/tools/testfiles/tempty-dtd.h5.xml b/tools/testfiles/tempty-dtd.h5.xml index 8d15505..a9b1d4f 100644 --- a/tools/testfiles/tempty-dtd.h5.xml +++ b/tools/testfiles/tempty-dtd.h5.xml @@ -1,17 +1,14 @@ -############################# -Expected output for 'h5dump --xml --use-dtd tempty.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://www.hdfgroup.org/DTDs/HDF5-File.dtd"> +<!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.dtd"> <HDF5-File> <RootGroup OBJ-XID="xid_928" H5Path="/"> <Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -31,7 +28,10 @@ Expected output for 'h5dump --xml --use-dtd tempty.h5' <!-- Note: format of VL data not specified --> <Data> <DataFromFile> - + + + + </DataFromFile> </Data> </Dataset> @@ -39,9 +39,9 @@ Expected output for 'h5dump --xml --use-dtd tempty.h5' <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -56,7 +56,10 @@ Expected output for 'h5dump --xml --use-dtd tempty.h5' </DataType> <Data> <DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </DataFromFile> </Data> </Dataset> @@ -64,9 +67,9 @@ Expected output for 'h5dump --xml --use-dtd tempty.h5' <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -81,7 +84,10 @@ Expected output for 'h5dump --xml --use-dtd tempty.h5' </DataType> <Data> <DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </DataFromFile> </Data> </Dataset> @@ -89,9 +95,9 @@ Expected output for 'h5dump --xml --use-dtd tempty.h5' <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -111,7 +117,10 @@ Expected output for 'h5dump --xml --use-dtd tempty.h5' </DataType> <Data> <DataFromFile> - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 </DataFromFile> </Data> </Dataset> @@ -119,9 +128,9 @@ Expected output for 'h5dump --xml --use-dtd tempty.h5' <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -157,7 +166,10 @@ Expected output for 'h5dump --xml --use-dtd tempty.h5' <!-- Note: format of compound data not specified --> <Data> <DataFromFile> - 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 + 0 0 0 + 0 0 0 + 0 0 0 </DataFromFile> </Data> </Dataset> diff --git a/tools/testfiles/tempty-nons-2.h5.xml b/tools/testfiles/tempty-nons-2.h5.xml index c9dc971..219dbfd 100644 --- a/tools/testfiles/tempty-nons-2.h5.xml +++ b/tools/testfiles/tempty-nons-2.h5.xml @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump --xml --xml-ns=: tempty.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<HDF5-File xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<HDF5-File xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <RootGroup OBJ-XID="xid_928" H5Path="/"> <Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -30,7 +27,10 @@ Expected output for 'h5dump --xml --xml-ns=: tempty.h5' <!-- Note: format of VL data not specified --> <Data> <DataFromFile> - + + + + </DataFromFile> </Data> </Dataset> @@ -38,9 +38,9 @@ Expected output for 'h5dump --xml --xml-ns=: tempty.h5' <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -55,7 +55,10 @@ Expected output for 'h5dump --xml --xml-ns=: tempty.h5' </DataType> <Data> <DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </DataFromFile> </Data> </Dataset> @@ -63,9 +66,9 @@ Expected output for 'h5dump --xml --xml-ns=: tempty.h5' <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -80,7 +83,10 @@ Expected output for 'h5dump --xml --xml-ns=: tempty.h5' </DataType> <Data> <DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </DataFromFile> </Data> </Dataset> @@ -88,9 +94,9 @@ Expected output for 'h5dump --xml --xml-ns=: tempty.h5' <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -110,7 +116,10 @@ Expected output for 'h5dump --xml --xml-ns=: tempty.h5' </DataType> <Data> <DataFromFile> - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 </DataFromFile> </Data> </Dataset> @@ -118,9 +127,9 @@ Expected output for 'h5dump --xml --xml-ns=: tempty.h5' <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -156,7 +165,10 @@ Expected output for 'h5dump --xml --xml-ns=: tempty.h5' <!-- Note: format of compound data not specified --> <Data> <DataFromFile> - 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 + 0 0 0 + 0 0 0 + 0 0 0 </DataFromFile> </Data> </Dataset> diff --git a/tools/testfiles/tempty-nons-uri.h5.xml b/tools/testfiles/tempty-nons-uri.h5.xml index 05471e1..032de41 100644 --- a/tools/testfiles/tempty-nons-uri.h5.xml +++ b/tools/testfiles/tempty-nons-uri.h5.xml @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump --xml --xml-ns=: --xml-dtd=http://somewhere.net tempty.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> <HDF5-File xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://somewhere.net"> <RootGroup OBJ-XID="xid_928" H5Path="/"> @@ -8,9 +5,9 @@ Expected output for 'h5dump --xml --xml-ns=: --xml-dtd=http://somewhere.net temp <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -30,7 +27,10 @@ Expected output for 'h5dump --xml --xml-ns=: --xml-dtd=http://somewhere.net temp <!-- Note: format of VL data not specified --> <Data> <DataFromFile> - + + + + </DataFromFile> </Data> </Dataset> @@ -38,9 +38,9 @@ Expected output for 'h5dump --xml --xml-ns=: --xml-dtd=http://somewhere.net temp <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -55,7 +55,10 @@ Expected output for 'h5dump --xml --xml-ns=: --xml-dtd=http://somewhere.net temp </DataType> <Data> <DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </DataFromFile> </Data> </Dataset> @@ -63,9 +66,9 @@ Expected output for 'h5dump --xml --xml-ns=: --xml-dtd=http://somewhere.net temp <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -80,7 +83,10 @@ Expected output for 'h5dump --xml --xml-ns=: --xml-dtd=http://somewhere.net temp </DataType> <Data> <DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </DataFromFile> </Data> </Dataset> @@ -88,9 +94,9 @@ Expected output for 'h5dump --xml --xml-ns=: --xml-dtd=http://somewhere.net temp <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -110,7 +116,10 @@ Expected output for 'h5dump --xml --xml-ns=: --xml-dtd=http://somewhere.net temp </DataType> <Data> <DataFromFile> - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 </DataFromFile> </Data> </Dataset> @@ -118,9 +127,9 @@ Expected output for 'h5dump --xml --xml-ns=: --xml-dtd=http://somewhere.net temp <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -156,7 +165,10 @@ Expected output for 'h5dump --xml --xml-ns=: --xml-dtd=http://somewhere.net temp <!-- Note: format of compound data not specified --> <Data> <DataFromFile> - 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 + 0 0 0 + 0 0 0 + 0 0 0 </DataFromFile> </Data> </Dataset> diff --git a/tools/testfiles/tempty-nons.h5.xml b/tools/testfiles/tempty-nons.h5.xml index 25536d9..219dbfd 100644 --- a/tools/testfiles/tempty-nons.h5.xml +++ b/tools/testfiles/tempty-nons.h5.xml @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump --xml -X : tempty.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<HDF5-File xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<HDF5-File xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <RootGroup OBJ-XID="xid_928" H5Path="/"> <Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -30,7 +27,10 @@ Expected output for 'h5dump --xml -X : tempty.h5' <!-- Note: format of VL data not specified --> <Data> <DataFromFile> - + + + + </DataFromFile> </Data> </Dataset> @@ -38,9 +38,9 @@ Expected output for 'h5dump --xml -X : tempty.h5' <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -55,7 +55,10 @@ Expected output for 'h5dump --xml -X : tempty.h5' </DataType> <Data> <DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </DataFromFile> </Data> </Dataset> @@ -63,9 +66,9 @@ Expected output for 'h5dump --xml -X : tempty.h5' <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -80,7 +83,10 @@ Expected output for 'h5dump --xml -X : tempty.h5' </DataType> <Data> <DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </DataFromFile> </Data> </Dataset> @@ -88,9 +94,9 @@ Expected output for 'h5dump --xml -X : tempty.h5' <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -110,7 +116,10 @@ Expected output for 'h5dump --xml -X : tempty.h5' </DataType> <Data> <DataFromFile> - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 </DataFromFile> </Data> </Dataset> @@ -118,9 +127,9 @@ Expected output for 'h5dump --xml -X : tempty.h5' <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -156,7 +165,10 @@ Expected output for 'h5dump --xml -X : tempty.h5' <!-- Note: format of compound data not specified --> <Data> <DataFromFile> - 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 + 0 0 0 + 0 0 0 + 0 0 0 </DataFromFile> </Data> </Dataset> diff --git a/tools/testfiles/tempty-ns-2.h5.xml b/tools/testfiles/tempty-ns-2.h5.xml index 4851e5c..3476b60 100644 --- a/tools/testfiles/tempty-ns-2.h5.xml +++ b/tools/testfiles/tempty-ns-2.h5.xml @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump --xml --xml-ns=thing: tempty.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<thing:HDF5-File xmlns:thing="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<thing:HDF5-File xmlns:thing="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <thing:RootGroup OBJ-XID="xid_928" H5Path="/"> <thing:Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/"> <thing:StorageLayout> <thing:ContiguousLayout/> </thing:StorageLayout> - <thing:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <thing:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <thing:FillValue> - <thing:NoFill/> + <thing:NoFill/> </thing:FillValue> </thing:FillValueInfo> <thing:Dataspace> @@ -30,7 +27,10 @@ Expected output for 'h5dump --xml --xml-ns=thing: tempty.h5' <!-- Note: format of VL data not specified --> <thing:Data> <thing:DataFromFile> - + + + + </thing:DataFromFile> </thing:Data> </thing:Dataset> @@ -38,9 +38,9 @@ Expected output for 'h5dump --xml --xml-ns=thing: tempty.h5' <thing:StorageLayout> <thing:ContiguousLayout/> </thing:StorageLayout> - <thing:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <thing:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <thing:FillValue> - <thing:NoFill/> + <thing:NoFill/> </thing:FillValue> </thing:FillValueInfo> <thing:Dataspace> @@ -55,7 +55,10 @@ Expected output for 'h5dump --xml --xml-ns=thing: tempty.h5' </thing:DataType> <thing:Data> <thing:DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </thing:DataFromFile> </thing:Data> </thing:Dataset> @@ -63,9 +66,9 @@ Expected output for 'h5dump --xml --xml-ns=thing: tempty.h5' <thing:StorageLayout> <thing:ContiguousLayout/> </thing:StorageLayout> - <thing:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <thing:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <thing:FillValue> - <thing:NoFill/> + <thing:NoFill/> </thing:FillValue> </thing:FillValueInfo> <thing:Dataspace> @@ -80,7 +83,10 @@ Expected output for 'h5dump --xml --xml-ns=thing: tempty.h5' </thing:DataType> <thing:Data> <thing:DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </thing:DataFromFile> </thing:Data> </thing:Dataset> @@ -88,9 +94,9 @@ Expected output for 'h5dump --xml --xml-ns=thing: tempty.h5' <thing:StorageLayout> <thing:ContiguousLayout/> </thing:StorageLayout> - <thing:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <thing:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <thing:FillValue> - <thing:NoFill/> + <thing:NoFill/> </thing:FillValue> </thing:FillValueInfo> <thing:Dataspace> @@ -110,7 +116,10 @@ Expected output for 'h5dump --xml --xml-ns=thing: tempty.h5' </thing:DataType> <thing:Data> <thing:DataFromFile> - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 </thing:DataFromFile> </thing:Data> </thing:Dataset> @@ -118,9 +127,9 @@ Expected output for 'h5dump --xml --xml-ns=thing: tempty.h5' <thing:StorageLayout> <thing:ContiguousLayout/> </thing:StorageLayout> - <thing:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <thing:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <thing:FillValue> - <thing:NoFill/> + <thing:NoFill/> </thing:FillValue> </thing:FillValueInfo> <thing:Dataspace> @@ -156,7 +165,10 @@ Expected output for 'h5dump --xml --xml-ns=thing: tempty.h5' <!-- Note: format of compound data not specified --> <thing:Data> <thing:DataFromFile> - 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 + 0 0 0 + 0 0 0 + 0 0 0 </thing:DataFromFile> </thing:Data> </thing:Dataset> diff --git a/tools/testfiles/tempty-ns.h5.xml b/tools/testfiles/tempty-ns.h5.xml index 01ae896..3476b60 100644 --- a/tools/testfiles/tempty-ns.h5.xml +++ b/tools/testfiles/tempty-ns.h5.xml @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump --xml -X thing: tempty.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<thing:HDF5-File xmlns:thing="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<thing:HDF5-File xmlns:thing="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <thing:RootGroup OBJ-XID="xid_928" H5Path="/"> <thing:Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/"> <thing:StorageLayout> <thing:ContiguousLayout/> </thing:StorageLayout> - <thing:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <thing:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <thing:FillValue> - <thing:NoFill/> + <thing:NoFill/> </thing:FillValue> </thing:FillValueInfo> <thing:Dataspace> @@ -30,7 +27,10 @@ Expected output for 'h5dump --xml -X thing: tempty.h5' <!-- Note: format of VL data not specified --> <thing:Data> <thing:DataFromFile> - + + + + </thing:DataFromFile> </thing:Data> </thing:Dataset> @@ -38,9 +38,9 @@ Expected output for 'h5dump --xml -X thing: tempty.h5' <thing:StorageLayout> <thing:ContiguousLayout/> </thing:StorageLayout> - <thing:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <thing:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <thing:FillValue> - <thing:NoFill/> + <thing:NoFill/> </thing:FillValue> </thing:FillValueInfo> <thing:Dataspace> @@ -55,7 +55,10 @@ Expected output for 'h5dump --xml -X thing: tempty.h5' </thing:DataType> <thing:Data> <thing:DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </thing:DataFromFile> </thing:Data> </thing:Dataset> @@ -63,9 +66,9 @@ Expected output for 'h5dump --xml -X thing: tempty.h5' <thing:StorageLayout> <thing:ContiguousLayout/> </thing:StorageLayout> - <thing:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <thing:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <thing:FillValue> - <thing:NoFill/> + <thing:NoFill/> </thing:FillValue> </thing:FillValueInfo> <thing:Dataspace> @@ -80,7 +83,10 @@ Expected output for 'h5dump --xml -X thing: tempty.h5' </thing:DataType> <thing:Data> <thing:DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </thing:DataFromFile> </thing:Data> </thing:Dataset> @@ -88,9 +94,9 @@ Expected output for 'h5dump --xml -X thing: tempty.h5' <thing:StorageLayout> <thing:ContiguousLayout/> </thing:StorageLayout> - <thing:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <thing:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <thing:FillValue> - <thing:NoFill/> + <thing:NoFill/> </thing:FillValue> </thing:FillValueInfo> <thing:Dataspace> @@ -110,7 +116,10 @@ Expected output for 'h5dump --xml -X thing: tempty.h5' </thing:DataType> <thing:Data> <thing:DataFromFile> - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 </thing:DataFromFile> </thing:Data> </thing:Dataset> @@ -118,9 +127,9 @@ Expected output for 'h5dump --xml -X thing: tempty.h5' <thing:StorageLayout> <thing:ContiguousLayout/> </thing:StorageLayout> - <thing:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <thing:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <thing:FillValue> - <thing:NoFill/> + <thing:NoFill/> </thing:FillValue> </thing:FillValueInfo> <thing:Dataspace> @@ -156,7 +165,10 @@ Expected output for 'h5dump --xml -X thing: tempty.h5' <!-- Note: format of compound data not specified --> <thing:Data> <thing:DataFromFile> - 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 + 0 0 0 + 0 0 0 + 0 0 0 </thing:DataFromFile> </thing:Data> </thing:Dataset> diff --git a/tools/testfiles/tempty.ddl b/tools/testfiles/tempty.ddl index d6eadd2..0c24334 100644 --- a/tools/testfiles/tempty.ddl +++ b/tools/testfiles/tempty.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tempty.h5' -############################# HDF5 "tempty.h5" { GROUP "/" { DATASET "Dataset1.0" { diff --git a/tools/testfiles/tempty.h5.xml b/tools/testfiles/tempty.h5.xml index 4ff8c95..d75bc70 100644 --- a/tools/testfiles/tempty.h5.xml +++ b/tools/testfiles/tempty.h5.xml @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump --xml tempty.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> <hdf5:Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -30,7 +27,10 @@ Expected output for 'h5dump --xml tempty.h5' <!-- Note: format of VL data not specified --> <hdf5:Data> <hdf5:DataFromFile> - + + + + </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -38,9 +38,9 @@ Expected output for 'h5dump --xml tempty.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -55,7 +55,10 @@ Expected output for 'h5dump --xml tempty.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -63,9 +66,9 @@ Expected output for 'h5dump --xml tempty.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -80,7 +83,10 @@ Expected output for 'h5dump --xml tempty.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -88,9 +94,9 @@ Expected output for 'h5dump --xml tempty.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -110,7 +116,10 @@ Expected output for 'h5dump --xml tempty.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -118,9 +127,9 @@ Expected output for 'h5dump --xml tempty.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -156,7 +165,10 @@ Expected output for 'h5dump --xml tempty.h5' <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 + 0 0 0 + 0 0 0 + 0 0 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tempty.ls b/tools/testfiles/tempty.ls index 96ea64a..38ecb55 100644 --- a/tools/testfiles/tempty.ls +++ b/tools/testfiles/tempty.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -d tempty.h5' -############################# Dataset1.0 Dataset {4} Data: (0) (), (), (), () diff --git a/tools/testfiles/tenum.h5.xml b/tools/testfiles/tenum.h5.xml index d8adc1b..ecc7804 100644 --- a/tools/testfiles/tenum.h5.xml +++ b/tools/testfiles/tenum.h5.xml @@ -1,8 +1,5 @@ -############################# -Expected output for 'h5dump --xml tenum.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> <hdf5:NamedDataType Name="enum normal" OBJ-XID="xid_976" H5Path="/enum normal" Parents="xid_928" H5ParentPaths="/"> <hdf5:DataType> @@ -52,9 +49,9 @@ green <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -65,10 +62,26 @@ green <hdf5:NamedDataTypePtr OBJ-XID="xid_976" H5Path="/enum normal" /> <hdf5:Data> <hdf5:DataFromFile> - RED GREEN\ngreen BLUE blue GREEN\ngreen WHITE \"white\" WHITE \"white\" - BLACK \'black\' GREEN\ngreen BLUE blue RED RED BLUE blue GREEN\ngreen - BLACK \'black\' WHITE \"white\" RED WHITE \"white\" GREEN\ngreen - GREEN\ngreen BLUE blue + RED + GREEN\ngreen + BLUE blue + GREEN\ngreen + WHITE \"white\" + WHITE \"white\" + BLACK \'black\' + GREEN\ngreen + BLUE blue + RED + RED + BLUE blue + GREEN\ngreen + BLACK \'black\' + WHITE \"white\" + RED + WHITE \"white\" + GREEN\ngreen + GREEN\ngreen + BLUE blue </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/texternal.ddl b/tools/testfiles/texternal.ddl index 21b3b7a..279831a 100644 --- a/tools/testfiles/texternal.ddl +++ b/tools/testfiles/texternal.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -H -p -d external tfilters.h5' -############################# HDF5 "tfilters.h5" { DATASET "external" { DATATYPE H5T_STD_I32LE @@ -17,7 +14,7 @@ DATASET "external" { } FILLVALUE { FILL_TIME H5D_FILL_TIME_IFSET - VALUE 0 + VALUE 0 } ALLOCATION_TIME { H5D_ALLOC_TIME_LATE diff --git a/tools/testfiles/textlink-1.ls b/tools/testfiles/textlink-1.ls index c159483..a49001f 100644 --- a/tools/testfiles/textlink-1.ls +++ b/tools/testfiles/textlink-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r textlink.h5' -############################# / Group /extlink1 External Link {filename//objname} /extlink2 External Link {anotherfile//anotherobj} diff --git a/tools/testfiles/textlink.ddl b/tools/testfiles/textlink.ddl index 0a43c47..4718adb 100644 --- a/tools/testfiles/textlink.ddl +++ b/tools/testfiles/textlink.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump textlink.h5' -############################# HDF5 "textlink.h5" { GROUP "/" { EXTERNAL_LINK "extlink1" { @@ -13,3 +10,53 @@ GROUP "/" { } } } +HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): + #000: (file name) line (number) in H5Oopen(): unable to open object + major: Symbol table + minor: Can't open object + #001: (file name) line (number) in H5O_open_name(): object not found + major: Symbol table + minor: Object not found + #002: (file name) line (number) in H5G_loc_find(): can't find object + major: Symbol table + minor: Object not found + #003: (file name) line (number) in H5G_traverse(): internal path traversal failed + major: Symbol table + minor: Object not found + #004: (file name) line (number) in H5G_traverse_real(): special link traversal failed + major: Links + minor: Link traversal failure + #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed + major: Links + minor: Link traversal failure + #006: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID + major: Symbol table + minor: Unable to find atom information (already closed?) + #007: (file name) line (number) in H5L_extern_traverse(): unable to open external file, external link file name = 'filename', temp_file_name = 'filename' + major: Links + minor: Unable to open file +HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): + #000: (file name) line (number) in H5Oopen(): unable to open object + major: Symbol table + minor: Can't open object + #001: (file name) line (number) in H5O_open_name(): object not found + major: Symbol table + minor: Object not found + #002: (file name) line (number) in H5G_loc_find(): can't find object + major: Symbol table + minor: Object not found + #003: (file name) line (number) in H5G_traverse(): internal path traversal failed + major: Symbol table + minor: Object not found + #004: (file name) line (number) in H5G_traverse_real(): special link traversal failed + major: Links + minor: Link traversal failure + #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed + major: Links + minor: Link traversal failure + #006: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID + major: Symbol table + minor: Unable to find atom information (already closed?) + #007: (file name) line (number) in H5L_extern_traverse(): unable to open external file, external link file name = 'anotherfile', temp_file_name = 'anotherfile' + major: Links + minor: Unable to open file diff --git a/tools/testfiles/textlink.h5.xml b/tools/testfiles/textlink.h5.xml index f6666a8..f6c7ff6 100644 --- a/tools/testfiles/textlink.h5.xml +++ b/tools/testfiles/textlink.h5.xml @@ -1,8 +1,5 @@ -############################# -Expected output for 'h5dump --xml textlink.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/"> <hdf5:ExternalLink LinkName="extlink1" OBJ-XID="xid_18446744073709551614" H5SourcePath="/extlink1" TargetFilename="filename" TargetPath="objname" Parents="xid_96" H5ParentPaths="/" /> <hdf5:ExternalLink LinkName="extlink2" OBJ-XID="xid_18446744073709551613" H5SourcePath="/extlink2" TargetFilename="anotherfile" TargetPath="anotherobj" Parents="xid_96" H5ParentPaths="/" /> diff --git a/tools/testfiles/textlinkfar.ddl b/tools/testfiles/textlinkfar.ddl index 4151710..32b2b49 100644 --- a/tools/testfiles/textlinkfar.ddl +++ b/tools/testfiles/textlinkfar.ddl @@ -1,12 +1,27 @@ -############################# -Expected output for 'h5dump textlinkfar.h5' -############################# HDF5 "textlinkfar.h5" { GROUP "/" { EXTERNAL_LINK "src_file" { TARGETFILE "textlinksrc.h5" TARGETPATH "/" GROUP "/" { + EXTERNAL_LINK "ext2soft_link1" { + TARGETFILE "tsoftlinks.h5" + TARGETPATH "/soft_dset1" + DATASET "/soft_dset1" { + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 4, 2 ) / ( 4, 2 ) } + DATA { + (0,0): 0, 0, + (1,0): 1, 1, + (2,0): 2, 2, + (3,0): 3, 3 + } + } + } + EXTERNAL_LINK "ext2softdangle_link1" { + TARGETFILE "tsoftlinks.h5" + TARGETPATH "/soft_dangle" + } EXTERNAL_LINK "ext_link1" { TARGETFILE "textlinktar.h5" TARGETPATH "group" @@ -51,7 +66,6 @@ GROUP "/" { TARGETFILE "textlinktar.h5" TARGETPATH "type" DATATYPE "type" H5T_STD_I32LE; - } EXTERNAL_LINK "ext_link4" { TARGETFILE "textlinktar.h5" diff --git a/tools/testfiles/textlinksrc-1-old.ls b/tools/testfiles/textlinksrc-1-old.ls index 5e81dec..ef26cc4 100644 --- a/tools/testfiles/textlinksrc-1-old.ls +++ b/tools/testfiles/textlinksrc-1-old.ls @@ -1,10 +1,11 @@ -############################# - output for 'h5ls -w80 -Er textlinksrc.h5' -############################# / Group +/ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1} {Dataset {4, 2}} +/ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle} {**NOT FOUND**} /ext_link1 External Link {textlinktar.h5//group} {Group} /ext_link1/dset Dataset {6} /ext_link1/elink_t1 External Link {textlinksrc.h5//} {Group} +/ext_link1/elink_t1/ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1} {Already Visited} +/ext_link1/elink_t1/ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle} {Already Visited} /ext_link1/elink_t1/ext_link1 External Link {textlinktar.h5//group} {Already Visited} /ext_link1/elink_t1/ext_link2 External Link {textlinktar.h5//dset} {Dataset {6}} /ext_link1/elink_t1/ext_link3 External Link {textlinktar.h5//type} {Type} diff --git a/tools/testfiles/textlinksrc-1.ls b/tools/testfiles/textlinksrc-1.ls index f39eec9..ef26cc4 100644 --- a/tools/testfiles/textlinksrc-1.ls +++ b/tools/testfiles/textlinksrc-1.ls @@ -1,10 +1,11 @@ -############################# - output for 'h5ls -w80 --follow-symlinks -r textlinksrc.h5' -############################# / Group +/ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1} {Dataset {4, 2}} +/ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle} {**NOT FOUND**} /ext_link1 External Link {textlinktar.h5//group} {Group} /ext_link1/dset Dataset {6} /ext_link1/elink_t1 External Link {textlinksrc.h5//} {Group} +/ext_link1/elink_t1/ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1} {Already Visited} +/ext_link1/elink_t1/ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle} {Already Visited} /ext_link1/elink_t1/ext_link1 External Link {textlinktar.h5//group} {Already Visited} /ext_link1/elink_t1/ext_link2 External Link {textlinktar.h5//dset} {Dataset {6}} /ext_link1/elink_t1/ext_link3 External Link {textlinktar.h5//type} {Type} diff --git a/tools/testfiles/textlinksrc-2-old.ls b/tools/testfiles/textlinksrc-2-old.ls index 403a1d2..a3044dd 100644 --- a/tools/testfiles/textlinksrc-2-old.ls +++ b/tools/testfiles/textlinksrc-2-old.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -Erv textlinksrc.h5/ext_link5' -############################# Opened "textlinksrc.h5" with sec2 driver. ext_link5 External Link {textlinktar.h5//empty_group} {Group Location: 5:1832 diff --git a/tools/testfiles/textlinksrc-2.ls b/tools/testfiles/textlinksrc-2.ls index 1e92f59..a3044dd 100644 --- a/tools/testfiles/textlinksrc-2.ls +++ b/tools/testfiles/textlinksrc-2.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 --follow-symlinks -rv textlinksrc.h5/ext_link5' -############################# Opened "textlinksrc.h5" with sec2 driver. ext_link5 External Link {textlinktar.h5//empty_group} {Group Location: 5:1832 diff --git a/tools/testfiles/textlinksrc-3-old.ls b/tools/testfiles/textlinksrc-3-old.ls index a86ca32..75f3421 100644 --- a/tools/testfiles/textlinksrc-3-old.ls +++ b/tools/testfiles/textlinksrc-3-old.ls @@ -1,9 +1,8 @@ -############################# - output for 'h5ls -w80 -Er textlinksrc.h5/ext_link1' -############################# ext_link1 External Link {textlinktar.h5//group} {Group} /dset Dataset {6} /elink_t1 External Link {textlinksrc.h5//} {Group} +/elink_t1/ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1} {Dataset {4, 2}} +/elink_t1/ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle} {**NOT FOUND**} /elink_t1/ext_link1 External Link {textlinktar.h5//group} {Already Visited} /elink_t1/ext_link2 External Link {textlinktar.h5//dset} {Dataset {6}} /elink_t1/ext_link3 External Link {textlinktar.h5//type} {Type} diff --git a/tools/testfiles/textlinksrc-3.ls b/tools/testfiles/textlinksrc-3.ls index bd173f3..75f3421 100644 --- a/tools/testfiles/textlinksrc-3.ls +++ b/tools/testfiles/textlinksrc-3.ls @@ -1,9 +1,8 @@ -############################# - output for 'h5ls -w80 --follow-symlinks -r textlinksrc.h5/ext_link1' -############################# ext_link1 External Link {textlinktar.h5//group} {Group} /dset Dataset {6} /elink_t1 External Link {textlinksrc.h5//} {Group} +/elink_t1/ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1} {Dataset {4, 2}} +/elink_t1/ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle} {**NOT FOUND**} /elink_t1/ext_link1 External Link {textlinktar.h5//group} {Already Visited} /elink_t1/ext_link2 External Link {textlinktar.h5//dset} {Dataset {6}} /elink_t1/ext_link3 External Link {textlinktar.h5//type} {Type} diff --git a/tools/testfiles/textlinksrc-4.ls b/tools/testfiles/textlinksrc-4.ls index f440d9c..449830f 100644 --- a/tools/testfiles/textlinksrc-4.ls +++ b/tools/testfiles/textlinksrc-4.ls @@ -1,7 +1,6 @@ -############################# - output for 'h5ls -w80 -r textlinksrc.h5' -############################# / Group +/ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1} +/ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle} /ext_link1 External Link {textlinktar.h5//group} /ext_link2 External Link {textlinktar.h5//dset} /ext_link3 External Link {textlinktar.h5//type} diff --git a/tools/testfiles/textlinksrc-5.ls b/tools/testfiles/textlinksrc-5.ls index a1d61d7..8cba586 100644 --- a/tools/testfiles/textlinksrc-5.ls +++ b/tools/testfiles/textlinksrc-5.ls @@ -1,4 +1 @@ -############################# - output for 'h5ls -w80 -r textlinksrc.h5/ext_link1' -############################# ext_link1 External Link {textlinktar.h5//group} diff --git a/tools/testfiles/textlinksrc-6-old.ls b/tools/testfiles/textlinksrc-6-old.ls index e1b8b74..ae70721 100644 --- a/tools/testfiles/textlinksrc-6-old.ls +++ b/tools/testfiles/textlinksrc-6-old.ls @@ -1,6 +1,5 @@ -############################# - output for 'h5ls -w80 -E textlinksrc.h5' -############################# +ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1} {Dataset {4, 2}} +ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle} {**NOT FOUND**} ext_link1 External Link {textlinktar.h5//group} {Group} ext_link2 External Link {textlinktar.h5//dset} {Dataset {6}} ext_link3 External Link {textlinktar.h5//type} {Type} diff --git a/tools/testfiles/textlinksrc-6.ls b/tools/testfiles/textlinksrc-6.ls index 6cda888..ae70721 100644 --- a/tools/testfiles/textlinksrc-6.ls +++ b/tools/testfiles/textlinksrc-6.ls @@ -1,6 +1,5 @@ -############################# - output for 'h5ls -w80 --follow-symlinks textlinksrc.h5' -############################# +ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1} {Dataset {4, 2}} +ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle} {**NOT FOUND**} ext_link1 External Link {textlinktar.h5//group} {Group} ext_link2 External Link {textlinktar.h5//dset} {Dataset {6}} ext_link3 External Link {textlinktar.h5//type} {Type} diff --git a/tools/testfiles/textlinksrc-7-old.ls b/tools/testfiles/textlinksrc-7-old.ls index 9249d0c..e9a5a03 100644 --- a/tools/testfiles/textlinksrc-7-old.ls +++ b/tools/testfiles/textlinksrc-7-old.ls @@ -1,4 +1 @@ -############################# - output for 'h5ls -w80 -E textlinksrc.h5/ext_link1' -############################# ext_link1 External Link {textlinktar.h5//group} {Group} diff --git a/tools/testfiles/textlinksrc-7.ls b/tools/testfiles/textlinksrc-7.ls index 528c4c5..e9a5a03 100644 --- a/tools/testfiles/textlinksrc-7.ls +++ b/tools/testfiles/textlinksrc-7.ls @@ -1,4 +1 @@ -############################# - output for 'h5ls -w80 --follow-symlinks textlinksrc.h5/ext_link1' -############################# ext_link1 External Link {textlinktar.h5//group} {Group} diff --git a/tools/testfiles/textlinksrc-nodangle-1.ls b/tools/testfiles/textlinksrc-nodangle-1.ls index 9240761..7427e1c 100644 --- a/tools/testfiles/textlinksrc-nodangle-1.ls +++ b/tools/testfiles/textlinksrc-nodangle-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 --no-dangling-links textlinksrc.h5' -############################# Error: --no-dangling-links must be used along with --follow-symlinks option! usage: h5ls [OPTIONS] [OBJECTS...] diff --git a/tools/testfiles/textlinksrc-nodangle-2.ls b/tools/testfiles/textlinksrc-nodangle-2.ls index 4713849..ae70721 100644 --- a/tools/testfiles/textlinksrc-nodangle-2.ls +++ b/tools/testfiles/textlinksrc-nodangle-2.ls @@ -1,6 +1,5 @@ -############################# - output for 'h5ls -w80 --follow-symlinks --no-dangling-links textlinksrc.h5' -############################# +ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1} {Dataset {4, 2}} +ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle} {**NOT FOUND**} ext_link1 External Link {textlinktar.h5//group} {Group} ext_link2 External Link {textlinktar.h5//dset} {Dataset {6}} ext_link3 External Link {textlinktar.h5//type} {Type} diff --git a/tools/testfiles/textlinksrc.ddl b/tools/testfiles/textlinksrc.ddl index b806c56..6ef0b44 100644 --- a/tools/testfiles/textlinksrc.ddl +++ b/tools/testfiles/textlinksrc.ddl @@ -1,8 +1,23 @@ -############################# -Expected output for 'h5dump textlinksrc.h5' -############################# HDF5 "textlinksrc.h5" { GROUP "/" { + EXTERNAL_LINK "ext2soft_link1" { + TARGETFILE "tsoftlinks.h5" + TARGETPATH "/soft_dset1" + DATASET "/soft_dset1" { + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 4, 2 ) / ( 4, 2 ) } + DATA { + (0,0): 0, 0, + (1,0): 1, 1, + (2,0): 2, 2, + (3,0): 3, 3 + } + } + } + EXTERNAL_LINK "ext2softdangle_link1" { + TARGETFILE "tsoftlinks.h5" + TARGETPATH "/soft_dangle" + } EXTERNAL_LINK "ext_link1" { TARGETFILE "textlinktar.h5" TARGETPATH "group" @@ -44,7 +59,6 @@ GROUP "/" { TARGETFILE "textlinktar.h5" TARGETPATH "type" DATATYPE "type" H5T_STD_I32LE; - } EXTERNAL_LINK "ext_link4" { TARGETFILE "textlinktar.h5" diff --git a/tools/testfiles/textlinksrc.h5 b/tools/testfiles/textlinksrc.h5 Binary files differindex 062acbe..4db1cc4 100644 --- a/tools/testfiles/textlinksrc.h5 +++ b/tools/testfiles/textlinksrc.h5 diff --git a/tools/testfiles/tfamily.ddl b/tools/testfiles/tfamily.ddl index 14e46ef..489d8a8 100644 --- a/tools/testfiles/tfamily.ddl +++ b/tools/testfiles/tfamily.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump --filedriver=family tfamily%05d.h5' -############################# HDF5 "tfamily%05d.h5" { GROUP "/" { DATASET "dset1" { diff --git a/tools/testfiles/tfill.ddl b/tools/testfiles/tfill.ddl index 14a01f3..45497fd 100644 --- a/tools/testfiles/tfill.ddl +++ b/tools/testfiles/tfill.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -p tfvalues.h5' -############################# HDF5 "tfvalues.h5" { GROUP "/" { DATASET "fill_array" { @@ -16,7 +13,7 @@ GROUP "/" { } FILLVALUE { FILL_TIME H5D_FILL_TIME_IFSET - VALUE [ 0, 0, 0 ] + VALUE [ 0, 0, 0 ] } ALLOCATION_TIME { H5D_ALLOC_TIME_LATE @@ -42,9 +39,9 @@ GROUP "/" { FILLVALUE { FILL_TIME H5D_FILL_TIME_IFSET VALUE { - 1, - 2 - } + 1, + 2 + } } ALLOCATION_TIME { H5D_ALLOC_TIME_LATE @@ -73,7 +70,7 @@ GROUP "/" { } FILLVALUE { FILL_TIME H5D_FILL_TIME_ALLOC - VALUE -99 + VALUE -99 } ALLOCATION_TIME { H5D_ALLOC_TIME_LATE @@ -95,7 +92,7 @@ GROUP "/" { } FILLVALUE { FILL_TIME H5D_FILL_TIME_IFSET - VALUE -99 + VALUE -99 } ALLOCATION_TIME { H5D_ALLOC_TIME_LATE @@ -117,7 +114,7 @@ GROUP "/" { } FILLVALUE { FILL_TIME H5D_FILL_TIME_NEVER - VALUE -99 + VALUE -99 } ALLOCATION_TIME { H5D_ALLOC_TIME_LATE @@ -139,7 +136,7 @@ GROUP "/" { } FILLVALUE { FILL_TIME H5D_FILL_TIME_ALLOC - VALUE () + VALUE () } ALLOCATION_TIME { H5D_ALLOC_TIME_LATE @@ -161,7 +158,7 @@ GROUP "/" { } FILLVALUE { FILL_TIME H5D_FILL_TIME_IFSET - VALUE 0 + VALUE 0 } ALLOCATION_TIME { H5D_ALLOC_TIME_LATE diff --git a/tools/testfiles/tfletcher32.ddl b/tools/testfiles/tfletcher32.ddl index 9395f4a..072ef23 100644 --- a/tools/testfiles/tfletcher32.ddl +++ b/tools/testfiles/tfletcher32.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -H -p -d fletcher32 tfilters.h5' -############################# HDF5 "tfilters.h5" { DATASET "fletcher32" { DATATYPE H5T_STD_I32LE @@ -8,13 +5,13 @@ DATASET "fletcher32" { STORAGE_LAYOUT { CHUNKED ( 10, 5 ) SIZE 816 - } + } FILTERS { CHECKSUM FLETCHER32 } FILLVALUE { FILL_TIME H5D_FILL_TIME_IFSET - VALUE 0 + VALUE 0 } ALLOCATION_TIME { H5D_ALLOC_TIME_INCR diff --git a/tools/testfiles/tfpformat.ddl b/tools/testfiles/tfpformat.ddl index 2336822..2830ad5 100644 --- a/tools/testfiles/tfpformat.ddl +++ b/tools/testfiles/tfpformat.ddl @@ -1,20 +1,27 @@ -############################# -Expected output for 'h5dump -m %.7f tfpformat.h5' -############################# HDF5 "tfpformat.h5" { GROUP "/" { DATASET "double" { DATATYPE H5T_IEEE_F64LE DATASPACE SIMPLE { ( 6 ) / ( 6 ) } DATA { - (0): -0.1234567, 0.1234567, 0.0000000, 0.0000000, 0.0000000, 0.0000000 + (0): -0.1234567, + (1): 0.1234567, + (2): 0.0000000, + (3): 0.0000000, + (4): 0.0000000, + (5): 0.0000000 } } DATASET "float" { DATATYPE H5T_IEEE_F32LE DATASPACE SIMPLE { ( 6 ) / ( 6 ) } DATA { - (0): -0.1234567, 0.1234567, 0.0000000, 0.0000000, 0.0000000, 0.0000000 + (0): -0.1234567, + (1): 0.1234567, + (2): 0.0000000, + (3): 0.0000000, + (4): 0.0000000, + (5): 0.0000000 } } } diff --git a/tools/testfiles/tfpformat.h5.xml b/tools/testfiles/tfpformat.h5.xml index 939d7b3..c2bd96f 100644 --- a/tools/testfiles/tfpformat.h5.xml +++ b/tools/testfiles/tfpformat.h5.xml @@ -1,17 +1,14 @@ -############################# -Expected output for 'h5dump -u -m %.7f tfpformat.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://www.hdfgroup.org/DTDs/HDF5-File.dtd"> +<!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.dtd"> <HDF5-File> <RootGroup OBJ-XID="xid_96" H5Path="/"> <Dataset Name="double" OBJ-XID="xid_800" H5Path= "/double" Parents="xid_96" H5ParentPaths="/"> <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -26,7 +23,12 @@ Expected output for 'h5dump -u -m %.7f tfpformat.h5' </DataType> <Data> <DataFromFile> - -0.1234567 0.1234567 0.0000000 0.0000000 0.0000000 0.0000000 + -0.1234567 + 0.1234567 + 0.0000000 + 0.0000000 + 0.0000000 + 0.0000000 </DataFromFile> </Data> </Dataset> @@ -34,9 +36,9 @@ Expected output for 'h5dump -u -m %.7f tfpformat.h5' <StorageLayout> <ContiguousLayout/> </StorageLayout> - <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <FillValue> - <NoFill/> + <NoFill/> </FillValue> </FillValueInfo> <Dataspace> @@ -51,7 +53,12 @@ Expected output for 'h5dump -u -m %.7f tfpformat.h5' </DataType> <Data> <DataFromFile> - -0.1234567 0.1234567 0.0000000 0.0000000 0.0000000 0.0000000 + -0.1234567 + 0.1234567 + 0.0000000 + 0.0000000 + 0.0000000 + 0.0000000 </DataFromFile> </Data> </Dataset> diff --git a/tools/testfiles/tgroup-1.ddl b/tools/testfiles/tgroup-1.ddl index d5f5eb4..4407eae 100644 --- a/tools/testfiles/tgroup-1.ddl +++ b/tools/testfiles/tgroup-1.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tgroup.h5' -############################# HDF5 "tgroup.h5" { GROUP "/" { GROUP "g1" { diff --git a/tools/testfiles/tgroup-1.ls b/tools/testfiles/tgroup-1.ls index 04066ca..effaf5a 100644 --- a/tools/testfiles/tgroup-1.ls +++ b/tools/testfiles/tgroup-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -g tgroup.h5' -############################# Error: 'recursive' option not compatible with 'group info' option! usage: h5ls [OPTIONS] [OBJECTS...] diff --git a/tools/testfiles/tgroup-2.ddl b/tools/testfiles/tgroup-2.ddl index e993d35..c4af7bb 100644 --- a/tools/testfiles/tgroup-2.ddl +++ b/tools/testfiles/tgroup-2.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump --group=/g2 --group / -g /y tgroup.h5' -############################# HDF5 "tgroup.h5" { GROUP "/g2" { GROUP "g2.1" { diff --git a/tools/testfiles/tgroup-2.ls b/tools/testfiles/tgroup-2.ls index 0817d93..464d4d7 100644 --- a/tools/testfiles/tgroup-2.ls +++ b/tools/testfiles/tgroup-2.ls @@ -1,4 +1 @@ -############################# - output for 'h5ls -w80 -g tgroup.h5/g1' -############################# g1 Group diff --git a/tools/testfiles/tgroup-3.ls b/tools/testfiles/tgroup-3.ls index cfb479a..959415f 100644 --- a/tools/testfiles/tgroup-3.ls +++ b/tools/testfiles/tgroup-3.ls @@ -1,5 +1,2 @@ -############################# - output for 'h5ls -w80 tgroup.h5/g1' -############################# g1.1 Group g1.2 Group diff --git a/tools/testfiles/tgroup.h5.xml b/tools/testfiles/tgroup.h5.xml index 00f5a0b..8065165 100644 --- a/tools/testfiles/tgroup.h5.xml +++ b/tools/testfiles/tgroup.h5.xml @@ -1,8 +1,5 @@ -############################# -Expected output for 'h5dump --xml tgroup.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Group Name="g1" OBJ-XID="xid_1344" H5Path="/g1" Parents="xid_696" H5ParentPaths="/" > <hdf5:Group Name="g1.1" OBJ-XID="xid_3616" H5Path="/g1/g1.1" Parents="xid_1344" H5ParentPaths="/g1" > diff --git a/tools/testfiles/tgroup.ls b/tools/testfiles/tgroup.ls index 5e4b66d..549b166 100644 --- a/tools/testfiles/tgroup.ls +++ b/tools/testfiles/tgroup.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 tgroup.h5' -############################# g1 Group g2 Group g3 Group diff --git a/tools/testfiles/tgrp_comments.ddl b/tools/testfiles/tgrp_comments.ddl index 460a9f0..e33f3c2 100644 --- a/tools/testfiles/tgrp_comments.ddl +++ b/tools/testfiles/tgrp_comments.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tgrp_comments.h5' -############################# HDF5 "tgrp_comments.h5" { GROUP "/" { GROUP "g1" { diff --git a/tools/testfiles/tgrp_comments.ls b/tools/testfiles/tgrp_comments.ls index e4c7d42..c36a819 100644 --- a/tools/testfiles/tgrp_comments.ls +++ b/tools/testfiles/tgrp_comments.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -v -g tgrp_comments.h5/glongcomment' -############################# Opened "tgrp_comments.h5" with sec2 driver. glongcomment Group Location: 1:12424 diff --git a/tools/testfiles/thlink-1.ddl b/tools/testfiles/thlink-1.ddl index c913201..61ac6c2 100644 --- a/tools/testfiles/thlink-1.ddl +++ b/tools/testfiles/thlink-1.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump thlink.h5' -############################# HDF5 "thlink.h5" { GROUP "/" { DATASET "dset1" { diff --git a/tools/testfiles/thlink-1.ls b/tools/testfiles/thlink-1.ls index 01839bf..adcd38a 100644 --- a/tools/testfiles/thlink-1.ls +++ b/tools/testfiles/thlink-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 thlink.h5' -############################# dset1 Dataset {5} g1 Group g2 Group diff --git a/tools/testfiles/thlink-2.ddl b/tools/testfiles/thlink-2.ddl index 829dbd6..c1c6367 100644 --- a/tools/testfiles/thlink-2.ddl +++ b/tools/testfiles/thlink-2.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -d /g1/dset2 --dataset /dset1 --dataset=/g1/g1.1/dset3 thlink.h5' -############################# HDF5 "thlink.h5" { DATASET "/g1/dset2" { DATATYPE H5T_STD_I32BE diff --git a/tools/testfiles/thlink-3.ddl b/tools/testfiles/thlink-3.ddl index d4b9d39..625cf3c 100644 --- a/tools/testfiles/thlink-3.ddl +++ b/tools/testfiles/thlink-3.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -d /g1/g1.1/dset3 --dataset /g1/dset2 --dataset=/dset1 thlink.h5' -############################# HDF5 "thlink.h5" { DATASET "/g1/g1.1/dset3" { DATATYPE H5T_STD_I32BE diff --git a/tools/testfiles/thlink-4.ddl b/tools/testfiles/thlink-4.ddl index 4a06500..026f412 100644 --- a/tools/testfiles/thlink-4.ddl +++ b/tools/testfiles/thlink-4.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -g /g1 thlink.h5' -############################# HDF5 "thlink.h5" { GROUP "/g1" { DATASET "dset2" { diff --git a/tools/testfiles/thlink-5.ddl b/tools/testfiles/thlink-5.ddl index b5dd8ee..058e863 100644 --- a/tools/testfiles/thlink-5.ddl +++ b/tools/testfiles/thlink-5.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -d /dset1 -g /g2 -d /g1/dset2 thlink.h5' -############################# HDF5 "thlink.h5" { DATASET "/dset1" { DATATYPE H5T_STD_I32BE diff --git a/tools/testfiles/thlink.h5.xml b/tools/testfiles/thlink.h5.xml index 19bc816..65d7f8a 100644 --- a/tools/testfiles/thlink.h5.xml +++ b/tools/testfiles/thlink.h5.xml @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump --xml thlink.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/"> <hdf5:Dataset Name="dset1" OBJ-XID="xid_808" H5Path= "/dset1" Parents="xid_96" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -25,7 +22,11 @@ Expected output for 'h5dump --xml thlink.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 1 2 3 4 + 0 + 1 + 2 + 3 + 4 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -40,10 +41,10 @@ Expected output for 'h5dump --xml thlink.h5' </hdf5:Group> </hdf5:Group> <hdf5:Group Name="g2" OBJ-XID="xid_2000-3" H5Path="/g1/g1.1" Parents="xid_96" H5ParentPaths="/"> - <hdf5:GroupPtr OBJ-XID="xid_2000" H5Path="/g1/g1.1" Parents="xid_96" H5ParentPaths="/" /> + <hdf5:GroupPtr OBJ-XID="xid_2000" H5Path="/g1/g1.1" Parents="xid_96" H5ParentPaths="/" /> </hdf5:Group> <hdf5:Group Name="g3" OBJ-XID="xid_96-4" H5Path="/" Parents="xid_96" H5ParentPaths="/"> - <hdf5:GroupPtr OBJ-XID="xid_96" H5Path="/" Parents="xid_96" H5ParentPaths="/" /> + <hdf5:GroupPtr OBJ-XID="xid_96" H5Path="/" Parents="xid_96" H5ParentPaths="/" /> </hdf5:Group> </hdf5:RootGroup> </hdf5:HDF5-File> diff --git a/tools/testfiles/thlinks-nodangle-1.ls b/tools/testfiles/thlinks-nodangle-1.ls index 37ba6b0..adcd38a 100644 --- a/tools/testfiles/thlinks-nodangle-1.ls +++ b/tools/testfiles/thlinks-nodangle-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 --follow-symlinks --no-dangling-links thlink.h5' -############################# dset1 Dataset {5} g1 Group g2 Group diff --git a/tools/testfiles/thyperslab.ddl b/tools/testfiles/thyperslab.ddl index 733c456..2f4a118 100644 --- a/tools/testfiles/thyperslab.ddl +++ b/tools/testfiles/thyperslab.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump thyperslab.h5' -############################# HDF5 "thyperslab.h5" { GROUP "/" { DATASET "stripmine" { @@ -6341,212 +6338,212 @@ GROUP "/" { (30,4025): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, (30,4045): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, (30,4065): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (30,4085): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,8): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,29): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,50): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,71): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,92): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,113): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,133): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,153): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,173): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,193): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,213): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,233): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,253): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,273): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,293): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,313): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,333): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,353): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,373): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,393): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,413): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,433): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,453): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,473): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,493): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,513): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,533): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,553): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,573): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,593): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,613): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,633): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,653): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,673): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,693): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,713): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,733): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,753): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,773): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,793): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,813): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,833): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,853): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,873): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,893): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,913): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,933): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,953): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,973): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,993): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1013): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1033): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1053): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1073): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1093): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1113): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1133): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1153): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1173): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1193): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1213): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1233): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1253): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1273): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1293): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1313): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1333): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1353): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1373): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1393): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1413): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1433): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1453): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1473): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1493): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1513): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1533): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1553): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1573): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1593): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1613): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1633): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1653): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1673): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1693): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1713): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1733): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1753): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1773): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1793): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1813): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1833): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1853): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1873): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1893): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1913): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1933): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1953): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1973): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,1993): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2013): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2033): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2053): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2073): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2093): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2113): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2133): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2153): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2173): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2193): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2213): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2233): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2253): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2273): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2293): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2313): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2333): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2353): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2373): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2393): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2413): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2433): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2453): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2473): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2493): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2513): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2533): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2553): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2573): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2593): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2613): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2633): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2653): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2673): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2693): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2713): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2733): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2753): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2773): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2793): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2813): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2833): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2853): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2873): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2893): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2913): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2933): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2953): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2973): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,2993): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3013): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3033): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3053): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3073): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3093): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3113): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3133): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3153): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3173): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3193): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3213): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3233): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3253): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3273): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3293): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3313): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3333): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3353): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3373): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3393): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3413): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3433): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3453): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3473): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3493): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3513): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3533): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3553): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3573): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3593): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3613): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3633): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3653): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3673): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3693): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3713): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3733): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3753): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3773): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3793): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3813): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3833): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3853): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3873): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3893): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3913): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3933): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3953): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3973): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,3993): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,4013): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,4033): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,4053): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,4073): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - (31,4093): 1, 1, 1, 1 + (30,4085): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,0): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,21): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,42): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,63): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,84): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,105): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,125): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,145): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,165): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,185): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,205): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,225): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,245): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,265): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,285): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,305): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,325): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,345): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,365): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,385): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,405): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,425): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,445): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,465): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,485): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,505): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,525): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,545): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,565): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,585): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,605): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,625): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,645): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,665): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,685): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,705): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,725): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,745): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,765): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,785): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,805): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,825): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,845): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,865): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,885): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,905): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,925): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,945): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,965): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,985): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1005): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1025): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1045): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1065): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1085): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1105): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1125): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1145): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1165): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1185): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1205): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1225): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1245): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1265): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1285): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1305): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1325): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1345): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1365): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1385): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1405): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1425): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1445): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1465): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1485): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1505): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1525): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1545): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1565): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1585): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1605): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1625): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1645): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1665): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1685): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1705): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1725): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1745): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1765): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1785): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1805): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1825): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1845): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1865): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1885): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1905): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1925): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1945): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1965): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,1985): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2005): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2025): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2045): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2065): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2085): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2105): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2125): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2145): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2165): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2185): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2205): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2225): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2245): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2265): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2285): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2305): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2325): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2345): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2365): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2385): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2405): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2425): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2445): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2465): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2485): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2505): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2525): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2545): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2565): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2585): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2605): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2625): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2645): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2665): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2685): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2705): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2725): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2745): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2765): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2785): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2805): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2825): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2845): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2865): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2885): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2905): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2925): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2945): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2965): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,2985): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3005): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3025): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3045): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3065): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3085): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3105): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3125): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3145): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3165): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3185): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3205): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3225): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3245): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3265): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3285): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3305): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3325): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3345): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3365): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3385): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3405): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3425): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3445): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3465): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3485): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3505): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3525): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3545): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3565): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3585): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3605): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3625): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3645): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3665): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3685): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3705): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3725): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3745): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3765): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3785): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3805): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3825): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3845): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3865): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3885): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3905): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3925): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3945): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3965): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,3985): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,4005): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,4025): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,4045): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,4065): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + (31,4085): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } } } diff --git a/tools/testfiles/tindicesno.ddl b/tools/testfiles/tindicesno.ddl index a7ff3b0..a7b726e 100644 --- a/tools/testfiles/tindicesno.ddl +++ b/tools/testfiles/tindicesno.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -y taindices.h5' -############################# HDF5 "taindices.h5" { GROUP "/" { DATASET "1d" { diff --git a/tools/testfiles/tindicessub1.ddl b/tools/testfiles/tindicessub1.ddl index 0173fb5..5cf4058 100644 --- a/tools/testfiles/tindicessub1.ddl +++ b/tools/testfiles/tindicessub1.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -d 1d -s 1 -S 10 -c 2 -k 3 taindices.h5' -############################# HDF5 "taindices.h5" { DATASET "1d" { DATATYPE H5T_STD_I32LE diff --git a/tools/testfiles/tindicessub2.ddl b/tools/testfiles/tindicessub2.ddl index 0f8f720..5103b49 100644 --- a/tools/testfiles/tindicessub2.ddl +++ b/tools/testfiles/tindicessub2.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -d 2d -s 1,2 -S 3,3 -c 3,2 -k 2,2 taindices.h5' -############################# HDF5 "taindices.h5" { DATASET "2d" { DATATYPE H5T_STD_I32LE diff --git a/tools/testfiles/tindicessub3.ddl b/tools/testfiles/tindicessub3.ddl index 1ffc016..f7fb81c 100644 --- a/tools/testfiles/tindicessub3.ddl +++ b/tools/testfiles/tindicessub3.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -d 3d -s 0,1,2 -S 1,3,3 -c 2,2,2 -k 1,2,2 taindices.h5' -############################# HDF5 "taindices.h5" { DATASET "3d" { DATATYPE H5T_STD_I32LE diff --git a/tools/testfiles/tindicessub4.ddl b/tools/testfiles/tindicessub4.ddl index 273e396..7829875 100644 --- a/tools/testfiles/tindicessub4.ddl +++ b/tools/testfiles/tindicessub4.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -d 4d -s 0,0,1,2 -c 2,2,3,2 -S 1,1,3,3 -k 1,1,2,2 taindices.h5' -############################# HDF5 "taindices.h5" { DATASET "4d" { DATATYPE H5T_STD_I32LE diff --git a/tools/testfiles/tindicesyes.ddl b/tools/testfiles/tindicesyes.ddl index 4a07072..9440c54 100644 --- a/tools/testfiles/tindicesyes.ddl +++ b/tools/testfiles/tindicesyes.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump taindices.h5' -############################# HDF5 "taindices.h5" { GROUP "/" { DATASET "1d" { diff --git a/tools/testfiles/tlarge_objname.ddl b/tools/testfiles/tlarge_objname.ddl index d3f0fbe..0facc43 100644 --- a/tools/testfiles/tlarge_objname.ddl +++ b/tools/testfiles/tlarge_objname.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -w157 tlarge_objname.h5' -############################# HDF5 "tlarge_objname.h5" { GROUP "/" { GROUP "this_is_a_large_group_name" { diff --git a/tools/testfiles/tlonglinks.ddl b/tools/testfiles/tlonglinks.ddl index 9842e4d..0e57b3d 100644 --- a/tools/testfiles/tlonglinks.ddl +++ b/tools/testfiles/tlonglinks.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tlonglinks.h5' -############################# HDF5 "tlonglinks.h5" { GROUP "/" { GROUP "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" { diff --git a/tools/testfiles/tloop-1.ddl b/tools/testfiles/tloop-1.ddl index 8313887..1f3a2fb 100644 --- a/tools/testfiles/tloop-1.ddl +++ b/tools/testfiles/tloop-1.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tloop.h5' -############################# HDF5 "tloop.h5" { GROUP "/" { GROUP "g1" { diff --git a/tools/testfiles/tloop-1.ls b/tools/testfiles/tloop-1.ls index 22cb6c7..a68bd3b 100644 --- a/tools/testfiles/tloop-1.ls +++ b/tools/testfiles/tloop-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -d tloop.h5' -############################# / Group /g1 Group /g1/g1.1 Group diff --git a/tools/testfiles/tloop.h5.xml b/tools/testfiles/tloop.h5.xml index d8a5080..36e8f1b 100644 --- a/tools/testfiles/tloop.h5.xml +++ b/tools/testfiles/tloop.h5.xml @@ -1,18 +1,15 @@ -############################# -Expected output for 'h5dump --xml tloop.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Group Name="g1" OBJ-XID="xid_1344" H5Path="/g1" Parents="xid_696" H5ParentPaths="/" > <hdf5:Group Name="g1.1" OBJ-XID="xid_2320" H5Path="/g1/g1.1" Parents="xid_1344" H5ParentPaths="/g1" > <hdf5:Group Name="g2.1" OBJ-XID="xid_1344-1" H5Path="/g1" Parents="xid_2320" H5ParentPaths="/g1/g1.1"> - <hdf5:GroupPtr OBJ-XID="xid_1344" H5Path="/g1" Parents="xid_2320" H5ParentPaths="/g1/g1.1" /> + <hdf5:GroupPtr OBJ-XID="xid_1344" H5Path="/g1" Parents="xid_2320" H5ParentPaths="/g1/g1.1" /> </hdf5:Group> </hdf5:Group> </hdf5:Group> <hdf5:Group Name="g2" OBJ-XID="xid_2320-2" H5Path="/g1/g1.1" Parents="xid_696" H5ParentPaths="/"> - <hdf5:GroupPtr OBJ-XID="xid_2320" H5Path="/g1/g1.1" Parents="xid_696" H5ParentPaths="/" /> + <hdf5:GroupPtr OBJ-XID="xid_2320" H5Path="/g1/g1.1" Parents="xid_696" H5ParentPaths="/" /> </hdf5:Group> </hdf5:RootGroup> </hdf5:HDF5-File> diff --git a/tools/testfiles/tloop2.h5.xml b/tools/testfiles/tloop2.h5.xml index 73ac4e0..185e08b 100644 --- a/tools/testfiles/tloop2.h5.xml +++ b/tools/testfiles/tloop2.h5.xml @@ -1,8 +1,5 @@ -############################# -Expected output for 'h5dump --xml tloop2.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Group Name="g1" OBJ-XID="xid_1344" H5Path="/g1" Parents="xid_696" H5ParentPaths="/" > <hdf5:Group Name="g1.1" OBJ-XID="xid_2320" H5Path="/g1/g1.1" Parents="xid_1344" H5ParentPaths="/g1" > @@ -10,7 +7,7 @@ Expected output for 'h5dump --xml tloop2.h5' </hdf5:Group> </hdf5:Group> <hdf5:Group Name="g2" OBJ-XID="xid_2320-1" H5Path="/g1/g1.1" Parents="xid_696" H5ParentPaths="/"> - <hdf5:GroupPtr OBJ-XID="xid_2320" H5Path="/g1/g1.1" Parents="xid_696" H5ParentPaths="/" /> + <hdf5:GroupPtr OBJ-XID="xid_2320" H5Path="/g1/g1.1" Parents="xid_696" H5ParentPaths="/" /> </hdf5:Group> </hdf5:RootGroup> </hdf5:HDF5-File> diff --git a/tools/testfiles/tmany.h5.xml b/tools/testfiles/tmany.h5.xml index 59b856f..8056783 100644 --- a/tools/testfiles/tmany.h5.xml +++ b/tools/testfiles/tmany.h5.xml @@ -1,8 +1,5 @@ -############################# -Expected output for 'h5dump --xml tmany.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/"> <hdf5:Group Name="g1" OBJ-XID="xid_800" H5Path="/g1" Parents="xid_96" H5ParentPaths="/" > <hdf5:Group Name="g1.1" OBJ-XID="xid_1832" H5Path="/g1/g1.1" Parents="xid_800" H5ParentPaths="/g1" > @@ -16,7 +13,7 @@ Expected output for 'h5dump --xml tmany.h5' </hdf5:StorageLayout> <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Incremental"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -86,7 +83,16 @@ Expected output for 'h5dump --xml tmany.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 97 98 99 100 101 102 103 104 105 0 + 97 + 98 + 99 + 100 + 101 + 102 + 103 + 104 + 105 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> @@ -104,8 +110,10 @@ Expected output for 'h5dump --xml tmany.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 1 - 2 3 + 0 + 1 + 2 + 3 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> @@ -122,145 +130,28 @@ Expected output for 'h5dump --xml tmany.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 + 0 + 0.1 + 0.2 + 0.3 + 0.4 + 0.5 + 0.6 + 0.7 + 0.8 + 0.9 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 0 1 - 0 1 - 0 1 - 0 1 - 0 1 - 0 1 - 0 1 - 0 1 0 1 - 0 1 - 0 1 - 0 1 - 0 1 - 0 1 - 0 1 - 0 1 6 7 - 6 7 - 6 7 - 6 7 - 6 7 - 6 7 - 6 7 - 6 7 - 1 2 - 1 2 - 1 2 - 1 2 - 1 2 - 1 2 - 1 2 - 1 2 1 2 - 1 2 - 1 2 - 1 2 - 1 2 - 1 2 - 1 2 - 1 2 7 8 - 7 8 - 7 8 - 7 8 - 7 8 - 7 8 - 7 8 - 7 8 - 2 3 - 2 3 - 2 3 - 2 3 - 2 3 - 2 3 - 2 3 - 2 3 2 3 - 2 3 - 2 3 - 2 3 - 2 3 - 2 3 - 2 3 - 2 3 8 9 - 8 9 - 8 9 - 8 9 - 8 9 - 8 9 - 8 9 - 8 9 - 3 4 - 3 4 - 3 4 - 3 4 - 3 4 - 3 4 - 3 4 - 3 4 3 4 - 3 4 - 3 4 - 3 4 - 3 4 - 3 4 - 3 4 - 3 4 9 10 - 9 10 - 9 10 - 9 10 - 9 10 - 9 10 - 9 10 - 9 10 - 4 5 - 4 5 - 4 5 - 4 5 - 4 5 - 4 5 - 4 5 - 4 5 4 5 - 4 5 - 4 5 - 4 5 - 4 5 - 4 5 - 4 5 - 4 5 10 11 - 10 11 - 10 11 - 10 11 - 10 11 - 10 11 - 10 11 - 10 11 - 5 6 - 5 6 - 5 6 - 5 6 - 5 6 - 5 6 - 5 6 - 5 6 5 6 - 5 6 - 5 6 - 5 6 - 5 6 - 5 6 - 5 6 - 5 6 11 12 - 11 12 - 11 12 - 11 12 - 11 12 - 11 12 - 11 12 - 11 12 + 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 6 7 6 7 6 7 6 7 6 7 6 7 6 7 6 7 + 1 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2 7 8 7 8 7 8 7 8 7 8 7 8 7 8 7 8 + 2 3 2 3 2 3 2 3 2 3 2 3 2 3 2 3 2 3 2 3 2 3 2 3 2 3 2 3 2 3 2 3 8 9 8 9 8 9 8 9 8 9 8 9 8 9 8 9 + 3 4 3 4 3 4 3 4 3 4 3 4 3 4 3 4 3 4 3 4 3 4 3 4 3 4 3 4 3 4 3 4 9 10 9 10 9 10 9 10 9 10 9 10 9 10 9 10 + 4 5 4 5 4 5 4 5 4 5 4 5 4 5 4 5 4 5 4 5 4 5 4 5 4 5 4 5 4 5 4 5 10 11 10 11 10 11 10 11 10 11 10 11 10 11 10 11 + 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 11 12 11 12 11 12 11 12 11 12 11 12 11 12 11 12 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -279,9 +170,9 @@ Expected output for 'h5dump --xml tmany.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -297,16 +188,106 @@ Expected output for 'h5dump --xml tmany.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 - 0 1 2 3 4 5 6 7 8 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -324,9 +305,9 @@ Expected output for 'h5dump --xml tmany.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -342,16 +323,106 @@ Expected output for 'h5dump --xml tmany.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 0 0 0 0 0 0 - 1 1 1 1 1 1 1 1 1 1 - 2 2 2 2 2 2 2 2 2 2 - 3 3 3 3 3 3 3 3 3 3 - 4 4 4 4 4 4 4 4 4 4 - 5 5 5 5 5 5 5 5 5 5 - 6 6 6 6 6 6 6 6 6 6 - 7 7 7 7 7 7 7 7 7 7 - 8 8 8 8 8 8 8 8 8 8 - 9 9 9 9 9 9 9 9 9 9 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 3 + 3 + 3 + 3 + 3 + 3 + 3 + 3 + 3 + 3 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 5 + 5 + 5 + 5 + 5 + 5 + 5 + 5 + 5 + 5 + 6 + 6 + 6 + 6 + 6 + 6 + 6 + 6 + 6 + 6 + 7 + 7 + 7 + 7 + 7 + 7 + 7 + 7 + 7 + 7 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 9 + 9 + 9 + 9 + 9 + 9 + 9 + 9 + 9 + 9 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tmulti.ddl b/tools/testfiles/tmulti.ddl index 128513a..b6bf35e 100644 --- a/tools/testfiles/tmulti.ddl +++ b/tools/testfiles/tmulti.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump --filedriver=multi tmulti' -############################# HDF5 "tmulti" { GROUP "/" { DATASET "dset1" { diff --git a/tools/testfiles/tmultifile.ddl b/tools/testfiles/tmultifile.ddl new file mode 100644 index 0000000..cf94f2c --- /dev/null +++ b/tools/testfiles/tmultifile.ddl @@ -0,0 +1,42 @@ +HDF5 "tarray2.h5" { +DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [3][4][5] H5T_STD_I32LE } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } +} +} +HDF5 "tarray3.h5" { +DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [4] H5T_ARRAY { [6][3] H5T_STD_I32LE } } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } +} +} +HDF5 "tarray4.h5" { +DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [4] H5T_COMPOUND { + H5T_STD_I32LE "i"; + H5T_IEEE_F32LE "f"; + } } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } +} +} +HDF5 "tarray5.h5" { +DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [4] H5T_COMPOUND { + H5T_STD_I32LE "i"; + H5T_ARRAY { [4] H5T_IEEE_F32LE } "f"; + } } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } +} +} +HDF5 "tarray6.h5" { +DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [4] H5T_VLEN { H5T_STD_U32LE} } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } +} +} +HDF5 "tarray7.h5" { +DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [4] H5T_VLEN { H5T_ARRAY { [4] H5T_STD_U32LE }} } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } +} +} diff --git a/tools/testfiles/tmultifile.ls b/tools/testfiles/tmultifile.ls new file mode 100644 index 0000000..3fee937 --- /dev/null +++ b/tools/testfiles/tmultifile.ls @@ -0,0 +1,6 @@ +dset1 Dataset {5} +g1 Group +g2 Group +g3 Group, same as / +slink1 Soft Link {somevalue} +slink2 Soft Link {linkvalue} diff --git a/tools/testfiles/tname-amp.h5.xml b/tools/testfiles/tname-amp.h5.xml index b443f22..f28cdc5 100644 --- a/tools/testfiles/tname-amp.h5.xml +++ b/tools/testfiles/tname-amp.h5.xml @@ -1,8 +1,5 @@ -############################# -Expected output for 'h5dump --xml tname-amp.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Attribute Name="attr1&withamp"> <hdf5:Dataspace> @@ -17,7 +14,16 @@ Expected output for 'h5dump --xml tname-amp.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 97 98 99 100 101 102 103 104 105 0 + 97 + 98 + 99 + 100 + 101 + 102 + 103 + 104 + 105 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> @@ -26,9 +32,9 @@ Expected output for 'h5dump --xml tname-amp.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -44,16 +50,106 @@ Expected output for 'h5dump --xml tname-amp.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 0 0 0 0 0 0 - 0 1 2 3 4 5 6 7 8 9 - 0 2 4 6 8 10 12 14 16 18 - 0 3 6 9 12 15 18 21 24 27 - 0 4 8 12 16 20 24 28 32 36 - 0 5 10 15 20 25 30 35 40 45 - 0 6 12 18 24 30 36 42 48 54 - 0 7 14 21 28 35 42 49 56 63 - 0 8 16 24 32 40 48 56 64 72 - 0 9 18 27 36 45 54 63 72 81 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 2 + 4 + 6 + 8 + 10 + 12 + 14 + 16 + 18 + 0 + 3 + 6 + 9 + 12 + 15 + 18 + 21 + 24 + 27 + 0 + 4 + 8 + 12 + 16 + 20 + 24 + 28 + 32 + 36 + 0 + 5 + 10 + 15 + 20 + 25 + 30 + 35 + 40 + 45 + 0 + 6 + 12 + 18 + 24 + 30 + 36 + 42 + 48 + 54 + 0 + 7 + 14 + 21 + 28 + 35 + 42 + 49 + 56 + 63 + 0 + 8 + 16 + 24 + 32 + 40 + 48 + 56 + 64 + 72 + 0 + 9 + 18 + 27 + 36 + 45 + 54 + 63 + 72 + 81 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tname-apos.h5.xml b/tools/testfiles/tname-apos.h5.xml index f60fa48..2194971 100644 --- a/tools/testfiles/tname-apos.h5.xml +++ b/tools/testfiles/tname-apos.h5.xml @@ -1,8 +1,5 @@ -############################# -Expected output for 'h5dump --xml tname-apos.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Attribute Name="attr1'withapos"> <hdf5:Dataspace> @@ -17,7 +14,16 @@ Expected output for 'h5dump --xml tname-apos.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 97 98 99 100 101 102 103 104 105 0 + 97 + 98 + 99 + 100 + 101 + 102 + 103 + 104 + 105 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> @@ -26,9 +32,9 @@ Expected output for 'h5dump --xml tname-apos.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -44,16 +50,106 @@ Expected output for 'h5dump --xml tname-apos.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 0 0 0 0 0 0 - 0 1 2 3 4 5 6 7 8 9 - 0 2 4 6 8 10 12 14 16 18 - 0 3 6 9 12 15 18 21 24 27 - 0 4 8 12 16 20 24 28 32 36 - 0 5 10 15 20 25 30 35 40 45 - 0 6 12 18 24 30 36 42 48 54 - 0 7 14 21 28 35 42 49 56 63 - 0 8 16 24 32 40 48 56 64 72 - 0 9 18 27 36 45 54 63 72 81 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 2 + 4 + 6 + 8 + 10 + 12 + 14 + 16 + 18 + 0 + 3 + 6 + 9 + 12 + 15 + 18 + 21 + 24 + 27 + 0 + 4 + 8 + 12 + 16 + 20 + 24 + 28 + 32 + 36 + 0 + 5 + 10 + 15 + 20 + 25 + 30 + 35 + 40 + 45 + 0 + 6 + 12 + 18 + 24 + 30 + 36 + 42 + 48 + 54 + 0 + 7 + 14 + 21 + 28 + 35 + 42 + 49 + 56 + 63 + 0 + 8 + 16 + 24 + 32 + 40 + 48 + 56 + 64 + 72 + 0 + 9 + 18 + 27 + 36 + 45 + 54 + 63 + 72 + 81 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tname-gt.h5.xml b/tools/testfiles/tname-gt.h5.xml index 43d9a50..6a56587 100644 --- a/tools/testfiles/tname-gt.h5.xml +++ b/tools/testfiles/tname-gt.h5.xml @@ -1,8 +1,5 @@ -############################# -Expected output for 'h5dump --xml tname-gt.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Attribute Name="attr1>withgt"> <hdf5:Dataspace> @@ -17,7 +14,16 @@ Expected output for 'h5dump --xml tname-gt.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 97 98 99 100 101 102 103 104 105 0 + 97 + 98 + 99 + 100 + 101 + 102 + 103 + 104 + 105 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> @@ -26,9 +32,9 @@ Expected output for 'h5dump --xml tname-gt.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -44,16 +50,106 @@ Expected output for 'h5dump --xml tname-gt.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 0 0 0 0 0 0 - 0 1 2 3 4 5 6 7 8 9 - 0 2 4 6 8 10 12 14 16 18 - 0 3 6 9 12 15 18 21 24 27 - 0 4 8 12 16 20 24 28 32 36 - 0 5 10 15 20 25 30 35 40 45 - 0 6 12 18 24 30 36 42 48 54 - 0 7 14 21 28 35 42 49 56 63 - 0 8 16 24 32 40 48 56 64 72 - 0 9 18 27 36 45 54 63 72 81 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 2 + 4 + 6 + 8 + 10 + 12 + 14 + 16 + 18 + 0 + 3 + 6 + 9 + 12 + 15 + 18 + 21 + 24 + 27 + 0 + 4 + 8 + 12 + 16 + 20 + 24 + 28 + 32 + 36 + 0 + 5 + 10 + 15 + 20 + 25 + 30 + 35 + 40 + 45 + 0 + 6 + 12 + 18 + 24 + 30 + 36 + 42 + 48 + 54 + 0 + 7 + 14 + 21 + 28 + 35 + 42 + 49 + 56 + 63 + 0 + 8 + 16 + 24 + 32 + 40 + 48 + 56 + 64 + 72 + 0 + 9 + 18 + 27 + 36 + 45 + 54 + 63 + 72 + 81 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tname-lt.h5.xml b/tools/testfiles/tname-lt.h5.xml index 4e948c9..a6d2480 100644 --- a/tools/testfiles/tname-lt.h5.xml +++ b/tools/testfiles/tname-lt.h5.xml @@ -1,8 +1,5 @@ -############################# -Expected output for 'h5dump --xml tname-lt.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Attribute Name="attr1<withlt"> <hdf5:Dataspace> @@ -17,7 +14,16 @@ Expected output for 'h5dump --xml tname-lt.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 97 98 99 100 101 102 103 104 105 0 + 97 + 98 + 99 + 100 + 101 + 102 + 103 + 104 + 105 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> @@ -26,9 +32,9 @@ Expected output for 'h5dump --xml tname-lt.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -44,16 +50,106 @@ Expected output for 'h5dump --xml tname-lt.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 0 0 0 0 0 0 - 0 1 2 3 4 5 6 7 8 9 - 0 2 4 6 8 10 12 14 16 18 - 0 3 6 9 12 15 18 21 24 27 - 0 4 8 12 16 20 24 28 32 36 - 0 5 10 15 20 25 30 35 40 45 - 0 6 12 18 24 30 36 42 48 54 - 0 7 14 21 28 35 42 49 56 63 - 0 8 16 24 32 40 48 56 64 72 - 0 9 18 27 36 45 54 63 72 81 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 2 + 4 + 6 + 8 + 10 + 12 + 14 + 16 + 18 + 0 + 3 + 6 + 9 + 12 + 15 + 18 + 21 + 24 + 27 + 0 + 4 + 8 + 12 + 16 + 20 + 24 + 28 + 32 + 36 + 0 + 5 + 10 + 15 + 20 + 25 + 30 + 35 + 40 + 45 + 0 + 6 + 12 + 18 + 24 + 30 + 36 + 42 + 48 + 54 + 0 + 7 + 14 + 21 + 28 + 35 + 42 + 49 + 56 + 63 + 0 + 8 + 16 + 24 + 32 + 40 + 48 + 56 + 64 + 72 + 0 + 9 + 18 + 27 + 36 + 45 + 54 + 63 + 72 + 81 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tname-quot.h5.xml b/tools/testfiles/tname-quot.h5.xml index e148630..96ad068 100644 --- a/tools/testfiles/tname-quot.h5.xml +++ b/tools/testfiles/tname-quot.h5.xml @@ -1,8 +1,5 @@ -############################# -Expected output for 'h5dump --xml tname-quot.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Attribute Name="attr1"withquot"> <hdf5:Dataspace> @@ -17,7 +14,16 @@ Expected output for 'h5dump --xml tname-quot.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 97 98 99 100 101 102 103 104 105 0 + 97 + 98 + 99 + 100 + 101 + 102 + 103 + 104 + 105 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> @@ -26,9 +32,9 @@ Expected output for 'h5dump --xml tname-quot.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -44,16 +50,106 @@ Expected output for 'h5dump --xml tname-quot.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 0 0 0 0 0 0 - 0 1 2 3 4 5 6 7 8 9 - 0 2 4 6 8 10 12 14 16 18 - 0 3 6 9 12 15 18 21 24 27 - 0 4 8 12 16 20 24 28 32 36 - 0 5 10 15 20 25 30 35 40 45 - 0 6 12 18 24 30 36 42 48 54 - 0 7 14 21 28 35 42 49 56 63 - 0 8 16 24 32 40 48 56 64 72 - 0 9 18 27 36 45 54 63 72 81 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 2 + 4 + 6 + 8 + 10 + 12 + 14 + 16 + 18 + 0 + 3 + 6 + 9 + 12 + 15 + 18 + 21 + 24 + 27 + 0 + 4 + 8 + 12 + 16 + 20 + 24 + 28 + 32 + 36 + 0 + 5 + 10 + 15 + 20 + 25 + 30 + 35 + 40 + 45 + 0 + 6 + 12 + 18 + 24 + 30 + 36 + 42 + 48 + 54 + 0 + 7 + 14 + 21 + 28 + 35 + 42 + 49 + 56 + 63 + 0 + 8 + 16 + 24 + 32 + 40 + 48 + 56 + 64 + 72 + 0 + 9 + 18 + 27 + 36 + 45 + 54 + 63 + 72 + 81 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tname-sp.h5.xml b/tools/testfiles/tname-sp.h5.xml index 231d0d5..d6f8278 100644 --- a/tools/testfiles/tname-sp.h5.xml +++ b/tools/testfiles/tname-sp.h5.xml @@ -1,8 +1,5 @@ -############################# -Expected output for 'h5dump --xml tname-sp.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Attribute Name="attr1 withspace"> <hdf5:Dataspace> @@ -17,7 +14,16 @@ Expected output for 'h5dump --xml tname-sp.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 97 98 99 100 101 102 103 104 105 0 + 97 + 98 + 99 + 100 + 101 + 102 + 103 + 104 + 105 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Attribute> @@ -26,9 +32,9 @@ Expected output for 'h5dump --xml tname-sp.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -44,16 +50,106 @@ Expected output for 'h5dump --xml tname-sp.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 0 0 0 0 0 0 - 0 1 2 3 4 5 6 7 8 9 - 0 2 4 6 8 10 12 14 16 18 - 0 3 6 9 12 15 18 21 24 27 - 0 4 8 12 16 20 24 28 32 36 - 0 5 10 15 20 25 30 35 40 45 - 0 6 12 18 24 30 36 42 48 54 - 0 7 14 21 28 35 42 49 56 63 - 0 8 16 24 32 40 48 56 64 72 - 0 9 18 27 36 45 54 63 72 81 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + 2 + 4 + 6 + 8 + 10 + 12 + 14 + 16 + 18 + 0 + 3 + 6 + 9 + 12 + 15 + 18 + 21 + 24 + 27 + 0 + 4 + 8 + 12 + 16 + 20 + 24 + 28 + 32 + 36 + 0 + 5 + 10 + 15 + 20 + 25 + 30 + 35 + 40 + 45 + 0 + 6 + 12 + 18 + 24 + 30 + 36 + 42 + 48 + 54 + 0 + 7 + 14 + 21 + 28 + 35 + 42 + 49 + 56 + 63 + 0 + 8 + 16 + 24 + 32 + 40 + 48 + 56 + 64 + 72 + 0 + 9 + 18 + 27 + 36 + 45 + 54 + 63 + 72 + 81 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tnamed_dtype_attr.ddl b/tools/testfiles/tnamed_dtype_attr.ddl index 4ef3158..7cd14ef 100644 --- a/tools/testfiles/tnamed_dtype_attr.ddl +++ b/tools/testfiles/tnamed_dtype_attr.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tnamed_dtype_attr.h5' -############################# HDF5 "tnamed_dtype_attr.h5" { GROUP "/" { DATASET "Dataset" { @@ -25,9 +22,7 @@ GROUP "/" { (0): 8 } } - DATATYPE "Link_to_Datatype" HARDLINK "/Datatype" - GROUP "g1" { ATTRIBUTE "Attribute" { DATATYPE "/Datatype" diff --git a/tools/testfiles/tnamed_dtype_attr.h5.xml b/tools/testfiles/tnamed_dtype_attr.h5.xml index ebba88b..199211c 100644 --- a/tools/testfiles/tnamed_dtype_attr.h5.xml +++ b/tools/testfiles/tnamed_dtype_attr.h5.xml @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump --xml tnamed_dtype_attr.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/"> <hdf5:Dataset Name="Dataset" OBJ-XID="xid_1256" H5Path= "/Dataset" Parents="xid_96" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> diff --git a/tools/testfiles/tnbit.ddl b/tools/testfiles/tnbit.ddl index c310592..bd32eaa 100644 --- a/tools/testfiles/tnbit.ddl +++ b/tools/testfiles/tnbit.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -H -p -d nbit tfilters.h5' -############################# HDF5 "tfilters.h5" { DATASET "nbit" { DATATYPE 32-bit little-endian integer @@ -8,13 +5,13 @@ DATASET "nbit" { STORAGE_LAYOUT { CHUNKED ( 10, 5 ) SIZE 76 (10.526:1 COMPRESSION) - } + } FILTERS { COMPRESSION NBIT } FILLVALUE { FILL_TIME H5D_FILL_TIME_IFSET - VALUE 0 + VALUE 0 } ALLOCATION_TIME { H5D_ALLOC_TIME_INCR diff --git a/tools/testfiles/tnestcomp-1.ddl b/tools/testfiles/tnestcomp-1.ddl index e68e22d..fda9c7c 100644 --- a/tools/testfiles/tnestcomp-1.ddl +++ b/tools/testfiles/tnestcomp-1.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tnestedcomp.h5' -############################# HDF5 "tnestedcomp.h5" { GROUP "/" { DATASET "ArrayOfStructures" { diff --git a/tools/testfiles/tnestcomp-1.ls b/tools/testfiles/tnestcomp-1.ls index 9dc193d..425d92f 100644 --- a/tools/testfiles/tnestcomp-1.ls +++ b/tools/testfiles/tnestcomp-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -d tnestedcomp.h5' -############################# / Group /ArrayOfStructures Dataset {10} Data: diff --git a/tools/testfiles/tnestcomp-2.ls b/tools/testfiles/tnestcomp-2.ls index be60e8d..64be630 100644 --- a/tools/testfiles/tnestcomp-2.ls +++ b/tools/testfiles/tnestcomp-2.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -d -S tnestedcomp.h5' -############################# / Group /ArrayOfStructures Dataset {10} Data: diff --git a/tools/testfiles/tnestcomp-3.ls b/tools/testfiles/tnestcomp-3.ls index 98eca8e..0a230cc 100644 --- a/tools/testfiles/tnestcomp-3.ls +++ b/tools/testfiles/tnestcomp-3.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -d -l tnestedcomp.h5' -############################# / Group /ArrayOfStructures Dataset {10} Data: diff --git a/tools/testfiles/tnestcomp-4.ls b/tools/testfiles/tnestcomp-4.ls index 6618597..d937e86 100644 --- a/tools/testfiles/tnestcomp-4.ls +++ b/tools/testfiles/tnestcomp-4.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -d -l -S tnestedcomp.h5' -############################# / Group /ArrayOfStructures Dataset {10} Data: diff --git a/tools/testfiles/tnestedcomp.h5.xml b/tools/testfiles/tnestedcomp.h5.xml index a2f928b..2cae353 100644 --- a/tools/testfiles/tnestedcomp.h5.xml +++ b/tools/testfiles/tnestedcomp.h5.xml @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump --xml tnestedcomp.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Dataset Name="ArrayOfStructures" OBJ-XID="xid_744" H5Path= "/ArrayOfStructures" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -71,11 +68,16 @@ Expected output for 'h5dump --xml tnestedcomp.h5' <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 0 0 1 "A" -100 100 1 1 0.5 "B" -100 100 2 4 0.333333 "C" -100 100 - 3 9 0.25 "D" -100 100 4 16 0.2 "E" -100 100 - 5 25 0.166667 "F" -100 100 6 36 0.142857 "G" -100 100 - 7 49 0.125 "H" -100 100 8 64 0.111111 "I" -100 100 - 9 81 0.1 "J" -100 100 + 0 0 1 "A" -100 100 + 1 1 0.5 "B" -100 100 + 2 4 0.333333 "C" -100 100 + 3 9 0.25 "D" -100 100 + 4 16 0.2 "E" -100 100 + 5 25 0.166667 "F" -100 100 + 6 36 0.142857 "G" -100 100 + 7 49 0.125 "H" -100 100 + 8 64 0.111111 "I" -100 100 + 9 81 0.1 "J" -100 100 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tno-subset.ddl b/tools/testfiles/tno-subset.ddl new file mode 100644 index 0000000..11aa264 --- /dev/null +++ b/tools/testfiles/tno-subset.ddl @@ -0,0 +1,9 @@ +HDF5 "tno-subset.h5" { +DATASET "AHFINDERDIRECT::ah_centroid_t[0] it=0 tl=0" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 1, 1 ) / ( 1, 1 ) } + DATA { + (0,0): 0 + } +} +} diff --git a/tools/testfiles/tno-subset.h5 b/tools/testfiles/tno-subset.h5 Binary files differnew file mode 100644 index 0000000..e6b6f57 --- /dev/null +++ b/tools/testfiles/tno-subset.h5 diff --git a/tools/testfiles/tnodata.h5.xml b/tools/testfiles/tnodata.h5.xml index 762475e..17b4ac9 100644 --- a/tools/testfiles/tnodata.h5.xml +++ b/tools/testfiles/tnodata.h5.xml @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump --xml tnodata.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Dataset Name="dset1" OBJ-XID="xid_744" H5Path= "/dset1" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -25,7 +22,11 @@ Expected output for 'h5dump --xml tnodata.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 0 + 0 + 0 + 0 + 0 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tnofilename-with-packed-bits.ddl b/tools/testfiles/tnofilename-with-packed-bits.ddl new file mode 100644 index 0000000..d3b12e3 --- /dev/null +++ b/tools/testfiles/tnofilename-with-packed-bits.ddl @@ -0,0 +1,101 @@ +usage: h5dump [OPTIONS] files + OPTIONS + -h, --help Print a usage message and exit + -n, --contents Print a list of the file contents and exit + -B, --superblock Print the content of the super block + -H, --header Print the header only; no data is displayed + -A, --onlyattr Print the header and value of attributes + -i, --object-ids Print the object ids + -r, --string Print 1-byte integer datasets as ASCII + -e, --escape Escape non printing characters + -V, --version Print version number and exit + -a P, --attribute=P Print the specified attribute + -d P, --dataset=P Print the specified dataset + -y, --noindex Do not print array indices with the data + -p, --properties Print dataset filters, storage layout and fill value + -f D, --filedriver=D Specify which driver to open the file with + -g P, --group=P Print the specified group and all members + -l P, --soft-link=P Print the value(s) of the specified soft link + -o F, --output=F Output raw data into file F + -b B, --binary=B Binary file output, of form B + -t P, --datatype=P Print the specified named datatype + -w N, --width=N Set the number of columns of output. A value of 0 (zero) + sets the number of columns to the maximum (65535). + Default width is 80 columns. + -m T, --format=T Set the floating point output format + -q Q, --sort_by=Q Sort groups and attributes by index Q + -z Z, --sort_order=Z Sort groups and attributes by order Z + -M L, --packedbits=L Print packed bits as unsigned integers, using mask + format L for an integer dataset specified with + option -d. L is a list of offset,length values, + separated by commas. Offset is the beginning bit in + the data value and length is the number of bits of + the mask. + -R, --region Print dataset pointed by region references + -x, --xml Output in XML using Schema + -u, --use-dtd Output in XML using DTD + -D U, --xml-dtd=U Use the DTD or schema at U + -X S, --xml-ns=S (XML Schema) Use qualified names n the XML + ":": no namespace, default: "hdf5:" + E.g., to dump a file called `-f', use h5dump -- -f + --enable-error-stack Prints messages from the HDF5 error stack as they + occur. + --no-compact-subset Disable compact form of subsetting and allow the use + of "[" in datset names. + + Subsetting is available by using the following options with a dataset + attribute. Subsetting is done by selecting a hyperslab from the data. + Thus, the options mirror those for performing a hyperslab selection. + One of the START, COUNT, STRIDE, or BLOCK parameters are mandatory if you do subsetting. + The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in + each dimension. START is optional and will default to 0 in each dimension. + + -s START, --start=START Offset of start of subsetting selection + -S STRIDE, --stride=STRIDE Hyperslab stride + -c COUNT, --count=COUNT Number of blocks to include in selection + -k BLOCK, --block=BLOCK Size of block in hyperslab + START, COUNT, STRIDE, and BLOCK - is a list of integers the number of which are equal to the + number of dimensions in the dataspace being queried + + D - is the file driver to use in opening the file. Acceptable values + are "sec2", "family", "split", "multi", "direct", and "stream". Without + the file driver flag, the file will be opened with each driver in + turn and in the order specified above until one driver succeeds + in opening the file. + F - is a filename. + P - is the full path from the root group to the object. + N - is an integer greater than 1. + T - is a string containing the floating point format, e.g '%.3f' + U - is a URI reference (as defined in [IETF RFC 2396], + updated by [IETF RFC 2732]) + B - is the form of binary output: NATIVE for a memory type, FILE for the + file type, LE or BE for pre-existing little or big endian types. + Must be used with -o (output file) and it is recommended that + -d (dataset) is used. B is an optional argument, defaults to NATIVE + Q - is the sort index type. It can be "creation_order" or "name" (default) + Z - is the sort order type. It can be "descending" or "ascending" (default) + + Examples: + + 1) Attribute foo of the group /bar_none in file quux.h5 + + h5dump -a /bar_none/foo quux.h5 + + 2) Selecting a subset from dataset /foo in file quux.h5 + + h5dump -d /foo -s "0,1" -S "1,1" -c "2,3" -k "2,2" quux.h5 + + 3) Saving dataset 'dset' in file quux.h5 to binary file 'out.bin' + using a little-endian type + + h5dump -d /dset -b LE -o out.bin quux.h5 + + 4) Display two packed bits (bits 0-1 and bits 4-6) in the dataset /dset + + h5dump -d /dset -M 0,1,4,3 quux.h5 + + 5) Dataset foo in files multi1.h5 multi2.h5 multi3.h5 + + h5dump -d /foo multi1.h5 multi2.h5 multi3.h5 + +h5dump error: missing file name diff --git a/tools/testfiles/tnullspace.ddl b/tools/testfiles/tnullspace.ddl index 5507b08..32e208f 100644 --- a/tools/testfiles/tnullspace.ddl +++ b/tools/testfiles/tnullspace.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tnullspace.h5' -############################# HDF5 "tnullspace.h5" { GROUP "/" { ATTRIBUTE "attr" { diff --git a/tools/testfiles/tobjref.h5.xml b/tools/testfiles/tobjref.h5.xml index 825cb27..016b298 100644 --- a/tools/testfiles/tobjref.h5.xml +++ b/tools/testfiles/tobjref.h5.xml @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump --xml tobjref.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Dataset Name="Dataset3" OBJ-XID="xid_2348" H5Path= "/Dataset3" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -39,9 +36,9 @@ Expected output for 'h5dump --xml tobjref.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -56,7 +53,10 @@ Expected output for 'h5dump --xml tobjref.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 3 6 9 + 0 + 3 + 6 + 9 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -64,9 +64,9 @@ Expected output for 'h5dump --xml tobjref.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -81,7 +81,10 @@ Expected output for 'h5dump --xml tobjref.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/topaque.h5.xml b/tools/testfiles/topaque.h5.xml index 3f44ace..314fd23 100644 --- a/tools/testfiles/topaque.h5.xml +++ b/tools/testfiles/topaque.h5.xml @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump --xml topaque.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Dataset Name="opaque test" OBJ-XID="xid_744" H5Path= "/opaque test" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> diff --git a/tools/testfiles/torderattr1.ddl b/tools/testfiles/torderattr1.ddl index de3b72b..fb7fd70 100644 --- a/tools/testfiles/torderattr1.ddl +++ b/tools/testfiles/torderattr1.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -H --sort_by=name --sort_order=ascending torderattr.h5' -############################# HDF5 "torderattr.h5" { GROUP "/" { ATTRIBUTE "a" { @@ -88,7 +85,6 @@ GROUP "/" { DATATYPE H5T_STD_U8LE DATASPACE SCALAR } - DATATYPE "tt" H5T_STD_I32LE; ATTRIBUTE "a" { DATATYPE H5T_STD_U8LE @@ -102,6 +98,5 @@ GROUP "/" { DATATYPE H5T_STD_U8LE DATASPACE SCALAR } - } } diff --git a/tools/testfiles/torderattr1.h5.xml b/tools/testfiles/torderattr1.h5.xml index 15481fc..027cd64 100644 --- a/tools/testfiles/torderattr1.h5.xml +++ b/tools/testfiles/torderattr1.h5.xml @@ -1,8 +1,5 @@ -############################# -Expected output for 'h5dump --xml -H --sort_by=name --sort_order=ascending torderattr.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/"> <hdf5:Attribute Name="a"> <hdf5:Dataspace> @@ -47,9 +44,9 @@ Expected output for 'h5dump --xml -H --sort_by=name --sort_order=ascending torde <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -107,9 +104,9 @@ Expected output for 'h5dump --xml -H --sort_by=name --sort_order=ascending torde <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> diff --git a/tools/testfiles/torderattr2.ddl b/tools/testfiles/torderattr2.ddl index 3686984..dbf615b 100644 --- a/tools/testfiles/torderattr2.ddl +++ b/tools/testfiles/torderattr2.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -H --sort_by=name --sort_order=descending torderattr.h5' -############################# HDF5 "torderattr.h5" { GROUP "/" { ATTRIBUTE "c" { @@ -28,7 +25,6 @@ GROUP "/" { DATATYPE H5T_STD_U8LE DATASPACE SCALAR } - DATATYPE "t" H5T_STD_I32LE; ATTRIBUTE "c" { DATATYPE H5T_STD_U8LE @@ -42,7 +38,6 @@ GROUP "/" { DATATYPE H5T_STD_U8LE DATASPACE SCALAR } - GROUP "gt" { ATTRIBUTE "c" { DATATYPE H5T_STD_U8LE diff --git a/tools/testfiles/torderattr2.h5.xml b/tools/testfiles/torderattr2.h5.xml index ef28140..fe441da 100644 --- a/tools/testfiles/torderattr2.h5.xml +++ b/tools/testfiles/torderattr2.h5.xml @@ -1,8 +1,5 @@ -############################# -Expected output for 'h5dump --xml -H --sort_by=name --sort_order=descending torderattr.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/"> <hdf5:Attribute Name="c"> <hdf5:Dataspace> @@ -143,9 +140,9 @@ Expected output for 'h5dump --xml -H --sort_by=name --sort_order=descending tord <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -203,9 +200,9 @@ Expected output for 'h5dump --xml -H --sort_by=name --sort_order=descending tord <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> diff --git a/tools/testfiles/torderattr3.ddl b/tools/testfiles/torderattr3.ddl index 9dc027a..a2990f7 100644 --- a/tools/testfiles/torderattr3.ddl +++ b/tools/testfiles/torderattr3.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -H --sort_by=creation_order --sort_order=ascending torderattr.h5' -############################# HDF5 "torderattr.h5" { GROUP "/" { ATTRIBUTE "a" { @@ -88,7 +85,6 @@ GROUP "/" { DATATYPE H5T_STD_U8LE DATASPACE SCALAR } - DATATYPE "tt" H5T_STD_I32LE; ATTRIBUTE "c" { DATATYPE H5T_STD_U8LE @@ -102,6 +98,5 @@ GROUP "/" { DATATYPE H5T_STD_U8LE DATASPACE SCALAR } - } } diff --git a/tools/testfiles/torderattr3.h5.xml b/tools/testfiles/torderattr3.h5.xml index e9e131a..38bbef7 100644 --- a/tools/testfiles/torderattr3.h5.xml +++ b/tools/testfiles/torderattr3.h5.xml @@ -1,8 +1,5 @@ -############################# -Expected output for 'h5dump --xml -H --sort_by=creation_order --sort_order=ascending torderattr.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/"> <hdf5:Attribute Name="a"> <hdf5:Dataspace> @@ -47,9 +44,9 @@ Expected output for 'h5dump --xml -H --sort_by=creation_order --sort_order=ascen <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -107,9 +104,9 @@ Expected output for 'h5dump --xml -H --sort_by=creation_order --sort_order=ascen <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> diff --git a/tools/testfiles/torderattr4.ddl b/tools/testfiles/torderattr4.ddl index 38af25d..000a852 100644 --- a/tools/testfiles/torderattr4.ddl +++ b/tools/testfiles/torderattr4.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -H --sort_by=creation_order --sort_order=descending torderattr.h5' -############################# HDF5 "torderattr.h5" { GROUP "/" { ATTRIBUTE "c" { @@ -28,7 +25,6 @@ GROUP "/" { DATATYPE H5T_STD_U8LE DATASPACE SCALAR } - DATATYPE "t" H5T_STD_I32LE; ATTRIBUTE "c" { DATATYPE H5T_STD_U8LE @@ -42,7 +38,6 @@ GROUP "/" { DATATYPE H5T_STD_U8LE DATASPACE SCALAR } - GROUP "gt" { ATTRIBUTE "a" { DATATYPE H5T_STD_U8LE diff --git a/tools/testfiles/torderattr4.h5.xml b/tools/testfiles/torderattr4.h5.xml index 2f4a2ed..0f90b22 100644 --- a/tools/testfiles/torderattr4.h5.xml +++ b/tools/testfiles/torderattr4.h5.xml @@ -1,8 +1,5 @@ -############################# -Expected output for 'h5dump --xml -H --sort_by=creation_order --sort_order=descending torderattr.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/"> <hdf5:Attribute Name="c"> <hdf5:Dataspace> @@ -143,9 +140,9 @@ Expected output for 'h5dump --xml -H --sort_by=creation_order --sort_order=desce <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -203,9 +200,9 @@ Expected output for 'h5dump --xml -H --sort_by=creation_order --sort_order=desce <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> diff --git a/tools/testfiles/tordergr1.ddl b/tools/testfiles/tordergr1.ddl index a78fc0f..0fa74d9 100644 --- a/tools/testfiles/tordergr1.ddl +++ b/tools/testfiles/tordergr1.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump --group=1 --sort_by=creation_order --sort_order=ascending tordergr.h5' -############################# HDF5 "tordergr.h5" { GROUP "1" { GROUP "c" { diff --git a/tools/testfiles/tordergr2.ddl b/tools/testfiles/tordergr2.ddl index 4a39d22..500d99c 100644 --- a/tools/testfiles/tordergr2.ddl +++ b/tools/testfiles/tordergr2.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump --group=1 --sort_by=creation_order --sort_order=descending tordergr.h5' -############################# HDF5 "tordergr.h5" { GROUP "1" { GROUP "a" { diff --git a/tools/testfiles/tordergr3.ddl b/tools/testfiles/tordergr3.ddl index c948ccb..99e9a6b 100644 --- a/tools/testfiles/tordergr3.ddl +++ b/tools/testfiles/tordergr3.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -g 2 -q name -z ascending tordergr.h5' -############################# HDF5 "tordergr.h5" { GROUP "2" { GROUP "a" { diff --git a/tools/testfiles/tordergr4.ddl b/tools/testfiles/tordergr4.ddl index 5f5c454..1613d9d 100644 --- a/tools/testfiles/tordergr4.ddl +++ b/tools/testfiles/tordergr4.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -g 2 -q name -z descending tordergr.h5' -############################# HDF5 "tordergr.h5" { GROUP "2" { GROUP "c" { diff --git a/tools/testfiles/tordergr5.ddl b/tools/testfiles/tordergr5.ddl index e7854bd..0ede967 100644 --- a/tools/testfiles/tordergr5.ddl +++ b/tools/testfiles/tordergr5.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -q creation_order tordergr.h5' -############################# HDF5 "tordergr.h5" { GROUP "/" { GROUP "2" { diff --git a/tools/testfiles/tpbitsArray.ddl b/tools/testfiles/tpbitsArray.ddl new file mode 100644 index 0000000..125abb8 --- /dev/null +++ b/tools/testfiles/tpbitsArray.ddl @@ -0,0 +1,14 @@ +HDF5 "tarray1.h5" { +DATASET "/Dataset1" { + DATATYPE H5T_ARRAY { [4] H5T_STD_I32LE } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } + PACKED_BITS OFFSET=0 LENGTH=1 + DATA { + (0): [ 0, 1, 0, 1 ], [ 0, 1, 0, 1 ], [ 0, 1, 0, 1 ], [ 0, 1, 0, 1 ] + } + PACKED_BITS OFFSET=1 LENGTH=1 + DATA { + (0): [ 0, 0, 1, 1 ], [ 1, 1, 0, 0 ], [ 0, 0, 1, 1 ], [ 1, 1, 0, 0 ] + } +} +} diff --git a/tools/testfiles/tpbitsCharLengthExceeded.ddl b/tools/testfiles/tpbitsCharLengthExceeded.ddl new file mode 100644 index 0000000..b0683a7 --- /dev/null +++ b/tools/testfiles/tpbitsCharLengthExceeded.ddl @@ -0,0 +1,18 @@ +HDF5 "packedbits.h5" { +DATASET "/DS08BITS" { + DATATYPE H5T_STD_I8LE + DATASPACE SIMPLE { ( 8, 8 ) / ( 8, 8 ) } + PACKED_BITS OFFSET=2 LENGTH=7 + DATA { + (0,0): 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0 + } +} +} +h5dump error: Packed Bit offset+length value(9) too large. Max is 8 diff --git a/tools/testfiles/tpbitsCharOffsetExceeded.ddl b/tools/testfiles/tpbitsCharOffsetExceeded.ddl new file mode 100644 index 0000000..530fa05 --- /dev/null +++ b/tools/testfiles/tpbitsCharOffsetExceeded.ddl @@ -0,0 +1,18 @@ +HDF5 "packedbits.h5" { +DATASET "/DS08BITS" { + DATATYPE H5T_STD_I8LE + DATASPACE SIMPLE { ( 8, 8 ) / ( 8, 8 ) } + PACKED_BITS OFFSET=8 LENGTH=1 + DATA { + (0,0): 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0 + } +} +} +h5dump error: Packed Bit offset+length value(9) too large. Max is 8 diff --git a/tools/testfiles/tpbitsCompound.ddl b/tools/testfiles/tpbitsCompound.ddl new file mode 100644 index 0000000..c84272a --- /dev/null +++ b/tools/testfiles/tpbitsCompound.ddl @@ -0,0 +1,66 @@ +HDF5 "tcompound.h5" { +DATASET "/dset1" { + DATATYPE H5T_COMPOUND { + H5T_STD_I32BE "a_name"; + H5T_IEEE_F32BE "b_name"; + H5T_IEEE_F64BE "c_name"; + } + DATASPACE SIMPLE { ( 5 ) / ( 5 ) } + PACKED_BITS OFFSET=0 LENGTH=1 + DATA { + (0): { + 0, + 0, + 1 + }, + (1): { + 1, + 1, + 0.5 + }, + (2): { + 0, + 4, + 0.333333 + }, + (3): { + 1, + 9, + 0.25 + }, + (4): { + 0, + 16, + 0.2 + } + } + PACKED_BITS OFFSET=1 LENGTH=1 + DATA { + (0): { + 0, + 0, + 1 + }, + (1): { + 0, + 1, + 0.5 + }, + (2): { + 1, + 4, + 0.333333 + }, + (3): { + 1, + 9, + 0.25 + }, + (4): { + 0, + 16, + 0.2 + } + } +} +} diff --git a/tools/testfiles/tpbitsIncomplete.ddl b/tools/testfiles/tpbitsIncomplete.ddl new file mode 100644 index 0000000..0da055b --- /dev/null +++ b/tools/testfiles/tpbitsIncomplete.ddl @@ -0,0 +1,101 @@ +usage: h5dump [OPTIONS] files + OPTIONS + -h, --help Print a usage message and exit + -n, --contents Print a list of the file contents and exit + -B, --superblock Print the content of the super block + -H, --header Print the header only; no data is displayed + -A, --onlyattr Print the header and value of attributes + -i, --object-ids Print the object ids + -r, --string Print 1-byte integer datasets as ASCII + -e, --escape Escape non printing characters + -V, --version Print version number and exit + -a P, --attribute=P Print the specified attribute + -d P, --dataset=P Print the specified dataset + -y, --noindex Do not print array indices with the data + -p, --properties Print dataset filters, storage layout and fill value + -f D, --filedriver=D Specify which driver to open the file with + -g P, --group=P Print the specified group and all members + -l P, --soft-link=P Print the value(s) of the specified soft link + -o F, --output=F Output raw data into file F + -b B, --binary=B Binary file output, of form B + -t P, --datatype=P Print the specified named datatype + -w N, --width=N Set the number of columns of output. A value of 0 (zero) + sets the number of columns to the maximum (65535). + Default width is 80 columns. + -m T, --format=T Set the floating point output format + -q Q, --sort_by=Q Sort groups and attributes by index Q + -z Z, --sort_order=Z Sort groups and attributes by order Z + -M L, --packedbits=L Print packed bits as unsigned integers, using mask + format L for an integer dataset specified with + option -d. L is a list of offset,length values, + separated by commas. Offset is the beginning bit in + the data value and length is the number of bits of + the mask. + -R, --region Print dataset pointed by region references + -x, --xml Output in XML using Schema + -u, --use-dtd Output in XML using DTD + -D U, --xml-dtd=U Use the DTD or schema at U + -X S, --xml-ns=S (XML Schema) Use qualified names n the XML + ":": no namespace, default: "hdf5:" + E.g., to dump a file called `-f', use h5dump -- -f + --enable-error-stack Prints messages from the HDF5 error stack as they + occur. + --no-compact-subset Disable compact form of subsetting and allow the use + of "[" in datset names. + + Subsetting is available by using the following options with a dataset + attribute. Subsetting is done by selecting a hyperslab from the data. + Thus, the options mirror those for performing a hyperslab selection. + One of the START, COUNT, STRIDE, or BLOCK parameters are mandatory if you do subsetting. + The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in + each dimension. START is optional and will default to 0 in each dimension. + + -s START, --start=START Offset of start of subsetting selection + -S STRIDE, --stride=STRIDE Hyperslab stride + -c COUNT, --count=COUNT Number of blocks to include in selection + -k BLOCK, --block=BLOCK Size of block in hyperslab + START, COUNT, STRIDE, and BLOCK - is a list of integers the number of which are equal to the + number of dimensions in the dataspace being queried + + D - is the file driver to use in opening the file. Acceptable values + are "sec2", "family", "split", "multi", "direct", and "stream". Without + the file driver flag, the file will be opened with each driver in + turn and in the order specified above until one driver succeeds + in opening the file. + F - is a filename. + P - is the full path from the root group to the object. + N - is an integer greater than 1. + T - is a string containing the floating point format, e.g '%.3f' + U - is a URI reference (as defined in [IETF RFC 2396], + updated by [IETF RFC 2732]) + B - is the form of binary output: NATIVE for a memory type, FILE for the + file type, LE or BE for pre-existing little or big endian types. + Must be used with -o (output file) and it is recommended that + -d (dataset) is used. B is an optional argument, defaults to NATIVE + Q - is the sort index type. It can be "creation_order" or "name" (default) + Z - is the sort order type. It can be "descending" or "ascending" (default) + + Examples: + + 1) Attribute foo of the group /bar_none in file quux.h5 + + h5dump -a /bar_none/foo quux.h5 + + 2) Selecting a subset from dataset /foo in file quux.h5 + + h5dump -d /foo -s "0,1" -S "1,1" -c "2,3" -k "2,2" quux.h5 + + 3) Saving dataset 'dset' in file quux.h5 to binary file 'out.bin' + using a little-endian type + + h5dump -d /dset -b LE -o out.bin quux.h5 + + 4) Display two packed bits (bits 0-1 and bits 4-6) in the dataset /dset + + h5dump -d /dset -M 0,1,4,3 quux.h5 + + 5) Dataset foo in files multi1.h5 multi2.h5 multi3.h5 + + h5dump -d /foo multi1.h5 multi2.h5 multi3.h5 + +h5dump error: Bad mask list(0,2,2,1,0,2,2,) diff --git a/tools/testfiles/tpbitsIntLengthExceeded.ddl b/tools/testfiles/tpbitsIntLengthExceeded.ddl new file mode 100644 index 0000000..1c919cd --- /dev/null +++ b/tools/testfiles/tpbitsIntLengthExceeded.ddl @@ -0,0 +1,18 @@ +HDF5 "packedbits.h5" { +DATASET "/DS16BITS" { + DATATYPE H5T_STD_I16LE + DATASPACE SIMPLE { ( 8, 16 ) / ( 8, 16 ) } + PACKED_BITS OFFSET=10 LENGTH=7 + DATA { + (0,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } +} +} +h5dump error: Packed Bit offset+length value(17) too large. Max is 16 diff --git a/tools/testfiles/tpbitsIntOffsetExceeded.ddl b/tools/testfiles/tpbitsIntOffsetExceeded.ddl new file mode 100644 index 0000000..f3b2a8c --- /dev/null +++ b/tools/testfiles/tpbitsIntOffsetExceeded.ddl @@ -0,0 +1,18 @@ +HDF5 "packedbits.h5" { +DATASET "/DS16BITS" { + DATATYPE H5T_STD_I16LE + DATASPACE SIMPLE { ( 8, 16 ) / ( 8, 16 ) } + PACKED_BITS OFFSET=16 LENGTH=1 + DATA { + (0,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } +} +} +h5dump error: Packed Bit offset+length value(17) too large. Max is 16 diff --git a/tools/testfiles/tpbitsLengthExceeded.ddl b/tools/testfiles/tpbitsLengthExceeded.ddl new file mode 100644 index 0000000..594d70c --- /dev/null +++ b/tools/testfiles/tpbitsLengthExceeded.ddl @@ -0,0 +1,101 @@ +usage: h5dump [OPTIONS] files + OPTIONS + -h, --help Print a usage message and exit + -n, --contents Print a list of the file contents and exit + -B, --superblock Print the content of the super block + -H, --header Print the header only; no data is displayed + -A, --onlyattr Print the header and value of attributes + -i, --object-ids Print the object ids + -r, --string Print 1-byte integer datasets as ASCII + -e, --escape Escape non printing characters + -V, --version Print version number and exit + -a P, --attribute=P Print the specified attribute + -d P, --dataset=P Print the specified dataset + -y, --noindex Do not print array indices with the data + -p, --properties Print dataset filters, storage layout and fill value + -f D, --filedriver=D Specify which driver to open the file with + -g P, --group=P Print the specified group and all members + -l P, --soft-link=P Print the value(s) of the specified soft link + -o F, --output=F Output raw data into file F + -b B, --binary=B Binary file output, of form B + -t P, --datatype=P Print the specified named datatype + -w N, --width=N Set the number of columns of output. A value of 0 (zero) + sets the number of columns to the maximum (65535). + Default width is 80 columns. + -m T, --format=T Set the floating point output format + -q Q, --sort_by=Q Sort groups and attributes by index Q + -z Z, --sort_order=Z Sort groups and attributes by order Z + -M L, --packedbits=L Print packed bits as unsigned integers, using mask + format L for an integer dataset specified with + option -d. L is a list of offset,length values, + separated by commas. Offset is the beginning bit in + the data value and length is the number of bits of + the mask. + -R, --region Print dataset pointed by region references + -x, --xml Output in XML using Schema + -u, --use-dtd Output in XML using DTD + -D U, --xml-dtd=U Use the DTD or schema at U + -X S, --xml-ns=S (XML Schema) Use qualified names n the XML + ":": no namespace, default: "hdf5:" + E.g., to dump a file called `-f', use h5dump -- -f + --enable-error-stack Prints messages from the HDF5 error stack as they + occur. + --no-compact-subset Disable compact form of subsetting and allow the use + of "[" in datset names. + + Subsetting is available by using the following options with a dataset + attribute. Subsetting is done by selecting a hyperslab from the data. + Thus, the options mirror those for performing a hyperslab selection. + One of the START, COUNT, STRIDE, or BLOCK parameters are mandatory if you do subsetting. + The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in + each dimension. START is optional and will default to 0 in each dimension. + + -s START, --start=START Offset of start of subsetting selection + -S STRIDE, --stride=STRIDE Hyperslab stride + -c COUNT, --count=COUNT Number of blocks to include in selection + -k BLOCK, --block=BLOCK Size of block in hyperslab + START, COUNT, STRIDE, and BLOCK - is a list of integers the number of which are equal to the + number of dimensions in the dataspace being queried + + D - is the file driver to use in opening the file. Acceptable values + are "sec2", "family", "split", "multi", "direct", and "stream". Without + the file driver flag, the file will be opened with each driver in + turn and in the order specified above until one driver succeeds + in opening the file. + F - is a filename. + P - is the full path from the root group to the object. + N - is an integer greater than 1. + T - is a string containing the floating point format, e.g '%.3f' + U - is a URI reference (as defined in [IETF RFC 2396], + updated by [IETF RFC 2732]) + B - is the form of binary output: NATIVE for a memory type, FILE for the + file type, LE or BE for pre-existing little or big endian types. + Must be used with -o (output file) and it is recommended that + -d (dataset) is used. B is an optional argument, defaults to NATIVE + Q - is the sort index type. It can be "creation_order" or "name" (default) + Z - is the sort order type. It can be "descending" or "ascending" (default) + + Examples: + + 1) Attribute foo of the group /bar_none in file quux.h5 + + h5dump -a /bar_none/foo quux.h5 + + 2) Selecting a subset from dataset /foo in file quux.h5 + + h5dump -d /foo -s "0,1" -S "1,1" -c "2,3" -k "2,2" quux.h5 + + 3) Saving dataset 'dset' in file quux.h5 to binary file 'out.bin' + using a little-endian type + + h5dump -d /dset -b LE -o out.bin quux.h5 + + 4) Display two packed bits (bits 0-1 and bits 4-6) in the dataset /dset + + h5dump -d /dset -M 0,1,4,3 quux.h5 + + 5) Dataset foo in files multi1.h5 multi2.h5 multi3.h5 + + h5dump -d /foo multi1.h5 multi2.h5 multi3.h5 + +h5dump error: Packed Bit offset+length value(65) too large. Max is 64 diff --git a/tools/testfiles/tpbitsLengthPositive.ddl b/tools/testfiles/tpbitsLengthPositive.ddl new file mode 100644 index 0000000..7b3b678 --- /dev/null +++ b/tools/testfiles/tpbitsLengthPositive.ddl @@ -0,0 +1,101 @@ +usage: h5dump [OPTIONS] files + OPTIONS + -h, --help Print a usage message and exit + -n, --contents Print a list of the file contents and exit + -B, --superblock Print the content of the super block + -H, --header Print the header only; no data is displayed + -A, --onlyattr Print the header and value of attributes + -i, --object-ids Print the object ids + -r, --string Print 1-byte integer datasets as ASCII + -e, --escape Escape non printing characters + -V, --version Print version number and exit + -a P, --attribute=P Print the specified attribute + -d P, --dataset=P Print the specified dataset + -y, --noindex Do not print array indices with the data + -p, --properties Print dataset filters, storage layout and fill value + -f D, --filedriver=D Specify which driver to open the file with + -g P, --group=P Print the specified group and all members + -l P, --soft-link=P Print the value(s) of the specified soft link + -o F, --output=F Output raw data into file F + -b B, --binary=B Binary file output, of form B + -t P, --datatype=P Print the specified named datatype + -w N, --width=N Set the number of columns of output. A value of 0 (zero) + sets the number of columns to the maximum (65535). + Default width is 80 columns. + -m T, --format=T Set the floating point output format + -q Q, --sort_by=Q Sort groups and attributes by index Q + -z Z, --sort_order=Z Sort groups and attributes by order Z + -M L, --packedbits=L Print packed bits as unsigned integers, using mask + format L for an integer dataset specified with + option -d. L is a list of offset,length values, + separated by commas. Offset is the beginning bit in + the data value and length is the number of bits of + the mask. + -R, --region Print dataset pointed by region references + -x, --xml Output in XML using Schema + -u, --use-dtd Output in XML using DTD + -D U, --xml-dtd=U Use the DTD or schema at U + -X S, --xml-ns=S (XML Schema) Use qualified names n the XML + ":": no namespace, default: "hdf5:" + E.g., to dump a file called `-f', use h5dump -- -f + --enable-error-stack Prints messages from the HDF5 error stack as they + occur. + --no-compact-subset Disable compact form of subsetting and allow the use + of "[" in datset names. + + Subsetting is available by using the following options with a dataset + attribute. Subsetting is done by selecting a hyperslab from the data. + Thus, the options mirror those for performing a hyperslab selection. + One of the START, COUNT, STRIDE, or BLOCK parameters are mandatory if you do subsetting. + The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in + each dimension. START is optional and will default to 0 in each dimension. + + -s START, --start=START Offset of start of subsetting selection + -S STRIDE, --stride=STRIDE Hyperslab stride + -c COUNT, --count=COUNT Number of blocks to include in selection + -k BLOCK, --block=BLOCK Size of block in hyperslab + START, COUNT, STRIDE, and BLOCK - is a list of integers the number of which are equal to the + number of dimensions in the dataspace being queried + + D - is the file driver to use in opening the file. Acceptable values + are "sec2", "family", "split", "multi", "direct", and "stream". Without + the file driver flag, the file will be opened with each driver in + turn and in the order specified above until one driver succeeds + in opening the file. + F - is a filename. + P - is the full path from the root group to the object. + N - is an integer greater than 1. + T - is a string containing the floating point format, e.g '%.3f' + U - is a URI reference (as defined in [IETF RFC 2396], + updated by [IETF RFC 2732]) + B - is the form of binary output: NATIVE for a memory type, FILE for the + file type, LE or BE for pre-existing little or big endian types. + Must be used with -o (output file) and it is recommended that + -d (dataset) is used. B is an optional argument, defaults to NATIVE + Q - is the sort index type. It can be "creation_order" or "name" (default) + Z - is the sort order type. It can be "descending" or "ascending" (default) + + Examples: + + 1) Attribute foo of the group /bar_none in file quux.h5 + + h5dump -a /bar_none/foo quux.h5 + + 2) Selecting a subset from dataset /foo in file quux.h5 + + h5dump -d /foo -s "0,1" -S "1,1" -c "2,3" -k "2,2" quux.h5 + + 3) Saving dataset 'dset' in file quux.h5 to binary file 'out.bin' + using a little-endian type + + h5dump -d /dset -b LE -o out.bin quux.h5 + + 4) Display two packed bits (bits 0-1 and bits 4-6) in the dataset /dset + + h5dump -d /dset -M 0,1,4,3 quux.h5 + + 5) Dataset foo in files multi1.h5 multi2.h5 multi3.h5 + + h5dump -d /foo multi1.h5 multi2.h5 multi3.h5 + +h5dump error: Packed Bit length value(0) must be positive. diff --git a/tools/testfiles/tpbitsLongLengthExceeded.ddl b/tools/testfiles/tpbitsLongLengthExceeded.ddl new file mode 100644 index 0000000..812c300 --- /dev/null +++ b/tools/testfiles/tpbitsLongLengthExceeded.ddl @@ -0,0 +1,26 @@ +HDF5 "packedbits.h5" { +DATASET "/DS32BITS" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 8, 32 ) / ( 8, 32 ) } + PACKED_BITS OFFSET=26 LENGTH=7 + DATA { + (0,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (0,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } +} +} +h5dump error: Packed Bit offset+length value(33) too large. Max is 32 diff --git a/tools/testfiles/tpbitsLongOffsetExceeded.ddl b/tools/testfiles/tpbitsLongOffsetExceeded.ddl new file mode 100644 index 0000000..cbea722 --- /dev/null +++ b/tools/testfiles/tpbitsLongOffsetExceeded.ddl @@ -0,0 +1,26 @@ +HDF5 "packedbits.h5" { +DATASET "/DS32BITS" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 8, 32 ) / ( 8, 32 ) } + PACKED_BITS OFFSET=32 LENGTH=1 + DATA { + (0,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (0,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } +} +} +h5dump error: Packed Bit offset+length value(33) too large. Max is 32 diff --git a/tools/testfiles/tpbitsMax.ddl b/tools/testfiles/tpbitsMax.ddl new file mode 100644 index 0000000..e569488 --- /dev/null +++ b/tools/testfiles/tpbitsMax.ddl @@ -0,0 +1,94 @@ +HDF5 "packedbits.h5" { +DATASET "/DS08BITS" { + DATATYPE H5T_STD_I8LE + DATASPACE SIMPLE { ( 8, 8 ) / ( 8, 8 ) } + PACKED_BITS OFFSET=0 LENGTH=1 + DATA { + (0,0): 1, 0, 0, 0, 0, 0, 0, 0, + (1,0): 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=1 LENGTH=1 + DATA { + (0,0): 1, 1, 0, 0, 0, 0, 0, 0, + (1,0): 1, 0, 0, 0, 0, 0, 0, 0, + (2,0): 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=2 LENGTH=1 + DATA { + (0,0): 1, 1, 1, 0, 0, 0, 0, 0, + (1,0): 1, 1, 0, 0, 0, 0, 0, 0, + (2,0): 1, 0, 0, 0, 0, 0, 0, 0, + (3,0): 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=3 LENGTH=1 + DATA { + (0,0): 1, 1, 1, 1, 0, 0, 0, 0, + (1,0): 1, 1, 1, 0, 0, 0, 0, 0, + (2,0): 1, 1, 0, 0, 0, 0, 0, 0, + (3,0): 1, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=4 LENGTH=1 + DATA { + (0,0): 1, 1, 1, 1, 1, 0, 0, 0, + (1,0): 1, 1, 1, 1, 0, 0, 0, 0, + (2,0): 1, 1, 1, 0, 0, 0, 0, 0, + (3,0): 1, 1, 0, 0, 0, 0, 0, 0, + (4,0): 1, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=5 LENGTH=1 + DATA { + (0,0): 1, 1, 1, 1, 1, 1, 0, 0, + (1,0): 1, 1, 1, 1, 1, 0, 0, 0, + (2,0): 1, 1, 1, 1, 0, 0, 0, 0, + (3,0): 1, 1, 1, 0, 0, 0, 0, 0, + (4,0): 1, 1, 0, 0, 0, 0, 0, 0, + (5,0): 1, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=6 LENGTH=1 + DATA { + (0,0): 1, 1, 1, 1, 1, 1, 1, 0, + (1,0): 1, 1, 1, 1, 1, 1, 0, 0, + (2,0): 1, 1, 1, 1, 1, 0, 0, 0, + (3,0): 1, 1, 1, 1, 0, 0, 0, 0, + (4,0): 1, 1, 1, 0, 0, 0, 0, 0, + (5,0): 1, 1, 0, 0, 0, 0, 0, 0, + (6,0): 1, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=7 LENGTH=1 + DATA { + (0,0): 1, 1, 1, 1, 1, 1, 1, 1, + (1,0): 1, 1, 1, 1, 1, 1, 1, 0, + (2,0): 1, 1, 1, 1, 1, 1, 0, 0, + (3,0): 1, 1, 1, 1, 1, 0, 0, 0, + (4,0): 1, 1, 1, 1, 0, 0, 0, 0, + (5,0): 1, 1, 1, 0, 0, 0, 0, 0, + (6,0): 1, 1, 0, 0, 0, 0, 0, 0, + (7,0): 1, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsMaxExceeded.ddl b/tools/testfiles/tpbitsMaxExceeded.ddl new file mode 100644 index 0000000..60bc2b1 --- /dev/null +++ b/tools/testfiles/tpbitsMaxExceeded.ddl @@ -0,0 +1,101 @@ +usage: h5dump [OPTIONS] files + OPTIONS + -h, --help Print a usage message and exit + -n, --contents Print a list of the file contents and exit + -B, --superblock Print the content of the super block + -H, --header Print the header only; no data is displayed + -A, --onlyattr Print the header and value of attributes + -i, --object-ids Print the object ids + -r, --string Print 1-byte integer datasets as ASCII + -e, --escape Escape non printing characters + -V, --version Print version number and exit + -a P, --attribute=P Print the specified attribute + -d P, --dataset=P Print the specified dataset + -y, --noindex Do not print array indices with the data + -p, --properties Print dataset filters, storage layout and fill value + -f D, --filedriver=D Specify which driver to open the file with + -g P, --group=P Print the specified group and all members + -l P, --soft-link=P Print the value(s) of the specified soft link + -o F, --output=F Output raw data into file F + -b B, --binary=B Binary file output, of form B + -t P, --datatype=P Print the specified named datatype + -w N, --width=N Set the number of columns of output. A value of 0 (zero) + sets the number of columns to the maximum (65535). + Default width is 80 columns. + -m T, --format=T Set the floating point output format + -q Q, --sort_by=Q Sort groups and attributes by index Q + -z Z, --sort_order=Z Sort groups and attributes by order Z + -M L, --packedbits=L Print packed bits as unsigned integers, using mask + format L for an integer dataset specified with + option -d. L is a list of offset,length values, + separated by commas. Offset is the beginning bit in + the data value and length is the number of bits of + the mask. + -R, --region Print dataset pointed by region references + -x, --xml Output in XML using Schema + -u, --use-dtd Output in XML using DTD + -D U, --xml-dtd=U Use the DTD or schema at U + -X S, --xml-ns=S (XML Schema) Use qualified names n the XML + ":": no namespace, default: "hdf5:" + E.g., to dump a file called `-f', use h5dump -- -f + --enable-error-stack Prints messages from the HDF5 error stack as they + occur. + --no-compact-subset Disable compact form of subsetting and allow the use + of "[" in datset names. + + Subsetting is available by using the following options with a dataset + attribute. Subsetting is done by selecting a hyperslab from the data. + Thus, the options mirror those for performing a hyperslab selection. + One of the START, COUNT, STRIDE, or BLOCK parameters are mandatory if you do subsetting. + The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in + each dimension. START is optional and will default to 0 in each dimension. + + -s START, --start=START Offset of start of subsetting selection + -S STRIDE, --stride=STRIDE Hyperslab stride + -c COUNT, --count=COUNT Number of blocks to include in selection + -k BLOCK, --block=BLOCK Size of block in hyperslab + START, COUNT, STRIDE, and BLOCK - is a list of integers the number of which are equal to the + number of dimensions in the dataspace being queried + + D - is the file driver to use in opening the file. Acceptable values + are "sec2", "family", "split", "multi", "direct", and "stream". Without + the file driver flag, the file will be opened with each driver in + turn and in the order specified above until one driver succeeds + in opening the file. + F - is a filename. + P - is the full path from the root group to the object. + N - is an integer greater than 1. + T - is a string containing the floating point format, e.g '%.3f' + U - is a URI reference (as defined in [IETF RFC 2396], + updated by [IETF RFC 2732]) + B - is the form of binary output: NATIVE for a memory type, FILE for the + file type, LE or BE for pre-existing little or big endian types. + Must be used with -o (output file) and it is recommended that + -d (dataset) is used. B is an optional argument, defaults to NATIVE + Q - is the sort index type. It can be "creation_order" or "name" (default) + Z - is the sort order type. It can be "descending" or "ascending" (default) + + Examples: + + 1) Attribute foo of the group /bar_none in file quux.h5 + + h5dump -a /bar_none/foo quux.h5 + + 2) Selecting a subset from dataset /foo in file quux.h5 + + h5dump -d /foo -s "0,1" -S "1,1" -c "2,3" -k "2,2" quux.h5 + + 3) Saving dataset 'dset' in file quux.h5 to binary file 'out.bin' + using a little-endian type + + h5dump -d /dset -b LE -o out.bin quux.h5 + + 4) Display two packed bits (bits 0-1 and bits 4-6) in the dataset /dset + + h5dump -d /dset -M 0,1,4,3 quux.h5 + + 5) Dataset foo in files multi1.h5 multi2.h5 multi3.h5 + + h5dump -d /foo multi1.h5 multi2.h5 multi3.h5 + +h5dump error: Too many masks requested (max. 8). Mask list(0,1,0,1,1,1,2,1,3,1,4,1,5,1,6,1,7,1) diff --git a/tools/testfiles/tpbitsOffsetExceeded.ddl b/tools/testfiles/tpbitsOffsetExceeded.ddl new file mode 100644 index 0000000..5db6a91 --- /dev/null +++ b/tools/testfiles/tpbitsOffsetExceeded.ddl @@ -0,0 +1,101 @@ +usage: h5dump [OPTIONS] files + OPTIONS + -h, --help Print a usage message and exit + -n, --contents Print a list of the file contents and exit + -B, --superblock Print the content of the super block + -H, --header Print the header only; no data is displayed + -A, --onlyattr Print the header and value of attributes + -i, --object-ids Print the object ids + -r, --string Print 1-byte integer datasets as ASCII + -e, --escape Escape non printing characters + -V, --version Print version number and exit + -a P, --attribute=P Print the specified attribute + -d P, --dataset=P Print the specified dataset + -y, --noindex Do not print array indices with the data + -p, --properties Print dataset filters, storage layout and fill value + -f D, --filedriver=D Specify which driver to open the file with + -g P, --group=P Print the specified group and all members + -l P, --soft-link=P Print the value(s) of the specified soft link + -o F, --output=F Output raw data into file F + -b B, --binary=B Binary file output, of form B + -t P, --datatype=P Print the specified named datatype + -w N, --width=N Set the number of columns of output. A value of 0 (zero) + sets the number of columns to the maximum (65535). + Default width is 80 columns. + -m T, --format=T Set the floating point output format + -q Q, --sort_by=Q Sort groups and attributes by index Q + -z Z, --sort_order=Z Sort groups and attributes by order Z + -M L, --packedbits=L Print packed bits as unsigned integers, using mask + format L for an integer dataset specified with + option -d. L is a list of offset,length values, + separated by commas. Offset is the beginning bit in + the data value and length is the number of bits of + the mask. + -R, --region Print dataset pointed by region references + -x, --xml Output in XML using Schema + -u, --use-dtd Output in XML using DTD + -D U, --xml-dtd=U Use the DTD or schema at U + -X S, --xml-ns=S (XML Schema) Use qualified names n the XML + ":": no namespace, default: "hdf5:" + E.g., to dump a file called `-f', use h5dump -- -f + --enable-error-stack Prints messages from the HDF5 error stack as they + occur. + --no-compact-subset Disable compact form of subsetting and allow the use + of "[" in datset names. + + Subsetting is available by using the following options with a dataset + attribute. Subsetting is done by selecting a hyperslab from the data. + Thus, the options mirror those for performing a hyperslab selection. + One of the START, COUNT, STRIDE, or BLOCK parameters are mandatory if you do subsetting. + The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in + each dimension. START is optional and will default to 0 in each dimension. + + -s START, --start=START Offset of start of subsetting selection + -S STRIDE, --stride=STRIDE Hyperslab stride + -c COUNT, --count=COUNT Number of blocks to include in selection + -k BLOCK, --block=BLOCK Size of block in hyperslab + START, COUNT, STRIDE, and BLOCK - is a list of integers the number of which are equal to the + number of dimensions in the dataspace being queried + + D - is the file driver to use in opening the file. Acceptable values + are "sec2", "family", "split", "multi", "direct", and "stream". Without + the file driver flag, the file will be opened with each driver in + turn and in the order specified above until one driver succeeds + in opening the file. + F - is a filename. + P - is the full path from the root group to the object. + N - is an integer greater than 1. + T - is a string containing the floating point format, e.g '%.3f' + U - is a URI reference (as defined in [IETF RFC 2396], + updated by [IETF RFC 2732]) + B - is the form of binary output: NATIVE for a memory type, FILE for the + file type, LE or BE for pre-existing little or big endian types. + Must be used with -o (output file) and it is recommended that + -d (dataset) is used. B is an optional argument, defaults to NATIVE + Q - is the sort index type. It can be "creation_order" or "name" (default) + Z - is the sort order type. It can be "descending" or "ascending" (default) + + Examples: + + 1) Attribute foo of the group /bar_none in file quux.h5 + + h5dump -a /bar_none/foo quux.h5 + + 2) Selecting a subset from dataset /foo in file quux.h5 + + h5dump -d /foo -s "0,1" -S "1,1" -c "2,3" -k "2,2" quux.h5 + + 3) Saving dataset 'dset' in file quux.h5 to binary file 'out.bin' + using a little-endian type + + h5dump -d /dset -b LE -o out.bin quux.h5 + + 4) Display two packed bits (bits 0-1 and bits 4-6) in the dataset /dset + + h5dump -d /dset -M 0,1,4,3 quux.h5 + + 5) Dataset foo in files multi1.h5 multi2.h5 multi3.h5 + + h5dump -d /foo multi1.h5 multi2.h5 multi3.h5 + +h5dump error: Packed Bit offset value(64) must be between 0 and 63 diff --git a/tools/testfiles/tpbitsOffsetNegative.ddl b/tools/testfiles/tpbitsOffsetNegative.ddl new file mode 100644 index 0000000..060fc37 --- /dev/null +++ b/tools/testfiles/tpbitsOffsetNegative.ddl @@ -0,0 +1,101 @@ +usage: h5dump [OPTIONS] files + OPTIONS + -h, --help Print a usage message and exit + -n, --contents Print a list of the file contents and exit + -B, --superblock Print the content of the super block + -H, --header Print the header only; no data is displayed + -A, --onlyattr Print the header and value of attributes + -i, --object-ids Print the object ids + -r, --string Print 1-byte integer datasets as ASCII + -e, --escape Escape non printing characters + -V, --version Print version number and exit + -a P, --attribute=P Print the specified attribute + -d P, --dataset=P Print the specified dataset + -y, --noindex Do not print array indices with the data + -p, --properties Print dataset filters, storage layout and fill value + -f D, --filedriver=D Specify which driver to open the file with + -g P, --group=P Print the specified group and all members + -l P, --soft-link=P Print the value(s) of the specified soft link + -o F, --output=F Output raw data into file F + -b B, --binary=B Binary file output, of form B + -t P, --datatype=P Print the specified named datatype + -w N, --width=N Set the number of columns of output. A value of 0 (zero) + sets the number of columns to the maximum (65535). + Default width is 80 columns. + -m T, --format=T Set the floating point output format + -q Q, --sort_by=Q Sort groups and attributes by index Q + -z Z, --sort_order=Z Sort groups and attributes by order Z + -M L, --packedbits=L Print packed bits as unsigned integers, using mask + format L for an integer dataset specified with + option -d. L is a list of offset,length values, + separated by commas. Offset is the beginning bit in + the data value and length is the number of bits of + the mask. + -R, --region Print dataset pointed by region references + -x, --xml Output in XML using Schema + -u, --use-dtd Output in XML using DTD + -D U, --xml-dtd=U Use the DTD or schema at U + -X S, --xml-ns=S (XML Schema) Use qualified names n the XML + ":": no namespace, default: "hdf5:" + E.g., to dump a file called `-f', use h5dump -- -f + --enable-error-stack Prints messages from the HDF5 error stack as they + occur. + --no-compact-subset Disable compact form of subsetting and allow the use + of "[" in datset names. + + Subsetting is available by using the following options with a dataset + attribute. Subsetting is done by selecting a hyperslab from the data. + Thus, the options mirror those for performing a hyperslab selection. + One of the START, COUNT, STRIDE, or BLOCK parameters are mandatory if you do subsetting. + The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in + each dimension. START is optional and will default to 0 in each dimension. + + -s START, --start=START Offset of start of subsetting selection + -S STRIDE, --stride=STRIDE Hyperslab stride + -c COUNT, --count=COUNT Number of blocks to include in selection + -k BLOCK, --block=BLOCK Size of block in hyperslab + START, COUNT, STRIDE, and BLOCK - is a list of integers the number of which are equal to the + number of dimensions in the dataspace being queried + + D - is the file driver to use in opening the file. Acceptable values + are "sec2", "family", "split", "multi", "direct", and "stream". Without + the file driver flag, the file will be opened with each driver in + turn and in the order specified above until one driver succeeds + in opening the file. + F - is a filename. + P - is the full path from the root group to the object. + N - is an integer greater than 1. + T - is a string containing the floating point format, e.g '%.3f' + U - is a URI reference (as defined in [IETF RFC 2396], + updated by [IETF RFC 2732]) + B - is the form of binary output: NATIVE for a memory type, FILE for the + file type, LE or BE for pre-existing little or big endian types. + Must be used with -o (output file) and it is recommended that + -d (dataset) is used. B is an optional argument, defaults to NATIVE + Q - is the sort index type. It can be "creation_order" or "name" (default) + Z - is the sort order type. It can be "descending" or "ascending" (default) + + Examples: + + 1) Attribute foo of the group /bar_none in file quux.h5 + + h5dump -a /bar_none/foo quux.h5 + + 2) Selecting a subset from dataset /foo in file quux.h5 + + h5dump -d /foo -s "0,1" -S "1,1" -c "2,3" -k "2,2" quux.h5 + + 3) Saving dataset 'dset' in file quux.h5 to binary file 'out.bin' + using a little-endian type + + h5dump -d /dset -b LE -o out.bin quux.h5 + + 4) Display two packed bits (bits 0-1 and bits 4-6) in the dataset /dset + + h5dump -d /dset -M 0,1,4,3 quux.h5 + + 5) Dataset foo in files multi1.h5 multi2.h5 multi3.h5 + + h5dump -d /foo multi1.h5 multi2.h5 multi3.h5 + +h5dump error: Bad mask list(-1,1) diff --git a/tools/testfiles/tpbitsOverlapped.ddl b/tools/testfiles/tpbitsOverlapped.ddl new file mode 100644 index 0000000..9dcc9d2 --- /dev/null +++ b/tools/testfiles/tpbitsOverlapped.ddl @@ -0,0 +1,50 @@ +HDF5 "packedbits.h5" { +DATASET "/DS08BITS" { + DATATYPE H5T_STD_I8LE + DATASPACE SIMPLE { ( 8, 8 ) / ( 8, 8 ) } + PACKED_BITS OFFSET=0 LENGTH=1 + DATA { + (0,0): 1, 0, 0, 0, 0, 0, 0, 0, + (1,0): 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=1 LENGTH=1 + DATA { + (0,0): 1, 1, 0, 0, 0, 0, 0, 0, + (1,0): 1, 0, 0, 0, 0, 0, 0, 0, + (2,0): 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=2 LENGTH=1 + DATA { + (0,0): 1, 1, 1, 0, 0, 0, 0, 0, + (1,0): 1, 1, 0, 0, 0, 0, 0, 0, + (2,0): 1, 0, 0, 0, 0, 0, 0, 0, + (3,0): 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=0 LENGTH=3 + DATA { + (0,0): 7, 6, 4, 0, 0, 0, 0, 0, + (1,0): 6, 4, 0, 0, 0, 0, 0, 0, + (2,0): 4, 0, 0, 0, 0, 0, 0, 0, + (3,0): 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsSigned.ddl b/tools/testfiles/tpbitsSigned.ddl new file mode 100644 index 0000000..b843388 --- /dev/null +++ b/tools/testfiles/tpbitsSigned.ddl @@ -0,0 +1,28 @@ +HDF5 "packedbits.h5" { +DATASET "/DS08BITS" { + DATATYPE H5T_STD_I8LE + DATASPACE SIMPLE { ( 8, 8 ) / ( 8, 8 ) } + PACKED_BITS OFFSET=0 LENGTH=2 + DATA { + (0,0): 3, 2, 0, 0, 0, 0, 0, 0, + (1,0): 2, 0, 0, 0, 0, 0, 0, 0, + (2,0): 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=2 LENGTH=6 + DATA { + (0,0): 63, 63, 63, 62, 60, 56, 48, 32, + (1,0): 63, 63, 62, 60, 56, 48, 32, 0, + (2,0): 63, 62, 60, 56, 48, 32, 0, 0, + (3,0): 62, 60, 56, 48, 32, 0, 0, 0, + (4,0): 60, 56, 48, 32, 0, 0, 0, 0, + (5,0): 56, 48, 32, 0, 0, 0, 0, 0, + (6,0): 48, 32, 0, 0, 0, 0, 0, 0, + (7,0): 32, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsSigned2.ddl b/tools/testfiles/tpbitsSigned2.ddl new file mode 100644 index 0000000..932b5fd --- /dev/null +++ b/tools/testfiles/tpbitsSigned2.ddl @@ -0,0 +1,50 @@ +HDF5 "packedbits.h5" { +DATASET "/DS08BITS" { + DATATYPE H5T_STD_I8LE + DATASPACE SIMPLE { ( 8, 8 ) / ( 8, 8 ) } + PACKED_BITS OFFSET=0 LENGTH=2 + DATA { + (0,0): 3, 2, 0, 0, 0, 0, 0, 0, + (1,0): 2, 0, 0, 0, 0, 0, 0, 0, + (2,0): 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=2 LENGTH=2 + DATA { + (0,0): 3, 3, 3, 2, 0, 0, 0, 0, + (1,0): 3, 3, 2, 0, 0, 0, 0, 0, + (2,0): 3, 2, 0, 0, 0, 0, 0, 0, + (3,0): 2, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=4 LENGTH=2 + DATA { + (0,0): 3, 3, 3, 3, 3, 2, 0, 0, + (1,0): 3, 3, 3, 3, 2, 0, 0, 0, + (2,0): 3, 3, 3, 2, 0, 0, 0, 0, + (3,0): 3, 3, 2, 0, 0, 0, 0, 0, + (4,0): 3, 2, 0, 0, 0, 0, 0, 0, + (5,0): 2, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=6 LENGTH=2 + DATA { + (0,0): 3, 3, 3, 3, 3, 3, 3, 2, + (1,0): 3, 3, 3, 3, 3, 3, 2, 0, + (2,0): 3, 3, 3, 3, 3, 2, 0, 0, + (3,0): 3, 3, 3, 3, 2, 0, 0, 0, + (4,0): 3, 3, 3, 2, 0, 0, 0, 0, + (5,0): 3, 3, 2, 0, 0, 0, 0, 0, + (6,0): 3, 2, 0, 0, 0, 0, 0, 0, + (7,0): 2, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsSigned4.ddl b/tools/testfiles/tpbitsSigned4.ddl new file mode 100644 index 0000000..9eacd83 --- /dev/null +++ b/tools/testfiles/tpbitsSigned4.ddl @@ -0,0 +1,28 @@ +HDF5 "packedbits.h5" { +DATASET "/DS08BITS" { + DATATYPE H5T_STD_I8LE + DATASPACE SIMPLE { ( 8, 8 ) / ( 8, 8 ) } + PACKED_BITS OFFSET=0 LENGTH=4 + DATA { + (0,0): 15, 14, 12, 8, 0, 0, 0, 0, + (1,0): 14, 12, 8, 0, 0, 0, 0, 0, + (2,0): 12, 8, 0, 0, 0, 0, 0, 0, + (3,0): 8, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=4 LENGTH=4 + DATA { + (0,0): 15, 15, 15, 15, 15, 14, 12, 8, + (1,0): 15, 15, 15, 15, 14, 12, 8, 0, + (2,0): 15, 15, 15, 14, 12, 8, 0, 0, + (3,0): 15, 15, 14, 12, 8, 0, 0, 0, + (4,0): 15, 14, 12, 8, 0, 0, 0, 0, + (5,0): 14, 12, 8, 0, 0, 0, 0, 0, + (6,0): 12, 8, 0, 0, 0, 0, 0, 0, + (7,0): 8, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsSignedInt.ddl b/tools/testfiles/tpbitsSignedInt.ddl new file mode 100644 index 0000000..5c37e77 --- /dev/null +++ b/tools/testfiles/tpbitsSignedInt.ddl @@ -0,0 +1,28 @@ +HDF5 "packedbits.h5" { +DATASET "/DS16BITS" { + DATATYPE H5T_STD_I16LE + DATASPACE SIMPLE { ( 8, 16 ) / ( 8, 16 ) } + PACKED_BITS OFFSET=0 LENGTH=2 + DATA { + (0,0): 3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=10 LENGTH=6 + DATA { + (0,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, + (1,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, + (2,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, + (3,0): 63, 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, + (4,0): 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, 0, + (5,0): 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, 0, 0, + (6,0): 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, 0, 0, 0, + (7,0): 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsSignedInt4.ddl b/tools/testfiles/tpbitsSignedInt4.ddl new file mode 100644 index 0000000..4e9f0f6 --- /dev/null +++ b/tools/testfiles/tpbitsSignedInt4.ddl @@ -0,0 +1,50 @@ +HDF5 "packedbits.h5" { +DATASET "/DS16BITS" { + DATATYPE H5T_STD_I16LE + DATASPACE SIMPLE { ( 8, 16 ) / ( 8, 16 ) } + PACKED_BITS OFFSET=0 LENGTH=4 + DATA { + (0,0): 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=4 LENGTH=4 + DATA { + (0,0): 15, 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=8 LENGTH=4 + DATA { + (0,0): 15, 15, 15, 15, 15, 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, + (1,0): 15, 15, 15, 15, 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, + (2,0): 15, 15, 15, 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, + (3,0): 15, 15, 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, + (4,0): 15, 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=12 LENGTH=4 + DATA { + (0,0): 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 14, 12, 8, + (1,0): 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 14, 12, 8, 0, + (2,0): 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 14, 12, 8, 0, 0, + (3,0): 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, + (4,0): 15, 15, 15, 15, 15, 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, + (5,0): 15, 15, 15, 15, 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, + (6,0): 15, 15, 15, 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, + (7,0): 15, 15, 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsSignedInt8.ddl b/tools/testfiles/tpbitsSignedInt8.ddl new file mode 100644 index 0000000..f2d6069 --- /dev/null +++ b/tools/testfiles/tpbitsSignedInt8.ddl @@ -0,0 +1,34 @@ +HDF5 "packedbits.h5" { +DATASET "/DS16BITS" { + DATATYPE H5T_STD_I16LE + DATASPACE SIMPLE { ( 8, 16 ) / ( 8, 16 ) } + PACKED_BITS OFFSET=0 LENGTH=8 + DATA { + (0,0): 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=8 LENGTH=8 + DATA { + (0,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 252, 248, 240, + (0,13): 224, 192, 128, + (1,0): 255, 255, 255, 255, 255, 255, 255, 255, 254, 252, 248, 240, 224, + (1,13): 192, 128, 0, + (2,0): 255, 255, 255, 255, 255, 255, 255, 254, 252, 248, 240, 224, 192, + (2,13): 128, 0, 0, + (3,0): 255, 255, 255, 255, 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, + (3,14): 0, 0, + (4,0): 255, 255, 255, 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, + (4,14): 0, 0, + (5,0): 255, 255, 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, + (5,15): 0, + (6,0): 255, 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, + (7,0): 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsSignedIntWhole.ddl b/tools/testfiles/tpbitsSignedIntWhole.ddl new file mode 100644 index 0000000..598c446 --- /dev/null +++ b/tools/testfiles/tpbitsSignedIntWhole.ddl @@ -0,0 +1,25 @@ +HDF5 "packedbits.h5" { +DATASET "/DS16BITS" { + DATATYPE H5T_STD_I16LE + DATASPACE SIMPLE { ( 8, 16 ) / ( 8, 16 ) } + PACKED_BITS OFFSET=0 LENGTH=16 + DATA { + (0,0): -1, -2, -4, -8, -16, -32, -64, -128, -256, -512, -1024, -2048, + (0,12): -4096, -8192, -16384, -32768, + (1,0): -2, -4, -8, -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, + (1,12): -8192, -16384, -32768, 0, + (2,0): -4, -8, -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, + (2,11): -8192, -16384, -32768, 0, 0, + (3,0): -8, -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, + (3,11): -16384, -32768, 0, 0, 0, + (4,0): -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, + (4,10): -16384, -32768, 0, 0, 0, 0, + (5,0): -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, + (5,10): -32768, 0, 0, 0, 0, 0, + (6,0): -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, + (6,10): 0, 0, 0, 0, 0, 0, + (7,0): -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, 0, 0, + (7,11): 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsSignedLong.ddl b/tools/testfiles/tpbitsSignedLong.ddl new file mode 100644 index 0000000..b3eba61 --- /dev/null +++ b/tools/testfiles/tpbitsSignedLong.ddl @@ -0,0 +1,44 @@ +HDF5 "packedbits.h5" { +DATASET "/DS32BITS" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 8, 32 ) / ( 8, 32 ) } + PACKED_BITS OFFSET=0 LENGTH=2 + DATA { + (0,0): 3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (0,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=26 LENGTH=6 + DATA { + (0,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (0,17): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, + (1,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (1,17): 63, 63, 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, + (2,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (2,17): 63, 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, + (3,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (3,17): 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, + (4,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (4,17): 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, 0, + (5,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (5,17): 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, 0, 0, + (6,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (6,17): 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, 0, 0, 0, + (7,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (7,17): 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsSignedLong16.ddl b/tools/testfiles/tpbitsSignedLong16.ddl new file mode 100644 index 0000000..83fa889 --- /dev/null +++ b/tools/testfiles/tpbitsSignedLong16.ddl @@ -0,0 +1,67 @@ +HDF5 "packedbits.h5" { +DATASET "/DS32BITS" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 8, 32 ) / ( 8, 32 ) } + PACKED_BITS OFFSET=0 LENGTH=16 + DATA { + (0,0): 65535, 65534, 65532, 65528, 65520, 65504, 65472, 65408, 65280, + (0,9): 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, + (0,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 65534, 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, + (1,9): 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, + (1,23): 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, + (2,9): 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,25): 0, 0, 0, 0, 0, 0, 0, + (3,0): 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, + (3,9): 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,26): 0, 0, 0, 0, 0, 0, + (4,0): 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, + (4,9): 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,27): 0, 0, 0, 0, 0, + (5,0): 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, + (5,9): 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,29): 0, 0, 0, + (6,0): 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, + (6,9): 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,30): 0, 0, + (7,0): 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, + (7,10): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=16 LENGTH=16 + DATA { + (0,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (0,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65534, + (0,18): 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, + (0,27): 63488, 61440, 57344, 49152, 32768, + (1,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (1,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65534, 65532, + (1,18): 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, + (1,27): 61440, 57344, 49152, 32768, 0, + (2,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (2,9): 65535, 65535, 65535, 65535, 65535, 65535, 65534, 65532, 65528, + (2,18): 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, + (2,27): 57344, 49152, 32768, 0, 0, + (3,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (3,9): 65535, 65535, 65535, 65535, 65535, 65534, 65532, 65528, 65520, + (3,18): 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, + (3,27): 49152, 32768, 0, 0, 0, + (4,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (4,9): 65535, 65535, 65535, 65535, 65534, 65532, 65528, 65520, 65504, + (4,18): 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, + (4,27): 32768, 0, 0, 0, 0, + (5,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (5,9): 65535, 65535, 65535, 65534, 65532, 65528, 65520, 65504, 65472, + (5,18): 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, + (5,28): 0, 0, 0, 0, + (6,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (6,9): 65535, 65535, 65534, 65532, 65528, 65520, 65504, 65472, 65408, + (6,18): 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, + (6,29): 0, 0, 0, + (7,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (7,9): 65535, 65534, 65532, 65528, 65520, 65504, 65472, 65408, 65280, + (7,18): 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, + (7,31): 0 + } +} +} diff --git a/tools/testfiles/tpbitsSignedLong8.ddl b/tools/testfiles/tpbitsSignedLong8.ddl new file mode 100644 index 0000000..e99b1d0 --- /dev/null +++ b/tools/testfiles/tpbitsSignedLong8.ddl @@ -0,0 +1,96 @@ +HDF5 "packedbits.h5" { +DATASET "/DS32BITS" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 8, 32 ) / ( 8, 32 ) } + PACKED_BITS OFFSET=0 LENGTH=8 + DATA { + (0,0): 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (0,17): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,18): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,18): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,19): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,20): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,20): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,21): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=8 LENGTH=8 + DATA { + (0,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 252, 248, 240, + (0,13): 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 255, 255, 255, 255, 255, 255, 255, 255, 254, 252, 248, 240, 224, + (1,13): 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 255, 255, 255, 255, 255, 255, 255, 254, 252, 248, 240, 224, 192, + (2,13): 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 255, 255, 255, 255, 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, + (3,14): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 255, 255, 255, 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, + (4,14): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 255, 255, 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, + (5,15): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 255, 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, + (6,16): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, + (7,16): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=16 LENGTH=8 + DATA { + (0,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (0,13): 255, 255, 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, + (0,28): 0, 0, 0, 0, + (1,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (1,13): 255, 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, + (1,28): 0, 0, 0, 0, + (2,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (2,13): 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, + (2,29): 0, 0, 0, + (3,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (3,13): 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,30): 0, 0, + (4,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (4,13): 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,30): 0, 0, + (5,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, + (5,13): 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,31): 0, + (6,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 252, + (6,13): 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 252, 248, + (7,13): 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=24 LENGTH=8 + DATA { + (0,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (0,13): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, + (0,26): 252, 248, 240, 224, 192, 128, + (1,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (1,13): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 252, + (1,26): 248, 240, 224, 192, 128, 0, + (2,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (2,13): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 252, 248, + (2,26): 240, 224, 192, 128, 0, 0, + (3,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (3,13): 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 252, 248, 240, + (3,26): 224, 192, 128, 0, 0, 0, + (4,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (4,13): 255, 255, 255, 255, 255, 255, 255, 255, 254, 252, 248, 240, 224, + (4,26): 192, 128, 0, 0, 0, 0, + (5,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (5,13): 255, 255, 255, 255, 255, 255, 255, 254, 252, 248, 240, 224, 192, + (5,26): 128, 0, 0, 0, 0, 0, + (6,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (6,13): 255, 255, 255, 255, 255, 255, 254, 252, 248, 240, 224, 192, 128, + (6,26): 0, 0, 0, 0, 0, 0, + (7,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (7,13): 255, 255, 255, 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, + (7,27): 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsSignedLongLong.ddl b/tools/testfiles/tpbitsSignedLongLong.ddl new file mode 100644 index 0000000..2be8a55 --- /dev/null +++ b/tools/testfiles/tpbitsSignedLongLong.ddl @@ -0,0 +1,68 @@ +HDF5 "packedbits.h5" { +DATASET "/DS64BITS" { + DATATYPE H5T_STD_I64LE + DATASPACE SIMPLE { ( 8, 64 ) / ( 8, 64 ) } + PACKED_BITS OFFSET=0 LENGTH=2 + DATA { + (0,0): 3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (0,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (0,44): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,44): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,44): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,44): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,44): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,44): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,44): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,44): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=58 LENGTH=6 + DATA { + (0,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (0,17): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (0,33): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (0,49): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, + (1,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (1,17): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (1,33): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (1,49): 63, 63, 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, + (2,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (2,17): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (2,33): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (2,49): 63, 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, + (3,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (3,17): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (3,33): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (3,49): 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, + (4,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (4,17): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (4,33): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (4,49): 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, 0, + (5,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (5,17): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (5,33): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (5,49): 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, 0, 0, + (6,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (6,17): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (6,33): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (6,49): 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, 0, 0, 0, + (7,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (7,17): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (7,33): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (7,49): 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsSignedLongLong16.ddl b/tools/testfiles/tpbitsSignedLongLong16.ddl new file mode 100644 index 0000000..44e336d --- /dev/null +++ b/tools/testfiles/tpbitsSignedLongLong16.ddl @@ -0,0 +1,196 @@ +HDF5 "packedbits.h5" { +DATASET "/DS64BITS" { + DATATYPE H5T_STD_I64LE + DATASPACE SIMPLE { ( 8, 64 ) / ( 8, 64 ) } + PACKED_BITS OFFSET=0 LENGTH=16 + DATA { + (0,0): 65535, 65534, 65532, 65528, 65520, 65504, 65472, 65408, 65280, + (0,9): 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, + (0,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (0,44): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 65534, 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, + (1,9): 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, + (1,23): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,45): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, + (2,9): 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,25): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,47): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, + (3,9): 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,26): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,48): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, + (4,9): 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,27): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,49): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, + (5,9): 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,29): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,51): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, + (6,9): 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,30): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,52): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, + (7,10): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,32): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,54): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=16 LENGTH=16 + DATA { + (0,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (0,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65534, + (0,18): 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, + (0,27): 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (0,42): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (1,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65534, 65532, + (1,18): 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, + (1,27): 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,44): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (2,9): 65535, 65535, 65535, 65535, 65535, 65535, 65534, 65532, 65528, + (2,18): 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, + (2,27): 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,45): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (3,9): 65535, 65535, 65535, 65535, 65535, 65534, 65532, 65528, 65520, + (3,18): 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, + (3,27): 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,46): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (4,9): 65535, 65535, 65535, 65535, 65534, 65532, 65528, 65520, 65504, + (4,18): 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, + (4,27): 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,48): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (5,9): 65535, 65535, 65535, 65534, 65532, 65528, 65520, 65504, 65472, + (5,18): 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, + (5,28): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,50): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (6,9): 65535, 65535, 65534, 65532, 65528, 65520, 65504, 65472, 65408, + (6,18): 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, + (6,29): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,51): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (7,9): 65535, 65534, 65532, 65528, 65520, 65504, 65472, 65408, 65280, + (7,18): 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, + (7,31): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,53): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=32 LENGTH=16 + DATA { + (0,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (0,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (0,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (0,27): 65535, 65535, 65535, 65535, 65535, 65535, 65534, 65532, 65528, + (0,36): 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, + (0,45): 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (0,63): 0, + (1,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (1,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (1,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (1,27): 65535, 65535, 65535, 65535, 65535, 65534, 65532, 65528, 65520, + (1,36): 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, + (1,45): 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (2,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (2,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (2,27): 65535, 65535, 65535, 65535, 65534, 65532, 65528, 65520, 65504, + (2,36): 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, + (2,45): 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (3,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (3,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (3,27): 65535, 65535, 65535, 65534, 65532, 65528, 65520, 65504, 65472, + (3,36): 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, + (3,46): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (4,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (4,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (4,27): 65535, 65535, 65534, 65532, 65528, 65520, 65504, 65472, 65408, + (4,36): 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, + (4,47): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (5,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (5,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (5,27): 65535, 65534, 65532, 65528, 65520, 65504, 65472, 65408, 65280, + (5,36): 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, + (5,49): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (6,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (6,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (6,27): 65534, 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, + (6,36): 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, + (6,50): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (7,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (7,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65534, + (7,27): 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, + (7,36): 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,51): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=48 LENGTH=16 + DATA { + (0,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (0,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (0,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (0,27): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (0,36): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (0,45): 65535, 65535, 65535, 65535, 65534, 65532, 65528, 65520, 65504, + (0,54): 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, + (0,63): 32768, + (1,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (1,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (1,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (1,27): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (1,36): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (1,45): 65535, 65535, 65535, 65534, 65532, 65528, 65520, 65504, 65472, + (1,54): 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, + (2,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (2,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (2,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (2,27): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (2,36): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (2,45): 65535, 65535, 65534, 65532, 65528, 65520, 65504, 65472, 65408, + (2,54): 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, + (3,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (3,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (3,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (3,27): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (3,36): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (3,45): 65535, 65534, 65532, 65528, 65520, 65504, 65472, 65408, 65280, + (3,54): 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, + (4,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (4,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (4,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (4,27): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (4,36): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (4,45): 65534, 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, + (4,54): 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, + (5,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (5,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (5,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (5,27): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (5,36): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65534, + (5,45): 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, + (5,54): 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, + (6,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (6,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (6,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (6,27): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (6,36): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65534, 65532, + (6,45): 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, + (6,54): 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, + (7,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (7,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (7,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (7,27): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (7,36): 65535, 65535, 65535, 65535, 65535, 65535, 65534, 65532, 65528, + (7,45): 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, + (7,54): 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsSignedLongLong32.ddl b/tools/testfiles/tpbitsSignedLongLong32.ddl new file mode 100644 index 0000000..6ab4ac4 --- /dev/null +++ b/tools/testfiles/tpbitsSignedLongLong32.ddl @@ -0,0 +1,175 @@ +HDF5 "packedbits.h5" { +DATASET "/DS64BITS" { + DATATYPE H5T_STD_I64LE + DATASPACE SIMPLE { ( 8, 64 ) / ( 8, 64 ) } + PACKED_BITS OFFSET=0 LENGTH=32 + DATA { + (0,0): 4294967295, 4294967294, 4294967292, 4294967288, 4294967280, + (0,5): 4294967264, 4294967232, 4294967168, 4294967040, 4294966784, + (0,10): 4294966272, 4294965248, 4294963200, 4294959104, 4294950912, + (0,15): 4294934528, 4294901760, 4294836224, 4294705152, 4294443008, + (0,20): 4293918720, 4292870144, 4290772992, 4286578688, 4278190080, + (0,25): 4261412864, 4227858432, 4160749568, 4026531840, 3758096384, + (0,30): 3221225472, 2147483648, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (0,46): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 4294967294, 4294967292, 4294967288, 4294967280, 4294967264, + (1,5): 4294967232, 4294967168, 4294967040, 4294966784, 4294966272, + (1,10): 4294965248, 4294963200, 4294959104, 4294950912, 4294934528, + (1,15): 4294901760, 4294836224, 4294705152, 4294443008, 4293918720, + (1,20): 4292870144, 4290772992, 4286578688, 4278190080, 4261412864, + (1,25): 4227858432, 4160749568, 4026531840, 3758096384, 3221225472, + (1,30): 2147483648, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,49): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 4294967292, 4294967288, 4294967280, 4294967264, 4294967232, + (2,5): 4294967168, 4294967040, 4294966784, 4294966272, 4294965248, + (2,10): 4294963200, 4294959104, 4294950912, 4294934528, 4294901760, + (2,15): 4294836224, 4294705152, 4294443008, 4293918720, 4292870144, + (2,20): 4290772992, 4286578688, 4278190080, 4261412864, 4227858432, + (2,25): 4160749568, 4026531840, 3758096384, 3221225472, 2147483648, 0, 0, + (2,32): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,54): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 4294967288, 4294967280, 4294967264, 4294967232, 4294967168, + (3,5): 4294967040, 4294966784, 4294966272, 4294965248, 4294963200, + (3,10): 4294959104, 4294950912, 4294934528, 4294901760, 4294836224, + (3,15): 4294705152, 4294443008, 4293918720, 4292870144, 4290772992, + (3,20): 4286578688, 4278190080, 4261412864, 4227858432, 4160749568, + (3,25): 4026531840, 3758096384, 3221225472, 2147483648, 0, 0, 0, 0, 0, 0, + (3,35): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,57): 0, 0, 0, 0, 0, 0, 0, + (4,0): 4294967280, 4294967264, 4294967232, 4294967168, 4294967040, + (4,5): 4294966784, 4294966272, 4294965248, 4294963200, 4294959104, + (4,10): 4294950912, 4294934528, 4294901760, 4294836224, 4294705152, + (4,15): 4294443008, 4293918720, 4292870144, 4290772992, 4286578688, + (4,20): 4278190080, 4261412864, 4227858432, 4160749568, 4026531840, + (4,25): 3758096384, 3221225472, 2147483648, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,38): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,60): 0, 0, 0, 0, + (5,0): 4294967264, 4294967232, 4294967168, 4294967040, 4294966784, + (5,5): 4294966272, 4294965248, 4294963200, 4294959104, 4294950912, + (5,10): 4294934528, 4294901760, 4294836224, 4294705152, 4294443008, + (5,15): 4293918720, 4292870144, 4290772992, 4286578688, 4278190080, + (5,20): 4261412864, 4227858432, 4160749568, 4026531840, 3758096384, + (5,25): 3221225472, 2147483648, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,41): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,63): 0, + (6,0): 4294967232, 4294967168, 4294967040, 4294966784, 4294966272, + (6,5): 4294965248, 4294963200, 4294959104, 4294950912, 4294934528, + (6,10): 4294901760, 4294836224, 4294705152, 4294443008, 4293918720, + (6,15): 4292870144, 4290772992, 4286578688, 4278190080, 4261412864, + (6,20): 4227858432, 4160749568, 4026531840, 3758096384, 3221225472, + (6,25): 2147483648, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,44): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 4294967168, 4294967040, 4294966784, 4294966272, 4294965248, + (7,5): 4294963200, 4294959104, 4294950912, 4294934528, 4294901760, + (7,10): 4294836224, 4294705152, 4294443008, 4293918720, 4292870144, + (7,15): 4290772992, 4286578688, 4278190080, 4261412864, 4227858432, + (7,20): 4160749568, 4026531840, 3758096384, 3221225472, 2147483648, 0, 0, + (7,27): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,49): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=32 LENGTH=32 + DATA { + (0,0): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (0,5): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (0,10): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (0,15): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (0,20): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (0,25): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (0,30): 4294967295, 4294967295, 4294967295, 4294967294, 4294967292, + (0,35): 4294967288, 4294967280, 4294967264, 4294967232, 4294967168, + (0,40): 4294967040, 4294966784, 4294966272, 4294965248, 4294963200, + (0,45): 4294959104, 4294950912, 4294934528, 4294901760, 4294836224, + (0,50): 4294705152, 4294443008, 4293918720, 4292870144, 4290772992, + (0,55): 4286578688, 4278190080, 4261412864, 4227858432, 4160749568, + (0,60): 4026531840, 3758096384, 3221225472, 2147483648, + (1,0): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (1,5): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (1,10): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (1,15): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (1,20): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (1,25): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (1,30): 4294967295, 4294967295, 4294967294, 4294967292, 4294967288, + (1,35): 4294967280, 4294967264, 4294967232, 4294967168, 4294967040, + (1,40): 4294966784, 4294966272, 4294965248, 4294963200, 4294959104, + (1,45): 4294950912, 4294934528, 4294901760, 4294836224, 4294705152, + (1,50): 4294443008, 4293918720, 4292870144, 4290772992, 4286578688, + (1,55): 4278190080, 4261412864, 4227858432, 4160749568, 4026531840, + (1,60): 3758096384, 3221225472, 2147483648, 0, + (2,0): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (2,5): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (2,10): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (2,15): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (2,20): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (2,25): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (2,30): 4294967295, 4294967294, 4294967292, 4294967288, 4294967280, + (2,35): 4294967264, 4294967232, 4294967168, 4294967040, 4294966784, + (2,40): 4294966272, 4294965248, 4294963200, 4294959104, 4294950912, + (2,45): 4294934528, 4294901760, 4294836224, 4294705152, 4294443008, + (2,50): 4293918720, 4292870144, 4290772992, 4286578688, 4278190080, + (2,55): 4261412864, 4227858432, 4160749568, 4026531840, 3758096384, + (2,60): 3221225472, 2147483648, 0, 0, + (3,0): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (3,5): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (3,10): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (3,15): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (3,20): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (3,25): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (3,30): 4294967294, 4294967292, 4294967288, 4294967280, 4294967264, + (3,35): 4294967232, 4294967168, 4294967040, 4294966784, 4294966272, + (3,40): 4294965248, 4294963200, 4294959104, 4294950912, 4294934528, + (3,45): 4294901760, 4294836224, 4294705152, 4294443008, 4293918720, + (3,50): 4292870144, 4290772992, 4286578688, 4278190080, 4261412864, + (3,55): 4227858432, 4160749568, 4026531840, 3758096384, 3221225472, + (3,60): 2147483648, 0, 0, 0, + (4,0): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (4,5): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (4,10): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (4,15): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (4,20): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (4,25): 4294967295, 4294967295, 4294967295, 4294967295, 4294967294, + (4,30): 4294967292, 4294967288, 4294967280, 4294967264, 4294967232, + (4,35): 4294967168, 4294967040, 4294966784, 4294966272, 4294965248, + (4,40): 4294963200, 4294959104, 4294950912, 4294934528, 4294901760, + (4,45): 4294836224, 4294705152, 4294443008, 4293918720, 4292870144, + (4,50): 4290772992, 4286578688, 4278190080, 4261412864, 4227858432, + (4,55): 4160749568, 4026531840, 3758096384, 3221225472, 2147483648, 0, 0, + (4,62): 0, 0, + (5,0): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (5,5): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (5,10): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (5,15): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (5,20): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (5,25): 4294967295, 4294967295, 4294967295, 4294967294, 4294967292, + (5,30): 4294967288, 4294967280, 4294967264, 4294967232, 4294967168, + (5,35): 4294967040, 4294966784, 4294966272, 4294965248, 4294963200, + (5,40): 4294959104, 4294950912, 4294934528, 4294901760, 4294836224, + (5,45): 4294705152, 4294443008, 4293918720, 4292870144, 4290772992, + (5,50): 4286578688, 4278190080, 4261412864, 4227858432, 4160749568, + (5,55): 4026531840, 3758096384, 3221225472, 2147483648, 0, 0, 0, 0, 0, + (6,0): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (6,5): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (6,10): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (6,15): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (6,20): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (6,25): 4294967295, 4294967295, 4294967294, 4294967292, 4294967288, + (6,30): 4294967280, 4294967264, 4294967232, 4294967168, 4294967040, + (6,35): 4294966784, 4294966272, 4294965248, 4294963200, 4294959104, + (6,40): 4294950912, 4294934528, 4294901760, 4294836224, 4294705152, + (6,45): 4294443008, 4293918720, 4292870144, 4290772992, 4286578688, + (6,50): 4278190080, 4261412864, 4227858432, 4160749568, 4026531840, + (6,55): 3758096384, 3221225472, 2147483648, 0, 0, 0, 0, 0, 0, + (7,0): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (7,5): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (7,10): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (7,15): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (7,20): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (7,25): 4294967295, 4294967294, 4294967292, 4294967288, 4294967280, + (7,30): 4294967264, 4294967232, 4294967168, 4294967040, 4294966784, + (7,35): 4294966272, 4294965248, 4294963200, 4294959104, 4294950912, + (7,40): 4294934528, 4294901760, 4294836224, 4294705152, 4294443008, + (7,45): 4293918720, 4292870144, 4290772992, 4286578688, 4278190080, + (7,50): 4261412864, 4227858432, 4160749568, 4026531840, 3758096384, + (7,55): 3221225472, 2147483648, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsSignedLongLongWhole.ddl b/tools/testfiles/tpbitsSignedLongLongWhole.ddl new file mode 100644 index 0000000..134f3be --- /dev/null +++ b/tools/testfiles/tpbitsSignedLongLongWhole.ddl @@ -0,0 +1,121 @@ +HDF5 "packedbits.h5" { +DATASET "/DS64BITS" { + DATATYPE H5T_STD_I64LE + DATASPACE SIMPLE { ( 8, 64 ) / ( 8, 64 ) } + PACKED_BITS OFFSET=0 LENGTH=64 + DATA { + (0,0): -1, -2, -4, -8, -16, -32, -64, -128, -256, -512, -1024, -2048, + (0,12): -4096, -8192, -16384, -32768, -65536, -131072, -262144, -524288, + (0,20): -1048576, -2097152, -4194304, -8388608, -16777216, -33554432, + (0,26): -67108864, -134217728, -268435456, -536870912, -1073741824, + (0,31): -2147483648, -4294967296, -8589934592, -17179869184, -34359738368, + (0,36): -68719476736, -137438953472, -274877906944, -549755813888, + (0,40): -1099511627776, -2199023255552, -4398046511104, -8796093022208, + (0,44): -17592186044416, -35184372088832, -70368744177664, + (0,47): -140737488355328, -281474976710656, -562949953421312, + (0,50): -1125899906842624, -2251799813685248, -4503599627370496, + (0,53): -9007199254740992, -18014398509481984, -36028797018963968, + (0,56): -72057594037927936, -144115188075855872, -288230376151711744, + (0,59): -576460752303423488, -1152921504606846976, -2305843009213693952, + (0,62): -4611686018427387904, -9223372036854775808, + (1,0): -2, -4, -8, -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, + (1,12): -8192, -16384, -32768, -65536, -131072, -262144, -524288, + (1,19): -1048576, -2097152, -4194304, -8388608, -16777216, -33554432, + (1,25): -67108864, -134217728, -268435456, -536870912, -1073741824, + (1,30): -2147483648, -4294967296, -8589934592, -17179869184, -34359738368, + (1,35): -68719476736, -137438953472, -274877906944, -549755813888, + (1,39): -1099511627776, -2199023255552, -4398046511104, -8796093022208, + (1,43): -17592186044416, -35184372088832, -70368744177664, + (1,46): -140737488355328, -281474976710656, -562949953421312, + (1,49): -1125899906842624, -2251799813685248, -4503599627370496, + (1,52): -9007199254740992, -18014398509481984, -36028797018963968, + (1,55): -72057594037927936, -144115188075855872, -288230376151711744, + (1,58): -576460752303423488, -1152921504606846976, -2305843009213693952, + (1,61): -4611686018427387904, -9223372036854775808, 0, + (2,0): -4, -8, -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, + (2,11): -8192, -16384, -32768, -65536, -131072, -262144, -524288, + (2,18): -1048576, -2097152, -4194304, -8388608, -16777216, -33554432, + (2,24): -67108864, -134217728, -268435456, -536870912, -1073741824, + (2,29): -2147483648, -4294967296, -8589934592, -17179869184, -34359738368, + (2,34): -68719476736, -137438953472, -274877906944, -549755813888, + (2,38): -1099511627776, -2199023255552, -4398046511104, -8796093022208, + (2,42): -17592186044416, -35184372088832, -70368744177664, + (2,45): -140737488355328, -281474976710656, -562949953421312, + (2,48): -1125899906842624, -2251799813685248, -4503599627370496, + (2,51): -9007199254740992, -18014398509481984, -36028797018963968, + (2,54): -72057594037927936, -144115188075855872, -288230376151711744, + (2,57): -576460752303423488, -1152921504606846976, -2305843009213693952, + (2,60): -4611686018427387904, -9223372036854775808, 0, 0, + (3,0): -8, -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, + (3,11): -16384, -32768, -65536, -131072, -262144, -524288, -1048576, + (3,18): -2097152, -4194304, -8388608, -16777216, -33554432, -67108864, + (3,24): -134217728, -268435456, -536870912, -1073741824, -2147483648, + (3,29): -4294967296, -8589934592, -17179869184, -34359738368, + (3,33): -68719476736, -137438953472, -274877906944, -549755813888, + (3,37): -1099511627776, -2199023255552, -4398046511104, -8796093022208, + (3,41): -17592186044416, -35184372088832, -70368744177664, + (3,44): -140737488355328, -281474976710656, -562949953421312, + (3,47): -1125899906842624, -2251799813685248, -4503599627370496, + (3,50): -9007199254740992, -18014398509481984, -36028797018963968, + (3,53): -72057594037927936, -144115188075855872, -288230376151711744, + (3,56): -576460752303423488, -1152921504606846976, -2305843009213693952, + (3,59): -4611686018427387904, -9223372036854775808, 0, 0, 0, + (4,0): -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, + (4,10): -16384, -32768, -65536, -131072, -262144, -524288, -1048576, + (4,17): -2097152, -4194304, -8388608, -16777216, -33554432, -67108864, + (4,23): -134217728, -268435456, -536870912, -1073741824, -2147483648, + (4,28): -4294967296, -8589934592, -17179869184, -34359738368, + (4,32): -68719476736, -137438953472, -274877906944, -549755813888, + (4,36): -1099511627776, -2199023255552, -4398046511104, -8796093022208, + (4,40): -17592186044416, -35184372088832, -70368744177664, + (4,43): -140737488355328, -281474976710656, -562949953421312, + (4,46): -1125899906842624, -2251799813685248, -4503599627370496, + (4,49): -9007199254740992, -18014398509481984, -36028797018963968, + (4,52): -72057594037927936, -144115188075855872, -288230376151711744, + (4,55): -576460752303423488, -1152921504606846976, -2305843009213693952, + (4,58): -4611686018427387904, -9223372036854775808, 0, 0, 0, 0, + (5,0): -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, + (5,10): -32768, -65536, -131072, -262144, -524288, -1048576, -2097152, + (5,17): -4194304, -8388608, -16777216, -33554432, -67108864, -134217728, + (5,23): -268435456, -536870912, -1073741824, -2147483648, -4294967296, + (5,28): -8589934592, -17179869184, -34359738368, -68719476736, + (5,32): -137438953472, -274877906944, -549755813888, -1099511627776, + (5,36): -2199023255552, -4398046511104, -8796093022208, -17592186044416, + (5,40): -35184372088832, -70368744177664, -140737488355328, + (5,43): -281474976710656, -562949953421312, -1125899906842624, + (5,46): -2251799813685248, -4503599627370496, -9007199254740992, + (5,49): -18014398509481984, -36028797018963968, -72057594037927936, + (5,52): -144115188075855872, -288230376151711744, -576460752303423488, + (5,55): -1152921504606846976, -2305843009213693952, -4611686018427387904, + (5,58): -9223372036854775808, 0, 0, 0, 0, 0, + (6,0): -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, + (6,10): -65536, -131072, -262144, -524288, -1048576, -2097152, -4194304, + (6,17): -8388608, -16777216, -33554432, -67108864, -134217728, -268435456, + (6,23): -536870912, -1073741824, -2147483648, -4294967296, -8589934592, + (6,28): -17179869184, -34359738368, -68719476736, -137438953472, + (6,32): -274877906944, -549755813888, -1099511627776, -2199023255552, + (6,36): -4398046511104, -8796093022208, -17592186044416, -35184372088832, + (6,40): -70368744177664, -140737488355328, -281474976710656, + (6,43): -562949953421312, -1125899906842624, -2251799813685248, + (6,46): -4503599627370496, -9007199254740992, -18014398509481984, + (6,49): -36028797018963968, -72057594037927936, -144115188075855872, + (6,52): -288230376151711744, -576460752303423488, -1152921504606846976, + (6,55): -2305843009213693952, -4611686018427387904, -9223372036854775808, + (6,58): 0, 0, 0, 0, 0, 0, + (7,0): -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, + (7,9): -65536, -131072, -262144, -524288, -1048576, -2097152, -4194304, + (7,16): -8388608, -16777216, -33554432, -67108864, -134217728, -268435456, + (7,22): -536870912, -1073741824, -2147483648, -4294967296, -8589934592, + (7,27): -17179869184, -34359738368, -68719476736, -137438953472, + (7,31): -274877906944, -549755813888, -1099511627776, -2199023255552, + (7,35): -4398046511104, -8796093022208, -17592186044416, -35184372088832, + (7,39): -70368744177664, -140737488355328, -281474976710656, + (7,42): -562949953421312, -1125899906842624, -2251799813685248, + (7,45): -4503599627370496, -9007199254740992, -18014398509481984, + (7,48): -36028797018963968, -72057594037927936, -144115188075855872, + (7,51): -288230376151711744, -576460752303423488, -1152921504606846976, + (7,54): -2305843009213693952, -4611686018427387904, -9223372036854775808, + (7,57): 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsSignedLongLongWhole1.ddl b/tools/testfiles/tpbitsSignedLongLongWhole1.ddl new file mode 100644 index 0000000..7431670 --- /dev/null +++ b/tools/testfiles/tpbitsSignedLongLongWhole1.ddl @@ -0,0 +1,175 @@ +HDF5 "packedbits.h5" { +DATASET "/DS64BITS" { + DATATYPE H5T_STD_I64LE + DATASPACE SIMPLE { ( 8, 64 ) / ( 8, 64 ) } + PACKED_BITS OFFSET=1 LENGTH=63 + DATA { + (0,0): 9223372036854775807, 9223372036854775807, 9223372036854775806, + (0,3): 9223372036854775804, 9223372036854775800, 9223372036854775792, + (0,6): 9223372036854775776, 9223372036854775744, 9223372036854775680, + (0,9): 9223372036854775552, 9223372036854775296, 9223372036854774784, + (0,12): 9223372036854773760, 9223372036854771712, 9223372036854767616, + (0,15): 9223372036854759424, 9223372036854743040, 9223372036854710272, + (0,18): 9223372036854644736, 9223372036854513664, 9223372036854251520, + (0,21): 9223372036853727232, 9223372036852678656, 9223372036850581504, + (0,24): 9223372036846387200, 9223372036837998592, 9223372036821221376, + (0,27): 9223372036787666944, 9223372036720558080, 9223372036586340352, + (0,30): 9223372036317904896, 9223372035781033984, 9223372034707292160, + (0,33): 9223372032559808512, 9223372028264841216, 9223372019674906624, + (0,36): 9223372002495037440, 9223371968135299072, 9223371899415822336, + (0,39): 9223371761976868864, 9223371487098961920, 9223370937343148032, + (0,42): 9223369837831520256, 9223367638808264704, 9223363240761753600, + (0,45): 9223354444668731392, 9223336852482686976, 9223301668110598144, + (0,48): 9223231299366420480, 9223090561878065152, 9222809086901354496, + (0,51): 9222246136947933184, 9221120237041090560, 9218868437227405312, + (0,54): 9214364837600034816, 9205357638345293824, 9187343239835811840, + (0,57): 9151314442816847872, 9079256848778919936, 8935141660703064064, + (0,60): 8646911284551352320, 8070450532247928832, 6917529027641081856, + (0,63): 4611686018427387904, + (1,0): 9223372036854775807, 9223372036854775806, 9223372036854775804, + (1,3): 9223372036854775800, 9223372036854775792, 9223372036854775776, + (1,6): 9223372036854775744, 9223372036854775680, 9223372036854775552, + (1,9): 9223372036854775296, 9223372036854774784, 9223372036854773760, + (1,12): 9223372036854771712, 9223372036854767616, 9223372036854759424, + (1,15): 9223372036854743040, 9223372036854710272, 9223372036854644736, + (1,18): 9223372036854513664, 9223372036854251520, 9223372036853727232, + (1,21): 9223372036852678656, 9223372036850581504, 9223372036846387200, + (1,24): 9223372036837998592, 9223372036821221376, 9223372036787666944, + (1,27): 9223372036720558080, 9223372036586340352, 9223372036317904896, + (1,30): 9223372035781033984, 9223372034707292160, 9223372032559808512, + (1,33): 9223372028264841216, 9223372019674906624, 9223372002495037440, + (1,36): 9223371968135299072, 9223371899415822336, 9223371761976868864, + (1,39): 9223371487098961920, 9223370937343148032, 9223369837831520256, + (1,42): 9223367638808264704, 9223363240761753600, 9223354444668731392, + (1,45): 9223336852482686976, 9223301668110598144, 9223231299366420480, + (1,48): 9223090561878065152, 9222809086901354496, 9222246136947933184, + (1,51): 9221120237041090560, 9218868437227405312, 9214364837600034816, + (1,54): 9205357638345293824, 9187343239835811840, 9151314442816847872, + (1,57): 9079256848778919936, 8935141660703064064, 8646911284551352320, + (1,60): 8070450532247928832, 6917529027641081856, 4611686018427387904, 0, + (2,0): 9223372036854775806, 9223372036854775804, 9223372036854775800, + (2,3): 9223372036854775792, 9223372036854775776, 9223372036854775744, + (2,6): 9223372036854775680, 9223372036854775552, 9223372036854775296, + (2,9): 9223372036854774784, 9223372036854773760, 9223372036854771712, + (2,12): 9223372036854767616, 9223372036854759424, 9223372036854743040, + (2,15): 9223372036854710272, 9223372036854644736, 9223372036854513664, + (2,18): 9223372036854251520, 9223372036853727232, 9223372036852678656, + (2,21): 9223372036850581504, 9223372036846387200, 9223372036837998592, + (2,24): 9223372036821221376, 9223372036787666944, 9223372036720558080, + (2,27): 9223372036586340352, 9223372036317904896, 9223372035781033984, + (2,30): 9223372034707292160, 9223372032559808512, 9223372028264841216, + (2,33): 9223372019674906624, 9223372002495037440, 9223371968135299072, + (2,36): 9223371899415822336, 9223371761976868864, 9223371487098961920, + (2,39): 9223370937343148032, 9223369837831520256, 9223367638808264704, + (2,42): 9223363240761753600, 9223354444668731392, 9223336852482686976, + (2,45): 9223301668110598144, 9223231299366420480, 9223090561878065152, + (2,48): 9222809086901354496, 9222246136947933184, 9221120237041090560, + (2,51): 9218868437227405312, 9214364837600034816, 9205357638345293824, + (2,54): 9187343239835811840, 9151314442816847872, 9079256848778919936, + (2,57): 8935141660703064064, 8646911284551352320, 8070450532247928832, + (2,60): 6917529027641081856, 4611686018427387904, 0, 0, + (3,0): 9223372036854775804, 9223372036854775800, 9223372036854775792, + (3,3): 9223372036854775776, 9223372036854775744, 9223372036854775680, + (3,6): 9223372036854775552, 9223372036854775296, 9223372036854774784, + (3,9): 9223372036854773760, 9223372036854771712, 9223372036854767616, + (3,12): 9223372036854759424, 9223372036854743040, 9223372036854710272, + (3,15): 9223372036854644736, 9223372036854513664, 9223372036854251520, + (3,18): 9223372036853727232, 9223372036852678656, 9223372036850581504, + (3,21): 9223372036846387200, 9223372036837998592, 9223372036821221376, + (3,24): 9223372036787666944, 9223372036720558080, 9223372036586340352, + (3,27): 9223372036317904896, 9223372035781033984, 9223372034707292160, + (3,30): 9223372032559808512, 9223372028264841216, 9223372019674906624, + (3,33): 9223372002495037440, 9223371968135299072, 9223371899415822336, + (3,36): 9223371761976868864, 9223371487098961920, 9223370937343148032, + (3,39): 9223369837831520256, 9223367638808264704, 9223363240761753600, + (3,42): 9223354444668731392, 9223336852482686976, 9223301668110598144, + (3,45): 9223231299366420480, 9223090561878065152, 9222809086901354496, + (3,48): 9222246136947933184, 9221120237041090560, 9218868437227405312, + (3,51): 9214364837600034816, 9205357638345293824, 9187343239835811840, + (3,54): 9151314442816847872, 9079256848778919936, 8935141660703064064, + (3,57): 8646911284551352320, 8070450532247928832, 6917529027641081856, + (3,60): 4611686018427387904, 0, 0, 0, + (4,0): 9223372036854775800, 9223372036854775792, 9223372036854775776, + (4,3): 9223372036854775744, 9223372036854775680, 9223372036854775552, + (4,6): 9223372036854775296, 9223372036854774784, 9223372036854773760, + (4,9): 9223372036854771712, 9223372036854767616, 9223372036854759424, + (4,12): 9223372036854743040, 9223372036854710272, 9223372036854644736, + (4,15): 9223372036854513664, 9223372036854251520, 9223372036853727232, + (4,18): 9223372036852678656, 9223372036850581504, 9223372036846387200, + (4,21): 9223372036837998592, 9223372036821221376, 9223372036787666944, + (4,24): 9223372036720558080, 9223372036586340352, 9223372036317904896, + (4,27): 9223372035781033984, 9223372034707292160, 9223372032559808512, + (4,30): 9223372028264841216, 9223372019674906624, 9223372002495037440, + (4,33): 9223371968135299072, 9223371899415822336, 9223371761976868864, + (4,36): 9223371487098961920, 9223370937343148032, 9223369837831520256, + (4,39): 9223367638808264704, 9223363240761753600, 9223354444668731392, + (4,42): 9223336852482686976, 9223301668110598144, 9223231299366420480, + (4,45): 9223090561878065152, 9222809086901354496, 9222246136947933184, + (4,48): 9221120237041090560, 9218868437227405312, 9214364837600034816, + (4,51): 9205357638345293824, 9187343239835811840, 9151314442816847872, + (4,54): 9079256848778919936, 8935141660703064064, 8646911284551352320, + (4,57): 8070450532247928832, 6917529027641081856, 4611686018427387904, 0, + (4,61): 0, 0, 0, + (5,0): 9223372036854775792, 9223372036854775776, 9223372036854775744, + (5,3): 9223372036854775680, 9223372036854775552, 9223372036854775296, + (5,6): 9223372036854774784, 9223372036854773760, 9223372036854771712, + (5,9): 9223372036854767616, 9223372036854759424, 9223372036854743040, + (5,12): 9223372036854710272, 9223372036854644736, 9223372036854513664, + (5,15): 9223372036854251520, 9223372036853727232, 9223372036852678656, + (5,18): 9223372036850581504, 9223372036846387200, 9223372036837998592, + (5,21): 9223372036821221376, 9223372036787666944, 9223372036720558080, + (5,24): 9223372036586340352, 9223372036317904896, 9223372035781033984, + (5,27): 9223372034707292160, 9223372032559808512, 9223372028264841216, + (5,30): 9223372019674906624, 9223372002495037440, 9223371968135299072, + (5,33): 9223371899415822336, 9223371761976868864, 9223371487098961920, + (5,36): 9223370937343148032, 9223369837831520256, 9223367638808264704, + (5,39): 9223363240761753600, 9223354444668731392, 9223336852482686976, + (5,42): 9223301668110598144, 9223231299366420480, 9223090561878065152, + (5,45): 9222809086901354496, 9222246136947933184, 9221120237041090560, + (5,48): 9218868437227405312, 9214364837600034816, 9205357638345293824, + (5,51): 9187343239835811840, 9151314442816847872, 9079256848778919936, + (5,54): 8935141660703064064, 8646911284551352320, 8070450532247928832, + (5,57): 6917529027641081856, 4611686018427387904, 0, 0, 0, 0, 0, + (6,0): 9223372036854775776, 9223372036854775744, 9223372036854775680, + (6,3): 9223372036854775552, 9223372036854775296, 9223372036854774784, + (6,6): 9223372036854773760, 9223372036854771712, 9223372036854767616, + (6,9): 9223372036854759424, 9223372036854743040, 9223372036854710272, + (6,12): 9223372036854644736, 9223372036854513664, 9223372036854251520, + (6,15): 9223372036853727232, 9223372036852678656, 9223372036850581504, + (6,18): 9223372036846387200, 9223372036837998592, 9223372036821221376, + (6,21): 9223372036787666944, 9223372036720558080, 9223372036586340352, + (6,24): 9223372036317904896, 9223372035781033984, 9223372034707292160, + (6,27): 9223372032559808512, 9223372028264841216, 9223372019674906624, + (6,30): 9223372002495037440, 9223371968135299072, 9223371899415822336, + (6,33): 9223371761976868864, 9223371487098961920, 9223370937343148032, + (6,36): 9223369837831520256, 9223367638808264704, 9223363240761753600, + (6,39): 9223354444668731392, 9223336852482686976, 9223301668110598144, + (6,42): 9223231299366420480, 9223090561878065152, 9222809086901354496, + (6,45): 9222246136947933184, 9221120237041090560, 9218868437227405312, + (6,48): 9214364837600034816, 9205357638345293824, 9187343239835811840, + (6,51): 9151314442816847872, 9079256848778919936, 8935141660703064064, + (6,54): 8646911284551352320, 8070450532247928832, 6917529027641081856, + (6,57): 4611686018427387904, 0, 0, 0, 0, 0, 0, + (7,0): 9223372036854775744, 9223372036854775680, 9223372036854775552, + (7,3): 9223372036854775296, 9223372036854774784, 9223372036854773760, + (7,6): 9223372036854771712, 9223372036854767616, 9223372036854759424, + (7,9): 9223372036854743040, 9223372036854710272, 9223372036854644736, + (7,12): 9223372036854513664, 9223372036854251520, 9223372036853727232, + (7,15): 9223372036852678656, 9223372036850581504, 9223372036846387200, + (7,18): 9223372036837998592, 9223372036821221376, 9223372036787666944, + (7,21): 9223372036720558080, 9223372036586340352, 9223372036317904896, + (7,24): 9223372035781033984, 9223372034707292160, 9223372032559808512, + (7,27): 9223372028264841216, 9223372019674906624, 9223372002495037440, + (7,30): 9223371968135299072, 9223371899415822336, 9223371761976868864, + (7,33): 9223371487098961920, 9223370937343148032, 9223369837831520256, + (7,36): 9223367638808264704, 9223363240761753600, 9223354444668731392, + (7,39): 9223336852482686976, 9223301668110598144, 9223231299366420480, + (7,42): 9223090561878065152, 9222809086901354496, 9222246136947933184, + (7,45): 9221120237041090560, 9218868437227405312, 9214364837600034816, + (7,48): 9205357638345293824, 9187343239835811840, 9151314442816847872, + (7,51): 9079256848778919936, 8935141660703064064, 8646911284551352320, + (7,54): 8070450532247928832, 6917529027641081856, 4611686018427387904, 0, + (7,58): 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsSignedLongLongWhole63.ddl b/tools/testfiles/tpbitsSignedLongLongWhole63.ddl new file mode 100644 index 0000000..c7cc65f --- /dev/null +++ b/tools/testfiles/tpbitsSignedLongLongWhole63.ddl @@ -0,0 +1,172 @@ +HDF5 "packedbits.h5" { +DATASET "/DS64BITS" { + DATATYPE H5T_STD_I64LE + DATASPACE SIMPLE { ( 8, 64 ) / ( 8, 64 ) } + PACKED_BITS OFFSET=0 LENGTH=63 + DATA { + (0,0): 9223372036854775807, 9223372036854775806, 9223372036854775804, + (0,3): 9223372036854775800, 9223372036854775792, 9223372036854775776, + (0,6): 9223372036854775744, 9223372036854775680, 9223372036854775552, + (0,9): 9223372036854775296, 9223372036854774784, 9223372036854773760, + (0,12): 9223372036854771712, 9223372036854767616, 9223372036854759424, + (0,15): 9223372036854743040, 9223372036854710272, 9223372036854644736, + (0,18): 9223372036854513664, 9223372036854251520, 9223372036853727232, + (0,21): 9223372036852678656, 9223372036850581504, 9223372036846387200, + (0,24): 9223372036837998592, 9223372036821221376, 9223372036787666944, + (0,27): 9223372036720558080, 9223372036586340352, 9223372036317904896, + (0,30): 9223372035781033984, 9223372034707292160, 9223372032559808512, + (0,33): 9223372028264841216, 9223372019674906624, 9223372002495037440, + (0,36): 9223371968135299072, 9223371899415822336, 9223371761976868864, + (0,39): 9223371487098961920, 9223370937343148032, 9223369837831520256, + (0,42): 9223367638808264704, 9223363240761753600, 9223354444668731392, + (0,45): 9223336852482686976, 9223301668110598144, 9223231299366420480, + (0,48): 9223090561878065152, 9222809086901354496, 9222246136947933184, + (0,51): 9221120237041090560, 9218868437227405312, 9214364837600034816, + (0,54): 9205357638345293824, 9187343239835811840, 9151314442816847872, + (0,57): 9079256848778919936, 8935141660703064064, 8646911284551352320, + (0,60): 8070450532247928832, 6917529027641081856, 4611686018427387904, 0, + (1,0): 9223372036854775806, 9223372036854775804, 9223372036854775800, + (1,3): 9223372036854775792, 9223372036854775776, 9223372036854775744, + (1,6): 9223372036854775680, 9223372036854775552, 9223372036854775296, + (1,9): 9223372036854774784, 9223372036854773760, 9223372036854771712, + (1,12): 9223372036854767616, 9223372036854759424, 9223372036854743040, + (1,15): 9223372036854710272, 9223372036854644736, 9223372036854513664, + (1,18): 9223372036854251520, 9223372036853727232, 9223372036852678656, + (1,21): 9223372036850581504, 9223372036846387200, 9223372036837998592, + (1,24): 9223372036821221376, 9223372036787666944, 9223372036720558080, + (1,27): 9223372036586340352, 9223372036317904896, 9223372035781033984, + (1,30): 9223372034707292160, 9223372032559808512, 9223372028264841216, + (1,33): 9223372019674906624, 9223372002495037440, 9223371968135299072, + (1,36): 9223371899415822336, 9223371761976868864, 9223371487098961920, + (1,39): 9223370937343148032, 9223369837831520256, 9223367638808264704, + (1,42): 9223363240761753600, 9223354444668731392, 9223336852482686976, + (1,45): 9223301668110598144, 9223231299366420480, 9223090561878065152, + (1,48): 9222809086901354496, 9222246136947933184, 9221120237041090560, + (1,51): 9218868437227405312, 9214364837600034816, 9205357638345293824, + (1,54): 9187343239835811840, 9151314442816847872, 9079256848778919936, + (1,57): 8935141660703064064, 8646911284551352320, 8070450532247928832, + (1,60): 6917529027641081856, 4611686018427387904, 0, 0, + (2,0): 9223372036854775804, 9223372036854775800, 9223372036854775792, + (2,3): 9223372036854775776, 9223372036854775744, 9223372036854775680, + (2,6): 9223372036854775552, 9223372036854775296, 9223372036854774784, + (2,9): 9223372036854773760, 9223372036854771712, 9223372036854767616, + (2,12): 9223372036854759424, 9223372036854743040, 9223372036854710272, + (2,15): 9223372036854644736, 9223372036854513664, 9223372036854251520, + (2,18): 9223372036853727232, 9223372036852678656, 9223372036850581504, + (2,21): 9223372036846387200, 9223372036837998592, 9223372036821221376, + (2,24): 9223372036787666944, 9223372036720558080, 9223372036586340352, + (2,27): 9223372036317904896, 9223372035781033984, 9223372034707292160, + (2,30): 9223372032559808512, 9223372028264841216, 9223372019674906624, + (2,33): 9223372002495037440, 9223371968135299072, 9223371899415822336, + (2,36): 9223371761976868864, 9223371487098961920, 9223370937343148032, + (2,39): 9223369837831520256, 9223367638808264704, 9223363240761753600, + (2,42): 9223354444668731392, 9223336852482686976, 9223301668110598144, + (2,45): 9223231299366420480, 9223090561878065152, 9222809086901354496, + (2,48): 9222246136947933184, 9221120237041090560, 9218868437227405312, + (2,51): 9214364837600034816, 9205357638345293824, 9187343239835811840, + (2,54): 9151314442816847872, 9079256848778919936, 8935141660703064064, + (2,57): 8646911284551352320, 8070450532247928832, 6917529027641081856, + (2,60): 4611686018427387904, 0, 0, 0, + (3,0): 9223372036854775800, 9223372036854775792, 9223372036854775776, + (3,3): 9223372036854775744, 9223372036854775680, 9223372036854775552, + (3,6): 9223372036854775296, 9223372036854774784, 9223372036854773760, + (3,9): 9223372036854771712, 9223372036854767616, 9223372036854759424, + (3,12): 9223372036854743040, 9223372036854710272, 9223372036854644736, + (3,15): 9223372036854513664, 9223372036854251520, 9223372036853727232, + (3,18): 9223372036852678656, 9223372036850581504, 9223372036846387200, + (3,21): 9223372036837998592, 9223372036821221376, 9223372036787666944, + (3,24): 9223372036720558080, 9223372036586340352, 9223372036317904896, + (3,27): 9223372035781033984, 9223372034707292160, 9223372032559808512, + (3,30): 9223372028264841216, 9223372019674906624, 9223372002495037440, + (3,33): 9223371968135299072, 9223371899415822336, 9223371761976868864, + (3,36): 9223371487098961920, 9223370937343148032, 9223369837831520256, + (3,39): 9223367638808264704, 9223363240761753600, 9223354444668731392, + (3,42): 9223336852482686976, 9223301668110598144, 9223231299366420480, + (3,45): 9223090561878065152, 9222809086901354496, 9222246136947933184, + (3,48): 9221120237041090560, 9218868437227405312, 9214364837600034816, + (3,51): 9205357638345293824, 9187343239835811840, 9151314442816847872, + (3,54): 9079256848778919936, 8935141660703064064, 8646911284551352320, + (3,57): 8070450532247928832, 6917529027641081856, 4611686018427387904, 0, + (3,61): 0, 0, 0, + (4,0): 9223372036854775792, 9223372036854775776, 9223372036854775744, + (4,3): 9223372036854775680, 9223372036854775552, 9223372036854775296, + (4,6): 9223372036854774784, 9223372036854773760, 9223372036854771712, + (4,9): 9223372036854767616, 9223372036854759424, 9223372036854743040, + (4,12): 9223372036854710272, 9223372036854644736, 9223372036854513664, + (4,15): 9223372036854251520, 9223372036853727232, 9223372036852678656, + (4,18): 9223372036850581504, 9223372036846387200, 9223372036837998592, + (4,21): 9223372036821221376, 9223372036787666944, 9223372036720558080, + (4,24): 9223372036586340352, 9223372036317904896, 9223372035781033984, + (4,27): 9223372034707292160, 9223372032559808512, 9223372028264841216, + (4,30): 9223372019674906624, 9223372002495037440, 9223371968135299072, + (4,33): 9223371899415822336, 9223371761976868864, 9223371487098961920, + (4,36): 9223370937343148032, 9223369837831520256, 9223367638808264704, + (4,39): 9223363240761753600, 9223354444668731392, 9223336852482686976, + (4,42): 9223301668110598144, 9223231299366420480, 9223090561878065152, + (4,45): 9222809086901354496, 9222246136947933184, 9221120237041090560, + (4,48): 9218868437227405312, 9214364837600034816, 9205357638345293824, + (4,51): 9187343239835811840, 9151314442816847872, 9079256848778919936, + (4,54): 8935141660703064064, 8646911284551352320, 8070450532247928832, + (4,57): 6917529027641081856, 4611686018427387904, 0, 0, 0, 0, 0, + (5,0): 9223372036854775776, 9223372036854775744, 9223372036854775680, + (5,3): 9223372036854775552, 9223372036854775296, 9223372036854774784, + (5,6): 9223372036854773760, 9223372036854771712, 9223372036854767616, + (5,9): 9223372036854759424, 9223372036854743040, 9223372036854710272, + (5,12): 9223372036854644736, 9223372036854513664, 9223372036854251520, + (5,15): 9223372036853727232, 9223372036852678656, 9223372036850581504, + (5,18): 9223372036846387200, 9223372036837998592, 9223372036821221376, + (5,21): 9223372036787666944, 9223372036720558080, 9223372036586340352, + (5,24): 9223372036317904896, 9223372035781033984, 9223372034707292160, + (5,27): 9223372032559808512, 9223372028264841216, 9223372019674906624, + (5,30): 9223372002495037440, 9223371968135299072, 9223371899415822336, + (5,33): 9223371761976868864, 9223371487098961920, 9223370937343148032, + (5,36): 9223369837831520256, 9223367638808264704, 9223363240761753600, + (5,39): 9223354444668731392, 9223336852482686976, 9223301668110598144, + (5,42): 9223231299366420480, 9223090561878065152, 9222809086901354496, + (5,45): 9222246136947933184, 9221120237041090560, 9218868437227405312, + (5,48): 9214364837600034816, 9205357638345293824, 9187343239835811840, + (5,51): 9151314442816847872, 9079256848778919936, 8935141660703064064, + (5,54): 8646911284551352320, 8070450532247928832, 6917529027641081856, + (5,57): 4611686018427387904, 0, 0, 0, 0, 0, 0, + (6,0): 9223372036854775744, 9223372036854775680, 9223372036854775552, + (6,3): 9223372036854775296, 9223372036854774784, 9223372036854773760, + (6,6): 9223372036854771712, 9223372036854767616, 9223372036854759424, + (6,9): 9223372036854743040, 9223372036854710272, 9223372036854644736, + (6,12): 9223372036854513664, 9223372036854251520, 9223372036853727232, + (6,15): 9223372036852678656, 9223372036850581504, 9223372036846387200, + (6,18): 9223372036837998592, 9223372036821221376, 9223372036787666944, + (6,21): 9223372036720558080, 9223372036586340352, 9223372036317904896, + (6,24): 9223372035781033984, 9223372034707292160, 9223372032559808512, + (6,27): 9223372028264841216, 9223372019674906624, 9223372002495037440, + (6,30): 9223371968135299072, 9223371899415822336, 9223371761976868864, + (6,33): 9223371487098961920, 9223370937343148032, 9223369837831520256, + (6,36): 9223367638808264704, 9223363240761753600, 9223354444668731392, + (6,39): 9223336852482686976, 9223301668110598144, 9223231299366420480, + (6,42): 9223090561878065152, 9222809086901354496, 9222246136947933184, + (6,45): 9221120237041090560, 9218868437227405312, 9214364837600034816, + (6,48): 9205357638345293824, 9187343239835811840, 9151314442816847872, + (6,51): 9079256848778919936, 8935141660703064064, 8646911284551352320, + (6,54): 8070450532247928832, 6917529027641081856, 4611686018427387904, 0, + (6,58): 0, 0, 0, 0, 0, 0, + (7,0): 9223372036854775680, 9223372036854775552, 9223372036854775296, + (7,3): 9223372036854774784, 9223372036854773760, 9223372036854771712, + (7,6): 9223372036854767616, 9223372036854759424, 9223372036854743040, + (7,9): 9223372036854710272, 9223372036854644736, 9223372036854513664, + (7,12): 9223372036854251520, 9223372036853727232, 9223372036852678656, + (7,15): 9223372036850581504, 9223372036846387200, 9223372036837998592, + (7,18): 9223372036821221376, 9223372036787666944, 9223372036720558080, + (7,21): 9223372036586340352, 9223372036317904896, 9223372035781033984, + (7,24): 9223372034707292160, 9223372032559808512, 9223372028264841216, + (7,27): 9223372019674906624, 9223372002495037440, 9223371968135299072, + (7,30): 9223371899415822336, 9223371761976868864, 9223371487098961920, + (7,33): 9223370937343148032, 9223369837831520256, 9223367638808264704, + (7,36): 9223363240761753600, 9223354444668731392, 9223336852482686976, + (7,39): 9223301668110598144, 9223231299366420480, 9223090561878065152, + (7,42): 9222809086901354496, 9222246136947933184, 9221120237041090560, + (7,45): 9218868437227405312, 9214364837600034816, 9205357638345293824, + (7,48): 9187343239835811840, 9151314442816847872, 9079256848778919936, + (7,51): 8935141660703064064, 8646911284551352320, 8070450532247928832, + (7,54): 6917529027641081856, 4611686018427387904, 0, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsSignedLongWhole.ddl b/tools/testfiles/tpbitsSignedLongWhole.ddl new file mode 100644 index 0000000..e583f1d --- /dev/null +++ b/tools/testfiles/tpbitsSignedLongWhole.ddl @@ -0,0 +1,46 @@ +HDF5 "packedbits.h5" { +DATASET "/DS32BITS" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 8, 32 ) / ( 8, 32 ) } + PACKED_BITS OFFSET=0 LENGTH=32 + DATA { + (0,0): -1, -2, -4, -8, -16, -32, -64, -128, -256, -512, -1024, -2048, + (0,12): -4096, -8192, -16384, -32768, -65536, -131072, -262144, -524288, + (0,20): -1048576, -2097152, -4194304, -8388608, -16777216, -33554432, + (0,26): -67108864, -134217728, -268435456, -536870912, -1073741824, + (0,31): -2147483648, + (1,0): -2, -4, -8, -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, + (1,12): -8192, -16384, -32768, -65536, -131072, -262144, -524288, + (1,19): -1048576, -2097152, -4194304, -8388608, -16777216, -33554432, + (1,25): -67108864, -134217728, -268435456, -536870912, -1073741824, + (1,30): -2147483648, 0, + (2,0): -4, -8, -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, + (2,11): -8192, -16384, -32768, -65536, -131072, -262144, -524288, + (2,18): -1048576, -2097152, -4194304, -8388608, -16777216, -33554432, + (2,24): -67108864, -134217728, -268435456, -536870912, -1073741824, + (2,29): -2147483648, 0, 0, + (3,0): -8, -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, + (3,11): -16384, -32768, -65536, -131072, -262144, -524288, -1048576, + (3,18): -2097152, -4194304, -8388608, -16777216, -33554432, -67108864, + (3,24): -134217728, -268435456, -536870912, -1073741824, -2147483648, 0, + (3,30): 0, 0, + (4,0): -16, -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, + (4,10): -16384, -32768, -65536, -131072, -262144, -524288, -1048576, + (4,17): -2097152, -4194304, -8388608, -16777216, -33554432, -67108864, + (4,23): -134217728, -268435456, -536870912, -1073741824, -2147483648, 0, + (4,29): 0, 0, 0, + (5,0): -32, -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, + (5,10): -32768, -65536, -131072, -262144, -524288, -1048576, -2097152, + (5,17): -4194304, -8388608, -16777216, -33554432, -67108864, -134217728, + (5,23): -268435456, -536870912, -1073741824, -2147483648, 0, 0, 0, 0, 0, + (6,0): -64, -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, + (6,10): -65536, -131072, -262144, -524288, -1048576, -2097152, -4194304, + (6,17): -8388608, -16777216, -33554432, -67108864, -134217728, -268435456, + (6,23): -536870912, -1073741824, -2147483648, 0, 0, 0, 0, 0, 0, + (7,0): -128, -256, -512, -1024, -2048, -4096, -8192, -16384, -32768, + (7,9): -65536, -131072, -262144, -524288, -1048576, -2097152, -4194304, + (7,16): -8388608, -16777216, -33554432, -67108864, -134217728, -268435456, + (7,22): -536870912, -1073741824, -2147483648, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsSignedWhole.ddl b/tools/testfiles/tpbitsSignedWhole.ddl new file mode 100644 index 0000000..f044e23 --- /dev/null +++ b/tools/testfiles/tpbitsSignedWhole.ddl @@ -0,0 +1,17 @@ +HDF5 "packedbits.h5" { +DATASET "/DS08BITS" { + DATATYPE H5T_STD_I8LE + DATASPACE SIMPLE { ( 8, 8 ) / ( 8, 8 ) } + PACKED_BITS OFFSET=0 LENGTH=8 + DATA { + (0,0): -1, -2, -4, -8, -16, -32, -64, -128, + (1,0): -2, -4, -8, -16, -32, -64, -128, 0, + (2,0): -4, -8, -16, -32, -64, -128, 0, 0, + (3,0): -8, -16, -32, -64, -128, 0, 0, 0, + (4,0): -16, -32, -64, -128, 0, 0, 0, 0, + (5,0): -32, -64, -128, 0, 0, 0, 0, 0, + (6,0): -64, -128, 0, 0, 0, 0, 0, 0, + (7,0): -128, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsUnsigned.ddl b/tools/testfiles/tpbitsUnsigned.ddl new file mode 100644 index 0000000..9e7ac50 --- /dev/null +++ b/tools/testfiles/tpbitsUnsigned.ddl @@ -0,0 +1,28 @@ +HDF5 "packedbits.h5" { +DATASET "/DU08BITS" { + DATATYPE H5T_STD_U8LE + DATASPACE SIMPLE { ( 8, 8 ) / ( 8, 8 ) } + PACKED_BITS OFFSET=0 LENGTH=2 + DATA { + (0,0): 3, 2, 0, 0, 0, 0, 0, 0, + (1,0): 2, 0, 0, 0, 0, 0, 0, 0, + (2,0): 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=2 LENGTH=6 + DATA { + (0,0): 63, 63, 63, 62, 60, 56, 48, 32, + (1,0): 63, 63, 62, 60, 56, 48, 32, 0, + (2,0): 63, 62, 60, 56, 48, 32, 0, 0, + (3,0): 62, 60, 56, 48, 32, 0, 0, 0, + (4,0): 60, 56, 48, 32, 0, 0, 0, 0, + (5,0): 56, 48, 32, 0, 0, 0, 0, 0, + (6,0): 48, 32, 0, 0, 0, 0, 0, 0, + (7,0): 32, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsUnsigned2.ddl b/tools/testfiles/tpbitsUnsigned2.ddl new file mode 100644 index 0000000..b7e6f79 --- /dev/null +++ b/tools/testfiles/tpbitsUnsigned2.ddl @@ -0,0 +1,50 @@ +HDF5 "packedbits.h5" { +DATASET "/DU08BITS" { + DATATYPE H5T_STD_U8LE + DATASPACE SIMPLE { ( 8, 8 ) / ( 8, 8 ) } + PACKED_BITS OFFSET=0 LENGTH=2 + DATA { + (0,0): 3, 2, 0, 0, 0, 0, 0, 0, + (1,0): 2, 0, 0, 0, 0, 0, 0, 0, + (2,0): 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=2 LENGTH=2 + DATA { + (0,0): 3, 3, 3, 2, 0, 0, 0, 0, + (1,0): 3, 3, 2, 0, 0, 0, 0, 0, + (2,0): 3, 2, 0, 0, 0, 0, 0, 0, + (3,0): 2, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=4 LENGTH=2 + DATA { + (0,0): 3, 3, 3, 3, 3, 2, 0, 0, + (1,0): 3, 3, 3, 3, 2, 0, 0, 0, + (2,0): 3, 3, 3, 2, 0, 0, 0, 0, + (3,0): 3, 3, 2, 0, 0, 0, 0, 0, + (4,0): 3, 2, 0, 0, 0, 0, 0, 0, + (5,0): 2, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=6 LENGTH=2 + DATA { + (0,0): 3, 3, 3, 3, 3, 3, 3, 2, + (1,0): 3, 3, 3, 3, 3, 3, 2, 0, + (2,0): 3, 3, 3, 3, 3, 2, 0, 0, + (3,0): 3, 3, 3, 3, 2, 0, 0, 0, + (4,0): 3, 3, 3, 2, 0, 0, 0, 0, + (5,0): 3, 3, 2, 0, 0, 0, 0, 0, + (6,0): 3, 2, 0, 0, 0, 0, 0, 0, + (7,0): 2, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsUnsigned4.ddl b/tools/testfiles/tpbitsUnsigned4.ddl new file mode 100644 index 0000000..d25d838 --- /dev/null +++ b/tools/testfiles/tpbitsUnsigned4.ddl @@ -0,0 +1,28 @@ +HDF5 "packedbits.h5" { +DATASET "/DU08BITS" { + DATATYPE H5T_STD_U8LE + DATASPACE SIMPLE { ( 8, 8 ) / ( 8, 8 ) } + PACKED_BITS OFFSET=0 LENGTH=4 + DATA { + (0,0): 15, 14, 12, 8, 0, 0, 0, 0, + (1,0): 14, 12, 8, 0, 0, 0, 0, 0, + (2,0): 12, 8, 0, 0, 0, 0, 0, 0, + (3,0): 8, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=4 LENGTH=4 + DATA { + (0,0): 15, 15, 15, 15, 15, 14, 12, 8, + (1,0): 15, 15, 15, 15, 14, 12, 8, 0, + (2,0): 15, 15, 15, 14, 12, 8, 0, 0, + (3,0): 15, 15, 14, 12, 8, 0, 0, 0, + (4,0): 15, 14, 12, 8, 0, 0, 0, 0, + (5,0): 14, 12, 8, 0, 0, 0, 0, 0, + (6,0): 12, 8, 0, 0, 0, 0, 0, 0, + (7,0): 8, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsUnsignedInt.ddl b/tools/testfiles/tpbitsUnsignedInt.ddl new file mode 100644 index 0000000..5e0fefe --- /dev/null +++ b/tools/testfiles/tpbitsUnsignedInt.ddl @@ -0,0 +1,28 @@ +HDF5 "packedbits.h5" { +DATASET "/DU16BITS" { + DATATYPE H5T_STD_U16LE + DATASPACE SIMPLE { ( 8, 16 ) / ( 8, 16 ) } + PACKED_BITS OFFSET=0 LENGTH=2 + DATA { + (0,0): 3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=10 LENGTH=6 + DATA { + (0,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, + (1,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, + (2,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, + (3,0): 63, 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, + (4,0): 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, 0, + (5,0): 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, 0, 0, + (6,0): 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, 0, 0, 0, + (7,0): 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsUnsignedInt4.ddl b/tools/testfiles/tpbitsUnsignedInt4.ddl new file mode 100644 index 0000000..0d3e38f --- /dev/null +++ b/tools/testfiles/tpbitsUnsignedInt4.ddl @@ -0,0 +1,50 @@ +HDF5 "packedbits.h5" { +DATASET "/DU16BITS" { + DATATYPE H5T_STD_U16LE + DATASPACE SIMPLE { ( 8, 16 ) / ( 8, 16 ) } + PACKED_BITS OFFSET=0 LENGTH=4 + DATA { + (0,0): 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=4 LENGTH=4 + DATA { + (0,0): 15, 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=8 LENGTH=4 + DATA { + (0,0): 15, 15, 15, 15, 15, 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, + (1,0): 15, 15, 15, 15, 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, + (2,0): 15, 15, 15, 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, + (3,0): 15, 15, 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, + (4,0): 15, 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=12 LENGTH=4 + DATA { + (0,0): 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 14, 12, 8, + (1,0): 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 14, 12, 8, 0, + (2,0): 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 14, 12, 8, 0, 0, + (3,0): 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, + (4,0): 15, 15, 15, 15, 15, 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, + (5,0): 15, 15, 15, 15, 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, + (6,0): 15, 15, 15, 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, + (7,0): 15, 15, 15, 15, 15, 15, 14, 12, 8, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsUnsignedInt8.ddl b/tools/testfiles/tpbitsUnsignedInt8.ddl new file mode 100644 index 0000000..861ed3e --- /dev/null +++ b/tools/testfiles/tpbitsUnsignedInt8.ddl @@ -0,0 +1,34 @@ +HDF5 "packedbits.h5" { +DATASET "/DU16BITS" { + DATATYPE H5T_STD_U16LE + DATASPACE SIMPLE { ( 8, 16 ) / ( 8, 16 ) } + PACKED_BITS OFFSET=0 LENGTH=8 + DATA { + (0,0): 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=8 LENGTH=8 + DATA { + (0,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 252, 248, 240, + (0,13): 224, 192, 128, + (1,0): 255, 255, 255, 255, 255, 255, 255, 255, 254, 252, 248, 240, 224, + (1,13): 192, 128, 0, + (2,0): 255, 255, 255, 255, 255, 255, 255, 254, 252, 248, 240, 224, 192, + (2,13): 128, 0, 0, + (3,0): 255, 255, 255, 255, 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, + (3,14): 0, 0, + (4,0): 255, 255, 255, 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, + (4,14): 0, 0, + (5,0): 255, 255, 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, + (5,15): 0, + (6,0): 255, 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, + (7,0): 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsUnsignedIntWhole.ddl b/tools/testfiles/tpbitsUnsignedIntWhole.ddl new file mode 100644 index 0000000..c054011 --- /dev/null +++ b/tools/testfiles/tpbitsUnsignedIntWhole.ddl @@ -0,0 +1,25 @@ +HDF5 "packedbits.h5" { +DATASET "/DU16BITS" { + DATATYPE H5T_STD_U16LE + DATASPACE SIMPLE { ( 8, 16 ) / ( 8, 16 ) } + PACKED_BITS OFFSET=0 LENGTH=16 + DATA { + (0,0): 65535, 65534, 65532, 65528, 65520, 65504, 65472, 65408, 65280, + (0,9): 65024, 64512, 63488, 61440, 57344, 49152, 32768, + (1,0): 65534, 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, + (1,9): 64512, 63488, 61440, 57344, 49152, 32768, 0, + (2,0): 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, + (2,9): 63488, 61440, 57344, 49152, 32768, 0, 0, + (3,0): 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, + (3,9): 61440, 57344, 49152, 32768, 0, 0, 0, + (4,0): 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, + (4,9): 57344, 49152, 32768, 0, 0, 0, 0, + (5,0): 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, + (5,9): 49152, 32768, 0, 0, 0, 0, 0, + (6,0): 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, + (6,9): 32768, 0, 0, 0, 0, 0, 0, + (7,0): 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, + (7,10): 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsUnsignedLong.ddl b/tools/testfiles/tpbitsUnsignedLong.ddl new file mode 100644 index 0000000..9f8bcb4 --- /dev/null +++ b/tools/testfiles/tpbitsUnsignedLong.ddl @@ -0,0 +1,44 @@ +HDF5 "packedbits.h5" { +DATASET "/DU32BITS" { + DATATYPE H5T_STD_U32LE + DATASPACE SIMPLE { ( 8, 32 ) / ( 8, 32 ) } + PACKED_BITS OFFSET=0 LENGTH=2 + DATA { + (0,0): 3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (0,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=26 LENGTH=6 + DATA { + (0,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (0,17): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, + (1,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (1,17): 63, 63, 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, + (2,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (2,17): 63, 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, + (3,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (3,17): 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, + (4,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (4,17): 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, 0, + (5,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (5,17): 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, 0, 0, + (6,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (6,17): 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, 0, 0, 0, + (7,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (7,17): 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsUnsignedLong16.ddl b/tools/testfiles/tpbitsUnsignedLong16.ddl new file mode 100644 index 0000000..7a1984f --- /dev/null +++ b/tools/testfiles/tpbitsUnsignedLong16.ddl @@ -0,0 +1,67 @@ +HDF5 "packedbits.h5" { +DATASET "/DU32BITS" { + DATATYPE H5T_STD_U32LE + DATASPACE SIMPLE { ( 8, 32 ) / ( 8, 32 ) } + PACKED_BITS OFFSET=0 LENGTH=16 + DATA { + (0,0): 65535, 65534, 65532, 65528, 65520, 65504, 65472, 65408, 65280, + (0,9): 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, + (0,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 65534, 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, + (1,9): 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, + (1,23): 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, + (2,9): 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,25): 0, 0, 0, 0, 0, 0, 0, + (3,0): 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, + (3,9): 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,26): 0, 0, 0, 0, 0, 0, + (4,0): 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, + (4,9): 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,27): 0, 0, 0, 0, 0, + (5,0): 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, + (5,9): 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,29): 0, 0, 0, + (6,0): 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, + (6,9): 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,30): 0, 0, + (7,0): 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, + (7,10): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=16 LENGTH=16 + DATA { + (0,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (0,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65534, + (0,18): 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, + (0,27): 63488, 61440, 57344, 49152, 32768, + (1,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (1,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65534, 65532, + (1,18): 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, + (1,27): 61440, 57344, 49152, 32768, 0, + (2,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (2,9): 65535, 65535, 65535, 65535, 65535, 65535, 65534, 65532, 65528, + (2,18): 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, + (2,27): 57344, 49152, 32768, 0, 0, + (3,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (3,9): 65535, 65535, 65535, 65535, 65535, 65534, 65532, 65528, 65520, + (3,18): 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, + (3,27): 49152, 32768, 0, 0, 0, + (4,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (4,9): 65535, 65535, 65535, 65535, 65534, 65532, 65528, 65520, 65504, + (4,18): 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, + (4,27): 32768, 0, 0, 0, 0, + (5,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (5,9): 65535, 65535, 65535, 65534, 65532, 65528, 65520, 65504, 65472, + (5,18): 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, + (5,28): 0, 0, 0, 0, + (6,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (6,9): 65535, 65535, 65534, 65532, 65528, 65520, 65504, 65472, 65408, + (6,18): 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, + (6,29): 0, 0, 0, + (7,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (7,9): 65535, 65534, 65532, 65528, 65520, 65504, 65472, 65408, 65280, + (7,18): 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, + (7,31): 0 + } +} +} diff --git a/tools/testfiles/tpbitsUnsignedLong8.ddl b/tools/testfiles/tpbitsUnsignedLong8.ddl new file mode 100644 index 0000000..17b896c --- /dev/null +++ b/tools/testfiles/tpbitsUnsignedLong8.ddl @@ -0,0 +1,96 @@ +HDF5 "packedbits.h5" { +DATASET "/DU32BITS" { + DATATYPE H5T_STD_U32LE + DATASPACE SIMPLE { ( 8, 32 ) / ( 8, 32 ) } + PACKED_BITS OFFSET=0 LENGTH=8 + DATA { + (0,0): 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (0,17): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,18): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,18): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,19): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,20): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,20): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,21): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=8 LENGTH=8 + DATA { + (0,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 252, 248, 240, + (0,13): 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 255, 255, 255, 255, 255, 255, 255, 255, 254, 252, 248, 240, 224, + (1,13): 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 255, 255, 255, 255, 255, 255, 255, 254, 252, 248, 240, 224, 192, + (2,13): 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 255, 255, 255, 255, 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, + (3,14): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 255, 255, 255, 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, + (4,14): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 255, 255, 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, + (5,15): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 255, 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, + (6,16): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, + (7,16): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=16 LENGTH=8 + DATA { + (0,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (0,13): 255, 255, 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, + (0,28): 0, 0, 0, 0, + (1,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (1,13): 255, 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, + (1,28): 0, 0, 0, 0, + (2,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (2,13): 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, + (2,29): 0, 0, 0, + (3,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (3,13): 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,30): 0, 0, + (4,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (4,13): 254, 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,30): 0, 0, + (5,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, + (5,13): 252, 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,31): 0, + (6,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 252, + (6,13): 248, 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 252, 248, + (7,13): 240, 224, 192, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=24 LENGTH=8 + DATA { + (0,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (0,13): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, + (0,26): 252, 248, 240, 224, 192, 128, + (1,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (1,13): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 252, + (1,26): 248, 240, 224, 192, 128, 0, + (2,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (2,13): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 252, 248, + (2,26): 240, 224, 192, 128, 0, 0, + (3,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (3,13): 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 252, 248, 240, + (3,26): 224, 192, 128, 0, 0, 0, + (4,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (4,13): 255, 255, 255, 255, 255, 255, 255, 255, 254, 252, 248, 240, 224, + (4,26): 192, 128, 0, 0, 0, 0, + (5,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (5,13): 255, 255, 255, 255, 255, 255, 255, 254, 252, 248, 240, 224, 192, + (5,26): 128, 0, 0, 0, 0, 0, + (6,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (6,13): 255, 255, 255, 255, 255, 255, 254, 252, 248, 240, 224, 192, 128, + (6,26): 0, 0, 0, 0, 0, 0, + (7,0): 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + (7,13): 255, 255, 255, 255, 255, 254, 252, 248, 240, 224, 192, 128, 0, 0, + (7,27): 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsUnsignedLongLong.ddl b/tools/testfiles/tpbitsUnsignedLongLong.ddl new file mode 100644 index 0000000..1cd9a6c --- /dev/null +++ b/tools/testfiles/tpbitsUnsignedLongLong.ddl @@ -0,0 +1,68 @@ +HDF5 "packedbits.h5" { +DATASET "/DU64BITS" { + DATATYPE H5T_STD_U64LE + DATASPACE SIMPLE { ( 8, 64 ) / ( 8, 64 ) } + PACKED_BITS OFFSET=0 LENGTH=2 + DATA { + (0,0): 3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (0,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (0,44): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,44): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,44): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,44): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,44): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,44): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,44): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,44): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=58 LENGTH=6 + DATA { + (0,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (0,17): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (0,33): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (0,49): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, + (1,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (1,17): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (1,33): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (1,49): 63, 63, 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, + (2,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (2,17): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (2,33): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (2,49): 63, 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, + (3,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (3,17): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (3,33): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (3,49): 63, 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, + (4,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (4,17): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (4,33): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (4,49): 63, 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, 0, + (5,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (5,17): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (5,33): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (5,49): 63, 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, 0, 0, + (6,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (6,17): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (6,33): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (6,49): 63, 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, 0, 0, 0, + (7,0): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (7,17): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (7,33): 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + (7,49): 63, 63, 63, 62, 60, 56, 48, 32, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsUnsignedLongLong16.ddl b/tools/testfiles/tpbitsUnsignedLongLong16.ddl new file mode 100644 index 0000000..f8b0189 --- /dev/null +++ b/tools/testfiles/tpbitsUnsignedLongLong16.ddl @@ -0,0 +1,196 @@ +HDF5 "packedbits.h5" { +DATASET "/DU64BITS" { + DATATYPE H5T_STD_U64LE + DATASPACE SIMPLE { ( 8, 64 ) / ( 8, 64 ) } + PACKED_BITS OFFSET=0 LENGTH=16 + DATA { + (0,0): 65535, 65534, 65532, 65528, 65520, 65504, 65472, 65408, 65280, + (0,9): 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, + (0,22): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (0,44): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 65534, 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, + (1,9): 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, + (1,23): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,45): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, + (2,9): 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,25): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,47): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, + (3,9): 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,26): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,48): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, + (4,9): 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,27): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,49): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, + (5,9): 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,29): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,51): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, + (6,9): 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,30): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,52): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, + (7,10): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,32): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,54): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=16 LENGTH=16 + DATA { + (0,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (0,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65534, + (0,18): 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, + (0,27): 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (0,42): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (1,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65534, 65532, + (1,18): 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, + (1,27): 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,44): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (2,9): 65535, 65535, 65535, 65535, 65535, 65535, 65534, 65532, 65528, + (2,18): 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, + (2,27): 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,45): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (3,9): 65535, 65535, 65535, 65535, 65535, 65534, 65532, 65528, 65520, + (3,18): 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, + (3,27): 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,46): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (4,9): 65535, 65535, 65535, 65535, 65534, 65532, 65528, 65520, 65504, + (4,18): 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, + (4,27): 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,48): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (5,9): 65535, 65535, 65535, 65534, 65532, 65528, 65520, 65504, 65472, + (5,18): 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, + (5,28): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,50): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (6,9): 65535, 65535, 65534, 65532, 65528, 65520, 65504, 65472, 65408, + (6,18): 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, + (6,29): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,51): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (7,9): 65535, 65534, 65532, 65528, 65520, 65504, 65472, 65408, 65280, + (7,18): 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, + (7,31): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,53): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=32 LENGTH=16 + DATA { + (0,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (0,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (0,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (0,27): 65535, 65535, 65535, 65535, 65535, 65535, 65534, 65532, 65528, + (0,36): 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, + (0,45): 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (0,63): 0, + (1,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (1,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (1,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (1,27): 65535, 65535, 65535, 65535, 65535, 65534, 65532, 65528, 65520, + (1,36): 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, + (1,45): 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (2,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (2,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (2,27): 65535, 65535, 65535, 65535, 65534, 65532, 65528, 65520, 65504, + (2,36): 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, + (2,45): 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (3,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (3,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (3,27): 65535, 65535, 65535, 65534, 65532, 65528, 65520, 65504, 65472, + (3,36): 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, + (3,46): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (4,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (4,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (4,27): 65535, 65535, 65534, 65532, 65528, 65520, 65504, 65472, 65408, + (4,36): 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, + (4,47): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (5,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (5,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (5,27): 65535, 65534, 65532, 65528, 65520, 65504, 65472, 65408, 65280, + (5,36): 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, + (5,49): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (6,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (6,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (6,27): 65534, 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, + (6,36): 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, + (6,50): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (7,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (7,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65534, + (7,27): 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, + (7,36): 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,51): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=48 LENGTH=16 + DATA { + (0,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (0,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (0,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (0,27): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (0,36): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (0,45): 65535, 65535, 65535, 65535, 65534, 65532, 65528, 65520, 65504, + (0,54): 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, + (0,63): 32768, + (1,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (1,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (1,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (1,27): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (1,36): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (1,45): 65535, 65535, 65535, 65534, 65532, 65528, 65520, 65504, 65472, + (1,54): 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, + (2,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (2,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (2,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (2,27): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (2,36): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (2,45): 65535, 65535, 65534, 65532, 65528, 65520, 65504, 65472, 65408, + (2,54): 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, + (3,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (3,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (3,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (3,27): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (3,36): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (3,45): 65535, 65534, 65532, 65528, 65520, 65504, 65472, 65408, 65280, + (3,54): 65024, 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, + (4,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (4,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (4,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (4,27): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (4,36): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (4,45): 65534, 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, + (4,54): 64512, 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, + (5,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (5,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (5,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (5,27): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (5,36): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65534, + (5,45): 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, + (5,54): 63488, 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, + (6,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (6,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (6,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (6,27): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (6,36): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65534, 65532, + (6,45): 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, + (6,54): 61440, 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, + (7,0): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (7,9): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (7,18): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (7,27): 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, + (7,36): 65535, 65535, 65535, 65535, 65535, 65535, 65534, 65532, 65528, + (7,45): 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, + (7,54): 57344, 49152, 32768, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsUnsignedLongLong32.ddl b/tools/testfiles/tpbitsUnsignedLongLong32.ddl new file mode 100644 index 0000000..befaf5b --- /dev/null +++ b/tools/testfiles/tpbitsUnsignedLongLong32.ddl @@ -0,0 +1,175 @@ +HDF5 "packedbits.h5" { +DATASET "/DU64BITS" { + DATATYPE H5T_STD_U64LE + DATASPACE SIMPLE { ( 8, 64 ) / ( 8, 64 ) } + PACKED_BITS OFFSET=0 LENGTH=32 + DATA { + (0,0): 4294967295, 4294967294, 4294967292, 4294967288, 4294967280, + (0,5): 4294967264, 4294967232, 4294967168, 4294967040, 4294966784, + (0,10): 4294966272, 4294965248, 4294963200, 4294959104, 4294950912, + (0,15): 4294934528, 4294901760, 4294836224, 4294705152, 4294443008, + (0,20): 4293918720, 4292870144, 4290772992, 4286578688, 4278190080, + (0,25): 4261412864, 4227858432, 4160749568, 4026531840, 3758096384, + (0,30): 3221225472, 2147483648, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (0,46): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 4294967294, 4294967292, 4294967288, 4294967280, 4294967264, + (1,5): 4294967232, 4294967168, 4294967040, 4294966784, 4294966272, + (1,10): 4294965248, 4294963200, 4294959104, 4294950912, 4294934528, + (1,15): 4294901760, 4294836224, 4294705152, 4294443008, 4293918720, + (1,20): 4292870144, 4290772992, 4286578688, 4278190080, 4261412864, + (1,25): 4227858432, 4160749568, 4026531840, 3758096384, 3221225472, + (1,30): 2147483648, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,49): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,0): 4294967292, 4294967288, 4294967280, 4294967264, 4294967232, + (2,5): 4294967168, 4294967040, 4294966784, 4294966272, 4294965248, + (2,10): 4294963200, 4294959104, 4294950912, 4294934528, 4294901760, + (2,15): 4294836224, 4294705152, 4294443008, 4293918720, 4292870144, + (2,20): 4290772992, 4286578688, 4278190080, 4261412864, 4227858432, + (2,25): 4160749568, 4026531840, 3758096384, 3221225472, 2147483648, 0, 0, + (2,32): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (2,54): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,0): 4294967288, 4294967280, 4294967264, 4294967232, 4294967168, + (3,5): 4294967040, 4294966784, 4294966272, 4294965248, 4294963200, + (3,10): 4294959104, 4294950912, 4294934528, 4294901760, 4294836224, + (3,15): 4294705152, 4294443008, 4293918720, 4292870144, 4290772992, + (3,20): 4286578688, 4278190080, 4261412864, 4227858432, 4160749568, + (3,25): 4026531840, 3758096384, 3221225472, 2147483648, 0, 0, 0, 0, 0, 0, + (3,35): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (3,57): 0, 0, 0, 0, 0, 0, 0, + (4,0): 4294967280, 4294967264, 4294967232, 4294967168, 4294967040, + (4,5): 4294966784, 4294966272, 4294965248, 4294963200, 4294959104, + (4,10): 4294950912, 4294934528, 4294901760, 4294836224, 4294705152, + (4,15): 4294443008, 4293918720, 4292870144, 4290772992, 4286578688, + (4,20): 4278190080, 4261412864, 4227858432, 4160749568, 4026531840, + (4,25): 3758096384, 3221225472, 2147483648, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,38): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (4,60): 0, 0, 0, 0, + (5,0): 4294967264, 4294967232, 4294967168, 4294967040, 4294966784, + (5,5): 4294966272, 4294965248, 4294963200, 4294959104, 4294950912, + (5,10): 4294934528, 4294901760, 4294836224, 4294705152, 4294443008, + (5,15): 4293918720, 4292870144, 4290772992, 4286578688, 4278190080, + (5,20): 4261412864, 4227858432, 4160749568, 4026531840, 3758096384, + (5,25): 3221225472, 2147483648, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,41): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (5,63): 0, + (6,0): 4294967232, 4294967168, 4294967040, 4294966784, 4294966272, + (6,5): 4294965248, 4294963200, 4294959104, 4294950912, 4294934528, + (6,10): 4294901760, 4294836224, 4294705152, 4294443008, 4293918720, + (6,15): 4292870144, 4290772992, 4286578688, 4278190080, 4261412864, + (6,20): 4227858432, 4160749568, 4026531840, 3758096384, 3221225472, + (6,25): 2147483648, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (6,44): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,0): 4294967168, 4294967040, 4294966784, 4294966272, 4294965248, + (7,5): 4294963200, 4294959104, 4294950912, 4294934528, 4294901760, + (7,10): 4294836224, 4294705152, 4294443008, 4293918720, 4292870144, + (7,15): 4290772992, 4286578688, 4278190080, 4261412864, 4227858432, + (7,20): 4160749568, 4026531840, 3758096384, 3221225472, 2147483648, 0, 0, + (7,27): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (7,49): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + PACKED_BITS OFFSET=32 LENGTH=32 + DATA { + (0,0): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (0,5): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (0,10): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (0,15): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (0,20): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (0,25): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (0,30): 4294967295, 4294967295, 4294967295, 4294967294, 4294967292, + (0,35): 4294967288, 4294967280, 4294967264, 4294967232, 4294967168, + (0,40): 4294967040, 4294966784, 4294966272, 4294965248, 4294963200, + (0,45): 4294959104, 4294950912, 4294934528, 4294901760, 4294836224, + (0,50): 4294705152, 4294443008, 4293918720, 4292870144, 4290772992, + (0,55): 4286578688, 4278190080, 4261412864, 4227858432, 4160749568, + (0,60): 4026531840, 3758096384, 3221225472, 2147483648, + (1,0): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (1,5): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (1,10): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (1,15): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (1,20): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (1,25): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (1,30): 4294967295, 4294967295, 4294967294, 4294967292, 4294967288, + (1,35): 4294967280, 4294967264, 4294967232, 4294967168, 4294967040, + (1,40): 4294966784, 4294966272, 4294965248, 4294963200, 4294959104, + (1,45): 4294950912, 4294934528, 4294901760, 4294836224, 4294705152, + (1,50): 4294443008, 4293918720, 4292870144, 4290772992, 4286578688, + (1,55): 4278190080, 4261412864, 4227858432, 4160749568, 4026531840, + (1,60): 3758096384, 3221225472, 2147483648, 0, + (2,0): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (2,5): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (2,10): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (2,15): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (2,20): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (2,25): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (2,30): 4294967295, 4294967294, 4294967292, 4294967288, 4294967280, + (2,35): 4294967264, 4294967232, 4294967168, 4294967040, 4294966784, + (2,40): 4294966272, 4294965248, 4294963200, 4294959104, 4294950912, + (2,45): 4294934528, 4294901760, 4294836224, 4294705152, 4294443008, + (2,50): 4293918720, 4292870144, 4290772992, 4286578688, 4278190080, + (2,55): 4261412864, 4227858432, 4160749568, 4026531840, 3758096384, + (2,60): 3221225472, 2147483648, 0, 0, + (3,0): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (3,5): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (3,10): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (3,15): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (3,20): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (3,25): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (3,30): 4294967294, 4294967292, 4294967288, 4294967280, 4294967264, + (3,35): 4294967232, 4294967168, 4294967040, 4294966784, 4294966272, + (3,40): 4294965248, 4294963200, 4294959104, 4294950912, 4294934528, + (3,45): 4294901760, 4294836224, 4294705152, 4294443008, 4293918720, + (3,50): 4292870144, 4290772992, 4286578688, 4278190080, 4261412864, + (3,55): 4227858432, 4160749568, 4026531840, 3758096384, 3221225472, + (3,60): 2147483648, 0, 0, 0, + (4,0): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (4,5): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (4,10): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (4,15): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (4,20): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (4,25): 4294967295, 4294967295, 4294967295, 4294967295, 4294967294, + (4,30): 4294967292, 4294967288, 4294967280, 4294967264, 4294967232, + (4,35): 4294967168, 4294967040, 4294966784, 4294966272, 4294965248, + (4,40): 4294963200, 4294959104, 4294950912, 4294934528, 4294901760, + (4,45): 4294836224, 4294705152, 4294443008, 4293918720, 4292870144, + (4,50): 4290772992, 4286578688, 4278190080, 4261412864, 4227858432, + (4,55): 4160749568, 4026531840, 3758096384, 3221225472, 2147483648, 0, 0, + (4,62): 0, 0, + (5,0): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (5,5): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (5,10): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (5,15): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (5,20): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (5,25): 4294967295, 4294967295, 4294967295, 4294967294, 4294967292, + (5,30): 4294967288, 4294967280, 4294967264, 4294967232, 4294967168, + (5,35): 4294967040, 4294966784, 4294966272, 4294965248, 4294963200, + (5,40): 4294959104, 4294950912, 4294934528, 4294901760, 4294836224, + (5,45): 4294705152, 4294443008, 4293918720, 4292870144, 4290772992, + (5,50): 4286578688, 4278190080, 4261412864, 4227858432, 4160749568, + (5,55): 4026531840, 3758096384, 3221225472, 2147483648, 0, 0, 0, 0, 0, + (6,0): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (6,5): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (6,10): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (6,15): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (6,20): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (6,25): 4294967295, 4294967295, 4294967294, 4294967292, 4294967288, + (6,30): 4294967280, 4294967264, 4294967232, 4294967168, 4294967040, + (6,35): 4294966784, 4294966272, 4294965248, 4294963200, 4294959104, + (6,40): 4294950912, 4294934528, 4294901760, 4294836224, 4294705152, + (6,45): 4294443008, 4293918720, 4292870144, 4290772992, 4286578688, + (6,50): 4278190080, 4261412864, 4227858432, 4160749568, 4026531840, + (6,55): 3758096384, 3221225472, 2147483648, 0, 0, 0, 0, 0, 0, + (7,0): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (7,5): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (7,10): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (7,15): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (7,20): 4294967295, 4294967295, 4294967295, 4294967295, 4294967295, + (7,25): 4294967295, 4294967294, 4294967292, 4294967288, 4294967280, + (7,30): 4294967264, 4294967232, 4294967168, 4294967040, 4294966784, + (7,35): 4294966272, 4294965248, 4294963200, 4294959104, 4294950912, + (7,40): 4294934528, 4294901760, 4294836224, 4294705152, 4294443008, + (7,45): 4293918720, 4292870144, 4290772992, 4286578688, 4278190080, + (7,50): 4261412864, 4227858432, 4160749568, 4026531840, 3758096384, + (7,55): 3221225472, 2147483648, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsUnsignedLongLongWhole.ddl b/tools/testfiles/tpbitsUnsignedLongLongWhole.ddl new file mode 100644 index 0000000..27c8879 --- /dev/null +++ b/tools/testfiles/tpbitsUnsignedLongLongWhole.ddl @@ -0,0 +1,176 @@ +HDF5 "packedbits.h5" { +DATASET "/DU64BITS" { + DATATYPE H5T_STD_U64LE + DATASPACE SIMPLE { ( 8, 64 ) / ( 8, 64 ) } + PACKED_BITS OFFSET=0 LENGTH=64 + DATA { + (0,0): 18446744073709551615, 18446744073709551614, 18446744073709551612, + (0,3): 18446744073709551608, 18446744073709551600, 18446744073709551584, + (0,6): 18446744073709551552, 18446744073709551488, 18446744073709551360, + (0,9): 18446744073709551104, 18446744073709550592, 18446744073709549568, + (0,12): 18446744073709547520, 18446744073709543424, 18446744073709535232, + (0,15): 18446744073709518848, 18446744073709486080, 18446744073709420544, + (0,18): 18446744073709289472, 18446744073709027328, 18446744073708503040, + (0,21): 18446744073707454464, 18446744073705357312, 18446744073701163008, + (0,24): 18446744073692774400, 18446744073675997184, 18446744073642442752, + (0,27): 18446744073575333888, 18446744073441116160, 18446744073172680704, + (0,30): 18446744072635809792, 18446744071562067968, 18446744069414584320, + (0,33): 18446744065119617024, 18446744056529682432, 18446744039349813248, + (0,36): 18446744004990074880, 18446743936270598144, 18446743798831644672, + (0,39): 18446743523953737728, 18446742974197923840, 18446741874686296064, + (0,42): 18446739675663040512, 18446735277616529408, 18446726481523507200, + (0,45): 18446708889337462784, 18446673704965373952, 18446603336221196288, + (0,48): 18446462598732840960, 18446181123756130304, 18445618173802708992, + (0,51): 18444492273895866368, 18442240474082181120, 18437736874454810624, + (0,54): 18428729675200069632, 18410715276690587648, 18374686479671623680, + (0,57): 18302628885633695744, 18158513697557839872, 17870283321406128128, + (0,60): 17293822569102704640, 16140901064495857664, 13835058055282163712, + (0,63): 9223372036854775808, + (1,0): 18446744073709551614, 18446744073709551612, 18446744073709551608, + (1,3): 18446744073709551600, 18446744073709551584, 18446744073709551552, + (1,6): 18446744073709551488, 18446744073709551360, 18446744073709551104, + (1,9): 18446744073709550592, 18446744073709549568, 18446744073709547520, + (1,12): 18446744073709543424, 18446744073709535232, 18446744073709518848, + (1,15): 18446744073709486080, 18446744073709420544, 18446744073709289472, + (1,18): 18446744073709027328, 18446744073708503040, 18446744073707454464, + (1,21): 18446744073705357312, 18446744073701163008, 18446744073692774400, + (1,24): 18446744073675997184, 18446744073642442752, 18446744073575333888, + (1,27): 18446744073441116160, 18446744073172680704, 18446744072635809792, + (1,30): 18446744071562067968, 18446744069414584320, 18446744065119617024, + (1,33): 18446744056529682432, 18446744039349813248, 18446744004990074880, + (1,36): 18446743936270598144, 18446743798831644672, 18446743523953737728, + (1,39): 18446742974197923840, 18446741874686296064, 18446739675663040512, + (1,42): 18446735277616529408, 18446726481523507200, 18446708889337462784, + (1,45): 18446673704965373952, 18446603336221196288, 18446462598732840960, + (1,48): 18446181123756130304, 18445618173802708992, 18444492273895866368, + (1,51): 18442240474082181120, 18437736874454810624, 18428729675200069632, + (1,54): 18410715276690587648, 18374686479671623680, 18302628885633695744, + (1,57): 18158513697557839872, 17870283321406128128, 17293822569102704640, + (1,60): 16140901064495857664, 13835058055282163712, 9223372036854775808, + (1,63): 0, + (2,0): 18446744073709551612, 18446744073709551608, 18446744073709551600, + (2,3): 18446744073709551584, 18446744073709551552, 18446744073709551488, + (2,6): 18446744073709551360, 18446744073709551104, 18446744073709550592, + (2,9): 18446744073709549568, 18446744073709547520, 18446744073709543424, + (2,12): 18446744073709535232, 18446744073709518848, 18446744073709486080, + (2,15): 18446744073709420544, 18446744073709289472, 18446744073709027328, + (2,18): 18446744073708503040, 18446744073707454464, 18446744073705357312, + (2,21): 18446744073701163008, 18446744073692774400, 18446744073675997184, + (2,24): 18446744073642442752, 18446744073575333888, 18446744073441116160, + (2,27): 18446744073172680704, 18446744072635809792, 18446744071562067968, + (2,30): 18446744069414584320, 18446744065119617024, 18446744056529682432, + (2,33): 18446744039349813248, 18446744004990074880, 18446743936270598144, + (2,36): 18446743798831644672, 18446743523953737728, 18446742974197923840, + (2,39): 18446741874686296064, 18446739675663040512, 18446735277616529408, + (2,42): 18446726481523507200, 18446708889337462784, 18446673704965373952, + (2,45): 18446603336221196288, 18446462598732840960, 18446181123756130304, + (2,48): 18445618173802708992, 18444492273895866368, 18442240474082181120, + (2,51): 18437736874454810624, 18428729675200069632, 18410715276690587648, + (2,54): 18374686479671623680, 18302628885633695744, 18158513697557839872, + (2,57): 17870283321406128128, 17293822569102704640, 16140901064495857664, + (2,60): 13835058055282163712, 9223372036854775808, 0, 0, + (3,0): 18446744073709551608, 18446744073709551600, 18446744073709551584, + (3,3): 18446744073709551552, 18446744073709551488, 18446744073709551360, + (3,6): 18446744073709551104, 18446744073709550592, 18446744073709549568, + (3,9): 18446744073709547520, 18446744073709543424, 18446744073709535232, + (3,12): 18446744073709518848, 18446744073709486080, 18446744073709420544, + (3,15): 18446744073709289472, 18446744073709027328, 18446744073708503040, + (3,18): 18446744073707454464, 18446744073705357312, 18446744073701163008, + (3,21): 18446744073692774400, 18446744073675997184, 18446744073642442752, + (3,24): 18446744073575333888, 18446744073441116160, 18446744073172680704, + (3,27): 18446744072635809792, 18446744071562067968, 18446744069414584320, + (3,30): 18446744065119617024, 18446744056529682432, 18446744039349813248, + (3,33): 18446744004990074880, 18446743936270598144, 18446743798831644672, + (3,36): 18446743523953737728, 18446742974197923840, 18446741874686296064, + (3,39): 18446739675663040512, 18446735277616529408, 18446726481523507200, + (3,42): 18446708889337462784, 18446673704965373952, 18446603336221196288, + (3,45): 18446462598732840960, 18446181123756130304, 18445618173802708992, + (3,48): 18444492273895866368, 18442240474082181120, 18437736874454810624, + (3,51): 18428729675200069632, 18410715276690587648, 18374686479671623680, + (3,54): 18302628885633695744, 18158513697557839872, 17870283321406128128, + (3,57): 17293822569102704640, 16140901064495857664, 13835058055282163712, + (3,60): 9223372036854775808, 0, 0, 0, + (4,0): 18446744073709551600, 18446744073709551584, 18446744073709551552, + (4,3): 18446744073709551488, 18446744073709551360, 18446744073709551104, + (4,6): 18446744073709550592, 18446744073709549568, 18446744073709547520, + (4,9): 18446744073709543424, 18446744073709535232, 18446744073709518848, + (4,12): 18446744073709486080, 18446744073709420544, 18446744073709289472, + (4,15): 18446744073709027328, 18446744073708503040, 18446744073707454464, + (4,18): 18446744073705357312, 18446744073701163008, 18446744073692774400, + (4,21): 18446744073675997184, 18446744073642442752, 18446744073575333888, + (4,24): 18446744073441116160, 18446744073172680704, 18446744072635809792, + (4,27): 18446744071562067968, 18446744069414584320, 18446744065119617024, + (4,30): 18446744056529682432, 18446744039349813248, 18446744004990074880, + (4,33): 18446743936270598144, 18446743798831644672, 18446743523953737728, + (4,36): 18446742974197923840, 18446741874686296064, 18446739675663040512, + (4,39): 18446735277616529408, 18446726481523507200, 18446708889337462784, + (4,42): 18446673704965373952, 18446603336221196288, 18446462598732840960, + (4,45): 18446181123756130304, 18445618173802708992, 18444492273895866368, + (4,48): 18442240474082181120, 18437736874454810624, 18428729675200069632, + (4,51): 18410715276690587648, 18374686479671623680, 18302628885633695744, + (4,54): 18158513697557839872, 17870283321406128128, 17293822569102704640, + (4,57): 16140901064495857664, 13835058055282163712, 9223372036854775808, + (4,60): 0, 0, 0, 0, + (5,0): 18446744073709551584, 18446744073709551552, 18446744073709551488, + (5,3): 18446744073709551360, 18446744073709551104, 18446744073709550592, + (5,6): 18446744073709549568, 18446744073709547520, 18446744073709543424, + (5,9): 18446744073709535232, 18446744073709518848, 18446744073709486080, + (5,12): 18446744073709420544, 18446744073709289472, 18446744073709027328, + (5,15): 18446744073708503040, 18446744073707454464, 18446744073705357312, + (5,18): 18446744073701163008, 18446744073692774400, 18446744073675997184, + (5,21): 18446744073642442752, 18446744073575333888, 18446744073441116160, + (5,24): 18446744073172680704, 18446744072635809792, 18446744071562067968, + (5,27): 18446744069414584320, 18446744065119617024, 18446744056529682432, + (5,30): 18446744039349813248, 18446744004990074880, 18446743936270598144, + (5,33): 18446743798831644672, 18446743523953737728, 18446742974197923840, + (5,36): 18446741874686296064, 18446739675663040512, 18446735277616529408, + (5,39): 18446726481523507200, 18446708889337462784, 18446673704965373952, + (5,42): 18446603336221196288, 18446462598732840960, 18446181123756130304, + (5,45): 18445618173802708992, 18444492273895866368, 18442240474082181120, + (5,48): 18437736874454810624, 18428729675200069632, 18410715276690587648, + (5,51): 18374686479671623680, 18302628885633695744, 18158513697557839872, + (5,54): 17870283321406128128, 17293822569102704640, 16140901064495857664, + (5,57): 13835058055282163712, 9223372036854775808, 0, 0, 0, 0, 0, + (6,0): 18446744073709551552, 18446744073709551488, 18446744073709551360, + (6,3): 18446744073709551104, 18446744073709550592, 18446744073709549568, + (6,6): 18446744073709547520, 18446744073709543424, 18446744073709535232, + (6,9): 18446744073709518848, 18446744073709486080, 18446744073709420544, + (6,12): 18446744073709289472, 18446744073709027328, 18446744073708503040, + (6,15): 18446744073707454464, 18446744073705357312, 18446744073701163008, + (6,18): 18446744073692774400, 18446744073675997184, 18446744073642442752, + (6,21): 18446744073575333888, 18446744073441116160, 18446744073172680704, + (6,24): 18446744072635809792, 18446744071562067968, 18446744069414584320, + (6,27): 18446744065119617024, 18446744056529682432, 18446744039349813248, + (6,30): 18446744004990074880, 18446743936270598144, 18446743798831644672, + (6,33): 18446743523953737728, 18446742974197923840, 18446741874686296064, + (6,36): 18446739675663040512, 18446735277616529408, 18446726481523507200, + (6,39): 18446708889337462784, 18446673704965373952, 18446603336221196288, + (6,42): 18446462598732840960, 18446181123756130304, 18445618173802708992, + (6,45): 18444492273895866368, 18442240474082181120, 18437736874454810624, + (6,48): 18428729675200069632, 18410715276690587648, 18374686479671623680, + (6,51): 18302628885633695744, 18158513697557839872, 17870283321406128128, + (6,54): 17293822569102704640, 16140901064495857664, 13835058055282163712, + (6,57): 9223372036854775808, 0, 0, 0, 0, 0, 0, + (7,0): 18446744073709551488, 18446744073709551360, 18446744073709551104, + (7,3): 18446744073709550592, 18446744073709549568, 18446744073709547520, + (7,6): 18446744073709543424, 18446744073709535232, 18446744073709518848, + (7,9): 18446744073709486080, 18446744073709420544, 18446744073709289472, + (7,12): 18446744073709027328, 18446744073708503040, 18446744073707454464, + (7,15): 18446744073705357312, 18446744073701163008, 18446744073692774400, + (7,18): 18446744073675997184, 18446744073642442752, 18446744073575333888, + (7,21): 18446744073441116160, 18446744073172680704, 18446744072635809792, + (7,24): 18446744071562067968, 18446744069414584320, 18446744065119617024, + (7,27): 18446744056529682432, 18446744039349813248, 18446744004990074880, + (7,30): 18446743936270598144, 18446743798831644672, 18446743523953737728, + (7,33): 18446742974197923840, 18446741874686296064, 18446739675663040512, + (7,36): 18446735277616529408, 18446726481523507200, 18446708889337462784, + (7,39): 18446673704965373952, 18446603336221196288, 18446462598732840960, + (7,42): 18446181123756130304, 18445618173802708992, 18444492273895866368, + (7,45): 18442240474082181120, 18437736874454810624, 18428729675200069632, + (7,48): 18410715276690587648, 18374686479671623680, 18302628885633695744, + (7,51): 18158513697557839872, 17870283321406128128, 17293822569102704640, + (7,54): 16140901064495857664, 13835058055282163712, 9223372036854775808, + (7,57): 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsUnsignedLongLongWhole1.ddl b/tools/testfiles/tpbitsUnsignedLongLongWhole1.ddl new file mode 100644 index 0000000..0302105 --- /dev/null +++ b/tools/testfiles/tpbitsUnsignedLongLongWhole1.ddl @@ -0,0 +1,175 @@ +HDF5 "packedbits.h5" { +DATASET "/DU64BITS" { + DATATYPE H5T_STD_U64LE + DATASPACE SIMPLE { ( 8, 64 ) / ( 8, 64 ) } + PACKED_BITS OFFSET=1 LENGTH=63 + DATA { + (0,0): 9223372036854775807, 9223372036854775807, 9223372036854775806, + (0,3): 9223372036854775804, 9223372036854775800, 9223372036854775792, + (0,6): 9223372036854775776, 9223372036854775744, 9223372036854775680, + (0,9): 9223372036854775552, 9223372036854775296, 9223372036854774784, + (0,12): 9223372036854773760, 9223372036854771712, 9223372036854767616, + (0,15): 9223372036854759424, 9223372036854743040, 9223372036854710272, + (0,18): 9223372036854644736, 9223372036854513664, 9223372036854251520, + (0,21): 9223372036853727232, 9223372036852678656, 9223372036850581504, + (0,24): 9223372036846387200, 9223372036837998592, 9223372036821221376, + (0,27): 9223372036787666944, 9223372036720558080, 9223372036586340352, + (0,30): 9223372036317904896, 9223372035781033984, 9223372034707292160, + (0,33): 9223372032559808512, 9223372028264841216, 9223372019674906624, + (0,36): 9223372002495037440, 9223371968135299072, 9223371899415822336, + (0,39): 9223371761976868864, 9223371487098961920, 9223370937343148032, + (0,42): 9223369837831520256, 9223367638808264704, 9223363240761753600, + (0,45): 9223354444668731392, 9223336852482686976, 9223301668110598144, + (0,48): 9223231299366420480, 9223090561878065152, 9222809086901354496, + (0,51): 9222246136947933184, 9221120237041090560, 9218868437227405312, + (0,54): 9214364837600034816, 9205357638345293824, 9187343239835811840, + (0,57): 9151314442816847872, 9079256848778919936, 8935141660703064064, + (0,60): 8646911284551352320, 8070450532247928832, 6917529027641081856, + (0,63): 4611686018427387904, + (1,0): 9223372036854775807, 9223372036854775806, 9223372036854775804, + (1,3): 9223372036854775800, 9223372036854775792, 9223372036854775776, + (1,6): 9223372036854775744, 9223372036854775680, 9223372036854775552, + (1,9): 9223372036854775296, 9223372036854774784, 9223372036854773760, + (1,12): 9223372036854771712, 9223372036854767616, 9223372036854759424, + (1,15): 9223372036854743040, 9223372036854710272, 9223372036854644736, + (1,18): 9223372036854513664, 9223372036854251520, 9223372036853727232, + (1,21): 9223372036852678656, 9223372036850581504, 9223372036846387200, + (1,24): 9223372036837998592, 9223372036821221376, 9223372036787666944, + (1,27): 9223372036720558080, 9223372036586340352, 9223372036317904896, + (1,30): 9223372035781033984, 9223372034707292160, 9223372032559808512, + (1,33): 9223372028264841216, 9223372019674906624, 9223372002495037440, + (1,36): 9223371968135299072, 9223371899415822336, 9223371761976868864, + (1,39): 9223371487098961920, 9223370937343148032, 9223369837831520256, + (1,42): 9223367638808264704, 9223363240761753600, 9223354444668731392, + (1,45): 9223336852482686976, 9223301668110598144, 9223231299366420480, + (1,48): 9223090561878065152, 9222809086901354496, 9222246136947933184, + (1,51): 9221120237041090560, 9218868437227405312, 9214364837600034816, + (1,54): 9205357638345293824, 9187343239835811840, 9151314442816847872, + (1,57): 9079256848778919936, 8935141660703064064, 8646911284551352320, + (1,60): 8070450532247928832, 6917529027641081856, 4611686018427387904, 0, + (2,0): 9223372036854775806, 9223372036854775804, 9223372036854775800, + (2,3): 9223372036854775792, 9223372036854775776, 9223372036854775744, + (2,6): 9223372036854775680, 9223372036854775552, 9223372036854775296, + (2,9): 9223372036854774784, 9223372036854773760, 9223372036854771712, + (2,12): 9223372036854767616, 9223372036854759424, 9223372036854743040, + (2,15): 9223372036854710272, 9223372036854644736, 9223372036854513664, + (2,18): 9223372036854251520, 9223372036853727232, 9223372036852678656, + (2,21): 9223372036850581504, 9223372036846387200, 9223372036837998592, + (2,24): 9223372036821221376, 9223372036787666944, 9223372036720558080, + (2,27): 9223372036586340352, 9223372036317904896, 9223372035781033984, + (2,30): 9223372034707292160, 9223372032559808512, 9223372028264841216, + (2,33): 9223372019674906624, 9223372002495037440, 9223371968135299072, + (2,36): 9223371899415822336, 9223371761976868864, 9223371487098961920, + (2,39): 9223370937343148032, 9223369837831520256, 9223367638808264704, + (2,42): 9223363240761753600, 9223354444668731392, 9223336852482686976, + (2,45): 9223301668110598144, 9223231299366420480, 9223090561878065152, + (2,48): 9222809086901354496, 9222246136947933184, 9221120237041090560, + (2,51): 9218868437227405312, 9214364837600034816, 9205357638345293824, + (2,54): 9187343239835811840, 9151314442816847872, 9079256848778919936, + (2,57): 8935141660703064064, 8646911284551352320, 8070450532247928832, + (2,60): 6917529027641081856, 4611686018427387904, 0, 0, + (3,0): 9223372036854775804, 9223372036854775800, 9223372036854775792, + (3,3): 9223372036854775776, 9223372036854775744, 9223372036854775680, + (3,6): 9223372036854775552, 9223372036854775296, 9223372036854774784, + (3,9): 9223372036854773760, 9223372036854771712, 9223372036854767616, + (3,12): 9223372036854759424, 9223372036854743040, 9223372036854710272, + (3,15): 9223372036854644736, 9223372036854513664, 9223372036854251520, + (3,18): 9223372036853727232, 9223372036852678656, 9223372036850581504, + (3,21): 9223372036846387200, 9223372036837998592, 9223372036821221376, + (3,24): 9223372036787666944, 9223372036720558080, 9223372036586340352, + (3,27): 9223372036317904896, 9223372035781033984, 9223372034707292160, + (3,30): 9223372032559808512, 9223372028264841216, 9223372019674906624, + (3,33): 9223372002495037440, 9223371968135299072, 9223371899415822336, + (3,36): 9223371761976868864, 9223371487098961920, 9223370937343148032, + (3,39): 9223369837831520256, 9223367638808264704, 9223363240761753600, + (3,42): 9223354444668731392, 9223336852482686976, 9223301668110598144, + (3,45): 9223231299366420480, 9223090561878065152, 9222809086901354496, + (3,48): 9222246136947933184, 9221120237041090560, 9218868437227405312, + (3,51): 9214364837600034816, 9205357638345293824, 9187343239835811840, + (3,54): 9151314442816847872, 9079256848778919936, 8935141660703064064, + (3,57): 8646911284551352320, 8070450532247928832, 6917529027641081856, + (3,60): 4611686018427387904, 0, 0, 0, + (4,0): 9223372036854775800, 9223372036854775792, 9223372036854775776, + (4,3): 9223372036854775744, 9223372036854775680, 9223372036854775552, + (4,6): 9223372036854775296, 9223372036854774784, 9223372036854773760, + (4,9): 9223372036854771712, 9223372036854767616, 9223372036854759424, + (4,12): 9223372036854743040, 9223372036854710272, 9223372036854644736, + (4,15): 9223372036854513664, 9223372036854251520, 9223372036853727232, + (4,18): 9223372036852678656, 9223372036850581504, 9223372036846387200, + (4,21): 9223372036837998592, 9223372036821221376, 9223372036787666944, + (4,24): 9223372036720558080, 9223372036586340352, 9223372036317904896, + (4,27): 9223372035781033984, 9223372034707292160, 9223372032559808512, + (4,30): 9223372028264841216, 9223372019674906624, 9223372002495037440, + (4,33): 9223371968135299072, 9223371899415822336, 9223371761976868864, + (4,36): 9223371487098961920, 9223370937343148032, 9223369837831520256, + (4,39): 9223367638808264704, 9223363240761753600, 9223354444668731392, + (4,42): 9223336852482686976, 9223301668110598144, 9223231299366420480, + (4,45): 9223090561878065152, 9222809086901354496, 9222246136947933184, + (4,48): 9221120237041090560, 9218868437227405312, 9214364837600034816, + (4,51): 9205357638345293824, 9187343239835811840, 9151314442816847872, + (4,54): 9079256848778919936, 8935141660703064064, 8646911284551352320, + (4,57): 8070450532247928832, 6917529027641081856, 4611686018427387904, 0, + (4,61): 0, 0, 0, + (5,0): 9223372036854775792, 9223372036854775776, 9223372036854775744, + (5,3): 9223372036854775680, 9223372036854775552, 9223372036854775296, + (5,6): 9223372036854774784, 9223372036854773760, 9223372036854771712, + (5,9): 9223372036854767616, 9223372036854759424, 9223372036854743040, + (5,12): 9223372036854710272, 9223372036854644736, 9223372036854513664, + (5,15): 9223372036854251520, 9223372036853727232, 9223372036852678656, + (5,18): 9223372036850581504, 9223372036846387200, 9223372036837998592, + (5,21): 9223372036821221376, 9223372036787666944, 9223372036720558080, + (5,24): 9223372036586340352, 9223372036317904896, 9223372035781033984, + (5,27): 9223372034707292160, 9223372032559808512, 9223372028264841216, + (5,30): 9223372019674906624, 9223372002495037440, 9223371968135299072, + (5,33): 9223371899415822336, 9223371761976868864, 9223371487098961920, + (5,36): 9223370937343148032, 9223369837831520256, 9223367638808264704, + (5,39): 9223363240761753600, 9223354444668731392, 9223336852482686976, + (5,42): 9223301668110598144, 9223231299366420480, 9223090561878065152, + (5,45): 9222809086901354496, 9222246136947933184, 9221120237041090560, + (5,48): 9218868437227405312, 9214364837600034816, 9205357638345293824, + (5,51): 9187343239835811840, 9151314442816847872, 9079256848778919936, + (5,54): 8935141660703064064, 8646911284551352320, 8070450532247928832, + (5,57): 6917529027641081856, 4611686018427387904, 0, 0, 0, 0, 0, + (6,0): 9223372036854775776, 9223372036854775744, 9223372036854775680, + (6,3): 9223372036854775552, 9223372036854775296, 9223372036854774784, + (6,6): 9223372036854773760, 9223372036854771712, 9223372036854767616, + (6,9): 9223372036854759424, 9223372036854743040, 9223372036854710272, + (6,12): 9223372036854644736, 9223372036854513664, 9223372036854251520, + (6,15): 9223372036853727232, 9223372036852678656, 9223372036850581504, + (6,18): 9223372036846387200, 9223372036837998592, 9223372036821221376, + (6,21): 9223372036787666944, 9223372036720558080, 9223372036586340352, + (6,24): 9223372036317904896, 9223372035781033984, 9223372034707292160, + (6,27): 9223372032559808512, 9223372028264841216, 9223372019674906624, + (6,30): 9223372002495037440, 9223371968135299072, 9223371899415822336, + (6,33): 9223371761976868864, 9223371487098961920, 9223370937343148032, + (6,36): 9223369837831520256, 9223367638808264704, 9223363240761753600, + (6,39): 9223354444668731392, 9223336852482686976, 9223301668110598144, + (6,42): 9223231299366420480, 9223090561878065152, 9222809086901354496, + (6,45): 9222246136947933184, 9221120237041090560, 9218868437227405312, + (6,48): 9214364837600034816, 9205357638345293824, 9187343239835811840, + (6,51): 9151314442816847872, 9079256848778919936, 8935141660703064064, + (6,54): 8646911284551352320, 8070450532247928832, 6917529027641081856, + (6,57): 4611686018427387904, 0, 0, 0, 0, 0, 0, + (7,0): 9223372036854775744, 9223372036854775680, 9223372036854775552, + (7,3): 9223372036854775296, 9223372036854774784, 9223372036854773760, + (7,6): 9223372036854771712, 9223372036854767616, 9223372036854759424, + (7,9): 9223372036854743040, 9223372036854710272, 9223372036854644736, + (7,12): 9223372036854513664, 9223372036854251520, 9223372036853727232, + (7,15): 9223372036852678656, 9223372036850581504, 9223372036846387200, + (7,18): 9223372036837998592, 9223372036821221376, 9223372036787666944, + (7,21): 9223372036720558080, 9223372036586340352, 9223372036317904896, + (7,24): 9223372035781033984, 9223372034707292160, 9223372032559808512, + (7,27): 9223372028264841216, 9223372019674906624, 9223372002495037440, + (7,30): 9223371968135299072, 9223371899415822336, 9223371761976868864, + (7,33): 9223371487098961920, 9223370937343148032, 9223369837831520256, + (7,36): 9223367638808264704, 9223363240761753600, 9223354444668731392, + (7,39): 9223336852482686976, 9223301668110598144, 9223231299366420480, + (7,42): 9223090561878065152, 9222809086901354496, 9222246136947933184, + (7,45): 9221120237041090560, 9218868437227405312, 9214364837600034816, + (7,48): 9205357638345293824, 9187343239835811840, 9151314442816847872, + (7,51): 9079256848778919936, 8935141660703064064, 8646911284551352320, + (7,54): 8070450532247928832, 6917529027641081856, 4611686018427387904, 0, + (7,58): 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsUnsignedLongLongWhole63.ddl b/tools/testfiles/tpbitsUnsignedLongLongWhole63.ddl new file mode 100644 index 0000000..6a9b503 --- /dev/null +++ b/tools/testfiles/tpbitsUnsignedLongLongWhole63.ddl @@ -0,0 +1,172 @@ +HDF5 "packedbits.h5" { +DATASET "/DU64BITS" { + DATATYPE H5T_STD_U64LE + DATASPACE SIMPLE { ( 8, 64 ) / ( 8, 64 ) } + PACKED_BITS OFFSET=0 LENGTH=63 + DATA { + (0,0): 9223372036854775807, 9223372036854775806, 9223372036854775804, + (0,3): 9223372036854775800, 9223372036854775792, 9223372036854775776, + (0,6): 9223372036854775744, 9223372036854775680, 9223372036854775552, + (0,9): 9223372036854775296, 9223372036854774784, 9223372036854773760, + (0,12): 9223372036854771712, 9223372036854767616, 9223372036854759424, + (0,15): 9223372036854743040, 9223372036854710272, 9223372036854644736, + (0,18): 9223372036854513664, 9223372036854251520, 9223372036853727232, + (0,21): 9223372036852678656, 9223372036850581504, 9223372036846387200, + (0,24): 9223372036837998592, 9223372036821221376, 9223372036787666944, + (0,27): 9223372036720558080, 9223372036586340352, 9223372036317904896, + (0,30): 9223372035781033984, 9223372034707292160, 9223372032559808512, + (0,33): 9223372028264841216, 9223372019674906624, 9223372002495037440, + (0,36): 9223371968135299072, 9223371899415822336, 9223371761976868864, + (0,39): 9223371487098961920, 9223370937343148032, 9223369837831520256, + (0,42): 9223367638808264704, 9223363240761753600, 9223354444668731392, + (0,45): 9223336852482686976, 9223301668110598144, 9223231299366420480, + (0,48): 9223090561878065152, 9222809086901354496, 9222246136947933184, + (0,51): 9221120237041090560, 9218868437227405312, 9214364837600034816, + (0,54): 9205357638345293824, 9187343239835811840, 9151314442816847872, + (0,57): 9079256848778919936, 8935141660703064064, 8646911284551352320, + (0,60): 8070450532247928832, 6917529027641081856, 4611686018427387904, 0, + (1,0): 9223372036854775806, 9223372036854775804, 9223372036854775800, + (1,3): 9223372036854775792, 9223372036854775776, 9223372036854775744, + (1,6): 9223372036854775680, 9223372036854775552, 9223372036854775296, + (1,9): 9223372036854774784, 9223372036854773760, 9223372036854771712, + (1,12): 9223372036854767616, 9223372036854759424, 9223372036854743040, + (1,15): 9223372036854710272, 9223372036854644736, 9223372036854513664, + (1,18): 9223372036854251520, 9223372036853727232, 9223372036852678656, + (1,21): 9223372036850581504, 9223372036846387200, 9223372036837998592, + (1,24): 9223372036821221376, 9223372036787666944, 9223372036720558080, + (1,27): 9223372036586340352, 9223372036317904896, 9223372035781033984, + (1,30): 9223372034707292160, 9223372032559808512, 9223372028264841216, + (1,33): 9223372019674906624, 9223372002495037440, 9223371968135299072, + (1,36): 9223371899415822336, 9223371761976868864, 9223371487098961920, + (1,39): 9223370937343148032, 9223369837831520256, 9223367638808264704, + (1,42): 9223363240761753600, 9223354444668731392, 9223336852482686976, + (1,45): 9223301668110598144, 9223231299366420480, 9223090561878065152, + (1,48): 9222809086901354496, 9222246136947933184, 9221120237041090560, + (1,51): 9218868437227405312, 9214364837600034816, 9205357638345293824, + (1,54): 9187343239835811840, 9151314442816847872, 9079256848778919936, + (1,57): 8935141660703064064, 8646911284551352320, 8070450532247928832, + (1,60): 6917529027641081856, 4611686018427387904, 0, 0, + (2,0): 9223372036854775804, 9223372036854775800, 9223372036854775792, + (2,3): 9223372036854775776, 9223372036854775744, 9223372036854775680, + (2,6): 9223372036854775552, 9223372036854775296, 9223372036854774784, + (2,9): 9223372036854773760, 9223372036854771712, 9223372036854767616, + (2,12): 9223372036854759424, 9223372036854743040, 9223372036854710272, + (2,15): 9223372036854644736, 9223372036854513664, 9223372036854251520, + (2,18): 9223372036853727232, 9223372036852678656, 9223372036850581504, + (2,21): 9223372036846387200, 9223372036837998592, 9223372036821221376, + (2,24): 9223372036787666944, 9223372036720558080, 9223372036586340352, + (2,27): 9223372036317904896, 9223372035781033984, 9223372034707292160, + (2,30): 9223372032559808512, 9223372028264841216, 9223372019674906624, + (2,33): 9223372002495037440, 9223371968135299072, 9223371899415822336, + (2,36): 9223371761976868864, 9223371487098961920, 9223370937343148032, + (2,39): 9223369837831520256, 9223367638808264704, 9223363240761753600, + (2,42): 9223354444668731392, 9223336852482686976, 9223301668110598144, + (2,45): 9223231299366420480, 9223090561878065152, 9222809086901354496, + (2,48): 9222246136947933184, 9221120237041090560, 9218868437227405312, + (2,51): 9214364837600034816, 9205357638345293824, 9187343239835811840, + (2,54): 9151314442816847872, 9079256848778919936, 8935141660703064064, + (2,57): 8646911284551352320, 8070450532247928832, 6917529027641081856, + (2,60): 4611686018427387904, 0, 0, 0, + (3,0): 9223372036854775800, 9223372036854775792, 9223372036854775776, + (3,3): 9223372036854775744, 9223372036854775680, 9223372036854775552, + (3,6): 9223372036854775296, 9223372036854774784, 9223372036854773760, + (3,9): 9223372036854771712, 9223372036854767616, 9223372036854759424, + (3,12): 9223372036854743040, 9223372036854710272, 9223372036854644736, + (3,15): 9223372036854513664, 9223372036854251520, 9223372036853727232, + (3,18): 9223372036852678656, 9223372036850581504, 9223372036846387200, + (3,21): 9223372036837998592, 9223372036821221376, 9223372036787666944, + (3,24): 9223372036720558080, 9223372036586340352, 9223372036317904896, + (3,27): 9223372035781033984, 9223372034707292160, 9223372032559808512, + (3,30): 9223372028264841216, 9223372019674906624, 9223372002495037440, + (3,33): 9223371968135299072, 9223371899415822336, 9223371761976868864, + (3,36): 9223371487098961920, 9223370937343148032, 9223369837831520256, + (3,39): 9223367638808264704, 9223363240761753600, 9223354444668731392, + (3,42): 9223336852482686976, 9223301668110598144, 9223231299366420480, + (3,45): 9223090561878065152, 9222809086901354496, 9222246136947933184, + (3,48): 9221120237041090560, 9218868437227405312, 9214364837600034816, + (3,51): 9205357638345293824, 9187343239835811840, 9151314442816847872, + (3,54): 9079256848778919936, 8935141660703064064, 8646911284551352320, + (3,57): 8070450532247928832, 6917529027641081856, 4611686018427387904, 0, + (3,61): 0, 0, 0, + (4,0): 9223372036854775792, 9223372036854775776, 9223372036854775744, + (4,3): 9223372036854775680, 9223372036854775552, 9223372036854775296, + (4,6): 9223372036854774784, 9223372036854773760, 9223372036854771712, + (4,9): 9223372036854767616, 9223372036854759424, 9223372036854743040, + (4,12): 9223372036854710272, 9223372036854644736, 9223372036854513664, + (4,15): 9223372036854251520, 9223372036853727232, 9223372036852678656, + (4,18): 9223372036850581504, 9223372036846387200, 9223372036837998592, + (4,21): 9223372036821221376, 9223372036787666944, 9223372036720558080, + (4,24): 9223372036586340352, 9223372036317904896, 9223372035781033984, + (4,27): 9223372034707292160, 9223372032559808512, 9223372028264841216, + (4,30): 9223372019674906624, 9223372002495037440, 9223371968135299072, + (4,33): 9223371899415822336, 9223371761976868864, 9223371487098961920, + (4,36): 9223370937343148032, 9223369837831520256, 9223367638808264704, + (4,39): 9223363240761753600, 9223354444668731392, 9223336852482686976, + (4,42): 9223301668110598144, 9223231299366420480, 9223090561878065152, + (4,45): 9222809086901354496, 9222246136947933184, 9221120237041090560, + (4,48): 9218868437227405312, 9214364837600034816, 9205357638345293824, + (4,51): 9187343239835811840, 9151314442816847872, 9079256848778919936, + (4,54): 8935141660703064064, 8646911284551352320, 8070450532247928832, + (4,57): 6917529027641081856, 4611686018427387904, 0, 0, 0, 0, 0, + (5,0): 9223372036854775776, 9223372036854775744, 9223372036854775680, + (5,3): 9223372036854775552, 9223372036854775296, 9223372036854774784, + (5,6): 9223372036854773760, 9223372036854771712, 9223372036854767616, + (5,9): 9223372036854759424, 9223372036854743040, 9223372036854710272, + (5,12): 9223372036854644736, 9223372036854513664, 9223372036854251520, + (5,15): 9223372036853727232, 9223372036852678656, 9223372036850581504, + (5,18): 9223372036846387200, 9223372036837998592, 9223372036821221376, + (5,21): 9223372036787666944, 9223372036720558080, 9223372036586340352, + (5,24): 9223372036317904896, 9223372035781033984, 9223372034707292160, + (5,27): 9223372032559808512, 9223372028264841216, 9223372019674906624, + (5,30): 9223372002495037440, 9223371968135299072, 9223371899415822336, + (5,33): 9223371761976868864, 9223371487098961920, 9223370937343148032, + (5,36): 9223369837831520256, 9223367638808264704, 9223363240761753600, + (5,39): 9223354444668731392, 9223336852482686976, 9223301668110598144, + (5,42): 9223231299366420480, 9223090561878065152, 9222809086901354496, + (5,45): 9222246136947933184, 9221120237041090560, 9218868437227405312, + (5,48): 9214364837600034816, 9205357638345293824, 9187343239835811840, + (5,51): 9151314442816847872, 9079256848778919936, 8935141660703064064, + (5,54): 8646911284551352320, 8070450532247928832, 6917529027641081856, + (5,57): 4611686018427387904, 0, 0, 0, 0, 0, 0, + (6,0): 9223372036854775744, 9223372036854775680, 9223372036854775552, + (6,3): 9223372036854775296, 9223372036854774784, 9223372036854773760, + (6,6): 9223372036854771712, 9223372036854767616, 9223372036854759424, + (6,9): 9223372036854743040, 9223372036854710272, 9223372036854644736, + (6,12): 9223372036854513664, 9223372036854251520, 9223372036853727232, + (6,15): 9223372036852678656, 9223372036850581504, 9223372036846387200, + (6,18): 9223372036837998592, 9223372036821221376, 9223372036787666944, + (6,21): 9223372036720558080, 9223372036586340352, 9223372036317904896, + (6,24): 9223372035781033984, 9223372034707292160, 9223372032559808512, + (6,27): 9223372028264841216, 9223372019674906624, 9223372002495037440, + (6,30): 9223371968135299072, 9223371899415822336, 9223371761976868864, + (6,33): 9223371487098961920, 9223370937343148032, 9223369837831520256, + (6,36): 9223367638808264704, 9223363240761753600, 9223354444668731392, + (6,39): 9223336852482686976, 9223301668110598144, 9223231299366420480, + (6,42): 9223090561878065152, 9222809086901354496, 9222246136947933184, + (6,45): 9221120237041090560, 9218868437227405312, 9214364837600034816, + (6,48): 9205357638345293824, 9187343239835811840, 9151314442816847872, + (6,51): 9079256848778919936, 8935141660703064064, 8646911284551352320, + (6,54): 8070450532247928832, 6917529027641081856, 4611686018427387904, 0, + (6,58): 0, 0, 0, 0, 0, 0, + (7,0): 9223372036854775680, 9223372036854775552, 9223372036854775296, + (7,3): 9223372036854774784, 9223372036854773760, 9223372036854771712, + (7,6): 9223372036854767616, 9223372036854759424, 9223372036854743040, + (7,9): 9223372036854710272, 9223372036854644736, 9223372036854513664, + (7,12): 9223372036854251520, 9223372036853727232, 9223372036852678656, + (7,15): 9223372036850581504, 9223372036846387200, 9223372036837998592, + (7,18): 9223372036821221376, 9223372036787666944, 9223372036720558080, + (7,21): 9223372036586340352, 9223372036317904896, 9223372035781033984, + (7,24): 9223372034707292160, 9223372032559808512, 9223372028264841216, + (7,27): 9223372019674906624, 9223372002495037440, 9223371968135299072, + (7,30): 9223371899415822336, 9223371761976868864, 9223371487098961920, + (7,33): 9223370937343148032, 9223369837831520256, 9223367638808264704, + (7,36): 9223363240761753600, 9223354444668731392, 9223336852482686976, + (7,39): 9223301668110598144, 9223231299366420480, 9223090561878065152, + (7,42): 9222809086901354496, 9222246136947933184, 9221120237041090560, + (7,45): 9218868437227405312, 9214364837600034816, 9205357638345293824, + (7,48): 9187343239835811840, 9151314442816847872, 9079256848778919936, + (7,51): 8935141660703064064, 8646911284551352320, 8070450532247928832, + (7,54): 6917529027641081856, 4611686018427387904, 0, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsUnsignedLongWhole.ddl b/tools/testfiles/tpbitsUnsignedLongWhole.ddl new file mode 100644 index 0000000..50ad02f --- /dev/null +++ b/tools/testfiles/tpbitsUnsignedLongWhole.ddl @@ -0,0 +1,59 @@ +HDF5 "packedbits.h5" { +DATASET "/DU32BITS" { + DATATYPE H5T_STD_U32LE + DATASPACE SIMPLE { ( 8, 32 ) / ( 8, 32 ) } + PACKED_BITS OFFSET=0 LENGTH=32 + DATA { + (0,0): 4294967295, 4294967294, 4294967292, 4294967288, 4294967280, + (0,5): 4294967264, 4294967232, 4294967168, 4294967040, 4294966784, + (0,10): 4294966272, 4294965248, 4294963200, 4294959104, 4294950912, + (0,15): 4294934528, 4294901760, 4294836224, 4294705152, 4294443008, + (0,20): 4293918720, 4292870144, 4290772992, 4286578688, 4278190080, + (0,25): 4261412864, 4227858432, 4160749568, 4026531840, 3758096384, + (0,30): 3221225472, 2147483648, + (1,0): 4294967294, 4294967292, 4294967288, 4294967280, 4294967264, + (1,5): 4294967232, 4294967168, 4294967040, 4294966784, 4294966272, + (1,10): 4294965248, 4294963200, 4294959104, 4294950912, 4294934528, + (1,15): 4294901760, 4294836224, 4294705152, 4294443008, 4293918720, + (1,20): 4292870144, 4290772992, 4286578688, 4278190080, 4261412864, + (1,25): 4227858432, 4160749568, 4026531840, 3758096384, 3221225472, + (1,30): 2147483648, 0, + (2,0): 4294967292, 4294967288, 4294967280, 4294967264, 4294967232, + (2,5): 4294967168, 4294967040, 4294966784, 4294966272, 4294965248, + (2,10): 4294963200, 4294959104, 4294950912, 4294934528, 4294901760, + (2,15): 4294836224, 4294705152, 4294443008, 4293918720, 4292870144, + (2,20): 4290772992, 4286578688, 4278190080, 4261412864, 4227858432, + (2,25): 4160749568, 4026531840, 3758096384, 3221225472, 2147483648, 0, 0, + (3,0): 4294967288, 4294967280, 4294967264, 4294967232, 4294967168, + (3,5): 4294967040, 4294966784, 4294966272, 4294965248, 4294963200, + (3,10): 4294959104, 4294950912, 4294934528, 4294901760, 4294836224, + (3,15): 4294705152, 4294443008, 4293918720, 4292870144, 4290772992, + (3,20): 4286578688, 4278190080, 4261412864, 4227858432, 4160749568, + (3,25): 4026531840, 3758096384, 3221225472, 2147483648, 0, 0, 0, + (4,0): 4294967280, 4294967264, 4294967232, 4294967168, 4294967040, + (4,5): 4294966784, 4294966272, 4294965248, 4294963200, 4294959104, + (4,10): 4294950912, 4294934528, 4294901760, 4294836224, 4294705152, + (4,15): 4294443008, 4293918720, 4292870144, 4290772992, 4286578688, + (4,20): 4278190080, 4261412864, 4227858432, 4160749568, 4026531840, + (4,25): 3758096384, 3221225472, 2147483648, 0, 0, 0, 0, + (5,0): 4294967264, 4294967232, 4294967168, 4294967040, 4294966784, + (5,5): 4294966272, 4294965248, 4294963200, 4294959104, 4294950912, + (5,10): 4294934528, 4294901760, 4294836224, 4294705152, 4294443008, + (5,15): 4293918720, 4292870144, 4290772992, 4286578688, 4278190080, + (5,20): 4261412864, 4227858432, 4160749568, 4026531840, 3758096384, + (5,25): 3221225472, 2147483648, 0, 0, 0, 0, 0, + (6,0): 4294967232, 4294967168, 4294967040, 4294966784, 4294966272, + (6,5): 4294965248, 4294963200, 4294959104, 4294950912, 4294934528, + (6,10): 4294901760, 4294836224, 4294705152, 4294443008, 4293918720, + (6,15): 4292870144, 4290772992, 4286578688, 4278190080, 4261412864, + (6,20): 4227858432, 4160749568, 4026531840, 3758096384, 3221225472, + (6,25): 2147483648, 0, 0, 0, 0, 0, 0, + (7,0): 4294967168, 4294967040, 4294966784, 4294966272, 4294965248, + (7,5): 4294963200, 4294959104, 4294950912, 4294934528, 4294901760, + (7,10): 4294836224, 4294705152, 4294443008, 4293918720, 4292870144, + (7,15): 4290772992, 4286578688, 4278190080, 4261412864, 4227858432, + (7,20): 4160749568, 4026531840, 3758096384, 3221225472, 2147483648, 0, 0, + (7,27): 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tpbitsUnsignedWhole.ddl b/tools/testfiles/tpbitsUnsignedWhole.ddl new file mode 100644 index 0000000..7c9e736 --- /dev/null +++ b/tools/testfiles/tpbitsUnsignedWhole.ddl @@ -0,0 +1,17 @@ +HDF5 "packedbits.h5" { +DATASET "/DU08BITS" { + DATATYPE H5T_STD_U8LE + DATASPACE SIMPLE { ( 8, 8 ) / ( 8, 8 ) } + PACKED_BITS OFFSET=0 LENGTH=8 + DATA { + (0,0): 255, 254, 252, 248, 240, 224, 192, 128, + (1,0): 254, 252, 248, 240, 224, 192, 128, 0, + (2,0): 252, 248, 240, 224, 192, 128, 0, 0, + (3,0): 248, 240, 224, 192, 128, 0, 0, 0, + (4,0): 240, 224, 192, 128, 0, 0, 0, 0, + (5,0): 224, 192, 128, 0, 0, 0, 0, 0, + (6,0): 192, 128, 0, 0, 0, 0, 0, 0, + (7,0): 128, 0, 0, 0, 0, 0, 0, 0 + } +} +} diff --git a/tools/testfiles/tperror.ddl b/tools/testfiles/tperror.ddl index c7ee79d..16a7d8e 100644 --- a/tools/testfiles/tperror.ddl +++ b/tools/testfiles/tperror.ddl @@ -1,8 +1,35 @@ -############################# -Expected output for 'h5dump -p -d bogus tfcontents1.h5' -############################# HDF5 "tfcontents1.h5" { -DATASET "bogus" { - } } -h5dump error: unable to open dataset "bogus" +HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): + #000: (file name) line (number) in H5Dopen2(): not found + major: Dataset + minor: Object not found + #001: (file name) line (number) in H5G_loc_find(): can't find object + major: Symbol table + minor: Object not found + #002: (file name) line (number) in H5G_traverse(): internal path traversal failed + major: Symbol table + minor: Object not found + #003: (file name) line (number) in H5G_traverse_real(): traversal operator failed + major: Symbol table + minor: Callback failed + #004: (file name) line (number) in H5G_loc_find_cb(): object 'bogus' doesn't exist + major: Symbol table + minor: Object not found +HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): + #000: (file name) line (number) in H5Lget_info(): unable to get link info + major: Symbol table + minor: Object not found + #001: (file name) line (number) in H5L_get_info(): name doesn't exist + major: Symbol table + minor: Object already exists + #002: (file name) line (number) in H5G_traverse(): internal path traversal failed + major: Symbol table + minor: Object not found + #003: (file name) line (number) in H5G_traverse_real(): traversal operator failed + major: Symbol table + minor: Callback failed + #004: (file name) line (number) in H5L_get_info_cb(): name doesn't exist + major: Symbol table + minor: Object not found +h5dump error: unable to get link info from "bogus" diff --git a/tools/testfiles/tqmarkfile.ddl b/tools/testfiles/tqmarkfile.ddl new file mode 100644 index 0000000..e7771cb --- /dev/null +++ b/tools/testfiles/tqmarkfile.ddl @@ -0,0 +1,83 @@ +HDF5 "tarray1.h5" { +DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [4] H5T_STD_I32LE } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } +} +} +HDF5 "tarray2.h5" { +DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [3][4][5] H5T_STD_I32LE } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } +} +} +HDF5 "tarray3.h5" { +DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [4] H5T_ARRAY { [6][3] H5T_STD_I32LE } } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } +} +} +HDF5 "tarray4.h5" { +DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [4] H5T_COMPOUND { + H5T_STD_I32LE "i"; + H5T_IEEE_F32LE "f"; + } } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } +} +} +HDF5 "tarray5.h5" { +DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [4] H5T_COMPOUND { + H5T_STD_I32LE "i"; + H5T_ARRAY { [4] H5T_IEEE_F32LE } "f"; + } } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } +} +} +HDF5 "tarray6.h5" { +DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [4] H5T_VLEN { H5T_STD_U32LE} } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } +} +} +HDF5 "tarray7.h5" { +DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [4] H5T_VLEN { H5T_ARRAY { [4] H5T_STD_U32LE }} } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } +} +} +HDF5 "tarray8.h5" { +} +HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): + #000: (file name) line (number) in H5Dopen2(): not found + major: Dataset + minor: Object not found + #001: (file name) line (number) in H5G_loc_find(): can't find object + major: Symbol table + minor: Object not found + #002: (file name) line (number) in H5G_traverse(): internal path traversal failed + major: Symbol table + minor: Object not found + #003: (file name) line (number) in H5G_traverse_real(): traversal operator failed + major: Symbol table + minor: Callback failed + #004: (file name) line (number) in H5G_loc_find_cb(): object 'Dataset1' doesn't exist + major: Symbol table + minor: Object not found +HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): + #000: (file name) line (number) in H5Lget_info(): unable to get link info + major: Symbol table + minor: Object not found + #001: (file name) line (number) in H5L_get_info(): name doesn't exist + major: Symbol table + minor: Object already exists + #002: (file name) line (number) in H5G_traverse(): internal path traversal failed + major: Symbol table + minor: Object not found + #003: (file name) line (number) in H5G_traverse_real(): traversal operator failed + major: Symbol table + minor: Callback failed + #004: (file name) line (number) in H5L_get_info_cb(): name doesn't exist + major: Symbol table + minor: Object not found +h5dump error: unable to get link info from "Dataset1" diff --git a/tools/testfiles/tref-escapes-at.h5.xml b/tools/testfiles/tref-escapes-at.h5.xml index 6d683f1..8126484 100644 --- a/tools/testfiles/tref-escapes-at.h5.xml +++ b/tools/testfiles/tref-escapes-at.h5.xml @@ -1,17 +1,14 @@ -############################# -Expected output for 'h5dump --xml tref-escapes-at.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Group Name="Group1" OBJ-XID="xid_1344" H5Path="/Group1" Parents="xid_696" H5ParentPaths="/" > <hdf5:Dataset Name="Dataset space" OBJ-XID="xid_3716" H5Path= "/Group1/Dataset space" Parents="xid_1344" H5ParentPaths="/Group1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -26,7 +23,10 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -34,9 +34,9 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -51,7 +51,10 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 3 6 9 + 0 + 3 + 6 + 9 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -59,9 +62,9 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -76,7 +79,10 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -84,9 +90,9 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -101,7 +107,10 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -109,9 +118,9 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -126,7 +135,10 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -134,9 +146,9 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -151,7 +163,10 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -159,9 +174,9 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -176,7 +191,10 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -185,9 +203,9 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -213,11 +231,11 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' </hdf5:ReferenceType> </hdf5:AtomicType> </hdf5:DataType> - <hdf5:Data> - <hdf5:DataFromFile> - "/Group1/Dataset&amp" - </hdf5:DataFromFile> - </hdf5:Data> + <hdf5:Data> + <hdf5:DataFromFile> + "/Group1/Dataset&amp" + </hdf5:DataFromFile> + </hdf5:Data> </hdf5:Attribute> <hdf5:Attribute Name="reftoapos"> <hdf5:Dataspace> @@ -232,11 +250,11 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' </hdf5:ReferenceType> </hdf5:AtomicType> </hdf5:DataType> - <hdf5:Data> - <hdf5:DataFromFile> - "/Group1/Dataset'apos" - </hdf5:DataFromFile> - </hdf5:Data> + <hdf5:Data> + <hdf5:DataFromFile> + "/Group1/Dataset'apos" + </hdf5:DataFromFile> + </hdf5:Data> </hdf5:Attribute> <hdf5:Attribute Name="reftogt"> <hdf5:Dataspace> @@ -251,11 +269,11 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' </hdf5:ReferenceType> </hdf5:AtomicType> </hdf5:DataType> - <hdf5:Data> - <hdf5:DataFromFile> - "/Group1/Dataset>gt" - </hdf5:DataFromFile> - </hdf5:Data> + <hdf5:Data> + <hdf5:DataFromFile> + "/Group1/Dataset>gt" + </hdf5:DataFromFile> + </hdf5:Data> </hdf5:Attribute> <hdf5:Attribute Name="reftolt"> <hdf5:Dataspace> @@ -270,11 +288,11 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' </hdf5:ReferenceType> </hdf5:AtomicType> </hdf5:DataType> - <hdf5:Data> - <hdf5:DataFromFile> - "/Group1/Dataset<lt" - </hdf5:DataFromFile> - </hdf5:Data> + <hdf5:Data> + <hdf5:DataFromFile> + "/Group1/Dataset<lt" + </hdf5:DataFromFile> + </hdf5:Data> </hdf5:Attribute> <hdf5:Attribute Name="reftoquote"> <hdf5:Dataspace> @@ -289,11 +307,11 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' </hdf5:ReferenceType> </hdf5:AtomicType> </hdf5:DataType> - <hdf5:Data> - <hdf5:DataFromFile> - "/Group1/Dataset\"quote" - </hdf5:DataFromFile> - </hdf5:Data> + <hdf5:Data> + <hdf5:DataFromFile> + "/Group1/Dataset\"quote" + </hdf5:DataFromFile> + </hdf5:Data> </hdf5:Attribute> <hdf5:Attribute Name="reftoslash"> <hdf5:Dataspace> @@ -308,11 +326,11 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' </hdf5:ReferenceType> </hdf5:AtomicType> </hdf5:DataType> - <hdf5:Data> - <hdf5:DataFromFile> - "/Group1/Dataset\\slash" - </hdf5:DataFromFile> - </hdf5:Data> + <hdf5:Data> + <hdf5:DataFromFile> + "/Group1/Dataset\\slash" + </hdf5:DataFromFile> + </hdf5:Data> </hdf5:Attribute> <hdf5:Attribute Name="reftospace"> <hdf5:Dataspace> @@ -327,11 +345,11 @@ Expected output for 'h5dump --xml tref-escapes-at.h5' </hdf5:ReferenceType> </hdf5:AtomicType> </hdf5:DataType> - <hdf5:Data> - <hdf5:DataFromFile> - "/Group1/Dataset space" - </hdf5:DataFromFile> - </hdf5:Data> + <hdf5:Data> + <hdf5:DataFromFile> + "/Group1/Dataset space" + </hdf5:DataFromFile> + </hdf5:Data> </hdf5:Attribute> <hdf5:Data> <hdf5:DataFromFile> diff --git a/tools/testfiles/tref-escapes.h5.xml b/tools/testfiles/tref-escapes.h5.xml index 6d43069..6c6455b 100644 --- a/tools/testfiles/tref-escapes.h5.xml +++ b/tools/testfiles/tref-escapes.h5.xml @@ -1,17 +1,14 @@ -############################# -Expected output for 'h5dump --xml tref-escapes.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Group Name="Group1" OBJ-XID="xid_1344" H5Path="/Group1" Parents="xid_696" H5ParentPaths="/" > <hdf5:Dataset Name="Dataset space" OBJ-XID="xid_1720" H5Path= "/Group1/Dataset space" Parents="xid_1344" H5ParentPaths="/Group1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -26,7 +23,10 @@ Expected output for 'h5dump --xml tref-escapes.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -34,9 +34,9 @@ Expected output for 'h5dump --xml tref-escapes.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -51,7 +51,10 @@ Expected output for 'h5dump --xml tref-escapes.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 3 6 9 + 0 + 3 + 6 + 9 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -59,9 +62,9 @@ Expected output for 'h5dump --xml tref-escapes.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -76,7 +79,10 @@ Expected output for 'h5dump --xml tref-escapes.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -84,9 +90,9 @@ Expected output for 'h5dump --xml tref-escapes.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -101,7 +107,10 @@ Expected output for 'h5dump --xml tref-escapes.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -109,9 +118,9 @@ Expected output for 'h5dump --xml tref-escapes.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -126,7 +135,10 @@ Expected output for 'h5dump --xml tref-escapes.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -134,9 +146,9 @@ Expected output for 'h5dump --xml tref-escapes.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -151,7 +163,10 @@ Expected output for 'h5dump --xml tref-escapes.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -159,9 +174,9 @@ Expected output for 'h5dump --xml tref-escapes.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -176,7 +191,10 @@ Expected output for 'h5dump --xml tref-escapes.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -185,9 +203,9 @@ Expected output for 'h5dump --xml tref-escapes.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> diff --git a/tools/testfiles/tref.h5.xml b/tools/testfiles/tref.h5.xml index 8a39acf..7ff360e 100644 --- a/tools/testfiles/tref.h5.xml +++ b/tools/testfiles/tref.h5.xml @@ -1,17 +1,14 @@ -############################# -Expected output for 'h5dump --xml tref.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Group Name="Group1" OBJ-XID="xid_1344" H5Path="/Group1" Parents="xid_696" H5ParentPaths="/" > <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_1720" H5Path= "/Group1/Dataset1" Parents="xid_1344" H5ParentPaths="/Group1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -26,7 +23,10 @@ Expected output for 'h5dump --xml tref.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 3 6 9 + 0 + 3 + 6 + 9 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -34,9 +34,9 @@ Expected output for 'h5dump --xml tref.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -51,7 +51,10 @@ Expected output for 'h5dump --xml tref.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 0 + 0 + 0 + 0 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -60,9 +63,9 @@ Expected output for 'h5dump --xml tref.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> diff --git a/tools/testfiles/treference.ddl b/tools/testfiles/treference.ddl index b94802f..4683ce5 100644 --- a/tools/testfiles/treference.ddl +++ b/tools/testfiles/treference.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tattr2.h5' -############################# HDF5 "tattr2.h5" { GROUP "/" { ATTRIBUTE "array" { @@ -228,10 +225,10 @@ GROUP "/" { } ATTRIBUTE "enum" { DATATYPE H5T_ENUM { - H5T_STD_I32LE; - "RED" 0; - "GREEN" 1; - } + H5T_STD_I32LE; + "RED" 0; + "GREEN" 1; + } DATASPACE SIMPLE { ( 2 ) / ( 2 ) } DATA { (0): RED, RED @@ -239,10 +236,10 @@ GROUP "/" { } ATTRIBUTE "enum2D" { DATATYPE H5T_ENUM { - H5T_STD_I32LE; - "RED" 0; - "GREEN" 1; - } + H5T_STD_I32LE; + "RED" 0; + "GREEN" 1; + } DATASPACE SIMPLE { ( 3, 2 ) / ( 3, 2 ) } DATA { (0,0): RED, RED, @@ -252,10 +249,10 @@ GROUP "/" { } ATTRIBUTE "enum3D" { DATATYPE H5T_ENUM { - H5T_STD_I32LE; - "RED" 0; - "GREEN" 1; - } + H5T_STD_I32LE; + "RED" 0; + "GREEN" 1; + } DATASPACE SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) } DATA { (0,0,0): RED, RED, @@ -341,20 +338,18 @@ GROUP "/" { } } ATTRIBUTE "opaque" { - DATATYPE - H5T_OPAQUE; + DATATYPE H5T_OPAQUE { OPAQUE_TAG "1-byte opaque type"; - + } DATASPACE SIMPLE { ( 2 ) / ( 2 ) } DATA { (0): 0x01, 0x02 } } ATTRIBUTE "opaque2D" { - DATATYPE - H5T_OPAQUE; + DATATYPE H5T_OPAQUE { OPAQUE_TAG "1-byte opaque type"; - + } DATASPACE SIMPLE { ( 3, 2 ) / ( 3, 2 ) } DATA { (0,0): 0x01, 0x02, @@ -363,10 +358,9 @@ GROUP "/" { } } ATTRIBUTE "opaque3D" { - DATATYPE - H5T_OPAQUE; + DATATYPE H5T_OPAQUE { OPAQUE_TAG "1-byte opaque type"; - + } DATASPACE SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) } DATA { (0,0,0): 0x01, 0x02, @@ -385,11 +379,11 @@ GROUP "/" { } ATTRIBUTE "string" { DATATYPE H5T_STRING { - STRSIZE 2; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 2; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 2 ) / ( 2 ) } DATA { (0): "ab", "de" @@ -397,11 +391,11 @@ GROUP "/" { } ATTRIBUTE "string2D" { DATATYPE H5T_STRING { - STRSIZE 2; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 2; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 3, 2 ) / ( 3, 2 ) } DATA { (0,0): "ab", "cd", @@ -411,11 +405,11 @@ GROUP "/" { } ATTRIBUTE "string3D" { DATATYPE H5T_STRING { - STRSIZE 2; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 2; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) } DATA { (0,0,0): "ab", "cd", @@ -697,10 +691,10 @@ GROUP "/" { } ATTRIBUTE "enum" { DATATYPE H5T_ENUM { - H5T_STD_I32LE; - "RED" 0; - "GREEN" 1; - } + H5T_STD_I32LE; + "RED" 0; + "GREEN" 1; + } DATASPACE SIMPLE { ( 2 ) / ( 2 ) } DATA { (0): RED, RED @@ -708,10 +702,10 @@ GROUP "/" { } ATTRIBUTE "enum2D" { DATATYPE H5T_ENUM { - H5T_STD_I32LE; - "RED" 0; - "GREEN" 1; - } + H5T_STD_I32LE; + "RED" 0; + "GREEN" 1; + } DATASPACE SIMPLE { ( 3, 2 ) / ( 3, 2 ) } DATA { (0,0): RED, RED, @@ -721,10 +715,10 @@ GROUP "/" { } ATTRIBUTE "enum3D" { DATATYPE H5T_ENUM { - H5T_STD_I32LE; - "RED" 0; - "GREEN" 1; - } + H5T_STD_I32LE; + "RED" 0; + "GREEN" 1; + } DATASPACE SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) } DATA { (0,0,0): RED, RED, @@ -810,20 +804,18 @@ GROUP "/" { } } ATTRIBUTE "opaque" { - DATATYPE - H5T_OPAQUE; + DATATYPE H5T_OPAQUE { OPAQUE_TAG "1-byte opaque type"; - + } DATASPACE SIMPLE { ( 2 ) / ( 2 ) } DATA { (0): 0x01, 0x02 } } ATTRIBUTE "opaque2D" { - DATATYPE - H5T_OPAQUE; + DATATYPE H5T_OPAQUE { OPAQUE_TAG "1-byte opaque type"; - + } DATASPACE SIMPLE { ( 3, 2 ) / ( 3, 2 ) } DATA { (0,0): 0x01, 0x02, @@ -832,10 +824,9 @@ GROUP "/" { } } ATTRIBUTE "opaque3D" { - DATATYPE - H5T_OPAQUE; + DATATYPE H5T_OPAQUE { OPAQUE_TAG "1-byte opaque type"; - + } DATASPACE SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) } DATA { (0,0,0): 0x01, 0x02, @@ -888,11 +879,11 @@ GROUP "/" { } ATTRIBUTE "string" { DATATYPE H5T_STRING { - STRSIZE 2; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 2; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 2 ) / ( 2 ) } DATA { (0): "ab", "de" @@ -900,11 +891,11 @@ GROUP "/" { } ATTRIBUTE "string2D" { DATATYPE H5T_STRING { - STRSIZE 2; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 2; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 3, 2 ) / ( 3, 2 ) } DATA { (0,0): "ab", "cd", @@ -914,11 +905,11 @@ GROUP "/" { } ATTRIBUTE "string3D" { DATATYPE H5T_STRING { - STRSIZE 2; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 2; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) } DATA { (0,0,0): "ab", "cd", @@ -1196,10 +1187,10 @@ GROUP "/" { } ATTRIBUTE "enum" { DATATYPE H5T_ENUM { - H5T_STD_I32LE; - "RED" 0; - "GREEN" 1; - } + H5T_STD_I32LE; + "RED" 0; + "GREEN" 1; + } DATASPACE SIMPLE { ( 2 ) / ( 2 ) } DATA { (0): RED, RED @@ -1207,10 +1198,10 @@ GROUP "/" { } ATTRIBUTE "enum2D" { DATATYPE H5T_ENUM { - H5T_STD_I32LE; - "RED" 0; - "GREEN" 1; - } + H5T_STD_I32LE; + "RED" 0; + "GREEN" 1; + } DATASPACE SIMPLE { ( 3, 2 ) / ( 3, 2 ) } DATA { (0,0): RED, RED, @@ -1220,10 +1211,10 @@ GROUP "/" { } ATTRIBUTE "enum3D" { DATATYPE H5T_ENUM { - H5T_STD_I32LE; - "RED" 0; - "GREEN" 1; - } + H5T_STD_I32LE; + "RED" 0; + "GREEN" 1; + } DATASPACE SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) } DATA { (0,0,0): RED, RED, @@ -1309,20 +1300,18 @@ GROUP "/" { } } ATTRIBUTE "opaque" { - DATATYPE - H5T_OPAQUE; + DATATYPE H5T_OPAQUE { OPAQUE_TAG "1-byte opaque type"; - + } DATASPACE SIMPLE { ( 2 ) / ( 2 ) } DATA { (0): 0x01, 0x02 } } ATTRIBUTE "opaque2D" { - DATATYPE - H5T_OPAQUE; + DATATYPE H5T_OPAQUE { OPAQUE_TAG "1-byte opaque type"; - + } DATASPACE SIMPLE { ( 3, 2 ) / ( 3, 2 ) } DATA { (0,0): 0x01, 0x02, @@ -1331,10 +1320,9 @@ GROUP "/" { } } ATTRIBUTE "opaque3D" { - DATATYPE - H5T_OPAQUE; + DATATYPE H5T_OPAQUE { OPAQUE_TAG "1-byte opaque type"; - + } DATASPACE SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) } DATA { (0,0,0): 0x01, 0x02, @@ -1353,11 +1341,11 @@ GROUP "/" { } ATTRIBUTE "string" { DATATYPE H5T_STRING { - STRSIZE 2; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 2; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 2 ) / ( 2 ) } DATA { (0): "ab", "de" @@ -1365,11 +1353,11 @@ GROUP "/" { } ATTRIBUTE "string2D" { DATATYPE H5T_STRING { - STRSIZE 2; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 2; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 3, 2 ) / ( 3, 2 ) } DATA { (0,0): "ab", "cd", @@ -1379,11 +1367,11 @@ GROUP "/" { } ATTRIBUTE "string3D" { DATATYPE H5T_STRING { - STRSIZE 2; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 2; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) } DATA { (0,0,0): "ab", "cd", @@ -1661,10 +1649,10 @@ GROUP "/" { } DATASET "enum" { DATATYPE H5T_ENUM { - H5T_STD_I32LE; - "RED" 0; - "GREEN" 1; - } + H5T_STD_I32LE; + "RED" 0; + "GREEN" 1; + } DATASPACE SIMPLE { ( 2 ) / ( 2 ) } DATA { (0): RED, RED @@ -1672,10 +1660,10 @@ GROUP "/" { } DATASET "enum2D" { DATATYPE H5T_ENUM { - H5T_STD_I32LE; - "RED" 0; - "GREEN" 1; - } + H5T_STD_I32LE; + "RED" 0; + "GREEN" 1; + } DATASPACE SIMPLE { ( 3, 2 ) / ( 3, 2 ) } DATA { (0,0): RED, RED, @@ -1685,10 +1673,10 @@ GROUP "/" { } DATASET "enum3D" { DATATYPE H5T_ENUM { - H5T_STD_I32LE; - "RED" 0; - "GREEN" 1; - } + H5T_STD_I32LE; + "RED" 0; + "GREEN" 1; + } DATASPACE SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) } DATA { (0,0,0): RED, RED, @@ -1774,20 +1762,18 @@ GROUP "/" { } } DATASET "opaque" { - DATATYPE - H5T_OPAQUE; + DATATYPE H5T_OPAQUE { OPAQUE_TAG "1-byte opaque type"; - + } DATASPACE SIMPLE { ( 2 ) / ( 2 ) } DATA { (0): 0x01, 0x02 } } DATASET "opaque2D" { - DATATYPE - H5T_OPAQUE; + DATATYPE H5T_OPAQUE { OPAQUE_TAG "1-byte opaque type"; - + } DATASPACE SIMPLE { ( 3, 2 ) / ( 3, 2 ) } DATA { (0,0): 0x01, 0x02, @@ -1796,10 +1782,9 @@ GROUP "/" { } } DATASET "opaque3D" { - DATATYPE - H5T_OPAQUE; + DATATYPE H5T_OPAQUE { OPAQUE_TAG "1-byte opaque type"; - + } DATASPACE SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) } DATA { (0,0,0): 0x01, 0x02, @@ -1852,11 +1837,11 @@ GROUP "/" { } DATASET "string" { DATATYPE H5T_STRING { - STRSIZE 2; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 2; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 2 ) / ( 2 ) } DATA { (0): "ab", "de" @@ -1864,11 +1849,11 @@ GROUP "/" { } DATASET "string2D" { DATATYPE H5T_STRING { - STRSIZE 2; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 2; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 3, 2 ) / ( 3, 2 ) } DATA { (0,0): "ab", "cd", @@ -1878,11 +1863,11 @@ GROUP "/" { } DATASET "string3D" { DATATYPE H5T_STRING { - STRSIZE 2; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 2; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) } DATA { (0,0,0): "ab", "cd", diff --git a/tools/testfiles/tsaf.ddl b/tools/testfiles/tsaf.ddl index 3825bda..fe9f864 100644 --- a/tools/testfiles/tsaf.ddl +++ b/tools/testfiles/tsaf.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tsaf.h5' -############################# HDF5 "tsaf.h5" { GROUP "/" { DATASET ".DSL_METADATA" { diff --git a/tools/testfiles/tsaf.h5.xml b/tools/testfiles/tsaf.h5.xml index 11808e3..8da41b9 100644 --- a/tools/testfiles/tsaf.h5.xml +++ b/tools/testfiles/tsaf.h5.xml @@ -1,8 +1,5 @@ -############################# -Expected output for 'h5dump --xml tsaf.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Dataset Name=".DSL_METADATA" OBJ-XID="xid_744" H5Path= "/.DSL_METADATA" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> @@ -14,7 +11,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:StorageLayout> <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Incremental"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -29,281 +26,5925 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 47 32 67 79 78 84 65 73 78 69 82 10 47 46 97 116 116 114 105 98 117 116 - 101 115 32 67 79 78 84 65 73 78 69 82 10 47 46 97 116 116 114 105 98 - 117 116 101 115 47 100 97 116 97 98 97 115 101 32 67 79 78 84 65 73 78 - 69 82 10 47 46 97 116 116 114 105 98 117 116 101 115 47 100 97 116 97 - 98 97 115 101 47 46 83 65 70 95 68 98 80 114 111 112 115 32 68 65 84 65 - 83 69 84 32 115 116 114 117 99 116 32 83 65 70 95 68 98 80 114 111 112 - 115 123 105 110 116 32 109 97 103 105 99 59 99 104 97 114 32 83 70 105 - 108 101 68 105 114 91 49 48 50 52 93 59 99 104 97 114 32 73 109 112 111 - 114 116 70 105 108 101 91 49 48 50 52 93 59 105 110 116 32 112 97 114 - 97 108 108 101 108 59 115 116 114 117 99 116 32 83 65 70 95 86 101 114 - 115 105 111 110 73 110 102 111 123 105 110 116 32 118 109 97 106 111 - 114 59 105 110 116 32 118 109 105 110 111 114 59 105 110 116 32 114 101 - 108 59 99 104 97 114 32 97 110 110 111 116 91 49 48 93 59 125 115 97 - 102 97 112 105 59 115 116 114 117 99 116 32 83 65 70 95 86 101 114 115 - 105 111 110 73 110 102 111 123 105 110 116 32 118 109 97 106 111 114 59 - 105 110 116 32 118 109 105 110 111 114 59 105 110 116 32 114 101 108 59 - 99 104 97 114 32 97 110 110 111 116 91 49 48 93 59 125 115 97 102 108 - 105 98 59 115 116 114 117 99 116 32 83 65 70 95 86 101 114 115 105 111 - 110 73 110 102 111 123 105 110 116 32 118 109 97 106 111 114 59 105 110 - 116 32 118 109 105 110 111 114 59 105 110 116 32 114 101 108 59 99 104 - 97 114 32 97 110 110 111 116 91 49 48 93 59 125 118 98 116 59 115 116 - 114 117 99 116 32 83 65 70 95 86 101 114 115 105 111 110 73 110 102 111 - 123 105 110 116 32 118 109 97 106 111 114 59 105 110 116 32 118 109 105 - 110 111 114 59 105 110 116 32 114 101 108 59 99 104 97 114 32 97 110 - 110 111 116 91 49 48 93 59 125 100 115 108 59 115 116 114 117 99 116 32 - 83 65 70 95 86 101 114 115 105 111 110 73 110 102 111 123 105 110 116 - 32 118 109 97 106 111 114 59 105 110 116 32 118 109 105 110 111 114 59 - 105 110 116 32 114 101 108 59 99 104 97 114 32 97 110 110 111 116 91 49 - 48 93 59 125 104 100 102 53 59 115 116 114 117 99 116 32 83 65 70 95 86 - 101 114 115 105 111 110 73 110 102 111 123 105 110 116 32 118 109 97 - 106 111 114 59 105 110 116 32 118 109 105 110 111 114 59 105 110 116 32 - 114 101 108 59 99 104 97 114 32 97 110 110 111 116 91 49 48 93 59 125 - 109 112 105 59 105 110 116 32 68 111 84 111 99 59 105 110 116 32 82 101 - 97 100 79 110 108 121 59 105 110 116 32 67 108 111 98 98 101 114 59 105 - 110 116 32 79 83 77 111 100 101 115 59 125 59 10 47 115 115 114 101 108 - 45 95 48 48 48 48 32 68 65 84 65 83 69 84 32 105 110 116 59 10 47 115 - 115 114 101 108 45 95 48 48 48 49 32 68 65 84 65 83 69 84 32 105 110 - 116 59 10 47 115 115 114 101 108 45 95 48 48 48 50 32 68 65 84 65 83 69 - 84 32 105 110 116 59 10 47 115 115 114 101 108 45 95 48 48 48 51 32 68 - 65 84 65 83 69 84 32 105 110 116 59 10 47 115 115 114 101 108 45 95 48 - 48 48 52 32 68 65 84 65 83 69 84 32 105 110 116 59 10 47 115 115 114 - 101 108 45 95 48 48 48 53 32 68 65 84 65 83 69 84 32 105 110 116 59 10 - 47 115 115 114 101 108 45 95 48 48 48 54 32 68 65 84 65 83 69 84 32 105 - 110 116 59 10 47 115 115 114 101 108 45 95 48 48 48 55 32 68 65 84 65 - 83 69 84 32 105 110 116 59 10 47 115 115 114 101 108 45 95 48 48 48 56 - 32 68 65 84 65 83 69 84 32 105 110 116 59 10 47 115 115 114 101 108 45 - 95 48 48 48 57 32 68 65 84 65 83 69 84 32 105 110 116 59 10 47 115 115 - 114 101 108 45 95 48 48 49 48 32 68 65 84 65 83 69 84 32 105 110 116 59 - 10 47 115 115 114 101 108 45 95 48 48 49 49 32 68 65 84 65 83 69 84 32 - 105 110 116 59 10 47 115 115 114 101 108 45 95 48 48 49 50 32 68 65 84 - 65 83 69 84 32 105 110 116 59 10 47 116 111 112 111 114 101 108 45 95 - 48 48 49 55 32 68 65 84 65 83 69 84 32 105 110 116 59 10 47 116 111 112 - 111 114 101 108 45 95 48 48 49 56 32 68 65 84 65 83 69 84 32 105 110 - 116 59 10 47 116 111 112 111 114 101 108 45 95 48 48 49 57 32 68 65 84 - 65 83 69 84 32 105 110 116 59 10 47 116 111 112 111 114 101 108 45 95 - 48 48 50 48 32 68 65 84 65 83 69 84 32 105 110 116 59 10 47 102 105 101 - 108 100 45 99 111 111 114 100 115 95 48 48 48 50 32 68 65 84 65 83 69 - 84 32 102 108 111 97 116 59 10 47 102 105 101 108 100 45 100 105 115 - 116 114 105 98 117 116 105 111 110 95 102 97 99 116 111 114 115 95 48 - 48 48 51 32 68 65 84 65 83 69 84 32 102 108 111 97 116 59 10 47 102 105 - 101 108 100 45 116 101 109 112 101 114 97 116 117 114 101 95 48 48 48 - 52 32 68 65 84 65 83 69 84 32 102 108 111 97 116 59 10 47 102 105 101 - 108 100 45 100 105 115 112 108 97 99 101 109 101 110 116 115 95 48 48 - 48 55 32 68 65 84 65 83 69 84 32 102 108 111 97 116 59 10 47 102 105 - 101 108 100 45 115 116 114 101 115 115 95 48 48 49 49 32 68 65 84 65 83 - 69 84 32 102 108 111 97 116 59 10 47 102 105 101 108 100 45 116 101 109 - 112 101 114 97 116 117 114 101 95 48 48 49 50 32 68 65 84 65 83 69 84 - 32 102 108 111 97 116 59 10 47 102 105 101 108 100 45 112 114 101 115 - 115 117 114 101 95 48 48 49 51 32 68 65 84 65 83 69 84 32 102 108 111 - 97 116 59 10 47 66 108 111 98 32 68 65 84 65 83 69 84 32 115 116 114 - 117 99 116 32 66 108 111 98 123 68 83 76 95 79 102 102 115 101 116 32 - 102 105 108 101 95 105 100 59 68 83 76 95 79 102 102 115 101 116 32 100 - 97 116 97 115 101 116 95 105 100 59 68 83 76 95 79 102 102 115 101 116 - 32 111 102 102 115 101 116 59 68 83 76 95 79 102 102 115 101 116 32 115 - 116 114 105 100 101 59 68 83 76 95 79 102 102 115 101 116 32 99 111 117 - 110 116 59 68 83 76 95 79 102 102 115 101 116 32 98 97 115 101 95 105 - 100 59 68 83 76 95 79 102 102 115 101 116 32 110 117 109 95 114 101 99 - 115 59 125 59 10 47 73 110 100 101 120 83 112 101 99 32 68 65 84 65 83 - 69 84 32 115 116 114 117 99 116 32 73 110 100 101 120 83 112 101 99 123 - 105 110 116 32 110 100 105 109 115 59 105 110 116 32 111 114 105 103 - 105 110 115 91 56 93 59 105 110 116 32 115 105 122 101 115 91 56 93 59 - 105 110 116 32 111 114 100 101 114 91 56 93 59 101 110 117 109 32 73 - 110 100 101 120 84 121 112 101 123 86 66 84 95 73 78 68 69 88 95 84 89 - 80 69 95 67 95 79 82 68 69 82 61 48 44 86 66 84 95 73 78 68 69 88 95 84 - 89 80 69 95 70 95 79 82 68 69 82 61 49 44 86 66 84 95 73 78 68 69 88 95 - 84 89 80 69 95 65 78 89 61 45 49 44 86 66 84 95 73 78 68 69 88 95 84 89 - 80 69 95 73 78 86 65 76 73 68 61 45 50 44 86 66 84 95 73 78 68 69 88 95 - 84 89 80 69 95 78 65 61 45 51 44 86 66 84 95 73 78 68 69 88 95 84 89 80 - 69 95 85 78 75 78 79 87 78 61 45 52 125 105 110 100 101 120 95 116 121 - 112 101 59 68 83 76 95 79 102 102 115 101 116 32 98 97 115 101 95 105 - 100 59 68 83 76 95 79 102 102 115 101 116 32 110 117 109 95 114 101 99 - 115 59 125 59 10 47 67 97 116 32 68 65 84 65 83 69 84 32 115 116 114 - 117 99 116 32 67 97 116 123 99 104 97 114 32 110 97 109 101 91 54 52 93 - 59 101 110 117 109 32 82 111 108 101 123 86 66 84 95 82 79 76 69 95 84 - 79 80 79 61 48 44 86 66 84 95 82 79 76 69 95 66 78 68 61 49 44 86 66 84 - 95 82 79 76 69 95 80 82 79 67 61 50 44 86 66 84 95 82 79 76 69 95 68 79 - 77 78 61 51 44 86 66 84 95 82 79 76 69 95 66 76 79 67 75 61 52 44 86 66 - 84 95 82 79 76 69 95 65 83 83 89 61 53 44 86 66 84 95 82 79 76 69 95 77 - 65 84 61 54 44 86 66 84 95 82 79 76 69 95 88 80 82 79 68 61 55 44 86 66 - 84 95 82 79 76 69 95 85 83 69 82 68 61 56 44 86 66 84 95 82 79 76 69 95 - 65 78 89 61 45 49 44 86 66 84 95 82 79 76 69 95 73 78 86 65 76 73 68 61 - 45 50 44 86 66 84 95 82 79 76 69 95 78 65 61 45 51 44 86 66 84 95 82 79 - 76 69 95 85 78 75 78 79 87 78 61 45 52 125 114 111 108 101 59 105 110 - 116 32 116 100 105 109 59 68 83 76 95 79 102 102 115 101 116 32 98 97 - 115 101 95 105 100 59 68 83 76 95 79 102 102 115 101 116 32 110 117 109 - 95 114 101 99 115 59 125 59 10 47 83 101 116 32 68 65 84 65 83 69 84 32 - 115 116 114 117 99 116 32 83 101 116 123 105 110 116 32 117 115 101 114 - 95 105 100 59 99 104 97 114 32 110 97 109 101 91 54 52 93 59 105 110 - 116 32 116 100 105 109 59 101 110 117 109 32 83 105 108 82 111 108 101 - 123 86 66 84 95 83 82 79 76 69 95 84 73 77 69 61 48 44 86 66 84 95 83 - 82 79 76 69 95 83 80 65 67 69 61 49 44 86 66 84 95 83 82 79 76 69 95 83 - 84 65 84 69 61 50 44 86 66 84 95 83 82 79 76 69 95 80 65 82 65 77 61 51 - 44 86 66 84 95 83 82 79 76 69 95 67 84 89 80 69 61 52 44 86 66 84 95 83 - 82 79 76 69 95 65 84 89 80 69 61 53 44 86 66 84 95 83 82 79 76 69 95 85 - 83 69 82 68 61 54 44 86 66 84 95 83 82 79 76 69 95 65 78 89 61 45 49 44 - 86 66 84 95 83 82 79 76 69 95 73 78 86 65 76 73 68 61 45 50 44 86 66 84 - 95 83 82 79 76 69 95 78 65 61 45 51 44 86 66 84 95 83 82 79 76 69 95 85 - 78 75 78 79 87 78 61 45 52 125 115 114 111 108 101 59 68 83 76 95 79 - 102 102 115 101 116 32 99 111 108 108 95 105 100 115 91 49 54 93 59 105 - 110 116 32 105 115 95 116 111 112 59 105 110 116 32 105 115 95 101 120 - 116 101 110 100 105 98 108 101 59 68 83 76 95 79 102 102 115 101 116 32 - 100 102 108 116 95 99 111 111 114 100 102 108 100 95 105 100 59 68 83 - 76 95 79 102 102 115 101 116 32 98 110 100 95 115 101 116 95 105 100 59 - 68 83 76 95 79 102 102 115 101 116 32 98 97 115 101 95 105 100 59 68 83 - 76 95 79 102 102 115 101 116 32 110 117 109 95 114 101 99 115 59 125 59 - 10 47 67 111 108 108 101 99 116 105 111 110 32 68 65 84 65 83 69 84 32 - 115 116 114 117 99 116 32 67 111 108 108 101 99 116 105 111 110 123 68 - 83 76 95 79 102 102 115 101 116 32 99 111 110 116 97 105 110 105 110 - 103 95 115 101 116 95 105 100 59 68 83 76 95 79 102 102 115 101 116 32 - 99 97 116 95 105 100 59 101 110 117 109 32 67 101 108 108 84 121 112 - 101 123 86 66 84 95 67 69 76 76 95 84 89 80 69 95 78 79 78 69 61 48 44 - 86 66 84 95 67 69 76 76 95 84 89 80 69 95 80 79 73 78 84 61 49 44 86 66 - 84 95 67 69 76 76 95 84 89 80 69 95 76 73 78 69 61 50 44 86 66 84 95 67 - 69 76 76 95 84 89 80 69 95 84 82 73 61 51 44 86 66 84 95 67 69 76 76 95 - 84 89 80 69 95 81 85 65 68 61 52 44 86 66 84 95 67 69 76 76 95 84 89 80 - 69 95 84 69 84 61 53 44 86 66 84 95 67 69 76 76 95 84 89 80 69 95 80 89 - 82 65 77 73 68 61 54 44 86 66 84 95 67 69 76 76 95 84 89 80 69 95 80 82 - 73 83 77 61 55 44 86 66 84 95 67 69 76 76 95 84 89 80 69 95 72 69 88 61 - 56 44 86 66 84 95 67 69 76 76 95 84 89 80 69 95 77 73 88 69 68 61 57 44 - 86 66 84 95 67 69 76 76 95 84 89 80 69 95 65 82 66 61 49 48 44 86 66 84 - 95 67 69 76 76 95 84 89 80 69 95 49 66 65 76 76 61 49 49 44 86 66 84 95 - 67 69 76 76 95 84 89 80 69 95 50 66 65 76 76 61 49 50 44 86 66 84 95 67 - 69 76 76 95 84 89 80 69 95 51 66 65 76 76 61 49 51 44 86 66 84 95 67 69 - 76 76 95 84 89 80 69 95 49 83 72 69 76 76 61 49 52 44 86 66 84 95 67 69 - 76 76 95 84 89 80 69 95 50 83 72 69 76 76 61 49 53 44 86 66 84 95 67 69 - 76 76 95 84 89 80 69 95 65 78 89 61 45 49 44 86 66 84 95 67 69 76 76 95 - 84 89 80 69 95 73 78 86 65 76 73 68 61 45 50 44 86 66 84 95 67 69 76 76 - 95 84 89 80 69 95 78 65 61 45 51 44 86 66 84 95 67 69 76 76 95 84 89 80 - 69 95 85 78 75 78 79 87 78 61 45 52 125 99 101 108 108 95 116 121 112 - 101 59 105 110 116 32 99 111 117 110 116 59 68 83 76 95 79 102 102 115 - 101 116 32 105 110 100 101 120 105 110 103 95 105 100 59 105 110 116 32 - 105 115 95 100 101 99 111 109 112 59 68 83 76 95 79 102 102 115 101 116 - 32 109 101 109 98 101 114 115 95 98 108 111 98 95 105 100 59 68 83 76 - 95 79 102 102 115 101 116 32 98 97 115 101 95 105 100 59 68 83 76 95 79 - 102 102 115 101 116 32 110 117 109 95 114 101 99 115 59 125 59 10 47 82 - 101 108 97 116 105 111 110 32 68 65 84 65 83 69 84 32 115 116 114 117 - 99 116 32 82 101 108 97 116 105 111 110 123 68 83 76 95 79 102 102 115 - 101 116 32 115 117 98 95 105 100 59 68 83 76 95 79 102 102 115 101 116 - 32 115 117 98 95 99 97 116 95 105 100 59 68 83 76 95 79 102 102 115 101 - 116 32 115 117 98 95 100 101 99 111 109 112 95 99 97 116 95 105 100 59 - 68 83 76 95 79 102 102 115 101 116 32 115 117 112 95 105 100 59 68 83 - 76 95 79 102 102 115 101 116 32 115 117 112 95 99 97 116 95 105 100 59 - 68 83 76 95 79 102 102 115 101 116 32 115 117 112 95 100 101 99 111 109 - 112 95 99 97 116 95 105 100 59 101 110 117 109 32 82 101 108 75 105 110 - 100 123 86 66 84 95 82 69 76 75 73 78 68 95 83 85 66 83 69 84 61 48 44 - 86 66 84 95 82 69 76 75 73 78 68 95 83 85 80 83 69 84 61 49 44 86 66 84 - 95 82 69 76 75 73 78 68 95 66 79 85 78 68 61 50 44 86 66 84 95 82 69 76 - 75 73 78 68 95 80 69 82 77 85 84 69 61 51 44 86 66 84 95 82 69 76 75 73 - 78 68 95 78 69 73 71 72 66 79 82 61 52 44 86 66 84 95 82 69 76 75 73 78 - 68 95 67 79 80 89 61 53 44 86 66 84 95 82 69 76 75 73 78 68 95 69 81 85 - 65 76 61 54 44 86 66 84 95 82 69 76 75 73 78 68 95 65 78 89 61 45 49 44 - 86 66 84 95 82 69 76 75 73 78 68 95 73 78 86 65 76 73 68 61 45 50 44 86 - 66 84 95 82 69 76 75 73 78 68 95 78 65 61 45 51 44 86 66 84 95 82 69 76 - 75 73 78 68 95 85 78 75 78 79 87 78 61 45 52 125 107 105 110 100 59 101 - 110 117 109 32 82 101 108 82 101 112 123 86 66 84 95 82 69 76 82 69 80 - 95 73 68 69 78 84 73 84 89 61 48 44 86 66 84 95 82 69 76 82 69 80 95 72 - 76 73 83 84 61 49 44 86 66 84 95 82 69 76 82 69 80 95 84 76 73 83 84 61 - 50 44 86 66 84 95 82 69 76 82 69 80 95 84 76 73 83 84 95 49 61 51 44 86 - 66 84 95 82 69 76 82 69 80 95 69 76 73 83 84 61 52 44 86 66 84 95 82 69 - 76 82 69 80 95 83 84 82 85 67 84 85 82 69 68 61 53 44 86 66 84 95 82 69 - 76 82 69 80 95 85 78 83 84 82 85 67 84 85 82 69 68 61 54 44 86 66 84 95 - 82 69 76 82 69 80 95 65 82 66 73 84 82 65 82 89 95 82 61 55 44 86 66 84 - 95 82 69 76 82 69 80 95 65 82 66 73 84 82 65 82 89 95 68 82 61 56 44 86 - 66 84 95 82 69 76 82 69 80 95 65 78 89 61 45 49 44 86 66 84 95 82 69 76 - 82 69 80 95 73 78 86 65 76 73 68 61 45 50 44 86 66 84 95 82 69 76 82 69 - 80 95 78 65 61 45 51 44 86 66 84 95 82 69 76 82 69 80 95 85 78 75 78 79 - 87 78 61 45 52 125 114 101 112 95 116 121 112 101 59 68 83 76 95 79 102 - 102 115 101 116 32 100 95 98 108 111 98 95 105 100 59 68 83 76 95 79 - 102 102 115 101 116 32 114 95 98 108 111 98 95 105 100 59 68 83 76 95 - 79 102 102 115 101 116 32 98 97 115 101 95 105 100 59 68 83 76 95 79 - 102 102 115 101 116 32 110 117 109 95 114 101 99 115 59 125 59 10 47 70 - 105 101 108 100 84 109 112 108 32 68 65 84 65 83 69 84 32 115 116 114 - 117 99 116 32 70 105 101 108 100 84 109 112 108 123 99 104 97 114 32 - 110 97 109 101 91 54 52 93 59 68 83 76 95 79 102 102 115 101 116 32 98 - 97 115 101 95 115 112 97 99 101 95 105 100 59 101 110 117 109 32 65 108 - 103 101 98 114 97 105 99 84 121 112 101 123 86 66 84 95 65 76 71 69 66 - 82 65 73 67 95 84 89 80 69 95 67 79 78 83 84 65 78 84 61 48 44 86 66 84 - 95 65 76 71 69 66 82 65 73 67 95 84 89 80 69 95 67 79 77 80 79 78 69 78 - 84 61 49 44 86 66 84 95 65 76 71 69 66 82 65 73 67 95 84 89 80 69 95 83 - 67 65 76 65 82 61 50 44 86 66 84 95 65 76 71 69 66 82 65 73 67 95 84 89 - 80 69 95 86 69 67 84 79 82 61 51 44 86 66 84 95 65 76 71 69 66 82 65 73 - 67 95 84 89 80 69 95 84 69 78 83 79 82 61 52 44 86 66 84 95 65 76 71 69 - 66 82 65 73 67 95 84 89 80 69 95 83 89 77 95 84 69 78 83 79 82 61 53 44 - 86 66 84 95 65 76 71 69 66 82 65 73 67 95 84 89 80 69 95 70 73 69 76 68 - 61 54 44 86 66 84 95 65 76 71 69 66 82 65 73 67 95 84 89 80 69 95 83 84 - 65 84 69 61 55 44 86 66 84 95 65 76 71 69 66 82 65 73 67 95 84 89 80 69 - 95 84 85 80 76 69 61 56 44 86 66 84 95 65 76 71 69 66 82 65 73 67 95 84 - 89 80 69 95 65 78 89 61 45 49 44 86 66 84 95 65 76 71 69 66 82 65 73 67 - 95 84 89 80 69 95 73 78 86 65 76 73 68 61 45 50 44 86 66 84 95 65 76 71 - 69 66 82 65 73 67 95 84 89 80 69 95 78 65 61 45 51 44 86 66 84 95 65 76 - 71 69 66 82 65 73 67 95 84 89 80 69 95 85 78 75 78 79 87 78 61 45 52 - 125 97 108 103 95 116 121 112 101 59 101 110 117 109 32 66 97 115 105 - 115 84 121 112 101 123 86 66 84 95 66 65 83 73 83 95 84 89 80 69 95 85 - 78 73 84 89 61 48 44 86 66 84 95 66 65 83 73 83 95 84 89 80 69 95 67 65 - 82 84 69 83 73 65 78 61 49 44 86 66 84 95 66 65 83 73 83 95 84 89 80 69 - 95 83 80 72 69 82 73 67 65 76 61 50 44 86 66 84 95 66 65 83 73 83 95 84 - 89 80 69 95 67 89 76 73 78 68 82 73 67 65 76 61 51 44 86 66 84 95 66 65 - 83 73 83 95 84 89 80 69 95 85 80 80 69 82 95 84 82 73 61 52 44 86 66 84 - 95 66 65 83 73 83 95 84 89 80 69 95 70 79 85 82 73 69 82 61 53 44 86 66 - 84 95 66 65 83 73 83 95 84 89 80 69 95 86 65 82 73 65 66 76 69 61 54 44 - 86 66 84 95 66 65 83 73 83 95 84 89 80 69 95 65 78 89 61 45 49 44 86 66 - 84 95 66 65 83 73 83 95 84 89 80 69 95 73 78 86 65 76 73 68 61 45 50 44 - 86 66 84 95 66 65 83 73 83 95 84 89 80 69 95 78 65 61 45 51 44 86 66 84 - 95 66 65 83 73 83 95 84 89 80 69 95 85 78 75 78 79 87 78 61 45 52 125 - 98 97 115 105 115 59 68 83 76 95 79 102 102 115 101 116 32 113 117 97 - 110 116 105 116 121 95 105 100 59 105 110 116 32 110 117 109 95 99 111 - 109 112 115 59 68 83 76 95 79 102 102 115 101 116 32 102 116 109 112 - 108 95 105 100 115 95 98 108 111 98 95 105 100 59 68 83 76 95 79 102 - 102 115 101 116 32 98 97 115 101 95 105 100 59 68 83 76 95 79 102 102 - 115 101 116 32 110 117 109 95 114 101 99 115 59 125 59 10 47 70 105 101 - 108 100 32 68 65 84 65 83 69 84 32 115 116 114 117 99 116 32 70 105 101 - 108 100 123 68 83 76 95 79 102 102 115 101 116 32 102 116 109 112 108 - 95 105 100 59 99 104 97 114 32 110 97 109 101 91 54 52 93 59 68 83 76 - 95 79 102 102 115 101 116 32 117 110 105 116 115 95 105 100 59 68 83 76 - 95 79 102 102 115 101 116 32 115 116 111 114 97 103 101 95 100 101 99 - 111 109 112 95 99 97 116 95 105 100 59 101 110 117 109 32 73 110 116 - 101 114 108 101 97 118 101 123 86 66 84 95 73 78 84 69 82 76 69 65 86 - 69 95 67 79 77 80 79 78 69 78 84 61 48 44 86 66 84 95 73 78 84 69 82 76 - 69 65 86 69 95 86 69 67 84 79 82 61 49 44 86 66 84 95 73 78 84 69 82 76 - 69 65 86 69 95 73 78 68 69 80 69 78 68 69 78 84 61 50 44 86 66 84 95 73 - 78 84 69 82 76 69 65 86 69 95 78 79 78 69 61 51 44 86 66 84 95 73 78 84 - 69 82 76 69 65 86 69 95 65 78 89 61 45 49 44 86 66 84 95 73 78 84 69 82 - 76 69 65 86 69 95 73 78 86 65 76 73 68 61 45 50 44 86 66 84 95 73 78 84 - 69 82 76 69 65 86 69 95 78 65 61 45 51 44 86 66 84 95 73 78 84 69 82 76 - 69 65 86 69 95 85 78 75 78 79 87 78 61 45 52 125 99 111 109 112 95 105 - 110 116 108 118 59 68 83 76 95 79 102 102 115 101 116 32 105 110 100 - 101 120 105 110 103 95 105 100 59 68 83 76 95 79 102 102 115 101 116 32 - 100 111 102 95 97 115 115 111 99 95 99 97 116 95 105 100 59 105 110 116 - 32 97 115 115 111 99 95 114 97 116 105 111 59 68 83 76 95 79 102 102 - 115 101 116 32 101 118 97 108 95 100 101 99 111 109 112 95 99 97 116 95 - 105 100 59 101 110 117 109 32 69 118 97 108 70 117 110 99 123 86 66 84 - 95 69 86 65 76 95 70 85 78 67 95 67 79 78 83 84 65 78 84 61 48 44 86 66 - 84 95 69 86 65 76 95 70 85 78 67 95 85 78 73 70 79 82 77 61 49 44 86 66 - 84 95 69 86 65 76 95 70 85 78 67 95 80 87 67 79 78 83 84 61 50 44 86 66 - 84 95 69 86 65 76 95 70 85 78 67 95 80 87 76 73 78 69 65 82 61 51 44 86 - 66 84 95 69 86 65 76 95 70 85 78 67 95 65 78 89 61 45 49 44 86 66 84 95 - 69 86 65 76 95 70 85 78 67 95 73 78 86 65 76 73 68 61 45 50 44 86 66 84 - 95 69 86 65 76 95 70 85 78 67 95 78 65 61 45 51 44 86 66 84 95 69 86 65 - 76 95 70 85 78 67 95 85 78 75 78 79 87 78 61 45 52 125 101 118 97 108 - 95 102 117 110 99 59 105 110 116 32 105 115 95 104 111 109 111 103 101 - 110 101 111 117 115 59 105 110 116 32 105 115 95 99 111 111 114 100 95 - 102 105 101 108 100 59 68 83 76 95 79 102 102 115 101 116 32 99 111 109 - 112 95 105 100 115 95 98 108 111 98 95 105 100 59 68 83 76 95 79 102 - 102 115 101 116 32 99 111 109 112 95 111 114 100 101 114 95 98 108 111 - 98 95 105 100 59 68 83 76 95 79 102 102 115 101 116 32 118 98 97 115 - 105 115 95 98 108 111 98 95 105 100 59 68 83 76 95 79 102 102 115 101 - 116 32 100 111 102 95 98 108 111 98 95 105 100 59 68 83 76 95 79 102 - 102 115 101 116 32 98 97 115 101 95 105 100 59 68 83 76 95 79 102 102 - 115 101 116 32 110 117 109 95 114 101 99 115 59 125 59 10 47 109 101 - 116 97 98 108 111 98 48 48 48 48 48 46 105 110 100 101 120 32 68 65 84 - 65 83 69 84 32 115 116 114 117 99 116 32 73 110 100 101 120 80 97 105 - 114 123 68 83 76 95 79 102 102 115 101 116 32 105 110 100 101 120 59 - 105 110 116 32 108 101 110 103 116 104 59 125 59 10 47 109 101 116 97 - 98 108 111 98 48 48 48 48 48 46 98 108 111 98 32 68 65 84 65 83 69 84 - 32 68 83 76 95 79 102 102 115 101 116 59 10 + 47 + 32 + 67 + 79 + 78 + 84 + 65 + 73 + 78 + 69 + 82 + 10 + 47 + 46 + 97 + 116 + 116 + 114 + 105 + 98 + 117 + 116 + 101 + 115 + 32 + 67 + 79 + 78 + 84 + 65 + 73 + 78 + 69 + 82 + 10 + 47 + 46 + 97 + 116 + 116 + 114 + 105 + 98 + 117 + 116 + 101 + 115 + 47 + 100 + 97 + 116 + 97 + 98 + 97 + 115 + 101 + 32 + 67 + 79 + 78 + 84 + 65 + 73 + 78 + 69 + 82 + 10 + 47 + 46 + 97 + 116 + 116 + 114 + 105 + 98 + 117 + 116 + 101 + 115 + 47 + 100 + 97 + 116 + 97 + 98 + 97 + 115 + 101 + 47 + 46 + 83 + 65 + 70 + 95 + 68 + 98 + 80 + 114 + 111 + 112 + 115 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 115 + 116 + 114 + 117 + 99 + 116 + 32 + 83 + 65 + 70 + 95 + 68 + 98 + 80 + 114 + 111 + 112 + 115 + 123 + 105 + 110 + 116 + 32 + 109 + 97 + 103 + 105 + 99 + 59 + 99 + 104 + 97 + 114 + 32 + 83 + 70 + 105 + 108 + 101 + 68 + 105 + 114 + 91 + 49 + 48 + 50 + 52 + 93 + 59 + 99 + 104 + 97 + 114 + 32 + 73 + 109 + 112 + 111 + 114 + 116 + 70 + 105 + 108 + 101 + 91 + 49 + 48 + 50 + 52 + 93 + 59 + 105 + 110 + 116 + 32 + 112 + 97 + 114 + 97 + 108 + 108 + 101 + 108 + 59 + 115 + 116 + 114 + 117 + 99 + 116 + 32 + 83 + 65 + 70 + 95 + 86 + 101 + 114 + 115 + 105 + 111 + 110 + 73 + 110 + 102 + 111 + 123 + 105 + 110 + 116 + 32 + 118 + 109 + 97 + 106 + 111 + 114 + 59 + 105 + 110 + 116 + 32 + 118 + 109 + 105 + 110 + 111 + 114 + 59 + 105 + 110 + 116 + 32 + 114 + 101 + 108 + 59 + 99 + 104 + 97 + 114 + 32 + 97 + 110 + 110 + 111 + 116 + 91 + 49 + 48 + 93 + 59 + 125 + 115 + 97 + 102 + 97 + 112 + 105 + 59 + 115 + 116 + 114 + 117 + 99 + 116 + 32 + 83 + 65 + 70 + 95 + 86 + 101 + 114 + 115 + 105 + 111 + 110 + 73 + 110 + 102 + 111 + 123 + 105 + 110 + 116 + 32 + 118 + 109 + 97 + 106 + 111 + 114 + 59 + 105 + 110 + 116 + 32 + 118 + 109 + 105 + 110 + 111 + 114 + 59 + 105 + 110 + 116 + 32 + 114 + 101 + 108 + 59 + 99 + 104 + 97 + 114 + 32 + 97 + 110 + 110 + 111 + 116 + 91 + 49 + 48 + 93 + 59 + 125 + 115 + 97 + 102 + 108 + 105 + 98 + 59 + 115 + 116 + 114 + 117 + 99 + 116 + 32 + 83 + 65 + 70 + 95 + 86 + 101 + 114 + 115 + 105 + 111 + 110 + 73 + 110 + 102 + 111 + 123 + 105 + 110 + 116 + 32 + 118 + 109 + 97 + 106 + 111 + 114 + 59 + 105 + 110 + 116 + 32 + 118 + 109 + 105 + 110 + 111 + 114 + 59 + 105 + 110 + 116 + 32 + 114 + 101 + 108 + 59 + 99 + 104 + 97 + 114 + 32 + 97 + 110 + 110 + 111 + 116 + 91 + 49 + 48 + 93 + 59 + 125 + 118 + 98 + 116 + 59 + 115 + 116 + 114 + 117 + 99 + 116 + 32 + 83 + 65 + 70 + 95 + 86 + 101 + 114 + 115 + 105 + 111 + 110 + 73 + 110 + 102 + 111 + 123 + 105 + 110 + 116 + 32 + 118 + 109 + 97 + 106 + 111 + 114 + 59 + 105 + 110 + 116 + 32 + 118 + 109 + 105 + 110 + 111 + 114 + 59 + 105 + 110 + 116 + 32 + 114 + 101 + 108 + 59 + 99 + 104 + 97 + 114 + 32 + 97 + 110 + 110 + 111 + 116 + 91 + 49 + 48 + 93 + 59 + 125 + 100 + 115 + 108 + 59 + 115 + 116 + 114 + 117 + 99 + 116 + 32 + 83 + 65 + 70 + 95 + 86 + 101 + 114 + 115 + 105 + 111 + 110 + 73 + 110 + 102 + 111 + 123 + 105 + 110 + 116 + 32 + 118 + 109 + 97 + 106 + 111 + 114 + 59 + 105 + 110 + 116 + 32 + 118 + 109 + 105 + 110 + 111 + 114 + 59 + 105 + 110 + 116 + 32 + 114 + 101 + 108 + 59 + 99 + 104 + 97 + 114 + 32 + 97 + 110 + 110 + 111 + 116 + 91 + 49 + 48 + 93 + 59 + 125 + 104 + 100 + 102 + 53 + 59 + 115 + 116 + 114 + 117 + 99 + 116 + 32 + 83 + 65 + 70 + 95 + 86 + 101 + 114 + 115 + 105 + 111 + 110 + 73 + 110 + 102 + 111 + 123 + 105 + 110 + 116 + 32 + 118 + 109 + 97 + 106 + 111 + 114 + 59 + 105 + 110 + 116 + 32 + 118 + 109 + 105 + 110 + 111 + 114 + 59 + 105 + 110 + 116 + 32 + 114 + 101 + 108 + 59 + 99 + 104 + 97 + 114 + 32 + 97 + 110 + 110 + 111 + 116 + 91 + 49 + 48 + 93 + 59 + 125 + 109 + 112 + 105 + 59 + 105 + 110 + 116 + 32 + 68 + 111 + 84 + 111 + 99 + 59 + 105 + 110 + 116 + 32 + 82 + 101 + 97 + 100 + 79 + 110 + 108 + 121 + 59 + 105 + 110 + 116 + 32 + 67 + 108 + 111 + 98 + 98 + 101 + 114 + 59 + 105 + 110 + 116 + 32 + 79 + 83 + 77 + 111 + 100 + 101 + 115 + 59 + 125 + 59 + 10 + 47 + 115 + 115 + 114 + 101 + 108 + 45 + 95 + 48 + 48 + 48 + 48 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 105 + 110 + 116 + 59 + 10 + 47 + 115 + 115 + 114 + 101 + 108 + 45 + 95 + 48 + 48 + 48 + 49 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 105 + 110 + 116 + 59 + 10 + 47 + 115 + 115 + 114 + 101 + 108 + 45 + 95 + 48 + 48 + 48 + 50 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 105 + 110 + 116 + 59 + 10 + 47 + 115 + 115 + 114 + 101 + 108 + 45 + 95 + 48 + 48 + 48 + 51 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 105 + 110 + 116 + 59 + 10 + 47 + 115 + 115 + 114 + 101 + 108 + 45 + 95 + 48 + 48 + 48 + 52 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 105 + 110 + 116 + 59 + 10 + 47 + 115 + 115 + 114 + 101 + 108 + 45 + 95 + 48 + 48 + 48 + 53 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 105 + 110 + 116 + 59 + 10 + 47 + 115 + 115 + 114 + 101 + 108 + 45 + 95 + 48 + 48 + 48 + 54 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 105 + 110 + 116 + 59 + 10 + 47 + 115 + 115 + 114 + 101 + 108 + 45 + 95 + 48 + 48 + 48 + 55 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 105 + 110 + 116 + 59 + 10 + 47 + 115 + 115 + 114 + 101 + 108 + 45 + 95 + 48 + 48 + 48 + 56 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 105 + 110 + 116 + 59 + 10 + 47 + 115 + 115 + 114 + 101 + 108 + 45 + 95 + 48 + 48 + 48 + 57 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 105 + 110 + 116 + 59 + 10 + 47 + 115 + 115 + 114 + 101 + 108 + 45 + 95 + 48 + 48 + 49 + 48 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 105 + 110 + 116 + 59 + 10 + 47 + 115 + 115 + 114 + 101 + 108 + 45 + 95 + 48 + 48 + 49 + 49 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 105 + 110 + 116 + 59 + 10 + 47 + 115 + 115 + 114 + 101 + 108 + 45 + 95 + 48 + 48 + 49 + 50 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 105 + 110 + 116 + 59 + 10 + 47 + 116 + 111 + 112 + 111 + 114 + 101 + 108 + 45 + 95 + 48 + 48 + 49 + 55 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 105 + 110 + 116 + 59 + 10 + 47 + 116 + 111 + 112 + 111 + 114 + 101 + 108 + 45 + 95 + 48 + 48 + 49 + 56 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 105 + 110 + 116 + 59 + 10 + 47 + 116 + 111 + 112 + 111 + 114 + 101 + 108 + 45 + 95 + 48 + 48 + 49 + 57 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 105 + 110 + 116 + 59 + 10 + 47 + 116 + 111 + 112 + 111 + 114 + 101 + 108 + 45 + 95 + 48 + 48 + 50 + 48 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 105 + 110 + 116 + 59 + 10 + 47 + 102 + 105 + 101 + 108 + 100 + 45 + 99 + 111 + 111 + 114 + 100 + 115 + 95 + 48 + 48 + 48 + 50 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 102 + 108 + 111 + 97 + 116 + 59 + 10 + 47 + 102 + 105 + 101 + 108 + 100 + 45 + 100 + 105 + 115 + 116 + 114 + 105 + 98 + 117 + 116 + 105 + 111 + 110 + 95 + 102 + 97 + 99 + 116 + 111 + 114 + 115 + 95 + 48 + 48 + 48 + 51 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 102 + 108 + 111 + 97 + 116 + 59 + 10 + 47 + 102 + 105 + 101 + 108 + 100 + 45 + 116 + 101 + 109 + 112 + 101 + 114 + 97 + 116 + 117 + 114 + 101 + 95 + 48 + 48 + 48 + 52 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 102 + 108 + 111 + 97 + 116 + 59 + 10 + 47 + 102 + 105 + 101 + 108 + 100 + 45 + 100 + 105 + 115 + 112 + 108 + 97 + 99 + 101 + 109 + 101 + 110 + 116 + 115 + 95 + 48 + 48 + 48 + 55 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 102 + 108 + 111 + 97 + 116 + 59 + 10 + 47 + 102 + 105 + 101 + 108 + 100 + 45 + 115 + 116 + 114 + 101 + 115 + 115 + 95 + 48 + 48 + 49 + 49 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 102 + 108 + 111 + 97 + 116 + 59 + 10 + 47 + 102 + 105 + 101 + 108 + 100 + 45 + 116 + 101 + 109 + 112 + 101 + 114 + 97 + 116 + 117 + 114 + 101 + 95 + 48 + 48 + 49 + 50 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 102 + 108 + 111 + 97 + 116 + 59 + 10 + 47 + 102 + 105 + 101 + 108 + 100 + 45 + 112 + 114 + 101 + 115 + 115 + 117 + 114 + 101 + 95 + 48 + 48 + 49 + 51 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 102 + 108 + 111 + 97 + 116 + 59 + 10 + 47 + 66 + 108 + 111 + 98 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 115 + 116 + 114 + 117 + 99 + 116 + 32 + 66 + 108 + 111 + 98 + 123 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 102 + 105 + 108 + 101 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 100 + 97 + 116 + 97 + 115 + 101 + 116 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 111 + 102 + 102 + 115 + 101 + 116 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 115 + 116 + 114 + 105 + 100 + 101 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 99 + 111 + 117 + 110 + 116 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 98 + 97 + 115 + 101 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 110 + 117 + 109 + 95 + 114 + 101 + 99 + 115 + 59 + 125 + 59 + 10 + 47 + 73 + 110 + 100 + 101 + 120 + 83 + 112 + 101 + 99 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 115 + 116 + 114 + 117 + 99 + 116 + 32 + 73 + 110 + 100 + 101 + 120 + 83 + 112 + 101 + 99 + 123 + 105 + 110 + 116 + 32 + 110 + 100 + 105 + 109 + 115 + 59 + 105 + 110 + 116 + 32 + 111 + 114 + 105 + 103 + 105 + 110 + 115 + 91 + 56 + 93 + 59 + 105 + 110 + 116 + 32 + 115 + 105 + 122 + 101 + 115 + 91 + 56 + 93 + 59 + 105 + 110 + 116 + 32 + 111 + 114 + 100 + 101 + 114 + 91 + 56 + 93 + 59 + 101 + 110 + 117 + 109 + 32 + 73 + 110 + 100 + 101 + 120 + 84 + 121 + 112 + 101 + 123 + 86 + 66 + 84 + 95 + 73 + 78 + 68 + 69 + 88 + 95 + 84 + 89 + 80 + 69 + 95 + 67 + 95 + 79 + 82 + 68 + 69 + 82 + 61 + 48 + 44 + 86 + 66 + 84 + 95 + 73 + 78 + 68 + 69 + 88 + 95 + 84 + 89 + 80 + 69 + 95 + 70 + 95 + 79 + 82 + 68 + 69 + 82 + 61 + 49 + 44 + 86 + 66 + 84 + 95 + 73 + 78 + 68 + 69 + 88 + 95 + 84 + 89 + 80 + 69 + 95 + 65 + 78 + 89 + 61 + 45 + 49 + 44 + 86 + 66 + 84 + 95 + 73 + 78 + 68 + 69 + 88 + 95 + 84 + 89 + 80 + 69 + 95 + 73 + 78 + 86 + 65 + 76 + 73 + 68 + 61 + 45 + 50 + 44 + 86 + 66 + 84 + 95 + 73 + 78 + 68 + 69 + 88 + 95 + 84 + 89 + 80 + 69 + 95 + 78 + 65 + 61 + 45 + 51 + 44 + 86 + 66 + 84 + 95 + 73 + 78 + 68 + 69 + 88 + 95 + 84 + 89 + 80 + 69 + 95 + 85 + 78 + 75 + 78 + 79 + 87 + 78 + 61 + 45 + 52 + 125 + 105 + 110 + 100 + 101 + 120 + 95 + 116 + 121 + 112 + 101 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 98 + 97 + 115 + 101 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 110 + 117 + 109 + 95 + 114 + 101 + 99 + 115 + 59 + 125 + 59 + 10 + 47 + 67 + 97 + 116 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 115 + 116 + 114 + 117 + 99 + 116 + 32 + 67 + 97 + 116 + 123 + 99 + 104 + 97 + 114 + 32 + 110 + 97 + 109 + 101 + 91 + 54 + 52 + 93 + 59 + 101 + 110 + 117 + 109 + 32 + 82 + 111 + 108 + 101 + 123 + 86 + 66 + 84 + 95 + 82 + 79 + 76 + 69 + 95 + 84 + 79 + 80 + 79 + 61 + 48 + 44 + 86 + 66 + 84 + 95 + 82 + 79 + 76 + 69 + 95 + 66 + 78 + 68 + 61 + 49 + 44 + 86 + 66 + 84 + 95 + 82 + 79 + 76 + 69 + 95 + 80 + 82 + 79 + 67 + 61 + 50 + 44 + 86 + 66 + 84 + 95 + 82 + 79 + 76 + 69 + 95 + 68 + 79 + 77 + 78 + 61 + 51 + 44 + 86 + 66 + 84 + 95 + 82 + 79 + 76 + 69 + 95 + 66 + 76 + 79 + 67 + 75 + 61 + 52 + 44 + 86 + 66 + 84 + 95 + 82 + 79 + 76 + 69 + 95 + 65 + 83 + 83 + 89 + 61 + 53 + 44 + 86 + 66 + 84 + 95 + 82 + 79 + 76 + 69 + 95 + 77 + 65 + 84 + 61 + 54 + 44 + 86 + 66 + 84 + 95 + 82 + 79 + 76 + 69 + 95 + 88 + 80 + 82 + 79 + 68 + 61 + 55 + 44 + 86 + 66 + 84 + 95 + 82 + 79 + 76 + 69 + 95 + 85 + 83 + 69 + 82 + 68 + 61 + 56 + 44 + 86 + 66 + 84 + 95 + 82 + 79 + 76 + 69 + 95 + 65 + 78 + 89 + 61 + 45 + 49 + 44 + 86 + 66 + 84 + 95 + 82 + 79 + 76 + 69 + 95 + 73 + 78 + 86 + 65 + 76 + 73 + 68 + 61 + 45 + 50 + 44 + 86 + 66 + 84 + 95 + 82 + 79 + 76 + 69 + 95 + 78 + 65 + 61 + 45 + 51 + 44 + 86 + 66 + 84 + 95 + 82 + 79 + 76 + 69 + 95 + 85 + 78 + 75 + 78 + 79 + 87 + 78 + 61 + 45 + 52 + 125 + 114 + 111 + 108 + 101 + 59 + 105 + 110 + 116 + 32 + 116 + 100 + 105 + 109 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 98 + 97 + 115 + 101 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 110 + 117 + 109 + 95 + 114 + 101 + 99 + 115 + 59 + 125 + 59 + 10 + 47 + 83 + 101 + 116 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 115 + 116 + 114 + 117 + 99 + 116 + 32 + 83 + 101 + 116 + 123 + 105 + 110 + 116 + 32 + 117 + 115 + 101 + 114 + 95 + 105 + 100 + 59 + 99 + 104 + 97 + 114 + 32 + 110 + 97 + 109 + 101 + 91 + 54 + 52 + 93 + 59 + 105 + 110 + 116 + 32 + 116 + 100 + 105 + 109 + 59 + 101 + 110 + 117 + 109 + 32 + 83 + 105 + 108 + 82 + 111 + 108 + 101 + 123 + 86 + 66 + 84 + 95 + 83 + 82 + 79 + 76 + 69 + 95 + 84 + 73 + 77 + 69 + 61 + 48 + 44 + 86 + 66 + 84 + 95 + 83 + 82 + 79 + 76 + 69 + 95 + 83 + 80 + 65 + 67 + 69 + 61 + 49 + 44 + 86 + 66 + 84 + 95 + 83 + 82 + 79 + 76 + 69 + 95 + 83 + 84 + 65 + 84 + 69 + 61 + 50 + 44 + 86 + 66 + 84 + 95 + 83 + 82 + 79 + 76 + 69 + 95 + 80 + 65 + 82 + 65 + 77 + 61 + 51 + 44 + 86 + 66 + 84 + 95 + 83 + 82 + 79 + 76 + 69 + 95 + 67 + 84 + 89 + 80 + 69 + 61 + 52 + 44 + 86 + 66 + 84 + 95 + 83 + 82 + 79 + 76 + 69 + 95 + 65 + 84 + 89 + 80 + 69 + 61 + 53 + 44 + 86 + 66 + 84 + 95 + 83 + 82 + 79 + 76 + 69 + 95 + 85 + 83 + 69 + 82 + 68 + 61 + 54 + 44 + 86 + 66 + 84 + 95 + 83 + 82 + 79 + 76 + 69 + 95 + 65 + 78 + 89 + 61 + 45 + 49 + 44 + 86 + 66 + 84 + 95 + 83 + 82 + 79 + 76 + 69 + 95 + 73 + 78 + 86 + 65 + 76 + 73 + 68 + 61 + 45 + 50 + 44 + 86 + 66 + 84 + 95 + 83 + 82 + 79 + 76 + 69 + 95 + 78 + 65 + 61 + 45 + 51 + 44 + 86 + 66 + 84 + 95 + 83 + 82 + 79 + 76 + 69 + 95 + 85 + 78 + 75 + 78 + 79 + 87 + 78 + 61 + 45 + 52 + 125 + 115 + 114 + 111 + 108 + 101 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 99 + 111 + 108 + 108 + 95 + 105 + 100 + 115 + 91 + 49 + 54 + 93 + 59 + 105 + 110 + 116 + 32 + 105 + 115 + 95 + 116 + 111 + 112 + 59 + 105 + 110 + 116 + 32 + 105 + 115 + 95 + 101 + 120 + 116 + 101 + 110 + 100 + 105 + 98 + 108 + 101 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 100 + 102 + 108 + 116 + 95 + 99 + 111 + 111 + 114 + 100 + 102 + 108 + 100 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 98 + 110 + 100 + 95 + 115 + 101 + 116 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 98 + 97 + 115 + 101 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 110 + 117 + 109 + 95 + 114 + 101 + 99 + 115 + 59 + 125 + 59 + 10 + 47 + 67 + 111 + 108 + 108 + 101 + 99 + 116 + 105 + 111 + 110 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 115 + 116 + 114 + 117 + 99 + 116 + 32 + 67 + 111 + 108 + 108 + 101 + 99 + 116 + 105 + 111 + 110 + 123 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 99 + 111 + 110 + 116 + 97 + 105 + 110 + 105 + 110 + 103 + 95 + 115 + 101 + 116 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 99 + 97 + 116 + 95 + 105 + 100 + 59 + 101 + 110 + 117 + 109 + 32 + 67 + 101 + 108 + 108 + 84 + 121 + 112 + 101 + 123 + 86 + 66 + 84 + 95 + 67 + 69 + 76 + 76 + 95 + 84 + 89 + 80 + 69 + 95 + 78 + 79 + 78 + 69 + 61 + 48 + 44 + 86 + 66 + 84 + 95 + 67 + 69 + 76 + 76 + 95 + 84 + 89 + 80 + 69 + 95 + 80 + 79 + 73 + 78 + 84 + 61 + 49 + 44 + 86 + 66 + 84 + 95 + 67 + 69 + 76 + 76 + 95 + 84 + 89 + 80 + 69 + 95 + 76 + 73 + 78 + 69 + 61 + 50 + 44 + 86 + 66 + 84 + 95 + 67 + 69 + 76 + 76 + 95 + 84 + 89 + 80 + 69 + 95 + 84 + 82 + 73 + 61 + 51 + 44 + 86 + 66 + 84 + 95 + 67 + 69 + 76 + 76 + 95 + 84 + 89 + 80 + 69 + 95 + 81 + 85 + 65 + 68 + 61 + 52 + 44 + 86 + 66 + 84 + 95 + 67 + 69 + 76 + 76 + 95 + 84 + 89 + 80 + 69 + 95 + 84 + 69 + 84 + 61 + 53 + 44 + 86 + 66 + 84 + 95 + 67 + 69 + 76 + 76 + 95 + 84 + 89 + 80 + 69 + 95 + 80 + 89 + 82 + 65 + 77 + 73 + 68 + 61 + 54 + 44 + 86 + 66 + 84 + 95 + 67 + 69 + 76 + 76 + 95 + 84 + 89 + 80 + 69 + 95 + 80 + 82 + 73 + 83 + 77 + 61 + 55 + 44 + 86 + 66 + 84 + 95 + 67 + 69 + 76 + 76 + 95 + 84 + 89 + 80 + 69 + 95 + 72 + 69 + 88 + 61 + 56 + 44 + 86 + 66 + 84 + 95 + 67 + 69 + 76 + 76 + 95 + 84 + 89 + 80 + 69 + 95 + 77 + 73 + 88 + 69 + 68 + 61 + 57 + 44 + 86 + 66 + 84 + 95 + 67 + 69 + 76 + 76 + 95 + 84 + 89 + 80 + 69 + 95 + 65 + 82 + 66 + 61 + 49 + 48 + 44 + 86 + 66 + 84 + 95 + 67 + 69 + 76 + 76 + 95 + 84 + 89 + 80 + 69 + 95 + 49 + 66 + 65 + 76 + 76 + 61 + 49 + 49 + 44 + 86 + 66 + 84 + 95 + 67 + 69 + 76 + 76 + 95 + 84 + 89 + 80 + 69 + 95 + 50 + 66 + 65 + 76 + 76 + 61 + 49 + 50 + 44 + 86 + 66 + 84 + 95 + 67 + 69 + 76 + 76 + 95 + 84 + 89 + 80 + 69 + 95 + 51 + 66 + 65 + 76 + 76 + 61 + 49 + 51 + 44 + 86 + 66 + 84 + 95 + 67 + 69 + 76 + 76 + 95 + 84 + 89 + 80 + 69 + 95 + 49 + 83 + 72 + 69 + 76 + 76 + 61 + 49 + 52 + 44 + 86 + 66 + 84 + 95 + 67 + 69 + 76 + 76 + 95 + 84 + 89 + 80 + 69 + 95 + 50 + 83 + 72 + 69 + 76 + 76 + 61 + 49 + 53 + 44 + 86 + 66 + 84 + 95 + 67 + 69 + 76 + 76 + 95 + 84 + 89 + 80 + 69 + 95 + 65 + 78 + 89 + 61 + 45 + 49 + 44 + 86 + 66 + 84 + 95 + 67 + 69 + 76 + 76 + 95 + 84 + 89 + 80 + 69 + 95 + 73 + 78 + 86 + 65 + 76 + 73 + 68 + 61 + 45 + 50 + 44 + 86 + 66 + 84 + 95 + 67 + 69 + 76 + 76 + 95 + 84 + 89 + 80 + 69 + 95 + 78 + 65 + 61 + 45 + 51 + 44 + 86 + 66 + 84 + 95 + 67 + 69 + 76 + 76 + 95 + 84 + 89 + 80 + 69 + 95 + 85 + 78 + 75 + 78 + 79 + 87 + 78 + 61 + 45 + 52 + 125 + 99 + 101 + 108 + 108 + 95 + 116 + 121 + 112 + 101 + 59 + 105 + 110 + 116 + 32 + 99 + 111 + 117 + 110 + 116 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 105 + 110 + 100 + 101 + 120 + 105 + 110 + 103 + 95 + 105 + 100 + 59 + 105 + 110 + 116 + 32 + 105 + 115 + 95 + 100 + 101 + 99 + 111 + 109 + 112 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 109 + 101 + 109 + 98 + 101 + 114 + 115 + 95 + 98 + 108 + 111 + 98 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 98 + 97 + 115 + 101 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 110 + 117 + 109 + 95 + 114 + 101 + 99 + 115 + 59 + 125 + 59 + 10 + 47 + 82 + 101 + 108 + 97 + 116 + 105 + 111 + 110 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 115 + 116 + 114 + 117 + 99 + 116 + 32 + 82 + 101 + 108 + 97 + 116 + 105 + 111 + 110 + 123 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 115 + 117 + 98 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 115 + 117 + 98 + 95 + 99 + 97 + 116 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 115 + 117 + 98 + 95 + 100 + 101 + 99 + 111 + 109 + 112 + 95 + 99 + 97 + 116 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 115 + 117 + 112 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 115 + 117 + 112 + 95 + 99 + 97 + 116 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 115 + 117 + 112 + 95 + 100 + 101 + 99 + 111 + 109 + 112 + 95 + 99 + 97 + 116 + 95 + 105 + 100 + 59 + 101 + 110 + 117 + 109 + 32 + 82 + 101 + 108 + 75 + 105 + 110 + 100 + 123 + 86 + 66 + 84 + 95 + 82 + 69 + 76 + 75 + 73 + 78 + 68 + 95 + 83 + 85 + 66 + 83 + 69 + 84 + 61 + 48 + 44 + 86 + 66 + 84 + 95 + 82 + 69 + 76 + 75 + 73 + 78 + 68 + 95 + 83 + 85 + 80 + 83 + 69 + 84 + 61 + 49 + 44 + 86 + 66 + 84 + 95 + 82 + 69 + 76 + 75 + 73 + 78 + 68 + 95 + 66 + 79 + 85 + 78 + 68 + 61 + 50 + 44 + 86 + 66 + 84 + 95 + 82 + 69 + 76 + 75 + 73 + 78 + 68 + 95 + 80 + 69 + 82 + 77 + 85 + 84 + 69 + 61 + 51 + 44 + 86 + 66 + 84 + 95 + 82 + 69 + 76 + 75 + 73 + 78 + 68 + 95 + 78 + 69 + 73 + 71 + 72 + 66 + 79 + 82 + 61 + 52 + 44 + 86 + 66 + 84 + 95 + 82 + 69 + 76 + 75 + 73 + 78 + 68 + 95 + 67 + 79 + 80 + 89 + 61 + 53 + 44 + 86 + 66 + 84 + 95 + 82 + 69 + 76 + 75 + 73 + 78 + 68 + 95 + 69 + 81 + 85 + 65 + 76 + 61 + 54 + 44 + 86 + 66 + 84 + 95 + 82 + 69 + 76 + 75 + 73 + 78 + 68 + 95 + 65 + 78 + 89 + 61 + 45 + 49 + 44 + 86 + 66 + 84 + 95 + 82 + 69 + 76 + 75 + 73 + 78 + 68 + 95 + 73 + 78 + 86 + 65 + 76 + 73 + 68 + 61 + 45 + 50 + 44 + 86 + 66 + 84 + 95 + 82 + 69 + 76 + 75 + 73 + 78 + 68 + 95 + 78 + 65 + 61 + 45 + 51 + 44 + 86 + 66 + 84 + 95 + 82 + 69 + 76 + 75 + 73 + 78 + 68 + 95 + 85 + 78 + 75 + 78 + 79 + 87 + 78 + 61 + 45 + 52 + 125 + 107 + 105 + 110 + 100 + 59 + 101 + 110 + 117 + 109 + 32 + 82 + 101 + 108 + 82 + 101 + 112 + 123 + 86 + 66 + 84 + 95 + 82 + 69 + 76 + 82 + 69 + 80 + 95 + 73 + 68 + 69 + 78 + 84 + 73 + 84 + 89 + 61 + 48 + 44 + 86 + 66 + 84 + 95 + 82 + 69 + 76 + 82 + 69 + 80 + 95 + 72 + 76 + 73 + 83 + 84 + 61 + 49 + 44 + 86 + 66 + 84 + 95 + 82 + 69 + 76 + 82 + 69 + 80 + 95 + 84 + 76 + 73 + 83 + 84 + 61 + 50 + 44 + 86 + 66 + 84 + 95 + 82 + 69 + 76 + 82 + 69 + 80 + 95 + 84 + 76 + 73 + 83 + 84 + 95 + 49 + 61 + 51 + 44 + 86 + 66 + 84 + 95 + 82 + 69 + 76 + 82 + 69 + 80 + 95 + 69 + 76 + 73 + 83 + 84 + 61 + 52 + 44 + 86 + 66 + 84 + 95 + 82 + 69 + 76 + 82 + 69 + 80 + 95 + 83 + 84 + 82 + 85 + 67 + 84 + 85 + 82 + 69 + 68 + 61 + 53 + 44 + 86 + 66 + 84 + 95 + 82 + 69 + 76 + 82 + 69 + 80 + 95 + 85 + 78 + 83 + 84 + 82 + 85 + 67 + 84 + 85 + 82 + 69 + 68 + 61 + 54 + 44 + 86 + 66 + 84 + 95 + 82 + 69 + 76 + 82 + 69 + 80 + 95 + 65 + 82 + 66 + 73 + 84 + 82 + 65 + 82 + 89 + 95 + 82 + 61 + 55 + 44 + 86 + 66 + 84 + 95 + 82 + 69 + 76 + 82 + 69 + 80 + 95 + 65 + 82 + 66 + 73 + 84 + 82 + 65 + 82 + 89 + 95 + 68 + 82 + 61 + 56 + 44 + 86 + 66 + 84 + 95 + 82 + 69 + 76 + 82 + 69 + 80 + 95 + 65 + 78 + 89 + 61 + 45 + 49 + 44 + 86 + 66 + 84 + 95 + 82 + 69 + 76 + 82 + 69 + 80 + 95 + 73 + 78 + 86 + 65 + 76 + 73 + 68 + 61 + 45 + 50 + 44 + 86 + 66 + 84 + 95 + 82 + 69 + 76 + 82 + 69 + 80 + 95 + 78 + 65 + 61 + 45 + 51 + 44 + 86 + 66 + 84 + 95 + 82 + 69 + 76 + 82 + 69 + 80 + 95 + 85 + 78 + 75 + 78 + 79 + 87 + 78 + 61 + 45 + 52 + 125 + 114 + 101 + 112 + 95 + 116 + 121 + 112 + 101 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 100 + 95 + 98 + 108 + 111 + 98 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 114 + 95 + 98 + 108 + 111 + 98 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 98 + 97 + 115 + 101 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 110 + 117 + 109 + 95 + 114 + 101 + 99 + 115 + 59 + 125 + 59 + 10 + 47 + 70 + 105 + 101 + 108 + 100 + 84 + 109 + 112 + 108 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 115 + 116 + 114 + 117 + 99 + 116 + 32 + 70 + 105 + 101 + 108 + 100 + 84 + 109 + 112 + 108 + 123 + 99 + 104 + 97 + 114 + 32 + 110 + 97 + 109 + 101 + 91 + 54 + 52 + 93 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 98 + 97 + 115 + 101 + 95 + 115 + 112 + 97 + 99 + 101 + 95 + 105 + 100 + 59 + 101 + 110 + 117 + 109 + 32 + 65 + 108 + 103 + 101 + 98 + 114 + 97 + 105 + 99 + 84 + 121 + 112 + 101 + 123 + 86 + 66 + 84 + 95 + 65 + 76 + 71 + 69 + 66 + 82 + 65 + 73 + 67 + 95 + 84 + 89 + 80 + 69 + 95 + 67 + 79 + 78 + 83 + 84 + 65 + 78 + 84 + 61 + 48 + 44 + 86 + 66 + 84 + 95 + 65 + 76 + 71 + 69 + 66 + 82 + 65 + 73 + 67 + 95 + 84 + 89 + 80 + 69 + 95 + 67 + 79 + 77 + 80 + 79 + 78 + 69 + 78 + 84 + 61 + 49 + 44 + 86 + 66 + 84 + 95 + 65 + 76 + 71 + 69 + 66 + 82 + 65 + 73 + 67 + 95 + 84 + 89 + 80 + 69 + 95 + 83 + 67 + 65 + 76 + 65 + 82 + 61 + 50 + 44 + 86 + 66 + 84 + 95 + 65 + 76 + 71 + 69 + 66 + 82 + 65 + 73 + 67 + 95 + 84 + 89 + 80 + 69 + 95 + 86 + 69 + 67 + 84 + 79 + 82 + 61 + 51 + 44 + 86 + 66 + 84 + 95 + 65 + 76 + 71 + 69 + 66 + 82 + 65 + 73 + 67 + 95 + 84 + 89 + 80 + 69 + 95 + 84 + 69 + 78 + 83 + 79 + 82 + 61 + 52 + 44 + 86 + 66 + 84 + 95 + 65 + 76 + 71 + 69 + 66 + 82 + 65 + 73 + 67 + 95 + 84 + 89 + 80 + 69 + 95 + 83 + 89 + 77 + 95 + 84 + 69 + 78 + 83 + 79 + 82 + 61 + 53 + 44 + 86 + 66 + 84 + 95 + 65 + 76 + 71 + 69 + 66 + 82 + 65 + 73 + 67 + 95 + 84 + 89 + 80 + 69 + 95 + 70 + 73 + 69 + 76 + 68 + 61 + 54 + 44 + 86 + 66 + 84 + 95 + 65 + 76 + 71 + 69 + 66 + 82 + 65 + 73 + 67 + 95 + 84 + 89 + 80 + 69 + 95 + 83 + 84 + 65 + 84 + 69 + 61 + 55 + 44 + 86 + 66 + 84 + 95 + 65 + 76 + 71 + 69 + 66 + 82 + 65 + 73 + 67 + 95 + 84 + 89 + 80 + 69 + 95 + 84 + 85 + 80 + 76 + 69 + 61 + 56 + 44 + 86 + 66 + 84 + 95 + 65 + 76 + 71 + 69 + 66 + 82 + 65 + 73 + 67 + 95 + 84 + 89 + 80 + 69 + 95 + 65 + 78 + 89 + 61 + 45 + 49 + 44 + 86 + 66 + 84 + 95 + 65 + 76 + 71 + 69 + 66 + 82 + 65 + 73 + 67 + 95 + 84 + 89 + 80 + 69 + 95 + 73 + 78 + 86 + 65 + 76 + 73 + 68 + 61 + 45 + 50 + 44 + 86 + 66 + 84 + 95 + 65 + 76 + 71 + 69 + 66 + 82 + 65 + 73 + 67 + 95 + 84 + 89 + 80 + 69 + 95 + 78 + 65 + 61 + 45 + 51 + 44 + 86 + 66 + 84 + 95 + 65 + 76 + 71 + 69 + 66 + 82 + 65 + 73 + 67 + 95 + 84 + 89 + 80 + 69 + 95 + 85 + 78 + 75 + 78 + 79 + 87 + 78 + 61 + 45 + 52 + 125 + 97 + 108 + 103 + 95 + 116 + 121 + 112 + 101 + 59 + 101 + 110 + 117 + 109 + 32 + 66 + 97 + 115 + 105 + 115 + 84 + 121 + 112 + 101 + 123 + 86 + 66 + 84 + 95 + 66 + 65 + 83 + 73 + 83 + 95 + 84 + 89 + 80 + 69 + 95 + 85 + 78 + 73 + 84 + 89 + 61 + 48 + 44 + 86 + 66 + 84 + 95 + 66 + 65 + 83 + 73 + 83 + 95 + 84 + 89 + 80 + 69 + 95 + 67 + 65 + 82 + 84 + 69 + 83 + 73 + 65 + 78 + 61 + 49 + 44 + 86 + 66 + 84 + 95 + 66 + 65 + 83 + 73 + 83 + 95 + 84 + 89 + 80 + 69 + 95 + 83 + 80 + 72 + 69 + 82 + 73 + 67 + 65 + 76 + 61 + 50 + 44 + 86 + 66 + 84 + 95 + 66 + 65 + 83 + 73 + 83 + 95 + 84 + 89 + 80 + 69 + 95 + 67 + 89 + 76 + 73 + 78 + 68 + 82 + 73 + 67 + 65 + 76 + 61 + 51 + 44 + 86 + 66 + 84 + 95 + 66 + 65 + 83 + 73 + 83 + 95 + 84 + 89 + 80 + 69 + 95 + 85 + 80 + 80 + 69 + 82 + 95 + 84 + 82 + 73 + 61 + 52 + 44 + 86 + 66 + 84 + 95 + 66 + 65 + 83 + 73 + 83 + 95 + 84 + 89 + 80 + 69 + 95 + 70 + 79 + 85 + 82 + 73 + 69 + 82 + 61 + 53 + 44 + 86 + 66 + 84 + 95 + 66 + 65 + 83 + 73 + 83 + 95 + 84 + 89 + 80 + 69 + 95 + 86 + 65 + 82 + 73 + 65 + 66 + 76 + 69 + 61 + 54 + 44 + 86 + 66 + 84 + 95 + 66 + 65 + 83 + 73 + 83 + 95 + 84 + 89 + 80 + 69 + 95 + 65 + 78 + 89 + 61 + 45 + 49 + 44 + 86 + 66 + 84 + 95 + 66 + 65 + 83 + 73 + 83 + 95 + 84 + 89 + 80 + 69 + 95 + 73 + 78 + 86 + 65 + 76 + 73 + 68 + 61 + 45 + 50 + 44 + 86 + 66 + 84 + 95 + 66 + 65 + 83 + 73 + 83 + 95 + 84 + 89 + 80 + 69 + 95 + 78 + 65 + 61 + 45 + 51 + 44 + 86 + 66 + 84 + 95 + 66 + 65 + 83 + 73 + 83 + 95 + 84 + 89 + 80 + 69 + 95 + 85 + 78 + 75 + 78 + 79 + 87 + 78 + 61 + 45 + 52 + 125 + 98 + 97 + 115 + 105 + 115 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 113 + 117 + 97 + 110 + 116 + 105 + 116 + 121 + 95 + 105 + 100 + 59 + 105 + 110 + 116 + 32 + 110 + 117 + 109 + 95 + 99 + 111 + 109 + 112 + 115 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 102 + 116 + 109 + 112 + 108 + 95 + 105 + 100 + 115 + 95 + 98 + 108 + 111 + 98 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 98 + 97 + 115 + 101 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 110 + 117 + 109 + 95 + 114 + 101 + 99 + 115 + 59 + 125 + 59 + 10 + 47 + 70 + 105 + 101 + 108 + 100 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 115 + 116 + 114 + 117 + 99 + 116 + 32 + 70 + 105 + 101 + 108 + 100 + 123 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 102 + 116 + 109 + 112 + 108 + 95 + 105 + 100 + 59 + 99 + 104 + 97 + 114 + 32 + 110 + 97 + 109 + 101 + 91 + 54 + 52 + 93 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 117 + 110 + 105 + 116 + 115 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 115 + 116 + 111 + 114 + 97 + 103 + 101 + 95 + 100 + 101 + 99 + 111 + 109 + 112 + 95 + 99 + 97 + 116 + 95 + 105 + 100 + 59 + 101 + 110 + 117 + 109 + 32 + 73 + 110 + 116 + 101 + 114 + 108 + 101 + 97 + 118 + 101 + 123 + 86 + 66 + 84 + 95 + 73 + 78 + 84 + 69 + 82 + 76 + 69 + 65 + 86 + 69 + 95 + 67 + 79 + 77 + 80 + 79 + 78 + 69 + 78 + 84 + 61 + 48 + 44 + 86 + 66 + 84 + 95 + 73 + 78 + 84 + 69 + 82 + 76 + 69 + 65 + 86 + 69 + 95 + 86 + 69 + 67 + 84 + 79 + 82 + 61 + 49 + 44 + 86 + 66 + 84 + 95 + 73 + 78 + 84 + 69 + 82 + 76 + 69 + 65 + 86 + 69 + 95 + 73 + 78 + 68 + 69 + 80 + 69 + 78 + 68 + 69 + 78 + 84 + 61 + 50 + 44 + 86 + 66 + 84 + 95 + 73 + 78 + 84 + 69 + 82 + 76 + 69 + 65 + 86 + 69 + 95 + 78 + 79 + 78 + 69 + 61 + 51 + 44 + 86 + 66 + 84 + 95 + 73 + 78 + 84 + 69 + 82 + 76 + 69 + 65 + 86 + 69 + 95 + 65 + 78 + 89 + 61 + 45 + 49 + 44 + 86 + 66 + 84 + 95 + 73 + 78 + 84 + 69 + 82 + 76 + 69 + 65 + 86 + 69 + 95 + 73 + 78 + 86 + 65 + 76 + 73 + 68 + 61 + 45 + 50 + 44 + 86 + 66 + 84 + 95 + 73 + 78 + 84 + 69 + 82 + 76 + 69 + 65 + 86 + 69 + 95 + 78 + 65 + 61 + 45 + 51 + 44 + 86 + 66 + 84 + 95 + 73 + 78 + 84 + 69 + 82 + 76 + 69 + 65 + 86 + 69 + 95 + 85 + 78 + 75 + 78 + 79 + 87 + 78 + 61 + 45 + 52 + 125 + 99 + 111 + 109 + 112 + 95 + 105 + 110 + 116 + 108 + 118 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 105 + 110 + 100 + 101 + 120 + 105 + 110 + 103 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 100 + 111 + 102 + 95 + 97 + 115 + 115 + 111 + 99 + 95 + 99 + 97 + 116 + 95 + 105 + 100 + 59 + 105 + 110 + 116 + 32 + 97 + 115 + 115 + 111 + 99 + 95 + 114 + 97 + 116 + 105 + 111 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 101 + 118 + 97 + 108 + 95 + 100 + 101 + 99 + 111 + 109 + 112 + 95 + 99 + 97 + 116 + 95 + 105 + 100 + 59 + 101 + 110 + 117 + 109 + 32 + 69 + 118 + 97 + 108 + 70 + 117 + 110 + 99 + 123 + 86 + 66 + 84 + 95 + 69 + 86 + 65 + 76 + 95 + 70 + 85 + 78 + 67 + 95 + 67 + 79 + 78 + 83 + 84 + 65 + 78 + 84 + 61 + 48 + 44 + 86 + 66 + 84 + 95 + 69 + 86 + 65 + 76 + 95 + 70 + 85 + 78 + 67 + 95 + 85 + 78 + 73 + 70 + 79 + 82 + 77 + 61 + 49 + 44 + 86 + 66 + 84 + 95 + 69 + 86 + 65 + 76 + 95 + 70 + 85 + 78 + 67 + 95 + 80 + 87 + 67 + 79 + 78 + 83 + 84 + 61 + 50 + 44 + 86 + 66 + 84 + 95 + 69 + 86 + 65 + 76 + 95 + 70 + 85 + 78 + 67 + 95 + 80 + 87 + 76 + 73 + 78 + 69 + 65 + 82 + 61 + 51 + 44 + 86 + 66 + 84 + 95 + 69 + 86 + 65 + 76 + 95 + 70 + 85 + 78 + 67 + 95 + 65 + 78 + 89 + 61 + 45 + 49 + 44 + 86 + 66 + 84 + 95 + 69 + 86 + 65 + 76 + 95 + 70 + 85 + 78 + 67 + 95 + 73 + 78 + 86 + 65 + 76 + 73 + 68 + 61 + 45 + 50 + 44 + 86 + 66 + 84 + 95 + 69 + 86 + 65 + 76 + 95 + 70 + 85 + 78 + 67 + 95 + 78 + 65 + 61 + 45 + 51 + 44 + 86 + 66 + 84 + 95 + 69 + 86 + 65 + 76 + 95 + 70 + 85 + 78 + 67 + 95 + 85 + 78 + 75 + 78 + 79 + 87 + 78 + 61 + 45 + 52 + 125 + 101 + 118 + 97 + 108 + 95 + 102 + 117 + 110 + 99 + 59 + 105 + 110 + 116 + 32 + 105 + 115 + 95 + 104 + 111 + 109 + 111 + 103 + 101 + 110 + 101 + 111 + 117 + 115 + 59 + 105 + 110 + 116 + 32 + 105 + 115 + 95 + 99 + 111 + 111 + 114 + 100 + 95 + 102 + 105 + 101 + 108 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 99 + 111 + 109 + 112 + 95 + 105 + 100 + 115 + 95 + 98 + 108 + 111 + 98 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 99 + 111 + 109 + 112 + 95 + 111 + 114 + 100 + 101 + 114 + 95 + 98 + 108 + 111 + 98 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 118 + 98 + 97 + 115 + 105 + 115 + 95 + 98 + 108 + 111 + 98 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 100 + 111 + 102 + 95 + 98 + 108 + 111 + 98 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 98 + 97 + 115 + 101 + 95 + 105 + 100 + 59 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 110 + 117 + 109 + 95 + 114 + 101 + 99 + 115 + 59 + 125 + 59 + 10 + 47 + 109 + 101 + 116 + 97 + 98 + 108 + 111 + 98 + 48 + 48 + 48 + 48 + 48 + 46 + 105 + 110 + 100 + 101 + 120 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 115 + 116 + 114 + 117 + 99 + 116 + 32 + 73 + 110 + 100 + 101 + 120 + 80 + 97 + 105 + 114 + 123 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 32 + 105 + 110 + 100 + 101 + 120 + 59 + 105 + 110 + 116 + 32 + 108 + 101 + 110 + 103 + 116 + 104 + 59 + 125 + 59 + 10 + 47 + 109 + 101 + 116 + 97 + 98 + 108 + 111 + 98 + 48 + 48 + 48 + 48 + 48 + 46 + 98 + 108 + 111 + 98 + 32 + 68 + 65 + 84 + 65 + 83 + 69 + 84 + 32 + 68 + 83 + 76 + 95 + 79 + 102 + 102 + 115 + 101 + 116 + 59 + 10 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -313,9 +5954,9 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -606,7 +6247,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:StorageLayout> <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Incremental"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -670,12 +6311,30 @@ Expected output for 'h5dump --xml tsaf.h5' <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> - -1 1 0 1 9 0 1 -1 2 0 1 4 1 1 -1 3 0 1 7 2 1 -1 4 0 1 4 3 1 - -1 5 0 1 5 4 1 -1 6 0 1 3 5 1 -1 7 0 1 4 6 1 -1 8 0 1 1 7 1 - -1 9 0 1 10 8 1 -1 10 0 1 4 9 1 -1 11 0 1 3 10 1 -1 12 0 1 5 11 1 - -1 13 0 1 5 12 1 -1 14 0 1 16 13 1 -1 15 0 1 9 14 1 -1 16 0 1 4 15 1 - -1 17 0 1 16 16 1 -1 18 0 1 36 17 1 -1 19 0 1 5 18 1 -1 20 0 1 5 19 1 - -1 21 0 1 36 20 1 -1 22 0 1 12 21 1 -1 23 0 1 7 22 1 -1 24 0 1 2 23 1 + -1 1 0 1 9 0 1 + -1 2 0 1 4 1 1 + -1 3 0 1 7 2 1 + -1 4 0 1 4 3 1 + -1 5 0 1 5 4 1 + -1 6 0 1 3 5 1 + -1 7 0 1 4 6 1 + -1 8 0 1 1 7 1 + -1 9 0 1 10 8 1 + -1 10 0 1 4 9 1 + -1 11 0 1 3 10 1 + -1 12 0 1 5 11 1 + -1 13 0 1 5 12 1 + -1 14 0 1 16 13 1 + -1 15 0 1 9 14 1 + -1 16 0 1 4 15 1 + -1 17 0 1 16 16 1 + -1 18 0 1 36 17 1 + -1 19 0 1 5 18 1 + -1 20 0 1 5 19 1 + -1 21 0 1 36 20 1 + -1 22 0 1 12 21 1 + -1 23 0 1 7 22 1 + -1 24 0 1 2 23 1 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -689,7 +6348,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:StorageLayout> <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Incremental"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -823,8 +6482,11 @@ Expected output for 'h5dump --xml tsaf.h5' <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> - "nodes" TOPO 0 0 1 "elems" TOPO 2 1 1 "edges" USERD 1 2 1 - "blocks" BLOCK 2 3 1 "side_sets" USERD 1 4 1 + "nodes" TOPO 0 0 1 + "elems" TOPO 2 1 1 + "edges" USERD 1 2 1 + "blocks" BLOCK 2 3 1 + "side_sets" USERD 1 4 1 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -838,7 +6500,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:StorageLayout> <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Incremental"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -1042,15 +6704,30 @@ Expected output for 'h5dump --xml tsaf.h5' <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 0 0 POINT 18 0 0 -2 0 1 0 1 MIXED 12 1 1 -2 1 1 0 3 NONE 4 2 1 0 2 1 - 0 4 NONE 2 3 0 1 3 1 1 0 POINT 9 4 0 -2 4 1 1 1 QUAD 4 5 1 -2 5 1 - 1 3 NONE 1 6 1 2 6 1 2 0 POINT 7 7 0 -2 7 1 2 1 MIXED 4 8 1 -2 8 1 - 2 3 NONE 2 9 1 3 9 1 3 0 POINT 10 10 0 -2 10 1 3 1 QUAD 4 11 1 -2 11 1 - 3 3 NONE 1 12 1 4 12 1 4 0 POINT 3 13 0 -2 13 1 4 2 LINE 2 14 1 -2 14 1 - 5 0 POINT 5 15 0 -2 15 1 5 2 LINE 4 16 1 -2 16 1 - 6 0 POINT 5 17 1 -2 17 1 7 0 POINT 5 18 0 -2 18 1 - 7 1 TRI 3 19 1 -2 19 1 7 3 NONE 1 20 1 5 20 1 8 0 POINT 4 21 0 -2 21 1 - 8 1 QUAD 1 22 1 -2 22 1 8 3 NONE 1 23 1 6 23 1 + 0 0 POINT 18 0 0 -2 0 1 + 0 1 MIXED 12 1 1 -2 1 1 + 0 3 NONE 4 2 1 0 2 1 + 0 4 NONE 2 3 0 1 3 1 + 1 0 POINT 9 4 0 -2 4 1 + 1 1 QUAD 4 5 1 -2 5 1 + 1 3 NONE 1 6 1 2 6 1 + 2 0 POINT 7 7 0 -2 7 1 + 2 1 MIXED 4 8 1 -2 8 1 + 2 3 NONE 2 9 1 3 9 1 + 3 0 POINT 10 10 0 -2 10 1 + 3 1 QUAD 4 11 1 -2 11 1 + 3 3 NONE 1 12 1 4 12 1 + 4 0 POINT 3 13 0 -2 13 1 + 4 2 LINE 2 14 1 -2 14 1 + 5 0 POINT 5 15 0 -2 15 1 + 5 2 LINE 4 16 1 -2 16 1 + 6 0 POINT 5 17 1 -2 17 1 + 7 0 POINT 5 18 0 -2 18 1 + 7 1 TRI 3 19 1 -2 19 1 + 7 3 NONE 1 20 1 5 20 1 + 8 0 POINT 4 21 0 -2 21 1 + 8 1 QUAD 1 22 1 -2 22 1 + 8 3 NONE 1 23 1 6 23 1 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -1064,7 +6741,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:StorageLayout> <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Incremental"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -1340,7 +7017,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:StorageLayout> <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Incremental"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -1595,7 +7272,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:StorageLayout> <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Incremental"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -1734,30 +7411,30 @@ Expected output for 'h5dump --xml tsaf.h5' <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 1 0 0 0 0 0 0 0 0 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 0 1 - 1 0 0 0 0 0 0 0 0 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 1 1 - 1 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 2 1 - 1 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 3 1 - 1 0 0 0 0 0 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 4 1 - 1 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 5 1 - 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 6 1 - 1 0 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 7 1 - 1 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 8 1 - 1 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 9 1 - 1 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 10 1 - 1 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 11 1 - 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 12 1 - 1 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 13 1 - 1 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 14 1 - 1 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 15 1 - 1 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 16 1 - 1 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 17 1 - 1 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 18 1 - 1 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 19 1 - 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 20 1 - 1 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 21 1 - 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 22 1 - 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 23 1 + 1 0 0 0 0 0 0 0 0 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 0 1 + 1 0 0 0 0 0 0 0 0 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 1 1 + 1 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 2 1 + 1 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 3 1 + 1 0 0 0 0 0 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 4 1 + 1 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 5 1 + 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 6 1 + 1 0 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 7 1 + 1 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 8 1 + 1 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 9 1 + 1 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 10 1 + 1 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 11 1 + 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 12 1 + 1 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 13 1 + 1 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 14 1 + 1 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 15 1 + 1 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 16 1 + 1 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 17 1 + 1 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 18 1 + 1 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 19 1 + 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 20 1 + 1 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 21 1 + 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 22 1 + 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C_ORDER 23 1 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -1771,7 +7448,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:StorageLayout> <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Incremental"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2026,11 +7703,16 @@ Expected output for 'h5dump --xml tsaf.h5' <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 1 0 -2 0 0 -2 EQUAL TLIST -2 0 0 1 1 1 -2 0 1 -2 EQUAL TLIST -2 1 1 1 - 2 0 -2 0 0 -2 EQUAL TLIST -2 2 2 1 2 1 -2 0 1 -2 EQUAL TLIST -2 3 3 1 - 7 0 -2 0 0 -2 EQUAL TLIST -2 4 4 1 7 1 -2 0 1 -2 EQUAL TLIST -2 5 5 1 - 8 0 -2 0 0 -2 EQUAL TLIST -2 6 6 1 8 1 -2 0 1 -2 EQUAL TLIST -2 7 7 1 - 3 0 -2 0 0 -2 EQUAL TLIST -2 8 8 1 3 1 -2 0 1 -2 EQUAL TLIST -2 9 9 1 + 1 0 -2 0 0 -2 EQUAL TLIST -2 0 0 1 + 1 1 -2 0 1 -2 EQUAL TLIST -2 1 1 1 + 2 0 -2 0 0 -2 EQUAL TLIST -2 2 2 1 + 2 1 -2 0 1 -2 EQUAL TLIST -2 3 3 1 + 7 0 -2 0 0 -2 EQUAL TLIST -2 4 4 1 + 7 1 -2 0 1 -2 EQUAL TLIST -2 5 5 1 + 8 0 -2 0 0 -2 EQUAL TLIST -2 6 6 1 + 8 1 -2 0 1 -2 EQUAL TLIST -2 7 7 1 + 3 0 -2 0 0 -2 EQUAL TLIST -2 8 8 1 + 3 1 -2 0 1 -2 EQUAL TLIST -2 9 9 1 4 0 -2 0 0 -2 EQUAL TLIST -2 10 10 1 5 0 -2 0 0 -2 EQUAL TLIST -2 11 11 1 6 0 -2 0 0 -2 EQUAL TLIST -2 12 12 1 @@ -2055,7 +7737,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:StorageLayout> <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Incremental"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2230,15 +7912,15 @@ Expected output for 'h5dump --xml tsaf.h5' <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 0 "TOP_CELL" 2 SPACE 0 1 -2 2 3 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 1 0 -2 -2 0 1 - 0 "CELL_1" 2 SPACE 4 5 -2 6 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 0 0 -2 -2 1 1 - 0 "CELL_2" 2 SPACE 7 8 -2 9 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 0 0 -2 -2 2 1 - 0 "CELL_3" 2 SPACE 10 11 -2 12 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 0 0 -2 -2 3 1 - 0 "SIDE_SET_1" 1 SPACE 13 -2 14 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 0 0 -2 -2 4 1 - 0 "SIDE_SET_2" 1 SPACE 15 -2 16 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 0 0 -2 -2 5 1 - 0 "NODE_SET_1" 0 SPACE 17 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 0 0 -2 -2 6 1 - 0 "CELL_2_TRIS" 2 SPACE 18 19 -2 20 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 0 0 -2 -2 7 1 - 0 "CELL_2_QUADS" 2 SPACE 21 22 -2 23 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 0 0 -2 -2 8 1 + 0 "TOP_CELL" 2 SPACE 0 1 -2 2 3 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 1 0 -2 -2 0 1 + 0 "CELL_1" 2 SPACE 4 5 -2 6 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 0 0 -2 -2 1 1 + 0 "CELL_2" 2 SPACE 7 8 -2 9 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 0 0 -2 -2 2 1 + 0 "CELL_3" 2 SPACE 10 11 -2 12 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 0 0 -2 -2 3 1 + 0 "SIDE_SET_1" 1 SPACE 13 -2 14 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 0 0 -2 -2 4 1 + 0 "SIDE_SET_2" 1 SPACE 15 -2 16 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 0 0 -2 -2 5 1 + 0 "NODE_SET_1" 0 SPACE 17 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 0 0 -2 -2 6 1 + 0 "CELL_2_TRIS" 2 SPACE 18 19 -2 20 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 0 0 -2 -2 7 1 + 0 "CELL_2_QUADS" 2 SPACE 21 22 -2 23 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 0 0 -2 -2 8 1 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -2246,9 +7928,9 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2263,8 +7945,42 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0 4 1 4 2 4 2.5 4 0 3 1 3 2 3 2.5 3 0 2 1 2 2 2 2.5 2 0 1 2 1 2.5 1 0 0 - 2 0 2.5 0 + 0 + 4 + 1 + 4 + 2 + 4 + 2.5 + 4 + 0 + 3 + 1 + 3 + 2 + 3 + 2.5 + 3 + 0 + 2 + 1 + 2 + 2 + 2 + 2.5 + 2 + 0 + 1 + 2 + 1 + 2.5 + 1 + 0 + 0 + 2 + 0 + 2.5 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -2272,9 +7988,9 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2289,9 +8005,42 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 - 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 - 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 + 0.25 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -2299,9 +8048,9 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2316,7 +8065,11 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 4 3 2 1 0 + 4 + 3 + 2 + 1 + 0 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -2324,9 +8077,9 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2341,7 +8094,8 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 45 55 + 45 + 55 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -2349,9 +8103,9 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2366,7 +8120,18 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 0.5 0.25 0.5 0.5 0.25 0.5 0.5 0.25 0.5 0.5 0.25 0.5 + 0.5 + 0.25 + 0.5 + 0.5 + 0.25 + 0.5 + 0.5 + 0.25 + 0.5 + 0.5 + 0.25 + 0.5 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -2374,9 +8139,9 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2391,7 +8156,11 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 100 150 150 100 75 + 100 + 150 + 150 + 100 + 75 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -2399,9 +8168,9 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2416,7 +8185,13 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 75 95 120 80 115 85 110 + 75 + 95 + 120 + 80 + 115 + 85 + 110 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -2430,7 +8205,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:StorageLayout> <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Incremental"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2445,7 +8220,25 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 1 7 8 3 -2 -2 -2 -2 -2 -2 -2 -2 0 1 5 6 8 9 10 + 1 + 7 + 8 + 3 + -2 + -2 + -2 + -2 + -2 + -2 + -2 + -2 + 0 + 1 + 5 + 6 + 8 + 9 + 10 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -2459,7 +8252,7 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:StorageLayout> <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Incremental"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2488,7 +8281,16 @@ Expected output for 'h5dump --xml tsaf.h5' <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 0 4 4 2 6 1 7 2 9 1 10 1 11 1 12 2 14 2 16 3 + 0 4 + 4 2 + 6 1 + 7 2 + 9 1 + 10 1 + 11 1 + 12 2 + 14 2 + 16 3 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -2496,9 +8298,9 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2513,7 +8315,15 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 1 2 3 5 6 7 9 10 11 + 1 + 2 + 3 + 5 + 6 + 7 + 9 + 10 + 11 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -2521,9 +8331,9 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2538,7 +8348,10 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 1 2 4 5 + 1 + 2 + 4 + 5 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -2546,9 +8359,9 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2563,7 +8376,13 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 9 10 11 13 14 16 17 + 9 + 10 + 11 + 13 + 14 + 16 + 17 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -2571,9 +8390,9 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2588,7 +8407,10 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 7 8 9 11 + 7 + 8 + 9 + 11 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -2596,9 +8418,9 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2613,7 +8435,11 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 9 10 11 13 14 + 9 + 10 + 11 + 13 + 14 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -2621,9 +8447,9 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2638,7 +8464,9 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 7 8 9 + 7 + 8 + 9 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -2646,9 +8474,9 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2663,7 +8491,10 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 13 14 16 17 + 13 + 14 + 16 + 17 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -2671,9 +8502,9 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2696,9 +8527,9 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2713,7 +8544,16 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 3 4 7 8 11 12 14 15 17 18 + 3 + 4 + 7 + 8 + 11 + 12 + 14 + 15 + 17 + 18 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -2721,9 +8561,9 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2738,7 +8578,10 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 3 6 10 12 + 3 + 6 + 10 + 12 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -2746,9 +8589,9 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2763,7 +8606,9 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 9 10 11 + 9 + 10 + 11 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -2771,9 +8616,9 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2788,7 +8633,11 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 1 5 9 13 16 + 1 + 5 + 9 + 13 + 16 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -2796,9 +8645,9 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2813,7 +8662,11 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 4 8 12 15 18 + 4 + 8 + 12 + 15 + 18 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -2821,9 +8674,9 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2838,7 +8691,22 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 1 2 6 5 2 3 7 6 5 6 10 9 6 7 11 10 + 1 + 2 + 6 + 5 + 2 + 3 + 7 + 6 + 5 + 6 + 10 + 9 + 6 + 7 + 11 + 10 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -2846,9 +8714,9 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2863,7 +8731,15 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 9 10 13 10 14 13 10 11 14 + 9 + 10 + 13 + 10 + 14 + 13 + 10 + 11 + 14 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -2871,9 +8747,9 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2888,7 +8764,10 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 13 14 17 16 + 13 + 14 + 17 + 16 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -2896,9 +8775,9 @@ Expected output for 'h5dump --xml tsaf.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -2913,7 +8792,22 @@ Expected output for 'h5dump --xml tsaf.h5' </hdf5:DataType> <hdf5:Data> <hdf5:DataFromFile> - 3 4 8 7 7 8 12 11 11 12 15 14 14 15 18 17 + 3 + 4 + 8 + 7 + 7 + 8 + 12 + 11 + 11 + 12 + 15 + 14 + 14 + 15 + 18 + 17 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tsaf.ls b/tools/testfiles/tsaf.ls index 96d4811..c950d7d 100644 --- a/tools/testfiles/tsaf.ls +++ b/tools/testfiles/tsaf.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -d tsaf.h5' -############################# / Group /.DSL_METADATA Dataset {5919/Inf} Data: diff --git a/tools/testfiles/tscaleoffset.ddl b/tools/testfiles/tscaleoffset.ddl index 3428bfa..f1891da 100644 --- a/tools/testfiles/tscaleoffset.ddl +++ b/tools/testfiles/tscaleoffset.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -H -p -d scaleoffset tfilters.h5' -############################# HDF5 "tfilters.h5" { DATASET "scaleoffset" { DATATYPE H5T_STD_I32LE @@ -8,13 +5,13 @@ DATASET "scaleoffset" { STORAGE_LAYOUT { CHUNKED ( 10, 5 ) SIZE 152 (5.263:1 COMPRESSION) - } + } FILTERS { COMPRESSION SCALEOFFSET { MIN BITS 4 } } FILLVALUE { FILL_TIME H5D_FILL_TIME_IFSET - VALUE 0 + VALUE 0 } ALLOCATION_TIME { H5D_ALLOC_TIME_INCR diff --git a/tools/testfiles/tshuffle.ddl b/tools/testfiles/tshuffle.ddl index 00f8e4a..cd1b5f8 100644 --- a/tools/testfiles/tshuffle.ddl +++ b/tools/testfiles/tshuffle.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -H -p -d shuffle tfilters.h5' -############################# HDF5 "tfilters.h5" { DATASET "shuffle" { DATATYPE H5T_STD_I32LE @@ -8,13 +5,13 @@ DATASET "shuffle" { STORAGE_LAYOUT { CHUNKED ( 10, 5 ) SIZE 800 - } + } FILTERS { PREPROCESSING SHUFFLE } FILLVALUE { FILL_TIME H5D_FILL_TIME_IFSET - VALUE 0 + VALUE 0 } ALLOCATION_TIME { H5D_ALLOC_TIME_INCR diff --git a/tools/testfiles/tslink-1.ddl b/tools/testfiles/tslink-1.ddl index e0f24e0..d9df572 100644 --- a/tools/testfiles/tslink-1.ddl +++ b/tools/testfiles/tslink-1.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tslink.h5' -############################# HDF5 "tslink.h5" { GROUP "/" { SOFTLINK "slink1" { diff --git a/tools/testfiles/tslink-1.ls b/tools/testfiles/tslink-1.ls index 6c3467a..7afc8a5 100644 --- a/tools/testfiles/tslink-1.ls +++ b/tools/testfiles/tslink-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r tslink.h5' -############################# / Group /slink1 Soft Link {somevalue} /slink2 Soft Link {linkvalue} diff --git a/tools/testfiles/tslink-2.ddl b/tools/testfiles/tslink-2.ddl index 0672707..853c093 100644 --- a/tools/testfiles/tslink-2.ddl +++ b/tools/testfiles/tslink-2.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -l slink2 tslink.h5' -############################# HDF5 "tslink.h5" { SOFTLINK "slink2" { LINKTARGET "linkvalue" diff --git a/tools/testfiles/tslink-D.ddl b/tools/testfiles/tslink-D.ddl new file mode 100644 index 0000000..a1d999a --- /dev/null +++ b/tools/testfiles/tslink-D.ddl @@ -0,0 +1,30 @@ +HDF5 "tslink.h5" { +SOFTLINK "/slink1" { + LINKTARGET "somevalue" +} +} +HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): + #000: (file name) line (number) in H5Dopen2(): not found + major: Dataset + minor: Object not found + #001: (file name) line (number) in H5G_loc_find(): can't find object + major: Symbol table + minor: Object not found + #002: (file name) line (number) in H5G_traverse(): internal path traversal failed + major: Symbol table + minor: Object not found + #003: (file name) line (number) in H5G_traverse_real(): special link traversal failed + major: Links + minor: Link traversal failure + #004: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed + major: Links + minor: Link traversal failure + #005: (file name) line (number) in H5G_traverse_slink(): unable to follow symbolic link + major: Symbol table + minor: Object not found + #006: (file name) line (number) in H5G_traverse_real(): traversal operator failed + major: Symbol table + minor: Callback failed + #007: (file name) line (number) in H5G_traverse_slink_cb(): component not found + major: Symbol table + minor: Object not found diff --git a/tools/testfiles/tslink.h5.xml b/tools/testfiles/tslink.h5.xml index f31f425..9d8040e 100644 --- a/tools/testfiles/tslink.h5.xml +++ b/tools/testfiles/tslink.h5.xml @@ -1,8 +1,5 @@ -############################# -Expected output for 'h5dump --xml tslink.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:SoftLink LinkName="slink1" OBJ-XID="xid_18446744073709551614" H5SourcePath="/slink1" TargetPath="somevalue" Parents="xid_696" H5ParentPaths="/" /> <hdf5:SoftLink LinkName="slink2" OBJ-XID="xid_18446744073709551613" H5SourcePath="/slink2" TargetPath="linkvalue" Parents="xid_696" H5ParentPaths="/" /> diff --git a/tools/testfiles/tsoftlinks-1.ls b/tools/testfiles/tsoftlinks-1.ls index fc57da9..d7d98a3 100644 --- a/tools/testfiles/tsoftlinks-1.ls +++ b/tools/testfiles/tsoftlinks-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls --follow-symlinks tsoftlinks.h5' -############################# dset1 Dataset {4, 2} dset2 Dataset {4, 2} dtype Type diff --git a/tools/testfiles/tsoftlinks-2.ls b/tools/testfiles/tsoftlinks-2.ls index 3566f70..52c5265 100644 --- a/tools/testfiles/tsoftlinks-2.ls +++ b/tools/testfiles/tsoftlinks-2.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls --follow-symlinks -r tsoftlinks.h5' -############################# / Group /dset1 Dataset {4, 2} /dset2 Dataset {4, 2} diff --git a/tools/testfiles/tsoftlinks-3.ls b/tools/testfiles/tsoftlinks-3.ls index 2face70..6b958ac 100644 --- a/tools/testfiles/tsoftlinks-3.ls +++ b/tools/testfiles/tsoftlinks-3.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls --follow-symlinks tsoftlinks.h5/group1' -############################# soft_dangle Soft Link {not_yet} {**NOT FOUND**} soft_dset1 Soft Link {/dset1} {Dataset {4, 2}} soft_dset2 Soft Link {/dset2} {Dataset {4, 2}} diff --git a/tools/testfiles/tsoftlinks-4.ls b/tools/testfiles/tsoftlinks-4.ls index c1f4568..092d8a5 100644 --- a/tools/testfiles/tsoftlinks-4.ls +++ b/tools/testfiles/tsoftlinks-4.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls --follow-symlinks -r tsoftlinks.h5/group1' -############################# /soft_dangle Soft Link {not_yet} {**NOT FOUND**} /soft_dset1 Soft Link {/dset1} {Dataset {4, 2}} /soft_dset2 Soft Link {/dset2} {Dataset {4, 2}} diff --git a/tools/testfiles/tsoftlinks-5.ls b/tools/testfiles/tsoftlinks-5.ls index 6e915e1..cc1f130 100644 --- a/tools/testfiles/tsoftlinks-5.ls +++ b/tools/testfiles/tsoftlinks-5.ls @@ -1,4 +1 @@ -############################# - output for 'h5ls --follow-symlinks tsoftlinks.h5/soft_dset1' -############################# soft_dset1 Soft Link {/dset1} {Dataset {4, 2}} diff --git a/tools/testfiles/tsoftlinks-nodangle-1.ls b/tools/testfiles/tsoftlinks-nodangle-1.ls index 6d639b7..d7d98a3 100644 --- a/tools/testfiles/tsoftlinks-nodangle-1.ls +++ b/tools/testfiles/tsoftlinks-nodangle-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 --follow-symlinks --no-dangling-links tsoftlinks.h5' -############################# dset1 Dataset {4, 2} dset2 Dataset {4, 2} dtype Type diff --git a/tools/testfiles/tsplit_file.ddl b/tools/testfiles/tsplit_file.ddl index 691790c..9a1e22d 100644 --- a/tools/testfiles/tsplit_file.ddl +++ b/tools/testfiles/tsplit_file.ddl @@ -1,15 +1,12 @@ -############################# -Expected output for 'h5dump --filedriver=split tsplit_file' -############################# HDF5 "tsplit_file" { GROUP "/" { ATTRIBUTE "Metadata" { DATATYPE H5T_STRING { - STRSIZE 35; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 35; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 1 ) / ( 1 ) } DATA { (0): "this is some metadata on this file" diff --git a/tools/testfiles/tstarfile.ddl b/tools/testfiles/tstarfile.ddl new file mode 100644 index 0000000..77b80e0 --- /dev/null +++ b/tools/testfiles/tstarfile.ddl @@ -0,0 +1,89 @@ +HDF5 "tarray1_big.h5" { +DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [1000] H5T_STD_I32LE } + DATASPACE SIMPLE { ( 2000 ) / ( 2000 ) } +} +} +HDF5 "tarray1.h5" { +DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [4] H5T_STD_I32LE } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } +} +} +HDF5 "tarray2.h5" { +DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [3][4][5] H5T_STD_I32LE } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } +} +} +HDF5 "tarray3.h5" { +DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [4] H5T_ARRAY { [6][3] H5T_STD_I32LE } } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } +} +} +HDF5 "tarray4.h5" { +DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [4] H5T_COMPOUND { + H5T_STD_I32LE "i"; + H5T_IEEE_F32LE "f"; + } } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } +} +} +HDF5 "tarray5.h5" { +DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [4] H5T_COMPOUND { + H5T_STD_I32LE "i"; + H5T_ARRAY { [4] H5T_IEEE_F32LE } "f"; + } } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } +} +} +HDF5 "tarray6.h5" { +DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [4] H5T_VLEN { H5T_STD_U32LE} } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } +} +} +HDF5 "tarray7.h5" { +DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [4] H5T_VLEN { H5T_ARRAY { [4] H5T_STD_U32LE }} } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } +} +} +HDF5 "tarray8.h5" { +} +HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): + #000: (file name) line (number) in H5Dopen2(): not found + major: Dataset + minor: Object not found + #001: (file name) line (number) in H5G_loc_find(): can't find object + major: Symbol table + minor: Object not found + #002: (file name) line (number) in H5G_traverse(): internal path traversal failed + major: Symbol table + minor: Object not found + #003: (file name) line (number) in H5G_traverse_real(): traversal operator failed + major: Symbol table + minor: Callback failed + #004: (file name) line (number) in H5G_loc_find_cb(): object 'Dataset1' doesn't exist + major: Symbol table + minor: Object not found +HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): + #000: (file name) line (number) in H5Lget_info(): unable to get link info + major: Symbol table + minor: Object not found + #001: (file name) line (number) in H5L_get_info(): name doesn't exist + major: Symbol table + minor: Object already exists + #002: (file name) line (number) in H5G_traverse(): internal path traversal failed + major: Symbol table + minor: Object not found + #003: (file name) line (number) in H5G_traverse_real(): traversal operator failed + major: Symbol table + minor: Callback failed + #004: (file name) line (number) in H5L_get_info_cb(): name doesn't exist + major: Symbol table + minor: Object not found +h5dump error: unable to get link info from "Dataset1" diff --git a/tools/testfiles/tstr-1.ddl b/tools/testfiles/tstr-1.ddl index 099b291..e43b732 100644 --- a/tools/testfiles/tstr-1.ddl +++ b/tools/testfiles/tstr-1.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tstr.h5' -############################# HDF5 "tstr.h5" { GROUP "/" { DATASET "comp1" { @@ -253,11 +250,11 @@ GROUP "/" { } DATASET "string1" { DATATYPE H5T_STRING { - STRSIZE 5; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 5; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 3, 4 ) / ( 3, 4 ) } DATA { (0,0): "s1", "s2", "s3", "s4", @@ -267,11 +264,11 @@ GROUP "/" { } DATASET "string2" { DATATYPE H5T_STRING { - STRSIZE 11; - STRPAD H5T_STR_SPACEPAD; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 11; + STRPAD H5T_STR_SPACEPAD; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 20 ) / ( 20 ) } DATA { (0): "ab cd ef1 ", "ab cd ef2 ", "ab cd ef3 ", "ab cd ef4 ", @@ -283,11 +280,11 @@ GROUP "/" { } DATASET "string3" { DATATYPE H5T_STRING { - STRSIZE 8; - STRPAD H5T_STR_NULLPAD; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 8; + STRPAD H5T_STR_NULLPAD; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 27 ) / ( 27 ) } DATA { (0): "abcd0\000\000\000", "abcd1\000\000\000", "abcd2\000\000\000", @@ -303,11 +300,11 @@ GROUP "/" { } DATASET "string4" { DATATYPE H5T_STRING { - STRSIZE 168; - STRPAD H5T_STR_SPACEPAD; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 168; + STRPAD H5T_STR_SPACEPAD; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 3 ) / ( 3 ) } DATA { (0): "s1234567890123456789 ", diff --git a/tools/testfiles/tstr-1.ls b/tools/testfiles/tstr-1.ls index 8a223cc..1ae4ecd 100644 --- a/tools/testfiles/tstr-1.ls +++ b/tools/testfiles/tstr-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -d tstr.h5' -############################# / Group /comp1 Dataset {3, 6} Data: diff --git a/tools/testfiles/tstr-2.ddl b/tools/testfiles/tstr-2.ddl index ab7cb42..26425f6 100644 --- a/tools/testfiles/tstr-2.ddl +++ b/tools/testfiles/tstr-2.ddl @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump tstr2.h5' -############################# HDF5 "tstr2.h5" { GROUP "/" { GROUP "g1" { DATASET "dset1" { DATATYPE H5T_STRING { - STRSIZE 50; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 50; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { (0): "This is row 0 of type H5T_STR_NULLTERM of", @@ -26,11 +23,11 @@ GROUP "/" { } ATTRIBUTE "attr1" { DATATYPE H5T_STRING { - STRSIZE 11; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 11; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 3 ) / ( 3 ) } DATA { (0): "0123456789", "abcdefghij", "ABCDEFGHIJ" @@ -41,11 +38,11 @@ GROUP "/" { GROUP "g2" { DATASET "dset2" { DATATYPE H5T_STRING { - STRSIZE 50; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 50; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { (0): "This is row 0 of type H5T_STR_NULLTERM of string ", @@ -64,11 +61,11 @@ GROUP "/" { GROUP "g3" { DATASET "dset3" { DATATYPE H5T_STRING { - STRSIZE 50; - STRPAD H5T_STR_NULLPAD; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 50; + STRPAD H5T_STR_NULLPAD; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { (0): "This is row 0 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", @@ -87,11 +84,11 @@ GROUP "/" { GROUP "g4" { DATASET "dset4" { DATATYPE H5T_STRING { - STRSIZE 50; - STRPAD H5T_STR_NULLPAD; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 50; + STRPAD H5T_STR_NULLPAD; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { (0): "This is row 0 of type H5T_STR_NULLPAD of string ar", @@ -110,11 +107,11 @@ GROUP "/" { GROUP "g5" { DATASET "dset5" { DATATYPE H5T_STRING { - STRSIZE 50; - STRPAD H5T_STR_SPACEPAD; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 50; + STRPAD H5T_STR_SPACEPAD; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { (0): "This is row 0 of type H5T_STR_SPACEPAD of ", @@ -133,11 +130,11 @@ GROUP "/" { GROUP "g6" { DATASET "dset6" { DATATYPE H5T_STRING { - STRSIZE 50; - STRPAD H5T_STR_SPACEPAD; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 50; + STRPAD H5T_STR_SPACEPAD; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { (0): "This is row 0 of type H5T_STR_SPACEPAD of string a", diff --git a/tools/testfiles/tstr.h5.xml b/tools/testfiles/tstr.h5.xml index aa429a8..d7214fd 100644 --- a/tools/testfiles/tstr.h5.xml +++ b/tools/testfiles/tstr.h5.xml @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump --xml tstr.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Dataset Name="comp1" OBJ-XID="xid_2520" H5Path= "/comp1" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -52,186 +49,24 @@ Expected output for 'h5dump --xml tstr.h5' <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 0 1 4 9 16 25 36 49 64 81 - 1 4 9 16 25 36 49 64 81 100 - 4 9 16 25 36 49 64 81 100 121 - 9 16 25 36 49 64 81 100 121 144 - 16 25 36 49 64 81 100 121 144 169 - 25 36 49 64 81 100 121 144 169 196 - 36 49 64 81 100 121 144 169 196 225 - 49 64 81 100 121 144 169 196 225 256 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - 1 4 9 16 25 36 49 64 81 100 - 4 9 16 25 36 49 64 81 100 121 - 9 16 25 36 49 64 81 100 121 144 - 16 25 36 49 64 81 100 121 144 169 - 25 36 49 64 81 100 121 144 169 196 - 36 49 64 81 100 121 144 169 196 225 - 49 64 81 100 121 144 169 196 225 256 - 64 81 100 121 144 169 196 225 256 289 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - 4 9 16 25 36 49 64 81 100 121 - 9 16 25 36 49 64 81 100 121 144 - 16 25 36 49 64 81 100 121 144 169 - 25 36 49 64 81 100 121 144 169 196 - 36 49 64 81 100 121 144 169 196 225 - 49 64 81 100 121 144 169 196 225 256 - 64 81 100 121 144 169 196 225 256 289 - 81 100 121 144 169 196 225 256 289 324 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - 9 16 25 36 49 64 81 100 121 144 - 16 25 36 49 64 81 100 121 144 169 - 25 36 49 64 81 100 121 144 169 196 - 36 49 64 81 100 121 144 169 196 225 - 49 64 81 100 121 144 169 196 225 256 - 64 81 100 121 144 169 196 225 256 289 - 81 100 121 144 169 196 225 256 289 324 - 100 121 144 169 196 225 256 289 324 361 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - 16 25 36 49 64 81 100 121 144 169 - 25 36 49 64 81 100 121 144 169 196 - 36 49 64 81 100 121 144 169 196 225 - 49 64 81 100 121 144 169 196 225 256 - 64 81 100 121 144 169 196 225 256 289 - 81 100 121 144 169 196 225 256 289 324 - 100 121 144 169 196 225 256 289 324 361 - 121 144 169 196 225 256 289 324 361 400 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - 25 36 49 64 81 100 121 144 169 196 - 36 49 64 81 100 121 144 169 196 225 - 49 64 81 100 121 144 169 196 225 256 - 64 81 100 121 144 169 196 225 256 289 - 81 100 121 144 169 196 225 256 289 324 - 100 121 144 169 196 225 256 289 324 361 - 121 144 169 196 225 256 289 324 361 400 - 144 169 196 225 256 289 324 361 400 441 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - 0 1 4 9 16 25 36 49 64 81 - 1 4 9 16 25 36 49 64 81 100 - 4 9 16 25 36 49 64 81 100 121 - 9 16 25 36 49 64 81 100 121 144 - 16 25 36 49 64 81 100 121 144 169 - 25 36 49 64 81 100 121 144 169 196 - 36 49 64 81 100 121 144 169 196 225 - 49 64 81 100 121 144 169 196 225 256 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - 1 4 9 16 25 36 49 64 81 100 - 4 9 16 25 36 49 64 81 100 121 - 9 16 25 36 49 64 81 100 121 144 - 16 25 36 49 64 81 100 121 144 169 - 25 36 49 64 81 100 121 144 169 196 - 36 49 64 81 100 121 144 169 196 225 - 49 64 81 100 121 144 169 196 225 256 - 64 81 100 121 144 169 196 225 256 289 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - 4 9 16 25 36 49 64 81 100 121 - 9 16 25 36 49 64 81 100 121 144 - 16 25 36 49 64 81 100 121 144 169 - 25 36 49 64 81 100 121 144 169 196 - 36 49 64 81 100 121 144 169 196 225 - 49 64 81 100 121 144 169 196 225 256 - 64 81 100 121 144 169 196 225 256 289 - 81 100 121 144 169 196 225 256 289 324 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - 9 16 25 36 49 64 81 100 121 144 - 16 25 36 49 64 81 100 121 144 169 - 25 36 49 64 81 100 121 144 169 196 - 36 49 64 81 100 121 144 169 196 225 - 49 64 81 100 121 144 169 196 225 256 - 64 81 100 121 144 169 196 225 256 289 - 81 100 121 144 169 196 225 256 289 324 - 100 121 144 169 196 225 256 289 324 361 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - 16 25 36 49 64 81 100 121 144 169 - 25 36 49 64 81 100 121 144 169 196 - 36 49 64 81 100 121 144 169 196 225 - 49 64 81 100 121 144 169 196 225 256 - 64 81 100 121 144 169 196 225 256 289 - 81 100 121 144 169 196 225 256 289 324 - 100 121 144 169 196 225 256 289 324 361 - 121 144 169 196 225 256 289 324 361 400 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - 25 36 49 64 81 100 121 144 169 196 - 36 49 64 81 100 121 144 169 196 225 - 49 64 81 100 121 144 169 196 225 256 - 64 81 100 121 144 169 196 225 256 289 - 81 100 121 144 169 196 225 256 289 324 - 100 121 144 169 196 225 256 289 324 361 - 121 144 169 196 225 256 289 324 361 400 - 144 169 196 225 256 289 324 361 400 441 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - 0 1 4 9 16 25 36 49 64 81 - 1 4 9 16 25 36 49 64 81 100 - 4 9 16 25 36 49 64 81 100 121 - 9 16 25 36 49 64 81 100 121 144 - 16 25 36 49 64 81 100 121 144 169 - 25 36 49 64 81 100 121 144 169 196 - 36 49 64 81 100 121 144 169 196 225 - 49 64 81 100 121 144 169 196 225 256 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - 1 4 9 16 25 36 49 64 81 100 - 4 9 16 25 36 49 64 81 100 121 - 9 16 25 36 49 64 81 100 121 144 - 16 25 36 49 64 81 100 121 144 169 - 25 36 49 64 81 100 121 144 169 196 - 36 49 64 81 100 121 144 169 196 225 - 49 64 81 100 121 144 169 196 225 256 - 64 81 100 121 144 169 196 225 256 289 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - 4 9 16 25 36 49 64 81 100 121 - 9 16 25 36 49 64 81 100 121 144 - 16 25 36 49 64 81 100 121 144 169 - 25 36 49 64 81 100 121 144 169 196 - 36 49 64 81 100 121 144 169 196 225 - 49 64 81 100 121 144 169 196 225 256 - 64 81 100 121 144 169 196 225 256 289 - 81 100 121 144 169 196 225 256 289 324 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - 9 16 25 36 49 64 81 100 121 144 - 16 25 36 49 64 81 100 121 144 169 - 25 36 49 64 81 100 121 144 169 196 - 36 49 64 81 100 121 144 169 196 225 - 49 64 81 100 121 144 169 196 225 256 - 64 81 100 121 144 169 196 225 256 289 - 81 100 121 144 169 196 225 256 289 324 - 100 121 144 169 196 225 256 289 324 361 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - 16 25 36 49 64 81 100 121 144 169 - 25 36 49 64 81 100 121 144 169 196 - 36 49 64 81 100 121 144 169 196 225 - 49 64 81 100 121 144 169 196 225 256 - 64 81 100 121 144 169 196 225 256 289 - 81 100 121 144 169 196 225 256 289 324 - 100 121 144 169 196 225 256 289 324 361 - 121 144 169 196 225 256 289 324 361 400 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - 25 36 49 64 81 100 121 144 169 196 - 36 49 64 81 100 121 144 169 196 225 - 49 64 81 100 121 144 169 196 225 256 - 64 81 100 121 144 169 196 225 256 289 - 81 100 121 144 169 196 225 256 289 324 - 100 121 144 169 196 225 256 289 324 361 - 121 144 169 196 225 256 289 324 361 400 - 144 169 196 225 256 289 324 361 400 441 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" - "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" + 0 1 4 9 16 25 36 49 64 81 1 4 9 16 25 36 49 64 81 100 4 9 16 25 36 49 64 81 100 121 9 16 25 36 49 64 81 100 121 144 16 25 36 49 64 81 100 121 144 169 25 36 49 64 81 100 121 144 169 196 36 49 64 81 100 121 144 169 196 225 49 64 81 100 121 144 169 196 225 256 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" + 1 4 9 16 25 36 49 64 81 100 4 9 16 25 36 49 64 81 100 121 9 16 25 36 49 64 81 100 121 144 16 25 36 49 64 81 100 121 144 169 25 36 49 64 81 100 121 144 169 196 36 49 64 81 100 121 144 169 196 225 49 64 81 100 121 144 169 196 225 256 64 81 100 121 144 169 196 225 256 289 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" + 4 9 16 25 36 49 64 81 100 121 9 16 25 36 49 64 81 100 121 144 16 25 36 49 64 81 100 121 144 169 25 36 49 64 81 100 121 144 169 196 36 49 64 81 100 121 144 169 196 225 49 64 81 100 121 144 169 196 225 256 64 81 100 121 144 169 196 225 256 289 81 100 121 144 169 196 225 256 289 324 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" + 9 16 25 36 49 64 81 100 121 144 16 25 36 49 64 81 100 121 144 169 25 36 49 64 81 100 121 144 169 196 36 49 64 81 100 121 144 169 196 225 49 64 81 100 121 144 169 196 225 256 64 81 100 121 144 169 196 225 256 289 81 100 121 144 169 196 225 256 289 324 100 121 144 169 196 225 256 289 324 361 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" + 16 25 36 49 64 81 100 121 144 169 25 36 49 64 81 100 121 144 169 196 36 49 64 81 100 121 144 169 196 225 49 64 81 100 121 144 169 196 225 256 64 81 100 121 144 169 196 225 256 289 81 100 121 144 169 196 225 256 289 324 100 121 144 169 196 225 256 289 324 361 121 144 169 196 225 256 289 324 361 400 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" + 25 36 49 64 81 100 121 144 169 196 36 49 64 81 100 121 144 169 196 225 49 64 81 100 121 144 169 196 225 256 64 81 100 121 144 169 196 225 256 289 81 100 121 144 169 196 225 256 289 324 100 121 144 169 196 225 256 289 324 361 121 144 169 196 225 256 289 324 361 400 144 169 196 225 256 289 324 361 400 441 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" + 0 1 4 9 16 25 36 49 64 81 1 4 9 16 25 36 49 64 81 100 4 9 16 25 36 49 64 81 100 121 9 16 25 36 49 64 81 100 121 144 16 25 36 49 64 81 100 121 144 169 25 36 49 64 81 100 121 144 169 196 36 49 64 81 100 121 144 169 196 225 49 64 81 100 121 144 169 196 225 256 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" + 1 4 9 16 25 36 49 64 81 100 4 9 16 25 36 49 64 81 100 121 9 16 25 36 49 64 81 100 121 144 16 25 36 49 64 81 100 121 144 169 25 36 49 64 81 100 121 144 169 196 36 49 64 81 100 121 144 169 196 225 49 64 81 100 121 144 169 196 225 256 64 81 100 121 144 169 196 225 256 289 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" + 4 9 16 25 36 49 64 81 100 121 9 16 25 36 49 64 81 100 121 144 16 25 36 49 64 81 100 121 144 169 25 36 49 64 81 100 121 144 169 196 36 49 64 81 100 121 144 169 196 225 49 64 81 100 121 144 169 196 225 256 64 81 100 121 144 169 196 225 256 289 81 100 121 144 169 196 225 256 289 324 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" + 9 16 25 36 49 64 81 100 121 144 16 25 36 49 64 81 100 121 144 169 25 36 49 64 81 100 121 144 169 196 36 49 64 81 100 121 144 169 196 225 49 64 81 100 121 144 169 196 225 256 64 81 100 121 144 169 196 225 256 289 81 100 121 144 169 196 225 256 289 324 100 121 144 169 196 225 256 289 324 361 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" + 16 25 36 49 64 81 100 121 144 169 25 36 49 64 81 100 121 144 169 196 36 49 64 81 100 121 144 169 196 225 49 64 81 100 121 144 169 196 225 256 64 81 100 121 144 169 196 225 256 289 81 100 121 144 169 196 225 256 289 324 100 121 144 169 196 225 256 289 324 361 121 144 169 196 225 256 289 324 361 400 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" + 25 36 49 64 81 100 121 144 169 196 36 49 64 81 100 121 144 169 196 225 49 64 81 100 121 144 169 196 225 256 64 81 100 121 144 169 196 225 256 289 81 100 121 144 169 196 225 256 289 324 100 121 144 169 196 225 256 289 324 361 121 144 169 196 225 256 289 324 361 400 144 169 196 225 256 289 324 361 400 441 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" + 0 1 4 9 16 25 36 49 64 81 1 4 9 16 25 36 49 64 81 100 4 9 16 25 36 49 64 81 100 121 9 16 25 36 49 64 81 100 121 144 16 25 36 49 64 81 100 121 144 169 25 36 49 64 81 100 121 144 169 196 36 49 64 81 100 121 144 169 196 225 49 64 81 100 121 144 169 196 225 256 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" + 1 4 9 16 25 36 49 64 81 100 4 9 16 25 36 49 64 81 100 121 9 16 25 36 49 64 81 100 121 144 16 25 36 49 64 81 100 121 144 169 25 36 49 64 81 100 121 144 169 196 36 49 64 81 100 121 144 169 196 225 49 64 81 100 121 144 169 196 225 256 64 81 100 121 144 169 196 225 256 289 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" + 4 9 16 25 36 49 64 81 100 121 9 16 25 36 49 64 81 100 121 144 16 25 36 49 64 81 100 121 144 169 25 36 49 64 81 100 121 144 169 196 36 49 64 81 100 121 144 169 196 225 49 64 81 100 121 144 169 196 225 256 64 81 100 121 144 169 196 225 256 289 81 100 121 144 169 196 225 256 289 324 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" + 9 16 25 36 49 64 81 100 121 144 16 25 36 49 64 81 100 121 144 169 25 36 49 64 81 100 121 144 169 196 36 49 64 81 100 121 144 169 196 225 49 64 81 100 121 144 169 196 225 256 64 81 100 121 144 169 196 225 256 289 81 100 121 144 169 196 225 256 289 324 100 121 144 169 196 225 256 289 324 361 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" + 16 25 36 49 64 81 100 121 144 169 25 36 49 64 81 100 121 144 169 196 36 49 64 81 100 121 144 169 196 225 49 64 81 100 121 144 169 196 225 256 64 81 100 121 144 169 196 225 256 289 81 100 121 144 169 196 225 256 289 324 100 121 144 169 196 225 256 289 324 361 121 144 169 196 225 256 289 324 361 400 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" + 25 36 49 64 81 100 121 144 169 196 36 49 64 81 100 121 144 169 196 225 49 64 81 100 121 144 169 196 225 256 64 81 100 121 144 169 196 225 256 289 81 100 121 144 169 196 225 256 289 324 100 121 144 169 196 225 256 289 324 361 121 144 169 196 225 256 289 324 361 400 144 169 196 225 256 289 324 361 400 441 "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" "abcdefgh12345678abcdefgh12345678" </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -239,9 +74,9 @@ Expected output for 'h5dump --xml tstr.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -276,9 +111,9 @@ Expected output for 'h5dump --xml tstr.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -320,9 +155,9 @@ Expected output for 'h5dump --xml tstr.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -371,9 +206,9 @@ Expected output for 'h5dump --xml tstr.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> diff --git a/tools/testfiles/tstr2.h5.xml b/tools/testfiles/tstr2.h5.xml index 62283be..26758b3 100644 --- a/tools/testfiles/tstr2.h5.xml +++ b/tools/testfiles/tstr2.h5.xml @@ -1,17 +1,14 @@ -############################# -Expected output for 'h5dump --xml tstr2.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Group Name="g1" OBJ-XID="xid_1344" H5Path="/g1" Parents="xid_696" H5ParentPaths="/" > <hdf5:Dataset Name="dset1" OBJ-XID="xid_1720" H5Path= "/g1/dset1" Parents="xid_1344" H5ParentPaths="/g1"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -64,9 +61,9 @@ Expected output for 'h5dump --xml tstr2.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -100,9 +97,9 @@ Expected output for 'h5dump --xml tstr2.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -136,9 +133,9 @@ Expected output for 'h5dump --xml tstr2.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -172,9 +169,9 @@ Expected output for 'h5dump --xml tstr2.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -208,9 +205,9 @@ Expected output for 'h5dump --xml tstr2.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> diff --git a/tools/testfiles/tstring-at.h5.xml b/tools/testfiles/tstring-at.h5.xml index 29e2b90..1962610 100644 --- a/tools/testfiles/tstring-at.h5.xml +++ b/tools/testfiles/tstring-at.h5.xml @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump --xml tstring-at.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_696" H5Path="/"> <hdf5:Dataset Name="dset1" OBJ-XID="xid_744" H5Path= "/dset1" Parents="xid_696" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> diff --git a/tools/testfiles/tstring.ddl b/tools/testfiles/tstring.ddl index 843d2aa..398bf33 100644 --- a/tools/testfiles/tstring.ddl +++ b/tools/testfiles/tstring.ddl @@ -1,15 +1,12 @@ -############################# -Expected output for 'h5dump tstr3.h5' -############################# HDF5 "tstr3.h5" { GROUP "/" { DATASET "str1" { DATATYPE H5T_STRING { - STRSIZE 73; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 73; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 1 ) / ( 1 ) } DATA { (0): "quote " backspace form feed new line @@ -19,11 +16,11 @@ GROUP "/" { } DATASET "str2" { DATATYPE H5T_STRING { - STRSIZE H5T_VARIABLE; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE H5T_VARIABLE; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { (0): "Four score and seven diff --git a/tools/testfiles/tstring.h5.xml b/tools/testfiles/tstring.h5.xml index d83ea0e..ebd0a3c 100644 --- a/tools/testfiles/tstring.h5.xml +++ b/tools/testfiles/tstring.h5.xml @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump --xml tstring.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> <hdf5:Dataset Name="dset1" OBJ-XID="xid_976" H5Path= "/dset1" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> diff --git a/tools/testfiles/tstring2.ddl b/tools/testfiles/tstring2.ddl index c3e9844..cda2ed5 100644 --- a/tools/testfiles/tstring2.ddl +++ b/tools/testfiles/tstring2.ddl @@ -1,14 +1,11 @@ -############################# -Expected output for 'h5dump -r -d str4 tstr3.h5' -############################# HDF5 "tstr3.h5" { DATASET "str4" { DATATYPE H5T_STD_I8LE DATASPACE SIMPLE { ( 93 ) / ( 93 ) } DATA { - "Four score and seven + "Four score and seven years ago our forefathers brought fo" - "rth on this continent a new nation\000" + "rth on this continent a new nation\000" } } } diff --git a/tools/testfiles/tstringe.ddl b/tools/testfiles/tstringe.ddl index 1d96dbd..d3f5181 100644 --- a/tools/testfiles/tstringe.ddl +++ b/tools/testfiles/tstringe.ddl @@ -1,15 +1,12 @@ -############################# -Expected output for 'h5dump -e tstr3.h5' -############################# HDF5 "tstr3.h5" { GROUP "/" { DATASET "str1" { DATATYPE H5T_STRING { - STRSIZE 73; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE 73; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 1 ) / ( 1 ) } DATA { (0): "quote \" backspace\b form feed\f new line\n tab\t new line\n carriage return\r" @@ -17,11 +14,11 @@ GROUP "/" { } DATASET "str2" { DATATYPE H5T_STRING { - STRSIZE H5T_VARIABLE; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE H5T_VARIABLE; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { (0): "Four score and seven\n years ago our forefathers brought forth on this continent a new nation,", diff --git a/tools/testfiles/tszip.ddl b/tools/testfiles/tszip.ddl index b9f80ca..6fdd92f 100644 --- a/tools/testfiles/tszip.ddl +++ b/tools/testfiles/tszip.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -H -p -d szip tfilters.h5' -############################# HDF5 "tfilters.h5" { DATASET "szip" { DATATYPE H5T_STD_I32LE @@ -8,7 +5,7 @@ DATASET "szip" { STORAGE_LAYOUT { CHUNKED ( 10, 5 ) SIZE 372 (2.151:1 COMPRESSION) - } + } FILTERS { COMPRESSION SZIP { PIXELS_PER_BLOCK 4 @@ -20,7 +17,7 @@ DATASET "szip" { } FILLVALUE { FILL_TIME H5D_FILL_TIME_IFSET - VALUE 0 + VALUE 0 } ALLOCATION_TIME { H5D_ALLOC_TIME_INCR diff --git a/tools/testfiles/tudlink-1.ddl b/tools/testfiles/tudlink-1.ddl index 5f76c40..53edf6b 100644 --- a/tools/testfiles/tudlink-1.ddl +++ b/tools/testfiles/tudlink-1.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tudlink.h5' -############################# HDF5 "tudlink.h5" { GROUP "/" { USERDEFINED_LINK "udlink1" { diff --git a/tools/testfiles/tudlink-1.ls b/tools/testfiles/tudlink-1.ls index d34ef4d..487e4bc 100644 --- a/tools/testfiles/tudlink-1.ls +++ b/tools/testfiles/tudlink-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r tudlink.h5' -############################# / Group /udlink1 UD Link {cannot follow UD links} /udlink2 UD Link {cannot follow UD links} diff --git a/tools/testfiles/tudlink-2.ddl b/tools/testfiles/tudlink-2.ddl index 9ae3a54..7f4281a 100644 --- a/tools/testfiles/tudlink-2.ddl +++ b/tools/testfiles/tudlink-2.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -l udlink2 tudlink.h5' -############################# HDF5 "tudlink.h5" { USERDEFINED_LINK "udlink2" { USERDEFINED_LINK "udlink2" { diff --git a/tools/testfiles/tudlink.h5.xml b/tools/testfiles/tudlink.h5.xml index bc55a83..7e57dd8 100644 --- a/tools/testfiles/tudlink.h5.xml +++ b/tools/testfiles/tudlink.h5.xml @@ -1,8 +1,5 @@ -############################# -Expected output for 'h5dump --xml tudlink.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/"> <hdf5:UserDefined LinkName="udlink1" OBJ-XID="xid_18446744073709551614" H5SourcePath="/udlink1" LinkClass="187" Parents="xid_96" H5ParentPaths="/" /> <hdf5:UserDefined LinkName="udlink2" OBJ-XID="xid_18446744073709551613" H5SourcePath="/udlink2" LinkClass="187" Parents="xid_96" H5ParentPaths="/" /> diff --git a/tools/testfiles/tuserfilter.ddl b/tools/testfiles/tuserfilter.ddl index 5549741..07b478f 100644 --- a/tools/testfiles/tuserfilter.ddl +++ b/tools/testfiles/tuserfilter.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -H -p -d myfilter tfilters.h5' -############################# HDF5 "tfilters.h5" { DATASET "myfilter" { DATATYPE H5T_STD_I32LE @@ -8,19 +5,20 @@ DATASET "myfilter" { STORAGE_LAYOUT { CHUNKED ( 10, 5 ) SIZE 800 - } + } FILTERS { UNKNOWN_FILTER { FILTER_ID 405 COMMENT myfilter PARAMS { 5 6 } } - FILLVALUE { - FILL_TIME H5D_FILL_TIME_IFSET - VALUE 0 - } - ALLOCATION_TIME { - H5D_ALLOC_TIME_INCR - } } + FILLVALUE { + FILL_TIME H5D_FILL_TIME_IFSET + VALUE 0 + } + ALLOCATION_TIME { + H5D_ALLOC_TIME_INCR + } +} } diff --git a/tools/testfiles/tvldtypes1.ddl b/tools/testfiles/tvldtypes1.ddl index e798d09..1ebb915 100644 --- a/tools/testfiles/tvldtypes1.ddl +++ b/tools/testfiles/tvldtypes1.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tvldtypes1.h5' -############################# HDF5 "tvldtypes1.h5" { GROUP "/" { DATASET "Dataset1.0" { diff --git a/tools/testfiles/tvldtypes1.h5.xml b/tools/testfiles/tvldtypes1.h5.xml index 34eb276..9c519f0 100644 --- a/tools/testfiles/tvldtypes1.h5.xml +++ b/tools/testfiles/tvldtypes1.h5.xml @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump --xml tvldtypes1.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> <hdf5:Dataset Name="Dataset1.0" OBJ-XID="xid_976" H5Path= "/Dataset1.0" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -30,7 +27,10 @@ Expected output for 'h5dump --xml tvldtypes1.h5' <!-- Note: format of VL data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 0 10 11 20 21 22 30 31 32 33 + 0 + 10 11 + 20 21 22 + 30 31 32 33 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -38,9 +38,9 @@ Expected output for 'h5dump --xml tvldtypes1.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -60,7 +60,10 @@ Expected output for 'h5dump --xml tvldtypes1.h5' <!-- Note: format of VL data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 0 10 10.1 20 20.1 20.2 30 30.1 30.2 30.3 + 0 + 10 10.1 + 20 20.1 20.2 + 30 30.1 30.2 30.3 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> @@ -68,9 +71,9 @@ Expected output for 'h5dump --xml tvldtypes1.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> diff --git a/tools/testfiles/tvldtypes1.ls b/tools/testfiles/tvldtypes1.ls index 4c4c162..feb1ac6 100644 --- a/tools/testfiles/tvldtypes1.ls +++ b/tools/testfiles/tvldtypes1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -d tvldtypes1.h5' -############################# / Group /Dataset1.0 Dataset {4} Data: diff --git a/tools/testfiles/tvldtypes2.ddl b/tools/testfiles/tvldtypes2.ddl index 855b5cd..93be862 100644 --- a/tools/testfiles/tvldtypes2.ddl +++ b/tools/testfiles/tvldtypes2.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tvldtypes2.h5' -############################# HDF5 "tvldtypes2.h5" { GROUP "/" { DATASET "Dataset1" { diff --git a/tools/testfiles/tvldtypes2.h5.xml b/tools/testfiles/tvldtypes2.h5.xml index d7e644c..9cabfdf 100644 --- a/tools/testfiles/tvldtypes2.h5.xml +++ b/tools/testfiles/tvldtypes2.h5.xml @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump --xml tvldtypes2.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -34,7 +31,9 @@ Expected output for 'h5dump --xml tvldtypes2.h5' <!-- Note: format of VL data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 0 100 110 111 200 210 211 220 221 222 + 0 + 100 110 111 + 200 210 211 220 221 222 300 310 311 320 321 322 330 331 332 333 </hdf5:DataFromFile> </hdf5:Data> diff --git a/tools/testfiles/tvldtypes2be.ls b/tools/testfiles/tvldtypes2be.ls index ee84185..2f7def3 100644 --- a/tools/testfiles/tvldtypes2be.ls +++ b/tools/testfiles/tvldtypes2be.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -v tvldtypes1.h5' -############################# Opened "tvldtypes1.h5" with sec2 driver. Dataset1.0 Dataset {4/4} Location: 1:976 diff --git a/tools/testfiles/tvldtypes2le.ls b/tools/testfiles/tvldtypes2le.ls index 62dfa61..f99ad18 100644 --- a/tools/testfiles/tvldtypes2le.ls +++ b/tools/testfiles/tvldtypes2le.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -v tvldtypes1.h5' -############################# Opened "tvldtypes1.h5" with sec2 driver. Dataset1.0 Dataset {4/4} Location: 1:976 diff --git a/tools/testfiles/tvldtypes3.ddl b/tools/testfiles/tvldtypes3.ddl index 692f485..3af9268 100644 --- a/tools/testfiles/tvldtypes3.ddl +++ b/tools/testfiles/tvldtypes3.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tvldtypes3.h5' -############################# HDF5 "tvldtypes3.h5" { GROUP "/" { DATASET "Dataset1" { diff --git a/tools/testfiles/tvldtypes3.h5.xml b/tools/testfiles/tvldtypes3.h5.xml index 627b2ca..811d536 100644 --- a/tools/testfiles/tvldtypes3.h5.xml +++ b/tools/testfiles/tvldtypes3.h5.xml @@ -1,16 +1,13 @@ -############################# -Expected output for 'h5dump --xml tvldtypes3.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:NoFill/> + <hdf5:NoFill/> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -50,7 +47,10 @@ Expected output for 'h5dump --xml tvldtypes3.h5' <!-- Note: format of compound data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 0 0 0 10 6.66667 10 11 20 13.3333 20 21 22 30 20 30 31 32 33 + 0 0 0 + 10 6.66667 10 11 + 20 13.3333 20 21 22 + 30 20 30 31 32 33 </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tvldtypes4.ddl b/tools/testfiles/tvldtypes4.ddl index 50ae28b..b1ca394 100644 --- a/tools/testfiles/tvldtypes4.ddl +++ b/tools/testfiles/tvldtypes4.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tvldtypes4.h5' -############################# HDF5 "tvldtypes4.h5" { GROUP "/" { DATASET "Dataset1" { diff --git a/tools/testfiles/tvldtypes4.h5.xml b/tools/testfiles/tvldtypes4.h5.xml index de2a476..1d368ce 100644 --- a/tools/testfiles/tvldtypes4.h5.xml +++ b/tools/testfiles/tvldtypes4.h5.xml @@ -1,19 +1,16 @@ -############################# -Expected output for 'h5dump --xml tvldtypes4.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillOnAlloc" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillOnAlloc" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:Data> - <!-- VL fill not yet implemented. --> - <hdf5:NoData /> - </hdf5:Data> + <hdf5:Data> + <!-- VL fill not yet implemented. --> + <hdf5:NoData /> + </hdf5:Data> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -46,7 +43,9 @@ Expected output for 'h5dump --xml tvldtypes4.h5' <!-- Note: format of VL data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 0 0 10 6.66667 11 7 20 13.3333 21 13.6667 22 14 + 0 0 + 10 6.66667 11 7 + 20 13.3333 21 13.6667 22 14 30 20 31 20.3333 32 20.6667 33 21 </hdf5:DataFromFile> </hdf5:Data> diff --git a/tools/testfiles/tvldtypes5.ddl b/tools/testfiles/tvldtypes5.ddl index 57462d7..b4bf3db 100644 --- a/tools/testfiles/tvldtypes5.ddl +++ b/tools/testfiles/tvldtypes5.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tvldtypes5.h5' -############################# HDF5 "tvldtypes5.h5" { GROUP "/" { DATASET "Dataset" { diff --git a/tools/testfiles/tvldtypes5.h5.xml b/tools/testfiles/tvldtypes5.h5.xml index 92d5f0c..d6ed774 100644 --- a/tools/testfiles/tvldtypes5.h5.xml +++ b/tools/testfiles/tvldtypes5.h5.xml @@ -1,19 +1,16 @@ -############################# -Expected output for 'h5dump --xml tvldtypes5.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/"> <hdf5:Dataset Name="Dataset" OBJ-XID="xid_976" H5Path= "/Dataset" Parents="xid_928" H5ParentPaths="/"> <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillOnAlloc" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillOnAlloc" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:Data> - <!-- VL fill not yet implemented. --> - <hdf5:NoData /> - </hdf5:Data> + <hdf5:Data> + <!-- VL fill not yet implemented. --> + <hdf5:NoData /> + </hdf5:Data> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> @@ -33,7 +30,10 @@ Expected output for 'h5dump --xml tvldtypes5.h5' <!-- Note: format of VL data not specified --> <hdf5:Data> <hdf5:DataFromFile> - 0 2 4 6 8 0 2 4 6 8 10 12 + 0 2 4 6 8 + + 0 2 4 6 8 10 12 + </hdf5:DataFromFile> </hdf5:Data> </hdf5:Dataset> diff --git a/tools/testfiles/tvlstr.ddl b/tools/testfiles/tvlstr.ddl index eda8e000..dfce2eb 100644 --- a/tools/testfiles/tvlstr.ddl +++ b/tools/testfiles/tvlstr.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tvlstr.h5' -############################# HDF5 "tvlstr.h5" { GROUP "/" { ATTRIBUTE "test_scalar" { @@ -12,11 +9,11 @@ GROUP "/" { } DATASET "Dataset1" { DATATYPE H5T_STRING { - STRSIZE H5T_VARIABLE; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } + STRSIZE H5T_VARIABLE; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { (0): "Four score and seven years ago our forefathers brought forth on this continent a new nation,", @@ -25,11 +22,10 @@ GROUP "/" { } } DATATYPE "vl_string_type" H5T_STRING { - STRSIZE H5T_VARIABLE; - STRPAD H5T_STR_NULLPAD; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - }; - + STRSIZE H5T_VARIABLE; + STRPAD H5T_STR_NULLPAD; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + }; } } diff --git a/tools/testfiles/tvlstr.h5.xml b/tools/testfiles/tvlstr.h5.xml index 507f0eb..e5ec1f3 100644 --- a/tools/testfiles/tvlstr.h5.xml +++ b/tools/testfiles/tvlstr.h5.xml @@ -1,8 +1,5 @@ -############################# -Expected output for 'h5dump --xml tvlstr.h5' -############################# <?xml version="1.0" encoding="UTF-8"?> -<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/DTDs/HDF5-File http://www.hdfgroup.org/DTDs/HDF5-File.xsd"> +<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"> <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/"> <hdf5:Attribute Name="test_scalar"> <hdf5:Dataspace> @@ -19,12 +16,12 @@ Expected output for 'h5dump --xml tvlstr.h5' <hdf5:StorageLayout> <hdf5:ContiguousLayout/> </hdf5:StorageLayout> - <hdf5:FillValueInfo FillTime="FillOnAlloc" AllocationTime="Late"> + <hdf5:FillValueInfo FillTime="FillOnAlloc" AllocationTime="Late"> <hdf5:FillValue> - <hdf5:Data> - <!-- String fill values not yet implemented. --> - <hdf5:NoData /> - </hdf5:Data> + <hdf5:Data> + <!-- String fill values not yet implemented. --> + <hdf5:NoData /> + </hdf5:Data> </hdf5:FillValue> </hdf5:FillValueInfo> <hdf5:Dataspace> diff --git a/tools/testfiles/tvms.ddl b/tools/testfiles/tvms.ddl index 077050b..49f3881 100644 --- a/tools/testfiles/tvms.ddl +++ b/tools/testfiles/tvms.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump tvms.h5' -############################# HDF5 "tvms.h5" { GROUP "/" { DATASET "Array" { diff --git a/tools/testfiles/zerodim.ddl b/tools/testfiles/zerodim.ddl new file mode 100644 index 0000000..484e907 --- /dev/null +++ b/tools/testfiles/zerodim.ddl @@ -0,0 +1,16 @@ +HDF5 "zerodim.h5" { +GROUP "/" { + ATTRIBUTE "attr of 0 dimension size" { + DATATYPE H5T_STD_U32LE + DATASPACE SIMPLE { ( 0, 0 ) / ( 0, 0 ) } + DATA { + } + } + DATASET "dset of 0 dimension size" { + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 0, 0 ) / ( 0, 0 ) } + DATA { + } + } +} +} diff --git a/tools/testfiles/zerodim.h5 b/tools/testfiles/zerodim.h5 Binary files differnew file mode 100644 index 0000000..6939353 --- /dev/null +++ b/tools/testfiles/zerodim.h5 |