diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2004-06-30 18:45:14 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2004-06-30 18:45:14 (GMT) |
| commit | 265a1d020947e829c570c051a02761779f37a706 (patch) | |
| tree | bc575a3ddbbdbec67d41bdd2bc28d9132b96cb1a /tools | |
| parent | cedec275523c73e98bc556ff0e77cbfed36b33f8 (diff) | |
| download | hdf5-265a1d020947e829c570c051a02761779f37a706.zip hdf5-265a1d020947e829c570c051a02761779f37a706.tar.gz hdf5-265a1d020947e829c570c051a02761779f37a706.tar.bz2 | |
[svn-r8773] Purpose:
bug fix
Description:
the indentation was not made properly for nested objects when printing array indices
Solution:
added the indentation to h5tools_simple_prefix function
Platforms tested:
linux
AIX
solaris
Misc. update:
Diffstat (limited to 'tools')
47 files changed, 1767 insertions, 1563 deletions
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c index 06c6b95..2f31dde 100644 --- a/tools/h5dump/h5dump.c +++ b/tools/h5dump/h5dump.c @@ -1122,7 +1122,7 @@ dump_attr(hid_t attr, const char *attr_name, void UNUSED * op_data) dump_oid(attr_id); if (display_data || display_attr_data) - dump_data(attr_id, ATTRIBUTE_DATA, NULL, 0); + dump_data(attr_id, ATTRIBUTE_DATA, NULL, display_ai); H5Tclose(type); H5Sclose(space); @@ -1888,8 +1888,18 @@ dump_data(hid_t obj_id, int obj_data, struct subset_t *sset, int pindex) int depth; int stdindent = COL; /* should be 3 */ + outputformat->line_ncols = nCols; outputformat->do_escape=display_escape; + /* print the matrix indices */ + outputformat->pindex=pindex; + if (outputformat->pindex) + { + outputformat->idx_fmt = "(%s): "; + outputformat->idx_n_fmt = "%lu"; + outputformat->idx_sep = ","; + outputformat->line_pre = "%s"; + } indent += COL; @@ -1949,19 +1959,6 @@ dump_data(hid_t obj_id, int obj_data, struct subset_t *sset, int pindex) } - /* print the matrix indices */ - outputformat->pindex=pindex; - if (outputformat->pindex) - { - outputformat->idx_fmt = "(%s):"; - outputformat->idx_n_fmt = "%lu"; - outputformat->idx_sep = ","; - outputformat->line_pre = " %s "; - outputformat->line_1st = " %s "; - outputformat->line_cont = " %s "; - depth=0; - } - status = h5tools_dump_dset(stdout, outputformat, obj_id, -1, sset, depth); H5Tclose(f_type); } else { diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c index 5906909..dbc8879 100644 --- a/tools/lib/h5tools.c +++ b/tools/lib/h5tools.c @@ -408,6 +408,10 @@ h5tools_ncols(const char *s) * Robb Matzke, 1999-09-29 * If a new prefix is printed then the current element number is set back * to zero. + * pvn, 2004-06-30 + * Added support for printing array indices: + * the indentation is printed before the prefix (printed one indentation + * level before) *------------------------------------------------------------------------- */ static void @@ -415,6 +419,7 @@ h5tools_simple_prefix(FILE *stream, const h5dump_t *info, h5tools_context_t *ctx, hsize_t elmtno, int secnum) { h5tools_str_t prefix; + h5tools_str_t str; /*temporary for indentation */ size_t templength = 0; int i, indentlevel = 0; @@ -422,12 +427,13 @@ h5tools_simple_prefix(FILE *stream, const h5dump_t *info, return; memset(&prefix, 0, sizeof(h5tools_str_t)); + memset(&str, 0, sizeof(h5tools_str_t)); /* Terminate previous line, if any */ if (ctx->cur_column) { - fputs(OPT(info->line_suf, ""), stream); - putc('\n', stream); - fputs(OPT(info->line_sep, ""), stream); + fputs(OPT(info->line_suf, ""), stream); + putc('\n', stream); + fputs(OPT(info->line_sep, ""), stream); } /* Calculate new prefix */ @@ -447,6 +453,14 @@ h5tools_simple_prefix(FILE *stream, const h5dump_t *info, indentlevel = ctx->default_indent_level; } + /* when printing array indices, print the indentation before the prefix + the prefix is printed one indentation level before */ + if (info->pindex) { + for (i = 0; i < indentlevel-1; i++){ + fputs(h5tools_str_fmt(&str, 0, info->line_indent), stream); + } + } + if (elmtno == 0 && secnum == 0 && info->line_1st) fputs(h5tools_str_fmt(&prefix, 0, info->line_1st), stream); else if (secnum && info->line_cont) @@ -457,7 +471,9 @@ h5tools_simple_prefix(FILE *stream, const h5dump_t *info, templength = h5tools_str_len(&prefix); for (i = 0; i < indentlevel; i++){ - fputs(h5tools_str_fmt(&prefix, 0, info->line_indent), stream); + /*we already made the indent for the array indices case */ + if (!info->pindex) + fputs(h5tools_str_fmt(&prefix, 0, info->line_indent), stream); templength += h5tools_str_len(&prefix); } @@ -467,6 +483,7 @@ h5tools_simple_prefix(FILE *stream, const h5dump_t *info, /* Free string */ h5tools_str_close(&prefix); + h5tools_str_close(&str); } /*------------------------------------------------------------------------- diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c index 056838e..3350f51 100644 --- a/tools/lib/h5tools_str.c +++ b/tools/lib/h5tools_str.c @@ -927,9 +927,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5dump_t *info, hid_t container, /*need to indent some more here*/ if (ctx->indent_level >= 0 ) { - if (info->pindex) - h5tools_str_append(str, "%s", " "); - else + if (!info->pindex) h5tools_str_append(str, "%s", OPT(info->line_pre, "")); } diff --git a/tools/testfiles/tall-1.ddl b/tools/testfiles/tall-1.ddl index d58ddf1..492ca0a 100644 --- a/tools/testfiles/tall-1.ddl +++ b/tools/testfiles/tall-1.ddl @@ -7,15 +7,15 @@ GROUP "/" { DATATYPE H5T_STD_I8BE DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { - 97, 98, 99, 100, 101, 102, 103, 104, 105, 0 + (0): 97, 98, 99, 100, 101, 102, 103, 104, 105, 0 } } ATTRIBUTE "attr2" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 2, 2 ) / ( 2, 2 ) } DATA { - 0, 1, - 2, 3 + (0,0): 0, 1, + (1,0): 2, 3 } } GROUP "g1" { @@ -24,33 +24,33 @@ GROUP "/" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 10, 10 ) / ( 10, 10 ) } DATA { - (0,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - (1,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - (2,0): 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, - (3,0): 0, 3, 6, 9, 12, 15, 18, 21, 24, 27, - (4,0): 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, - (5,0): 0, 5, 10, 15, 20, 25, 30, 35, 40, 45, - (6,0): 0, 6, 12, 18, 24, 30, 36, 42, 48, 54, - (7,0): 0, 7, 14, 21, 28, 35, 42, 49, 56, 63, - (8,0): 0, 8, 16, 24, 32, 40, 48, 56, 64, 72, - (9,0): 0, 9, 18, 27, 36, 45, 54, 63, 72, 81 + (0,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + (1,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + (2,0): 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, + (3,0): 0, 3, 6, 9, 12, 15, 18, 21, 24, 27, + (4,0): 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, + (5,0): 0, 5, 10, 15, 20, 25, 30, 35, 40, 45, + (6,0): 0, 6, 12, 18, 24, 30, 36, 42, 48, 54, + (7,0): 0, 7, 14, 21, 28, 35, 42, 49, 56, 63, + (8,0): 0, 8, 16, 24, 32, 40, 48, 56, 64, 72, + (9,0): 0, 9, 18, 27, 36, 45, 54, 63, 72, 81 } ATTRIBUTE "attr1" { DATATYPE H5T_STD_I8BE DATASPACE SIMPLE { ( 27 ) / ( 27 ) } DATA { - (0): 49, 115, 116, 32, 97, 116, 116, 114, 105, 98, - (10): 117, 116, 101, 32, 111, 102, 32, 100, 115, 101, - (20): 116, 49, 46, 49, 46, 49, 0 + (0): 49, 115, 116, 32, 97, 116, 116, 114, 105, 98, + (10): 117, 116, 101, 32, 111, 102, 32, 100, + (18): 115, 101, 116, 49, 46, 49, 46, 49, 0 } } ATTRIBUTE "attr2" { DATATYPE H5T_STD_I8BE DATASPACE SIMPLE { ( 27 ) / ( 27 ) } DATA { - (0): 50, 110, 100, 32, 97, 116, 116, 114, 105, 98, - (10): 117, 116, 101, 32, 111, 102, 32, 100, 115, 101, - (20): 116, 49, 46, 49, 46, 49, 0 + (0): 50, 110, 100, 32, 97, 116, 116, 114, 105, 98, + (10): 117, 116, 101, 32, 111, 102, 32, 100, + (18): 115, 101, 116, 49, 46, 49, 46, 49, 0 } } } @@ -58,8 +58,8 @@ GROUP "/" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 20 ) / ( 20 ) } DATA { - (0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - (19): 19 + (0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + (15): 15, 16, 17, 18, 19 } } } @@ -76,16 +76,16 @@ GROUP "/" { DATATYPE H5T_IEEE_F32BE DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { - (0): 1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9 + (0): 1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9 } } DATASET "dset2.2" { DATATYPE H5T_IEEE_F32BE DATASPACE SIMPLE { ( 3, 5 ) / ( 3, 5 ) } DATA { - (0,0): 0, 0.1, 0.2, 0.3, 0.4, - (1,0): 0, 0.2, 0.4, 0.6, 0.8, - (2,0): 0, 0.3, 0.6, 0.9, 1.2 + (0,0): 0, 0.1, 0.2, 0.3, 0.4, + (1,0): 0, 0.2, 0.4, 0.6, 0.8, + (2,0): 0, 0.3, 0.6, 0.9, 1.2 } } } diff --git a/tools/testfiles/tall-2A.ddl b/tools/testfiles/tall-2A.ddl index 778b8af..e60b5ac 100644 --- a/tools/testfiles/tall-2A.ddl +++ b/tools/testfiles/tall-2A.ddl @@ -7,15 +7,15 @@ GROUP "/" { DATATYPE H5T_STD_I8BE DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { - 97, 98, 99, 100, 101, 102, 103, 104, 105, 0 + (0): 97, 98, 99, 100, 101, 102, 103, 104, 105, 0 } } ATTRIBUTE "attr2" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 2, 2 ) / ( 2, 2 ) } DATA { - 0, 1, - 2, 3 + (0,0): 0, 1, + (1,0): 2, 3 } } GROUP "g1" { @@ -27,16 +27,18 @@ GROUP "/" { DATATYPE H5T_STD_I8BE DATASPACE SIMPLE { ( 27 ) / ( 27 ) } DATA { - 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 + (0): 49, 115, 116, 32, 97, 116, 116, 114, 105, 98, + (10): 117, 116, 101, 32, 111, 102, 32, 100, + (18): 115, 101, 116, 49, 46, 49, 46, 49, 0 } } ATTRIBUTE "attr2" { DATATYPE H5T_STD_I8BE DATASPACE SIMPLE { ( 27 ) / ( 27 ) } DATA { - 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 + (0): 50, 110, 100, 32, 97, 116, 116, 114, 105, 98, + (10): 117, 116, 101, 32, 111, 102, 32, 100, + (18): 115, 101, 116, 49, 46, 49, 46, 49, 0 } } } diff --git a/tools/testfiles/tall-3.ddl b/tools/testfiles/tall-3.ddl index 862826c..7d8e432 100644 --- a/tools/testfiles/tall-3.ddl +++ b/tools/testfiles/tall-3.ddl @@ -6,7 +6,7 @@ DATASET "/g2/dset2.1" { DATATYPE H5T_IEEE_F32BE DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { - (0): 1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9 + (0): 1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9 } } SOFTLINK "/g1/g1.2/g1.2.1/slink" { diff --git a/tools/testfiles/tall-4s.ddl b/tools/testfiles/tall-4s.ddl index 1b3f82e..fad052f 100644 --- a/tools/testfiles/tall-4s.ddl +++ b/tools/testfiles/tall-4s.ddl @@ -11,25 +11,25 @@ DATASET "/g1/g1.1/dset1.1.1" { COUNT ( 3, 2 ); BLOCK ( 1, 1 ); DATA { - (0,0): 1, 3, 5, 4, 12, 20 + (0,0): 1, 3, 5, 4, 12, 20 } } ATTRIBUTE "attr1" { DATATYPE H5T_STD_I8BE DATASPACE SIMPLE { ( 27 ) / ( 27 ) } DATA { - (0): 49, 115, 116, 32, 97, 116, 116, 114, 105, 98, 117, 116, - (12): 101, 32, 111, 102, 32, 100, 115, 101, 116, 49, 46, 49, - (24): 46, 49, 0 + (0): 49, 115, 116, 32, 97, 116, 116, 114, 105, 98, 117, 116, 101, + (13): 32, 111, 102, 32, 100, 115, 101, 116, 49, 46, 49, 46, + (25): 49, 0 } } ATTRIBUTE "attr2" { DATATYPE H5T_STD_I8BE DATASPACE SIMPLE { ( 27 ) / ( 27 ) } DATA { - (0): 50, 110, 100, 32, 97, 116, 116, 114, 105, 98, 117, 116, - (12): 101, 32, 111, 102, 32, 100, 115, 101, 116, 49, 46, 49, - (24): 46, 49, 0 + (0): 50, 110, 100, 32, 97, 116, 116, 114, 105, 98, 117, 116, 101, + (13): 32, 111, 102, 32, 100, 115, 101, 116, 49, 46, 49, 46, + (25): 49, 0 } } } diff --git a/tools/testfiles/tall-5s.ddl b/tools/testfiles/tall-5s.ddl index 4b1fb8a..95e4d63 100644 --- a/tools/testfiles/tall-5s.ddl +++ b/tools/testfiles/tall-5s.ddl @@ -11,7 +11,7 @@ DATASET "/g1/g1.1/dset1.1.2" { COUNT ( 10 ); BLOCK ( 1 ); DATA { - (0): 0, 2, 4, 6, 8, 10, 12, 14, 16, 18 + (0): 0, 2, 4, 6, 8, 10, 12, 14, 16, 18 } } } diff --git a/tools/testfiles/tarray1.ddl b/tools/testfiles/tarray1.ddl index 150d2ab..849bc67 100644 --- a/tools/testfiles/tarray1.ddl +++ b/tools/testfiles/tarray1.ddl @@ -7,8 +7,8 @@ GROUP "/" { DATATYPE H5T_ARRAY { [4] H5T_STD_I32LE } DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { - (0): [ 0, 1, 2, 3 ], [ 10, 11, 12, 13 ], [ 20, 21, 22, 23 ], - (3): [ 30, 31, 32, 33 ] + (0): [ 0, 1, 2, 3 ], [ 10, 11, 12, 13 ], [ 20, 21, 22, 23 ], + (3): [ 30, 31, 32, 33 ] } } } diff --git a/tools/testfiles/tarray2.ddl b/tools/testfiles/tarray2.ddl index af56d9f..df1e0b8 100644 --- a/tools/testfiles/tarray2.ddl +++ b/tools/testfiles/tarray2.ddl @@ -7,54 +7,54 @@ GROUP "/" { DATATYPE H5T_ARRAY { [3][4][5] H5T_STD_I32LE } DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { - (0): [ 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 ], - (1): [ 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 ], - (2): [ 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 ], - (3): [ 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): [ 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 ], + (1): [ 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 ], + (2): [ 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 ], + (3): [ 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 ] } } } diff --git a/tools/testfiles/tarray3.ddl b/tools/testfiles/tarray3.ddl index f89b500..17ceba6 100644 --- a/tools/testfiles/tarray3.ddl +++ b/tools/testfiles/tarray3.ddl @@ -7,90 +7,90 @@ GROUP "/" { DATATYPE H5T_ARRAY { [4] H5T_ARRAY { [6][3] H5T_STD_I32LE } } DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { - (0): [ [ 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 ] ], - (1): [ [ 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 ] ], - (2): [ [ 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 ] ], - (3): [ [ 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): [ [ 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 ] ], + (1): [ [ 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 ] ], + (2): [ [ 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 ] ], + (3): [ [ 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 ] ] } } } diff --git a/tools/testfiles/tarray4.ddl b/tools/testfiles/tarray4.ddl index 403d9b1..ebc265f 100644 --- a/tools/testfiles/tarray4.ddl +++ b/tools/testfiles/tarray4.ddl @@ -10,7 +10,7 @@ GROUP "/" { } } DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { - (0): [ { + (0): [ { 0, 0 }, { @@ -23,7 +23,7 @@ GROUP "/" { 3, 3 } ], - (1): [ { + (1): [ { 10, 2.5 }, { @@ -36,7 +36,7 @@ GROUP "/" { 13, 5.5 } ], - (2): [ { + (2): [ { 20, 5 }, { @@ -49,7 +49,7 @@ GROUP "/" { 23, 8 } ], - (3): [ { + (3): [ { 30, 7.5 }, { diff --git a/tools/testfiles/tarray5.ddl b/tools/testfiles/tarray5.ddl index 464ba4c..49eda3e 100644 --- a/tools/testfiles/tarray5.ddl +++ b/tools/testfiles/tarray5.ddl @@ -10,7 +10,7 @@ GROUP "/" { } } DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { - (0): [ { + (0): [ { 0, [ 0, 1, 2, 3 ] }, { @@ -23,7 +23,7 @@ GROUP "/" { 3, [ 7.5, 8.5, 9.5, 10.5 ] } ], - (1): [ { + (1): [ { 10, [ 10, 11, 12, 13 ] }, { @@ -36,7 +36,7 @@ GROUP "/" { 13, [ 17.5, 18.5, 19.5, 20.5 ] } ], - (2): [ { + (2): [ { 20, [ 20, 21, 22, 23 ] }, { @@ -49,7 +49,7 @@ GROUP "/" { 23, [ 27.5, 28.5, 29.5, 30.5 ] } ], - (3): [ { + (3): [ { 30, [ 30, 31, 32, 33 ] }, { diff --git a/tools/testfiles/tarray6.ddl b/tools/testfiles/tarray6.ddl index de0c4c5..b2f95ab 100644 --- a/tools/testfiles/tarray6.ddl +++ b/tools/testfiles/tarray6.ddl @@ -7,10 +7,10 @@ GROUP "/" { DATATYPE H5T_ARRAY { [4] H5T_VLEN { H5T_STD_U32LE} } DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { - (0): [ (0), (10, 11), (20, 21, 22), (30, 31, 32, 33) ], - (1): [ (100, 101), (110, 111, 112), (120, 121, 122, 123), (130, 131, 132, 133, 134) ], - (2): [ (200, 201, 202), (210, 211, 212, 213), (220, 221, 222, 223, 224), (230, 231, 232, 233, 234, 235) ], - (3): [ (300, 301, 302, 303), (310, 311, 312, 313, 314), (320, 321, 322, 323, 324, 325), (330, 331, 332, 333, 334, 335, 336) ] + (0): [ (0), (10, 11), (20, 21, 22), (30, 31, 32, 33) ], + (1): [ (100, 101), (110, 111, 112), (120, 121, 122, 123), (130, 131, 132, 133, 134) ], + (2): [ (200, 201, 202), (210, 211, 212, 213), (220, 221, 222, 223, 224), (230, 231, 232, 233, 234, 235) ], + (3): [ (300, 301, 302, 303), (310, 311, 312, 313, 314), (320, 321, 322, 323, 324, 325), (330, 331, 332, 333, 334, 335, 336) ] } } } diff --git a/tools/testfiles/tarray7.ddl b/tools/testfiles/tarray7.ddl index b9eeac0..a205875 100644 --- a/tools/testfiles/tarray7.ddl +++ b/tools/testfiles/tarray7.ddl @@ -7,10 +7,10 @@ GROUP "/" { 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/tattr-1.ddl b/tools/testfiles/tattr-1.ddl index b5b8afe..fa78894 100644 --- a/tools/testfiles/tattr-1.ddl +++ b/tools/testfiles/tattr-1.ddl @@ -7,29 +7,29 @@ GROUP "/" { DATATYPE H5T_STD_I8BE DATASPACE SIMPLE { ( 24 ) / ( 24 ) } DATA { - 97, 116, 116, 114, 105, 98, 117, 116, 101, 32, 111, 102, 32, 114, 111, - 111, 116, 32, 103, 114, 111, 117, 112, 0 + (0): 97, 116, 116, 114, 105, 98, 117, 116, 101, 32, 111, 102, 32, + (13): 114, 111, 111, 116, 32, 103, 114, 111, 117, 112, 0 } } ATTRIBUTE "attr2" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { - 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 + (0): 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 } } ATTRIBUTE "attr3" { DATATYPE H5T_IEEE_F64BE DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { - 0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9 + (0): 0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9 } } ATTRIBUTE "attr4" { DATATYPE H5T_STD_I32BE DATASPACE SCALAR DATA { - 100 + (0): 100 } } ATTRIBUTE "attr5" { @@ -41,7 +41,7 @@ GROUP "/" { } DATASPACE SCALAR DATA { - "string attribute" + (0): "string attribute" } } } diff --git a/tools/testfiles/tchar1.ddl b/tools/testfiles/tchar1.ddl index 94c017d..5fe8e6f 100644 --- a/tools/testfiles/tchar1.ddl +++ b/tools/testfiles/tchar1.ddl @@ -7,11 +7,14 @@ GROUP "/" { DATATYPE H5T_STD_I8LE DATASPACE SIMPLE { ( 308 ) / ( 308 ) } DATA { - (0): Four score and seven years ago our forefathers brought forth on th" - (66): is continent a new nation, conceived in liberty and dedicated to " - (131): the proposition that all men are created equal. Now we are engag" - (195): ed in a great civil war, testing whether that nation or any nati" - (259): on so conceived and so dedicated can long endure." + "Four score and seven years ago our fore" + "fathers brought forth on this continent" + " a new nation, conceived in liberty and" + " dedicated to the proposition that all " + "men are created equal. Now we are engag" + "ed in a great civil war, testing whethe" + "r that nation or any nation so conceive" + "d and so dedicated can long endure." } } } diff --git a/tools/testfiles/tcomp-1.ddl b/tools/testfiles/tcomp-1.ddl index 30b1b42..0c24dc9 100644 --- a/tools/testfiles/tcomp-1.ddl +++ b/tools/testfiles/tcomp-1.ddl @@ -15,27 +15,27 @@ GROUP "/" { } DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { - (0): { + (0): { 0, 0, 1 }, - (1): { + (1): { 1, 1, 0.5 }, - (2): { + (2): { 2, 4, 0.333333 }, - (3): { + (3): { 3, 9, 0.25 }, - (4): { + (4): { 4, 16, 0.2 @@ -47,202 +47,202 @@ GROUP "/" { DATATYPE "/type1" DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { - (0): { - 0, - 0 - }, - (1): { - 1, - 1.1 - }, - (2): { - 2, - 2.2 - }, - (3): { - 3, - 3.3 - }, - (4): { - 4, - 4.4 - } + (0): { + 0, + 0 + }, + (1): { + 1, + 1.1 + }, + (2): { + 2, + 2.2 + }, + (3): { + 3, + 3.3 + }, + (4): { + 4, + 4.4 + } } } DATASET "dset3" { DATATYPE "/type2" DATASPACE SIMPLE { ( 3, 6 ) / ( 3, 6 ) } DATA { - (0,0): { - [ 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 ] - }, - (0,1): { - [ 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 ] - }, - (0,2): { - [ 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 ] - }, - (0,3): { - [ 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 ] - }, - (0,4): { - [ 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 ] - }, - (0,5): { - [ 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,0): { - [ 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 ] - }, - (1,1): { - [ 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 ] - }, - (1,2): { - [ 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 ] - }, - (1,3): { - [ 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 ] - }, - (1,4): { - [ 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,5): { - [ 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,0): { - [ 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 ] - }, - (2,1): { - [ 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 ] - }, - (2,2): { - [ 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 ] - }, - (2,3): { - [ 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 ] - }, - (2,4): { - [ 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,5): { - [ 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,0): { + [ 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 ] + }, + (0,1): { + [ 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 ] + }, + (0,2): { + [ 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 ] + }, + (0,3): { + [ 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 ] + }, + (0,4): { + [ 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 ] + }, + (0,5): { + [ 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,0): { + [ 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 ] + }, + (1,1): { + [ 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 ] + }, + (1,2): { + [ 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 ] + }, + (1,3): { + [ 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 ] + }, + (1,4): { + [ 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,5): { + [ 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,0): { + [ 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 ] + }, + (2,1): { + [ 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 ] + }, + (2,2): { + [ 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 ] + }, + (2,3): { + [ 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 ] + }, + (2,4): { + [ 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,5): { + [ 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 ] + } } } DATASET "dset4" { DATATYPE "/group1/type3" DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { - (0): { - 0, - 3 - }, - (1): { - 1, - 4 - }, - (2): { - 2, - 5 - }, - (3): { - 3, - 6 - }, - (4): { - 4, - 7 - } + (0): { + 0, + 3 + }, + (1): { + 1, + 4 + }, + (2): { + 2, + 5 + }, + (3): { + 3, + 6 + }, + (4): { + 4, + 7 + } } } DATATYPE "type3" H5T_COMPOUND { @@ -255,26 +255,26 @@ GROUP "/" { DATATYPE "/#6632" DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { - (0): { - 0, - 0 - }, - (1): { - 1, - 0.1 - }, - (2): { - 2, - 0.2 - }, - (3): { - 3, - 0.3 - }, - (4): { - 4, - 0.4 - } + (0): { + 0, + 0 + }, + (1): { + 1, + 0.1 + }, + (2): { + 2, + 0.2 + }, + (3): { + 3, + 0.3 + }, + (4): { + 4, + 0.4 + } } } } diff --git a/tools/testfiles/tcomp-3.ddl b/tools/testfiles/tcomp-3.ddl index 9658d41..251bd52 100644 --- a/tools/testfiles/tcomp-3.ddl +++ b/tools/testfiles/tcomp-3.ddl @@ -9,23 +9,23 @@ GROUP "/group2" { DATATYPE "/#6632" DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { - (0): { + (0): { 0, 0 }, - (1): { + (1): { 1, 0.1 }, - (2): { + (2): { 2, 0.2 }, - (3): { + (3): { 3, 0.3 }, - (4): { + (4): { 4, 0.4 } diff --git a/tools/testfiles/tcomp-4.ddl b/tools/testfiles/tcomp-4.ddl index 9bb092a..32212f0 100644 --- a/tools/testfiles/tcomp-4.ddl +++ b/tools/testfiles/tcomp-4.ddl @@ -25,80 +25,80 @@ GROUP "/" { } DATASPACE SIMPLE { ( 6 ) / ( 6 ) } DATA { - (0): { + (0): { 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 ], + 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): { + (1): { 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 ], + 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): { + (2): { 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 ], + 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): { + (3): { 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 ], + 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): { + (4): { 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 ], + 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): { + (5): { 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 ], + 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 diff --git a/tools/testfiles/tdset-1.ddl b/tools/testfiles/tdset-1.ddl index 89a1907..096aff4 100644 --- a/tools/testfiles/tdset-1.ddl +++ b/tools/testfiles/tdset-1.ddl @@ -7,122 +7,152 @@ GROUP "/" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 10, 20 ) / ( 10, 20 ) } DATA { - (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - (0,19): 19, - (1,0): 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - (1,18): 19, 20, - (2,0): 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - (2,18): 20, 21, - (3,0): 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - (3,18): 21, 22, - (4,0): 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - (4,18): 22, 23, - (5,0): 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - (5,17): 22, 23, 24, - (6,0): 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, - (6,17): 23, 24, 25, - (7,0): 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, - (7,17): 24, 25, 26, - (8,0): 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - (8,17): 25, 26, 27, - (9,0): 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - (9,16): 25, 26, 27, 28 + (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + (0,15): 15, 16, 17, 18, 19, + (1,0): 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + (1,15): 16, 17, 18, 19, 20, + (2,0): 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + (2,15): 17, 18, 19, 20, 21, + (3,0): 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + (3,15): 18, 19, 20, 21, 22, + (4,0): 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + (4,14): 18, 19, 20, 21, 22, 23, + (5,0): 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + (5,14): 19, 20, 21, 22, 23, 24, + (6,0): 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + (6,14): 20, 21, 22, 23, 24, 25, + (7,0): 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + (7,14): 21, 22, 23, 24, 25, 26, + (8,0): 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + (8,13): 21, 22, 23, 24, 25, 26, 27, + (9,0): 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + (9,13): 22, 23, 24, 25, 26, 27, 28 } } DATASET "dset2" { DATATYPE H5T_IEEE_F64BE DATASPACE SIMPLE { ( 30, 20 ) / ( 30, 20 ) } DATA { - (0,0): 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, - (0,8): 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, - (0,16): 0.0016, 0.0017, 0.0018, 0.0019, - (1,0): 1, 1.0001, 1.0002, 1.0003, 1.0004, 1.0005, 1.0006, 1.0007, - (1,8): 1.0008, 1.0009, 1.001, 1.0011, 1.0012, 1.0013, 1.0014, 1.0015, - (1,16): 1.0016, 1.0017, 1.0018, 1.0019, - (2,0): 2, 2.0001, 2.0002, 2.0003, 2.0004, 2.0005, 2.0006, 2.0007, - (2,8): 2.0008, 2.0009, 2.001, 2.0011, 2.0012, 2.0013, 2.0014, 2.0015, - (2,16): 2.0016, 2.0017, 2.0018, 2.0019, - (3,0): 3, 3.0001, 3.0002, 3.0003, 3.0004, 3.0005, 3.0006, 3.0007, - (3,8): 3.0008, 3.0009, 3.001, 3.0011, 3.0012, 3.0013, 3.0014, 3.0015, - (3,16): 3.0016, 3.0017, 3.0018, 3.0019, - (4,0): 4, 4.0001, 4.0002, 4.0003, 4.0004, 4.0005, 4.0006, 4.0007, - (4,8): 4.0008, 4.0009, 4.001, 4.0011, 4.0012, 4.0013, 4.0014, 4.0015, - (4,16): 4.0016, 4.0017, 4.0018, 4.0019, - (5,0): 5, 5.0001, 5.0002, 5.0003, 5.0004, 5.0005, 5.0006, 5.0007, - (5,8): 5.0008, 5.0009, 5.001, 5.0011, 5.0012, 5.0013, 5.0014, 5.0015, - (5,16): 5.0016, 5.0017, 5.0018, 5.0019, - (6,0): 6, 6.0001, 6.0002, 6.0003, 6.0004, 6.0005, 6.0006, 6.0007, - (6,8): 6.0008, 6.0009, 6.001, 6.0011, 6.0012, 6.0013, 6.0014, 6.0015, - (6,16): 6.0016, 6.0017, 6.0018, 6.0019, - (7,0): 7, 7.0001, 7.0002, 7.0003, 7.0004, 7.0005, 7.0006, 7.0007, - (7,8): 7.0008, 7.0009, 7.001, 7.0011, 7.0012, 7.0013, 7.0014, 7.0015, - (7,16): 7.0016, 7.0017, 7.0018, 7.0019, - (8,0): 8, 8.0001, 8.0002, 8.0003, 8.0004, 8.0005, 8.0006, 8.0007, - (8,8): 8.0008, 8.0009, 8.001, 8.0011, 8.0012, 8.0013, 8.0014, 8.0015, - (8,16): 8.0016, 8.0017, 8.0018, 8.0019, - (9,0): 9, 9.0001, 9.0002, 9.0003, 9.0004, 9.0005, 9.0006, 9.0007, - (9,8): 9.0008, 9.0009, 9.001, 9.0011, 9.0012, 9.0013, 9.0014, 9.0015, - (9,16): 9.0016, 9.0017, 9.0018, 9.0019, - (10,0): 10, 10.0001, 10.0002, 10.0003, 10.0004, 10.0005, 10.0006, - (10,7): 10.0007, 10.0008, 10.0009, 10.001, 10.0011, 10.0012, 10.0013, - (10,14): 10.0014, 10.0015, 10.0016, 10.0017, 10.0018, 10.0019, - (11,0): 11, 11.0001, 11.0002, 11.0003, 11.0004, 11.0005, 11.0006, - (11,7): 11.0007, 11.0008, 11.0009, 11.001, 11.0011, 11.0012, 11.0013, - (11,14): 11.0014, 11.0015, 11.0016, 11.0017, 11.0018, 11.0019, - (12,0): 12, 12.0001, 12.0002, 12.0003, 12.0004, 12.0005, 12.0006, - (12,7): 12.0007, 12.0008, 12.0009, 12.001, 12.0011, 12.0012, 12.0013, - (12,14): 12.0014, 12.0015, 12.0016, 12.0017, 12.0018, 12.0019, - (13,0): 13, 13.0001, 13.0002, 13.0003, 13.0004, 13.0005, 13.0006, - (13,7): 13.0007, 13.0008, 13.0009, 13.001, 13.0011, 13.0012, 13.0013, - (13,14): 13.0014, 13.0015, 13.0016, 13.0017, 13.0018, 13.0019, - (14,0): 14, 14.0001, 14.0002, 14.0003, 14.0004, 14.0005, 14.0006, - (14,7): 14.0007, 14.0008, 14.0009, 14.001, 14.0011, 14.0012, 14.0013, - (14,14): 14.0014, 14.0015, 14.0016, 14.0017, 14.0018, 14.0019, - (15,0): 15, 15.0001, 15.0002, 15.0003, 15.0004, 15.0005, 15.0006, - (15,7): 15.0007, 15.0008, 15.0009, 15.001, 15.0011, 15.0012, 15.0013, - (15,14): 15.0014, 15.0015, 15.0016, 15.0017, 15.0018, 15.0019, - (16,0): 16, 16.0001, 16.0002, 16.0003, 16.0004, 16.0005, 16.0006, - (16,7): 16.0007, 16.0008, 16.0009, 16.001, 16.0011, 16.0012, 16.0013, - (16,14): 16.0014, 16.0015, 16.0016, 16.0017, 16.0018, 16.0019, - (17,0): 17, 17.0001, 17.0002, 17.0003, 17.0004, 17.0005, 17.0006, - (17,7): 17.0007, 17.0008, 17.0009, 17.001, 17.0011, 17.0012, 17.0013, - (17,14): 17.0014, 17.0015, 17.0016, 17.0017, 17.0018, 17.0019, - (18,0): 18, 18.0001, 18.0002, 18.0003, 18.0004, 18.0005, 18.0006, - (18,7): 18.0007, 18.0008, 18.0009, 18.001, 18.0011, 18.0012, 18.0013, - (18,14): 18.0014, 18.0015, 18.0016, 18.0017, 18.0018, 18.0019, - (19,0): 19, 19.0001, 19.0002, 19.0003, 19.0004, 19.0005, 19.0006, - (19,7): 19.0007, 19.0008, 19.0009, 19.001, 19.0011, 19.0012, 19.0013, - (19,14): 19.0014, 19.0015, 19.0016, 19.0017, 19.0018, 19.0019, - (20,0): 20, 20.0001, 20.0002, 20.0003, 20.0004, 20.0005, 20.0006, - (20,7): 20.0007, 20.0008, 20.0009, 20.001, 20.0011, 20.0012, 20.0013, - (20,14): 20.0014, 20.0015, 20.0016, 20.0017, 20.0018, 20.0019, - (21,0): 21, 21.0001, 21.0002, 21.0003, 21.0004, 21.0005, 21.0006, - (21,7): 21.0007, 21.0008, 21.0009, 21.001, 21.0011, 21.0012, 21.0013, - (21,14): 21.0014, 21.0015, 21.0016, 21.0017, 21.0018, 21.0019, - (22,0): 22, 22.0001, 22.0002, 22.0003, 22.0004, 22.0005, 22.0006, - (22,7): 22.0007, 22.0008, 22.0009, 22.001, 22.0011, 22.0012, 22.0013, - (22,14): 22.0014, 22.0015, 22.0016, 22.0017, 22.0018, 22.0019, - (23,0): 23, 23.0001, 23.0002, 23.0003, 23.0004, 23.0005, 23.0006, - (23,7): 23.0007, 23.0008, 23.0009, 23.001, 23.0011, 23.0012, 23.0013, - (23,14): 23.0014, 23.0015, 23.0016, 23.0017, 23.0018, 23.0019, - (24,0): 24, 24.0001, 24.0002, 24.0003, 24.0004, 24.0005, 24.0006, - (24,7): 24.0007, 24.0008, 24.0009, 24.001, 24.0011, 24.0012, 24.0013, - (24,14): 24.0014, 24.0015, 24.0016, 24.0017, 24.0018, 24.0019, - (25,0): 25, 25.0001, 25.0002, 25.0003, 25.0004, 25.0005, 25.0006, - (25,7): 25.0007, 25.0008, 25.0009, 25.001, 25.0011, 25.0012, 25.0013, - (25,14): 25.0014, 25.0015, 25.0016, 25.0017, 25.0018, 25.0019, - (26,0): 26, 26.0001, 26.0002, 26.0003, 26.0004, 26.0005, 26.0006, - (26,7): 26.0007, 26.0008, 26.0009, 26.001, 26.0011, 26.0012, 26.0013, - (26,14): 26.0014, 26.0015, 26.0016, 26.0017, 26.0018, 26.0019, - (27,0): 27, 27.0001, 27.0002, 27.0003, 27.0004, 27.0005, 27.0006, - (27,7): 27.0007, 27.0008, 27.0009, 27.001, 27.0011, 27.0012, 27.0013, - (27,14): 27.0014, 27.0015, 27.0016, 27.0017, 27.0018, 27.0019, - (28,0): 28, 28.0001, 28.0002, 28.0003, 28.0004, 28.0005, 28.0006, - (28,7): 28.0007, 28.0008, 28.0009, 28.001, 28.0011, 28.0012, 28.0013, - (28,14): 28.0014, 28.0015, 28.0016, 28.0017, 28.0018, 28.0019, - (29,0): 29, 29.0001, 29.0002, 29.0003, 29.0004, 29.0005, 29.0006, - (29,7): 29.0007, 29.0008, 29.0009, 29.001, 29.0011, 29.0012, 29.0013, - (29,14): 29.0014, 29.0015, 29.0016, 29.0017, 29.0018, 29.0019 + (0,0): 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, + (0,7): 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, + (0,13): 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, 0.0018, + (0,19): 0.0019, + (1,0): 1, 1.0001, 1.0002, 1.0003, 1.0004, 1.0005, 1.0006, + (1,7): 1.0007, 1.0008, 1.0009, 1.001, 1.0011, 1.0012, + (1,13): 1.0013, 1.0014, 1.0015, 1.0016, 1.0017, 1.0018, + (1,19): 1.0019, + (2,0): 2, 2.0001, 2.0002, 2.0003, 2.0004, 2.0005, 2.0006, + (2,7): 2.0007, 2.0008, 2.0009, 2.001, 2.0011, 2.0012, + (2,13): 2.0013, 2.0014, 2.0015, 2.0016, 2.0017, 2.0018, + (2,19): 2.0019, + (3,0): 3, 3.0001, 3.0002, 3.0003, 3.0004, 3.0005, 3.0006, + (3,7): 3.0007, 3.0008, 3.0009, 3.001, 3.0011, 3.0012, + (3,13): 3.0013, 3.0014, 3.0015, 3.0016, 3.0017, 3.0018, + (3,19): 3.0019, + (4,0): 4, 4.0001, 4.0002, 4.0003, 4.0004, 4.0005, 4.0006, + (4,7): 4.0007, 4.0008, 4.0009, 4.001, 4.0011, 4.0012, + (4,13): 4.0013, 4.0014, 4.0015, 4.0016, 4.0017, 4.0018, + (4,19): 4.0019, + (5,0): 5, 5.0001, 5.0002, 5.0003, 5.0004, 5.0005, 5.0006, + (5,7): 5.0007, 5.0008, 5.0009, 5.001, 5.0011, 5.0012, + (5,13): 5.0013, 5.0014, 5.0015, 5.0016, 5.0017, 5.0018, + (5,19): 5.0019, + (6,0): 6, 6.0001, 6.0002, 6.0003, 6.0004, 6.0005, 6.0006, + (6,7): 6.0007, 6.0008, 6.0009, 6.001, 6.0011, 6.0012, + (6,13): 6.0013, 6.0014, 6.0015, 6.0016, 6.0017, 6.0018, + (6,19): 6.0019, + (7,0): 7, 7.0001, 7.0002, 7.0003, 7.0004, 7.0005, 7.0006, + (7,7): 7.0007, 7.0008, 7.0009, 7.001, 7.0011, 7.0012, + (7,13): 7.0013, 7.0014, 7.0015, 7.0016, 7.0017, 7.0018, + (7,19): 7.0019, + (8,0): 8, 8.0001, 8.0002, 8.0003, 8.0004, 8.0005, 8.0006, + (8,7): 8.0007, 8.0008, 8.0009, 8.001, 8.0011, 8.0012, + (8,13): 8.0013, 8.0014, 8.0015, 8.0016, 8.0017, 8.0018, + (8,19): 8.0019, + (9,0): 9, 9.0001, 9.0002, 9.0003, 9.0004, 9.0005, 9.0006, + (9,7): 9.0007, 9.0008, 9.0009, 9.001, 9.0011, 9.0012, + (9,13): 9.0013, 9.0014, 9.0015, 9.0016, 9.0017, 9.0018, + (9,19): 9.0019, + (10,0): 10, 10.0001, 10.0002, 10.0003, 10.0004, 10.0005, + (10,6): 10.0006, 10.0007, 10.0008, 10.0009, 10.001, + (10,11): 10.0011, 10.0012, 10.0013, 10.0014, 10.0015, + (10,16): 10.0016, 10.0017, 10.0018, 10.0019, + (11,0): 11, 11.0001, 11.0002, 11.0003, 11.0004, 11.0005, + (11,6): 11.0006, 11.0007, 11.0008, 11.0009, 11.001, + (11,11): 11.0011, 11.0012, 11.0013, 11.0014, 11.0015, + (11,16): 11.0016, 11.0017, 11.0018, 11.0019, + (12,0): 12, 12.0001, 12.0002, 12.0003, 12.0004, 12.0005, + (12,6): 12.0006, 12.0007, 12.0008, 12.0009, 12.001, + (12,11): 12.0011, 12.0012, 12.0013, 12.0014, 12.0015, + (12,16): 12.0016, 12.0017, 12.0018, 12.0019, + (13,0): 13, 13.0001, 13.0002, 13.0003, 13.0004, 13.0005, + (13,6): 13.0006, 13.0007, 13.0008, 13.0009, 13.001, + (13,11): 13.0011, 13.0012, 13.0013, 13.0014, 13.0015, + (13,16): 13.0016, 13.0017, 13.0018, 13.0019, + (14,0): 14, 14.0001, 14.0002, 14.0003, 14.0004, 14.0005, + (14,6): 14.0006, 14.0007, 14.0008, 14.0009, 14.001, + (14,11): 14.0011, 14.0012, 14.0013, 14.0014, 14.0015, + (14,16): 14.0016, 14.0017, 14.0018, 14.0019, + (15,0): 15, 15.0001, 15.0002, 15.0003, 15.0004, 15.0005, + (15,6): 15.0006, 15.0007, 15.0008, 15.0009, 15.001, + (15,11): 15.0011, 15.0012, 15.0013, 15.0014, 15.0015, + (15,16): 15.0016, 15.0017, 15.0018, 15.0019, + (16,0): 16, 16.0001, 16.0002, 16.0003, 16.0004, 16.0005, + (16,6): 16.0006, 16.0007, 16.0008, 16.0009, 16.001, + (16,11): 16.0011, 16.0012, 16.0013, 16.0014, 16.0015, + (16,16): 16.0016, 16.0017, 16.0018, 16.0019, + (17,0): 17, 17.0001, 17.0002, 17.0003, 17.0004, 17.0005, + (17,6): 17.0006, 17.0007, 17.0008, 17.0009, 17.001, + (17,11): 17.0011, 17.0012, 17.0013, 17.0014, 17.0015, + (17,16): 17.0016, 17.0017, 17.0018, 17.0019, + (18,0): 18, 18.0001, 18.0002, 18.0003, 18.0004, 18.0005, + (18,6): 18.0006, 18.0007, 18.0008, 18.0009, 18.001, + (18,11): 18.0011, 18.0012, 18.0013, 18.0014, 18.0015, + (18,16): 18.0016, 18.0017, 18.0018, 18.0019, + (19,0): 19, 19.0001, 19.0002, 19.0003, 19.0004, 19.0005, + (19,6): 19.0006, 19.0007, 19.0008, 19.0009, 19.001, + (19,11): 19.0011, 19.0012, 19.0013, 19.0014, 19.0015, + (19,16): 19.0016, 19.0017, 19.0018, 19.0019, + (20,0): 20, 20.0001, 20.0002, 20.0003, 20.0004, 20.0005, + (20,6): 20.0006, 20.0007, 20.0008, 20.0009, 20.001, + (20,11): 20.0011, 20.0012, 20.0013, 20.0014, 20.0015, + (20,16): 20.0016, 20.0017, 20.0018, 20.0019, + (21,0): 21, 21.0001, 21.0002, 21.0003, 21.0004, 21.0005, + (21,6): 21.0006, 21.0007, 21.0008, 21.0009, 21.001, + (21,11): 21.0011, 21.0012, 21.0013, 21.0014, 21.0015, + (21,16): 21.0016, 21.0017, 21.0018, 21.0019, + (22,0): 22, 22.0001, 22.0002, 22.0003, 22.0004, 22.0005, + (22,6): 22.0006, 22.0007, 22.0008, 22.0009, 22.001, + (22,11): 22.0011, 22.0012, 22.0013, 22.0014, 22.0015, + (22,16): 22.0016, 22.0017, 22.0018, 22.0019, + (23,0): 23, 23.0001, 23.0002, 23.0003, 23.0004, 23.0005, + (23,6): 23.0006, 23.0007, 23.0008, 23.0009, 23.001, + (23,11): 23.0011, 23.0012, 23.0013, 23.0014, 23.0015, + (23,16): 23.0016, 23.0017, 23.0018, 23.0019, + (24,0): 24, 24.0001, 24.0002, 24.0003, 24.0004, 24.0005, + (24,6): 24.0006, 24.0007, 24.0008, 24.0009, 24.001, + (24,11): 24.0011, 24.0012, 24.0013, 24.0014, 24.0015, + (24,16): 24.0016, 24.0017, 24.0018, 24.0019, + (25,0): 25, 25.0001, 25.0002, 25.0003, 25.0004, 25.0005, + (25,6): 25.0006, 25.0007, 25.0008, 25.0009, 25.001, + (25,11): 25.0011, 25.0012, 25.0013, 25.0014, 25.0015, + (25,16): 25.0016, 25.0017, 25.0018, 25.0019, + (26,0): 26, 26.0001, 26.0002, 26.0003, 26.0004, 26.0005, + (26,6): 26.0006, 26.0007, 26.0008, 26.0009, 26.001, + (26,11): 26.0011, 26.0012, 26.0013, 26.0014, 26.0015, + (26,16): 26.0016, 26.0017, 26.0018, 26.0019, + (27,0): 27, 27.0001, 27.0002, 27.0003, 27.0004, 27.0005, + (27,6): 27.0006, 27.0007, 27.0008, 27.0009, 27.001, + (27,11): 27.0011, 27.0012, 27.0013, 27.0014, 27.0015, + (27,16): 27.0016, 27.0017, 27.0018, 27.0019, + (28,0): 28, 28.0001, 28.0002, 28.0003, 28.0004, 28.0005, + (28,6): 28.0006, 28.0007, 28.0008, 28.0009, 28.001, + (28,11): 28.0011, 28.0012, 28.0013, 28.0014, 28.0015, + (28,16): 28.0016, 28.0017, 28.0018, 28.0019, + (29,0): 29, 29.0001, 29.0002, 29.0003, 29.0004, 29.0005, + (29,6): 29.0006, 29.0007, 29.0008, 29.0009, 29.001, + (29,11): 29.0011, 29.0012, 29.0013, 29.0014, 29.0015, + (29,16): 29.0016, 29.0017, 29.0018, 29.0019 } } } diff --git a/tools/testfiles/tdset-3s.ddl b/tools/testfiles/tdset-3s.ddl index 26f76d7..5bac33b 100644 --- a/tools/testfiles/tdset-3s.ddl +++ b/tools/testfiles/tdset-3s.ddl @@ -11,17 +11,19 @@ DATASET "/dset1" { COUNT ( 9, 19 ); BLOCK ( 1, 1 ); DATA { - (0,0): 2, 3, 4, 5, 6, 7, 8, 9, 10, 3, 4, 5, 6, 7, 8, 9, 10, 11, 4, 5, - (0,2): 6, 7, 8, 9, 10, 11, 12, 5, 6, 7, 8, 9, 10, 11, 12, 13, 6, 7, 8, - (0,3): 9, 10, 11, 12, 13, 14, 7, 8, 9, 10, 11, 12, 13, 14, 15, 8, 9, 10, - (0,3): 11, 12, 13, 14, 15, 16, 9, 10, 11, 12, 13, 14, 15, 16, 17, 10, - (0,1): 11, 12, 13, 14, 15, 16, 17, 18, 11, 12, 13, 14, 15, 16, 17, 18, - (0,8): 19, 12, 13, 14, 15, 16, 17, 18, 19, 20, 13, 14, 15, 16, 17, 18, - (0,6): 19, 20, 21, 14, 15, 16, 17, 18, 19, 20, 21, 22, 15, 16, 17, 18, - (0,4): 19, 20, 21, 22, 23, 16, 17, 18, 19, 20, 21, 22, 23, 24, 17, 18, - (0,2): 19, 20, 21, 22, 23, 24, 25, 18, 19, 20, 21, 22, 23, 24, 25, 26, - (0,0): 19, 20, 21, 22, 23, 24, 25, 26, 27, 20, 21, 22, 23, 24, 25, 26, - (0,7): 27, 28 + (0,0): 2, 3, 4, 5, 6, 7, 8, 9, 10, 3, 4, 5, 6, 7, 8, 9, 10, + (0,8): 11, 4, 5, 6, 7, 8, 9, 10, 11, 12, 5, 6, 7, 8, 9, 10, + (0,6): 11, 12, 13, 6, 7, 8, 9, 10, 11, 12, 13, 14, 7, 8, 9, + (0,3): 10, 11, 12, 13, 14, 15, 8, 9, 10, 11, 12, 13, 14, + (0,7): 15, 16, 9, 10, 11, 12, 13, 14, 15, 16, 17, 10, 11, + (0,2): 12, 13, 14, 15, 16, 17, 18, 11, 12, 13, 14, 15, 16, + (0,6): 17, 18, 19, 12, 13, 14, 15, 16, 17, 18, 19, 20, 13, + (0,1): 14, 15, 16, 17, 18, 19, 20, 21, 14, 15, 16, 17, 18, + (0,5): 19, 20, 21, 22, 15, 16, 17, 18, 19, 20, 21, 22, 23, + (0,0): 16, 17, 18, 19, 20, 21, 22, 23, 24, 17, 18, 19, 20, + (0,4): 21, 22, 23, 24, 25, 18, 19, 20, 21, 22, 23, 24, 25, + (0,8): 26, 19, 20, 21, 22, 23, 24, 25, 26, 27, 20, 21, 22, + (0,3): 23, 24, 25, 26, 27, 28 } } } diff --git a/tools/testfiles/tdset2-1s.ddl b/tools/testfiles/tdset2-1s.ddl index 2d2eae5..eaf8ba0 100644 --- a/tools/testfiles/tdset2-1s.ddl +++ b/tools/testfiles/tdset2-1s.ddl @@ -11,10 +11,10 @@ DATASET "/dset1" { COUNT ( 4, 4 ); BLOCK ( 1, 4 ); DATA { - (0,0): 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 2, 3, 4, 5, - (0,4): 2, 3, 4, 5, 2, 3, 4, 5, 2, 3, 4, 5, 4, 5, 6, 7, 4, 5, 6, 7, - (0,8): 4, 5, 6, 7, 4, 5, 6, 7, 6, 7, 8, 9, 6, 7, 8, 9, 6, 7, 8, 9, - (0,12): 6, 7, 8, 9 + (0,0): 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 2, + (0,1): 3, 4, 5, 2, 3, 4, 5, 2, 3, 4, 5, 2, 3, 4, 5, 4, 5, + (0,2): 6, 7, 4, 5, 6, 7, 4, 5, 6, 7, 4, 5, 6, 7, 6, 7, 8, + (0,3): 9, 6, 7, 8, 9, 6, 7, 8, 9, 6, 7, 8, 9 } } } diff --git a/tools/testfiles/tempty.ddl b/tools/testfiles/tempty.ddl index 8942388..24e3d7c 100644 --- a/tools/testfiles/tempty.ddl +++ b/tools/testfiles/tempty.ddl @@ -7,28 +7,29 @@ GROUP "/" { DATATYPE H5T_VLEN { H5T_STD_I32LE} DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { - (0): (), (), (), () + (0): (), (), (), () } } DATASET "Dataset2.0" { DATATYPE H5T_STD_I32LE DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { - (0): 0, 0, 0, 0 + (0): 0, 0, 0, 0 } } DATASET "Dataset3.0" { DATATYPE H5T_IEEE_F32LE DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { - (0): 0, 0, 0, 0 + (0): 0, 0, 0, 0 } } DATASET "Dataset4.0" { DATATYPE H5T_ARRAY { [4] H5T_STD_I32LE } DATASPACE SIMPLE { ( 4 ) / ( 4 ) } 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, 0 ], [ 0, 0, 0, 0 ], + (3): [ 0, 0, 0, 0 ] } } DATASET "Dataset5.0" { @@ -39,22 +40,22 @@ GROUP "/" { } DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { - (0): { + (0): { 0, 0, 0 }, - (1): { + (1): { 0, 0, 0 }, - (2): { + (2): { 0, 0, 0 }, - (3): { + (3): { 0, 0, 0 diff --git a/tools/testfiles/tfamily.ddl b/tools/testfiles/tfamily.ddl index dd5176c..23f5bf2 100644 --- a/tools/testfiles/tfamily.ddl +++ b/tools/testfiles/tfamily.ddl @@ -7,16 +7,22 @@ GROUP "/" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 10, 15 ) / ( 10, 15 ) } DATA { - (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - (1,0): 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - (2,0): 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - (3,0): 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - (4,0): 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - (5,0): 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - (6,0): 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - (7,0): 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - (8,0): 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, - (9,0): 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23 + (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + (1,0): 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + (2,0): 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + (3,0): 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + (4,0): 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + (4,14): 18, + (5,0): 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + (5,14): 19, + (6,0): 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + (6,14): 20, + (7,0): 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + (7,14): 21, + (8,0): 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + (8,13): 21, 22, + (9,0): 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + (9,13): 22, 23 } } } diff --git a/tools/testfiles/thlink-1.ddl b/tools/testfiles/thlink-1.ddl index f696403..fd9b0bd 100644 --- a/tools/testfiles/thlink-1.ddl +++ b/tools/testfiles/thlink-1.ddl @@ -7,7 +7,7 @@ GROUP "/" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { - (0): 0, 1, 2, 3, 4 + (0): 0, 1, 2, 3, 4 } } GROUP "g1" { diff --git a/tools/testfiles/thlink-2.ddl b/tools/testfiles/thlink-2.ddl index 12647b0..0ff0eec 100644 --- a/tools/testfiles/thlink-2.ddl +++ b/tools/testfiles/thlink-2.ddl @@ -6,7 +6,7 @@ DATASET "/g1/dset2" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { - (0): 0, 1, 2, 3, 4 + (0): 0, 1, 2, 3, 4 } } DATASET "/dset1" { diff --git a/tools/testfiles/thlink-3.ddl b/tools/testfiles/thlink-3.ddl index 3276572..a41dbc1 100644 --- a/tools/testfiles/thlink-3.ddl +++ b/tools/testfiles/thlink-3.ddl @@ -6,7 +6,7 @@ DATASET "/g1/g1.1/dset3" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { - (0): 0, 1, 2, 3, 4 + (0): 0, 1, 2, 3, 4 } } DATASET "/g1/dset2" { diff --git a/tools/testfiles/thlink-4.ddl b/tools/testfiles/thlink-4.ddl index 28212d9..00c2a3a 100644 --- a/tools/testfiles/thlink-4.ddl +++ b/tools/testfiles/thlink-4.ddl @@ -7,7 +7,7 @@ GROUP "/g1" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { - (0): 0, 1, 2, 3, 4 + (0): 0, 1, 2, 3, 4 } } GROUP "g1.1" { diff --git a/tools/testfiles/thlink-5.ddl b/tools/testfiles/thlink-5.ddl index 1f9c1d5..b5dd8ee 100644 --- a/tools/testfiles/thlink-5.ddl +++ b/tools/testfiles/thlink-5.ddl @@ -6,7 +6,7 @@ DATASET "/dset1" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { - (0): 0, 1, 2, 3, 4 + (0): 0, 1, 2, 3, 4 } } GROUP "/g2" { diff --git a/tools/testfiles/tindicesyes.ddl b/tools/testfiles/tindicesyes.ddl index 003d0d9..e785742 100644 --- a/tools/testfiles/tindicesyes.ddl +++ b/tools/testfiles/tindicesyes.ddl @@ -7,26 +7,26 @@ COMMENT "This is a dataset with compact storage" DATATYPE H5T_STD_I32LE DATASPACE SIMPLE { ( 20, 10 ) / ( 20, 10 ) } DATA { - (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - (1,0): 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - (2,0): 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - (3,0): 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, - (4,0): 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, - (5,0): 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, - (6,0): 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, - (7,0): 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - (8,0): 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, - (9,0): 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, - (10,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, - (11,0): 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, - (12,0): 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, - (13,0): 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, - (14,0): 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, - (15,0): 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, - (16,0): 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, - (17,0): 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, - (18,0): 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, - (19,0): 190, 191, 192, 193, 194, 195, 196, 197, 198, 199 + (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + (1,0): 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + (2,0): 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, + (3,0): 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, + (4,0): 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, + (5,0): 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, + (6,0): 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, + (7,0): 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, + (8,0): 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, + (9,0): 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, + (10,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, + (11,0): 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, + (12,0): 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, + (13,0): 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, + (14,0): 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, + (15,0): 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, + (16,0): 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, + (17,0): 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, + (18,0): 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, + (19,0): 190, 191, 192, 193, 194, 195, 196, 197, 198, 199 } } } diff --git a/tools/testfiles/tmulti.ddl b/tools/testfiles/tmulti.ddl index fa75e6e..6c5986e 100644 --- a/tools/testfiles/tmulti.ddl +++ b/tools/testfiles/tmulti.ddl @@ -7,16 +7,22 @@ GROUP "/" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 10, 15 ) / ( 10, 15 ) } DATA { - (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - (1,0): 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - (2,0): 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - (3,0): 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - (4,0): 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - (5,0): 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - (6,0): 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - (7,0): 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - (8,0): 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, - (9,0): 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23 + (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + (1,0): 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + (2,0): 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + (3,0): 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + (4,0): 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + (4,14): 18, + (5,0): 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + (5,14): 19, + (6,0): 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + (6,14): 20, + (7,0): 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + (7,14): 21, + (8,0): 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + (8,13): 21, 22, + (9,0): 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + (9,13): 22, 23 } } } diff --git a/tools/testfiles/tnamed_dtype_attr.ddl b/tools/testfiles/tnamed_dtype_attr.ddl index 71b9241..5512d38 100644 --- a/tools/testfiles/tnamed_dtype_attr.ddl +++ b/tools/testfiles/tnamed_dtype_attr.ddl @@ -10,7 +10,7 @@ GROUP "/" { DATATYPE "/Datatype" DATASPACE SCALAR DATA { - 8 + (0): 8 } } } diff --git a/tools/testfiles/tnestcomp-1.ddl b/tools/testfiles/tnestcomp-1.ddl index 15d55d9..e68e22d 100644 --- a/tools/testfiles/tnestcomp-1.ddl +++ b/tools/testfiles/tnestcomp-1.ddl @@ -20,7 +20,7 @@ GROUP "/" { } DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { - (0): { + (0): { 0, 0, 1, @@ -29,7 +29,7 @@ GROUP "/" { [ -100, 100 ] } }, - (1): { + (1): { 1, 1, 0.5, @@ -38,7 +38,7 @@ GROUP "/" { [ -100, 100 ] } }, - (2): { + (2): { 2, 4, 0.333333, @@ -47,7 +47,7 @@ GROUP "/" { [ -100, 100 ] } }, - (3): { + (3): { 3, 9, 0.25, @@ -56,7 +56,7 @@ GROUP "/" { [ -100, 100 ] } }, - (4): { + (4): { 4, 16, 0.2, @@ -65,7 +65,7 @@ GROUP "/" { [ -100, 100 ] } }, - (5): { + (5): { 5, 25, 0.166667, @@ -74,7 +74,7 @@ GROUP "/" { [ -100, 100 ] } }, - (6): { + (6): { 6, 36, 0.142857, @@ -83,7 +83,7 @@ GROUP "/" { [ -100, 100 ] } }, - (7): { + (7): { 7, 49, 0.125, @@ -92,7 +92,7 @@ GROUP "/" { [ -100, 100 ] } }, - (8): { + (8): { 8, 64, 0.111111, @@ -101,7 +101,7 @@ GROUP "/" { [ -100, 100 ] } }, - (9): { + (9): { 9, 81, 0.1, diff --git a/tools/testfiles/treference.ddl b/tools/testfiles/treference.ddl index 859b205..f281a6a 100644 --- a/tools/testfiles/treference.ddl +++ b/tools/testfiles/treference.ddl @@ -6,7 +6,7 @@ DATASET "reference" { DATATYPE H5T_REFERENCE DATASPACE SIMPLE { ( 1 ) / ( 1 ) } DATA { - (0): DATASET 60328 /g1/mydset + (0): DATASET 60328 /g1/mydset } } } diff --git a/tools/testfiles/tsaf.ddl b/tools/testfiles/tsaf.ddl index 9bffd75..0bf59b1 100644 --- a/tools/testfiles/tsaf.ddl +++ b/tools/testfiles/tsaf.ddl @@ -7,406 +7,533 @@ GROUP "/" { DATATYPE H5T_STD_U8LE DATASPACE SIMPLE { ( 5919 ) / ( H5S_UNLIMITED ) } DATA { - (0): 47, 32, 67, 79, 78, 84, 65, 73, 78, 69, 82, 10, 47, 46, 97, 116, - (16): 116, 114, 105, 98, 117, 116, 101, 115, 32, 67, 79, 78, 84, 65, 73, - (31): 78, 69, 82, 10, 47, 46, 97, 116, 116, 114, 105, 98, 117, 116, 101, - (46): 115, 47, 100, 97, 116, 97, 98, 97, 115, 101, 32, 67, 79, 78, 84, - (61): 65, 73, 78, 69, 82, 10, 47, 46, 97, 116, 116, 114, 105, 98, 117, - (76): 116, 101, 115, 47, 100, 97, 116, 97, 98, 97, 115, 101, 47, 46, 83, - (91): 65, 70, 95, 68, 98, 80, 114, 111, 112, 115, 32, 68, 65, 84, 65, - (106): 83, 69, 84, 32, 115, 116, 114, 117, 99, 116, 32, 83, 65, 70, 95, - (121): 68, 98, 80, 114, 111, 112, 115, 123, 105, 110, 116, 32, 109, 97, - (135): 103, 105, 99, 59, 99, 104, 97, 114, 32, 83, 70, 105, 108, 101, - (149): 68, 105, 114, 91, 49, 48, 50, 52, 93, 59, 99, 104, 97, 114, 32, - (164): 73, 109, 112, 111, 114, 116, 70, 105, 108, 101, 91, 49, 48, 50, - (178): 52, 93, 59, 105, 110, 116, 32, 112, 97, 114, 97, 108, 108, 101, - (192): 108, 59, 115, 116, 114, 117, 99, 116, 32, 83, 65, 70, 95, 86, - (206): 101, 114, 115, 105, 111, 110, 73, 110, 102, 111, 123, 105, 110, - (219): 116, 32, 118, 109, 97, 106, 111, 114, 59, 105, 110, 116, 32, 118, - (233): 109, 105, 110, 111, 114, 59, 105, 110, 116, 32, 114, 101, 108, - (246): 59, 99, 104, 97, 114, 32, 97, 110, 110, 111, 116, 91, 49, 48, 93, - (261): 59, 125, 115, 97, 102, 97, 112, 105, 59, 115, 116, 114, 117, 99, - (275): 116, 32, 83, 65, 70, 95, 86, 101, 114, 115, 105, 111, 110, 73, - (289): 110, 102, 111, 123, 105, 110, 116, 32, 118, 109, 97, 106, 111, - (302): 114, 59, 105, 110, 116, 32, 118, 109, 105, 110, 111, 114, 59, - (315): 105, 110, 116, 32, 114, 101, 108, 59, 99, 104, 97, 114, 32, 97, - (329): 110, 110, 111, 116, 91, 49, 48, 93, 59, 125, 115, 97, 102, 108, - (343): 105, 98, 59, 115, 116, 114, 117, 99, 116, 32, 83, 65, 70, 95, 86, - (358): 101, 114, 115, 105, 111, 110, 73, 110, 102, 111, 123, 105, 110, - (371): 116, 32, 118, 109, 97, 106, 111, 114, 59, 105, 110, 116, 32, 118, - (385): 109, 105, 110, 111, 114, 59, 105, 110, 116, 32, 114, 101, 108, - (398): 59, 99, 104, 97, 114, 32, 97, 110, 110, 111, 116, 91, 49, 48, 93, - (413): 59, 125, 118, 98, 116, 59, 115, 116, 114, 117, 99, 116, 32, 83, - (427): 65, 70, 95, 86, 101, 114, 115, 105, 111, 110, 73, 110, 102, 111, - (441): 123, 105, 110, 116, 32, 118, 109, 97, 106, 111, 114, 59, 105, - (454): 110, 116, 32, 118, 109, 105, 110, 111, 114, 59, 105, 110, 116, - (467): 32, 114, 101, 108, 59, 99, 104, 97, 114, 32, 97, 110, 110, 111, - (481): 116, 91, 49, 48, 93, 59, 125, 100, 115, 108, 59, 115, 116, 114, - (495): 117, 99, 116, 32, 83, 65, 70, 95, 86, 101, 114, 115, 105, 111, - (509): 110, 73, 110, 102, 111, 123, 105, 110, 116, 32, 118, 109, 97, - (522): 106, 111, 114, 59, 105, 110, 116, 32, 118, 109, 105, 110, 111, - (535): 114, 59, 105, 110, 116, 32, 114, 101, 108, 59, 99, 104, 97, 114, - (549): 32, 97, 110, 110, 111, 116, 91, 49, 48, 93, 59, 125, 104, 100, - (563): 102, 53, 59, 115, 116, 114, 117, 99, 116, 32, 83, 65, 70, 95, 86, - (578): 101, 114, 115, 105, 111, 110, 73, 110, 102, 111, 123, 105, 110, - (591): 116, 32, 118, 109, 97, 106, 111, 114, 59, 105, 110, 116, 32, 118, - (605): 109, 105, 110, 111, 114, 59, 105, 110, 116, 32, 114, 101, 108, - (618): 59, 99, 104, 97, 114, 32, 97, 110, 110, 111, 116, 91, 49, 48, 93, - (633): 59, 125, 109, 112, 105, 59, 105, 110, 116, 32, 68, 111, 84, 111, - (647): 99, 59, 105, 110, 116, 32, 82, 101, 97, 100, 79, 110, 108, 121, - (661): 59, 105, 110, 116, 32, 67, 108, 111, 98, 98, 101, 114, 59, 105, - (675): 110, 116, 32, 79, 83, 77, 111, 100, 101, 115, 59, 125, 59, 10, - (689): 47, 115, 115, 114, 101, 108, 45, 95, 48, 48, 48, 48, 32, 68, 65, - (704): 84, 65, 83, 69, 84, 32, 105, 110, 116, 59, 10, 47, 115, 115, 114, - (719): 101, 108, 45, 95, 48, 48, 48, 49, 32, 68, 65, 84, 65, 83, 69, 84, - (735): 32, 105, 110, 116, 59, 10, 47, 115, 115, 114, 101, 108, 45, 95, - (749): 48, 48, 48, 50, 32, 68, 65, 84, 65, 83, 69, 84, 32, 105, 110, - (764): 116, 59, 10, 47, 115, 115, 114, 101, 108, 45, 95, 48, 48, 48, 51, - (779): 32, 68, 65, 84, 65, 83, 69, 84, 32, 105, 110, 116, 59, 10, 47, - (794): 115, 115, 114, 101, 108, 45, 95, 48, 48, 48, 52, 32, 68, 65, 84, - (809): 65, 83, 69, 84, 32, 105, 110, 116, 59, 10, 47, 115, 115, 114, - (823): 101, 108, 45, 95, 48, 48, 48, 53, 32, 68, 65, 84, 65, 83, 69, 84, - (839): 32, 105, 110, 116, 59, 10, 47, 115, 115, 114, 101, 108, 45, 95, - (853): 48, 48, 48, 54, 32, 68, 65, 84, 65, 83, 69, 84, 32, 105, 110, - (868): 116, 59, 10, 47, 115, 115, 114, 101, 108, 45, 95, 48, 48, 48, 55, - (883): 32, 68, 65, 84, 65, 83, 69, 84, 32, 105, 110, 116, 59, 10, 47, - (898): 115, 115, 114, 101, 108, 45, 95, 48, 48, 48, 56, 32, 68, 65, 84, - (913): 65, 83, 69, 84, 32, 105, 110, 116, 59, 10, 47, 115, 115, 114, - (927): 101, 108, 45, 95, 48, 48, 48, 57, 32, 68, 65, 84, 65, 83, 69, 84, - (943): 32, 105, 110, 116, 59, 10, 47, 115, 115, 114, 101, 108, 45, 95, - (957): 48, 48, 49, 48, 32, 68, 65, 84, 65, 83, 69, 84, 32, 105, 110, - (972): 116, 59, 10, 47, 115, 115, 114, 101, 108, 45, 95, 48, 48, 49, 49, - (987): 32, 68, 65, 84, 65, 83, 69, 84, 32, 105, 110, 116, 59, 10, 47, - (1002): 115, 115, 114, 101, 108, 45, 95, 48, 48, 49, 50, 32, 68, 65, 84, - (1017): 65, 83, 69, 84, 32, 105, 110, 116, 59, 10, 47, 116, 111, 112, - (1031): 111, 114, 101, 108, 45, 95, 48, 48, 49, 55, 32, 68, 65, 84, 65, - (1046): 83, 69, 84, 32, 105, 110, 116, 59, 10, 47, 116, 111, 112, 111, - (1060): 114, 101, 108, 45, 95, 48, 48, 49, 56, 32, 68, 65, 84, 65, 83, - (1075): 69, 84, 32, 105, 110, 116, 59, 10, 47, 116, 111, 112, 111, 114, - (1089): 101, 108, 45, 95, 48, 48, 49, 57, 32, 68, 65, 84, 65, 83, 69, - (1104): 84, 32, 105, 110, 116, 59, 10, 47, 116, 111, 112, 111, 114, 101, - (1118): 108, 45, 95, 48, 48, 50, 48, 32, 68, 65, 84, 65, 83, 69, 84, 32, - (1134): 105, 110, 116, 59, 10, 47, 102, 105, 101, 108, 100, 45, 99, 111, - (1148): 111, 114, 100, 115, 95, 48, 48, 48, 50, 32, 68, 65, 84, 65, 83, - (1163): 69, 84, 32, 102, 108, 111, 97, 116, 59, 10, 47, 102, 105, 101, - (1177): 108, 100, 45, 100, 105, 115, 116, 114, 105, 98, 117, 116, 105, - (1190): 111, 110, 95, 102, 97, 99, 116, 111, 114, 115, 95, 48, 48, 48, - (1204): 51, 32, 68, 65, 84, 65, 83, 69, 84, 32, 102, 108, 111, 97, 116, - (1219): 59, 10, 47, 102, 105, 101, 108, 100, 45, 116, 101, 109, 112, - (1232): 101, 114, 97, 116, 117, 114, 101, 95, 48, 48, 48, 52, 32, 68, - (1246): 65, 84, 65, 83, 69, 84, 32, 102, 108, 111, 97, 116, 59, 10, 47, - (1261): 102, 105, 101, 108, 100, 45, 100, 105, 115, 112, 108, 97, 99, - (1274): 101, 109, 101, 110, 116, 115, 95, 48, 48, 48, 55, 32, 68, 65, - (1288): 84, 65, 83, 69, 84, 32, 102, 108, 111, 97, 116, 59, 10, 47, 102, - (1303): 105, 101, 108, 100, 45, 115, 116, 114, 101, 115, 115, 95, 48, - (1316): 48, 49, 49, 32, 68, 65, 84, 65, 83, 69, 84, 32, 102, 108, 111, - (1331): 97, 116, 59, 10, 47, 102, 105, 101, 108, 100, 45, 116, 101, 109, - (1345): 112, 101, 114, 97, 116, 117, 114, 101, 95, 48, 48, 49, 50, 32, - (1359): 68, 65, 84, 65, 83, 69, 84, 32, 102, 108, 111, 97, 116, 59, 10, - (1374): 47, 102, 105, 101, 108, 100, 45, 112, 114, 101, 115, 115, 117, - (1387): 114, 101, 95, 48, 48, 49, 51, 32, 68, 65, 84, 65, 83, 69, 84, - (1402): 32, 102, 108, 111, 97, 116, 59, 10, 47, 66, 108, 111, 98, 32, - (1416): 68, 65, 84, 65, 83, 69, 84, 32, 115, 116, 114, 117, 99, 116, 32, - (1431): 66, 108, 111, 98, 123, 68, 83, 76, 95, 79, 102, 102, 115, 101, - (1445): 116, 32, 102, 105, 108, 101, 95, 105, 100, 59, 68, 83, 76, 95, - (1459): 79, 102, 102, 115, 101, 116, 32, 100, 97, 116, 97, 115, 101, - (1472): 116, 95, 105, 100, 59, 68, 83, 76, 95, 79, 102, 102, 115, 101, - (1486): 116, 32, 111, 102, 102, 115, 101, 116, 59, 68, 83, 76, 95, 79, - (1500): 102, 102, 115, 101, 116, 32, 115, 116, 114, 105, 100, 101, 59, - (1513): 68, 83, 76, 95, 79, 102, 102, 115, 101, 116, 32, 99, 111, 117, - (1527): 110, 116, 59, 68, 83, 76, 95, 79, 102, 102, 115, 101, 116, 32, - (1541): 98, 97, 115, 101, 95, 105, 100, 59, 68, 83, 76, 95, 79, 102, - (1555): 102, 115, 101, 116, 32, 110, 117, 109, 95, 114, 101, 99, 115, - (1568): 59, 125, 59, 10, 47, 73, 110, 100, 101, 120, 83, 112, 101, 99, - (1582): 32, 68, 65, 84, 65, 83, 69, 84, 32, 115, 116, 114, 117, 99, 116, - (1597): 32, 73, 110, 100, 101, 120, 83, 112, 101, 99, 123, 105, 110, - (1610): 116, 32, 110, 100, 105, 109, 115, 59, 105, 110, 116, 32, 111, - (1623): 114, 105, 103, 105, 110, 115, 91, 56, 93, 59, 105, 110, 116, 32, - (1637): 115, 105, 122, 101, 115, 91, 56, 93, 59, 105, 110, 116, 32, 111, - (1651): 114, 100, 101, 114, 91, 56, 93, 59, 101, 110, 117, 109, 32, 73, - (1665): 110, 100, 101, 120, 84, 121, 112, 101, 123, 86, 66, 84, 95, 73, - (1679): 78, 68, 69, 88, 95, 84, 89, 80, 69, 95, 67, 95, 79, 82, 68, 69, - (1695): 82, 61, 48, 44, 86, 66, 84, 95, 73, 78, 68, 69, 88, 95, 84, 89, - (1711): 80, 69, 95, 70, 95, 79, 82, 68, 69, 82, 61, 49, 44, 86, 66, 84, - (1727): 95, 73, 78, 68, 69, 88, 95, 84, 89, 80, 69, 95, 65, 78, 89, 61, - (1743): 45, 49, 44, 86, 66, 84, 95, 73, 78, 68, 69, 88, 95, 84, 89, 80, - (1759): 69, 95, 73, 78, 86, 65, 76, 73, 68, 61, 45, 50, 44, 86, 66, 84, - (1775): 95, 73, 78, 68, 69, 88, 95, 84, 89, 80, 69, 95, 78, 65, 61, 45, - (1791): 51, 44, 86, 66, 84, 95, 73, 78, 68, 69, 88, 95, 84, 89, 80, 69, - (1807): 95, 85, 78, 75, 78, 79, 87, 78, 61, 45, 52, 125, 105, 110, 100, - (1822): 101, 120, 95, 116, 121, 112, 101, 59, 68, 83, 76, 95, 79, 102, - (1836): 102, 115, 101, 116, 32, 98, 97, 115, 101, 95, 105, 100, 59, 68, - (1850): 83, 76, 95, 79, 102, 102, 115, 101, 116, 32, 110, 117, 109, 95, - (1864): 114, 101, 99, 115, 59, 125, 59, 10, 47, 67, 97, 116, 32, 68, 65, - (1879): 84, 65, 83, 69, 84, 32, 115, 116, 114, 117, 99, 116, 32, 67, 97, - (1894): 116, 123, 99, 104, 97, 114, 32, 110, 97, 109, 101, 91, 54, 52, - (1908): 93, 59, 101, 110, 117, 109, 32, 82, 111, 108, 101, 123, 86, 66, - (1922): 84, 95, 82, 79, 76, 69, 95, 84, 79, 80, 79, 61, 48, 44, 86, 66, - (1938): 84, 95, 82, 79, 76, 69, 95, 66, 78, 68, 61, 49, 44, 86, 66, 84, - (1954): 95, 82, 79, 76, 69, 95, 80, 82, 79, 67, 61, 50, 44, 86, 66, 84, - (1970): 95, 82, 79, 76, 69, 95, 68, 79, 77, 78, 61, 51, 44, 86, 66, 84, - (1986): 95, 82, 79, 76, 69, 95, 66, 76, 79, 67, 75, 61, 52, 44, 86, 66, - (2002): 84, 95, 82, 79, 76, 69, 95, 65, 83, 83, 89, 61, 53, 44, 86, 66, - (2018): 84, 95, 82, 79, 76, 69, 95, 77, 65, 84, 61, 54, 44, 86, 66, 84, - (2034): 95, 82, 79, 76, 69, 95, 88, 80, 82, 79, 68, 61, 55, 44, 86, 66, - (2050): 84, 95, 82, 79, 76, 69, 95, 85, 83, 69, 82, 68, 61, 56, 44, 86, - (2066): 66, 84, 95, 82, 79, 76, 69, 95, 65, 78, 89, 61, 45, 49, 44, 86, - (2082): 66, 84, 95, 82, 79, 76, 69, 95, 73, 78, 86, 65, 76, 73, 68, 61, - (2098): 45, 50, 44, 86, 66, 84, 95, 82, 79, 76, 69, 95, 78, 65, 61, 45, - (2114): 51, 44, 86, 66, 84, 95, 82, 79, 76, 69, 95, 85, 78, 75, 78, 79, - (2130): 87, 78, 61, 45, 52, 125, 114, 111, 108, 101, 59, 105, 110, 116, - (2144): 32, 116, 100, 105, 109, 59, 68, 83, 76, 95, 79, 102, 102, 115, - (2158): 101, 116, 32, 98, 97, 115, 101, 95, 105, 100, 59, 68, 83, 76, - (2172): 95, 79, 102, 102, 115, 101, 116, 32, 110, 117, 109, 95, 114, - (2185): 101, 99, 115, 59, 125, 59, 10, 47, 83, 101, 116, 32, 68, 65, 84, - (2200): 65, 83, 69, 84, 32, 115, 116, 114, 117, 99, 116, 32, 83, 101, - (2214): 116, 123, 105, 110, 116, 32, 117, 115, 101, 114, 95, 105, 100, - (2227): 59, 99, 104, 97, 114, 32, 110, 97, 109, 101, 91, 54, 52, 93, 59, - (2242): 105, 110, 116, 32, 116, 100, 105, 109, 59, 101, 110, 117, 109, - (2255): 32, 83, 105, 108, 82, 111, 108, 101, 123, 86, 66, 84, 95, 83, - (2269): 82, 79, 76, 69, 95, 84, 73, 77, 69, 61, 48, 44, 86, 66, 84, 95, - (2285): 83, 82, 79, 76, 69, 95, 83, 80, 65, 67, 69, 61, 49, 44, 86, 66, - (2301): 84, 95, 83, 82, 79, 76, 69, 95, 83, 84, 65, 84, 69, 61, 50, 44, - (2317): 86, 66, 84, 95, 83, 82, 79, 76, 69, 95, 80, 65, 82, 65, 77, 61, - (2333): 51, 44, 86, 66, 84, 95, 83, 82, 79, 76, 69, 95, 67, 84, 89, 80, - (2349): 69, 61, 52, 44, 86, 66, 84, 95, 83, 82, 79, 76, 69, 95, 65, 84, - (2365): 89, 80, 69, 61, 53, 44, 86, 66, 84, 95, 83, 82, 79, 76, 69, 95, - (2381): 85, 83, 69, 82, 68, 61, 54, 44, 86, 66, 84, 95, 83, 82, 79, 76, - (2397): 69, 95, 65, 78, 89, 61, 45, 49, 44, 86, 66, 84, 95, 83, 82, 79, - (2413): 76, 69, 95, 73, 78, 86, 65, 76, 73, 68, 61, 45, 50, 44, 86, 66, - (2429): 84, 95, 83, 82, 79, 76, 69, 95, 78, 65, 61, 45, 51, 44, 86, 66, - (2445): 84, 95, 83, 82, 79, 76, 69, 95, 85, 78, 75, 78, 79, 87, 78, 61, - (2461): 45, 52, 125, 115, 114, 111, 108, 101, 59, 68, 83, 76, 95, 79, - (2475): 102, 102, 115, 101, 116, 32, 99, 111, 108, 108, 95, 105, 100, - (2488): 115, 91, 49, 54, 93, 59, 105, 110, 116, 32, 105, 115, 95, 116, - (2502): 111, 112, 59, 105, 110, 116, 32, 105, 115, 95, 101, 120, 116, - (2515): 101, 110, 100, 105, 98, 108, 101, 59, 68, 83, 76, 95, 79, 102, - (2529): 102, 115, 101, 116, 32, 100, 102, 108, 116, 95, 99, 111, 111, - (2542): 114, 100, 102, 108, 100, 95, 105, 100, 59, 68, 83, 76, 95, 79, - (2556): 102, 102, 115, 101, 116, 32, 98, 110, 100, 95, 115, 101, 116, - (2569): 95, 105, 100, 59, 68, 83, 76, 95, 79, 102, 102, 115, 101, 116, - (2583): 32, 98, 97, 115, 101, 95, 105, 100, 59, 68, 83, 76, 95, 79, 102, - (2598): 102, 115, 101, 116, 32, 110, 117, 109, 95, 114, 101, 99, 115, - (2611): 59, 125, 59, 10, 47, 67, 111, 108, 108, 101, 99, 116, 105, 111, - (2625): 110, 32, 68, 65, 84, 65, 83, 69, 84, 32, 115, 116, 114, 117, 99, - (2640): 116, 32, 67, 111, 108, 108, 101, 99, 116, 105, 111, 110, 123, - (2653): 68, 83, 76, 95, 79, 102, 102, 115, 101, 116, 32, 99, 111, 110, - (2667): 116, 97, 105, 110, 105, 110, 103, 95, 115, 101, 116, 95, 105, - (2680): 100, 59, 68, 83, 76, 95, 79, 102, 102, 115, 101, 116, 32, 99, - (2694): 97, 116, 95, 105, 100, 59, 101, 110, 117, 109, 32, 67, 101, 108, - (2708): 108, 84, 121, 112, 101, 123, 86, 66, 84, 95, 67, 69, 76, 76, 95, - (2723): 84, 89, 80, 69, 95, 78, 79, 78, 69, 61, 48, 44, 86, 66, 84, 95, - (2739): 67, 69, 76, 76, 95, 84, 89, 80, 69, 95, 80, 79, 73, 78, 84, 61, - (2755): 49, 44, 86, 66, 84, 95, 67, 69, 76, 76, 95, 84, 89, 80, 69, 95, - (2771): 76, 73, 78, 69, 61, 50, 44, 86, 66, 84, 95, 67, 69, 76, 76, 95, - (2787): 84, 89, 80, 69, 95, 84, 82, 73, 61, 51, 44, 86, 66, 84, 95, 67, - (2803): 69, 76, 76, 95, 84, 89, 80, 69, 95, 81, 85, 65, 68, 61, 52, 44, - (2819): 86, 66, 84, 95, 67, 69, 76, 76, 95, 84, 89, 80, 69, 95, 84, 69, - (2835): 84, 61, 53, 44, 86, 66, 84, 95, 67, 69, 76, 76, 95, 84, 89, 80, - (2851): 69, 95, 80, 89, 82, 65, 77, 73, 68, 61, 54, 44, 86, 66, 84, 95, - (2867): 67, 69, 76, 76, 95, 84, 89, 80, 69, 95, 80, 82, 73, 83, 77, 61, - (2883): 55, 44, 86, 66, 84, 95, 67, 69, 76, 76, 95, 84, 89, 80, 69, 95, - (2899): 72, 69, 88, 61, 56, 44, 86, 66, 84, 95, 67, 69, 76, 76, 95, 84, - (2915): 89, 80, 69, 95, 77, 73, 88, 69, 68, 61, 57, 44, 86, 66, 84, 95, - (2931): 67, 69, 76, 76, 95, 84, 89, 80, 69, 95, 65, 82, 66, 61, 49, 48, - (2947): 44, 86, 66, 84, 95, 67, 69, 76, 76, 95, 84, 89, 80, 69, 95, 49, - (2963): 66, 65, 76, 76, 61, 49, 49, 44, 86, 66, 84, 95, 67, 69, 76, 76, - (2979): 95, 84, 89, 80, 69, 95, 50, 66, 65, 76, 76, 61, 49, 50, 44, 86, - (2995): 66, 84, 95, 67, 69, 76, 76, 95, 84, 89, 80, 69, 95, 51, 66, 65, - (3011): 76, 76, 61, 49, 51, 44, 86, 66, 84, 95, 67, 69, 76, 76, 95, 84, - (3027): 89, 80, 69, 95, 49, 83, 72, 69, 76, 76, 61, 49, 52, 44, 86, 66, - (3043): 84, 95, 67, 69, 76, 76, 95, 84, 89, 80, 69, 95, 50, 83, 72, 69, - (3059): 76, 76, 61, 49, 53, 44, 86, 66, 84, 95, 67, 69, 76, 76, 95, 84, - (3075): 89, 80, 69, 95, 65, 78, 89, 61, 45, 49, 44, 86, 66, 84, 95, 67, - (3091): 69, 76, 76, 95, 84, 89, 80, 69, 95, 73, 78, 86, 65, 76, 73, 68, - (3107): 61, 45, 50, 44, 86, 66, 84, 95, 67, 69, 76, 76, 95, 84, 89, 80, - (3123): 69, 95, 78, 65, 61, 45, 51, 44, 86, 66, 84, 95, 67, 69, 76, 76, - (3139): 95, 84, 89, 80, 69, 95, 85, 78, 75, 78, 79, 87, 78, 61, 45, 52, - (3155): 125, 99, 101, 108, 108, 95, 116, 121, 112, 101, 59, 105, 110, - (3168): 116, 32, 99, 111, 117, 110, 116, 59, 68, 83, 76, 95, 79, 102, - (3182): 102, 115, 101, 116, 32, 105, 110, 100, 101, 120, 105, 110, 103, - (3195): 95, 105, 100, 59, 105, 110, 116, 32, 105, 115, 95, 100, 101, 99, - (3209): 111, 109, 112, 59, 68, 83, 76, 95, 79, 102, 102, 115, 101, 116, - (3223): 32, 109, 101, 109, 98, 101, 114, 115, 95, 98, 108, 111, 98, 95, - (3237): 105, 100, 59, 68, 83, 76, 95, 79, 102, 102, 115, 101, 116, 32, - (3251): 98, 97, 115, 101, 95, 105, 100, 59, 68, 83, 76, 95, 79, 102, - (3265): 102, 115, 101, 116, 32, 110, 117, 109, 95, 114, 101, 99, 115, - (3278): 59, 125, 59, 10, 47, 82, 101, 108, 97, 116, 105, 111, 110, 32, - (3292): 68, 65, 84, 65, 83, 69, 84, 32, 115, 116, 114, 117, 99, 116, 32, - (3307): 82, 101, 108, 97, 116, 105, 111, 110, 123, 68, 83, 76, 95, 79, - (3321): 102, 102, 115, 101, 116, 32, 115, 117, 98, 95, 105, 100, 59, 68, - (3335): 83, 76, 95, 79, 102, 102, 115, 101, 116, 32, 115, 117, 98, 95, - (3349): 99, 97, 116, 95, 105, 100, 59, 68, 83, 76, 95, 79, 102, 102, - (3363): 115, 101, 116, 32, 115, 117, 98, 95, 100, 101, 99, 111, 109, - (3376): 112, 95, 99, 97, 116, 95, 105, 100, 59, 68, 83, 76, 95, 79, 102, - (3391): 102, 115, 101, 116, 32, 115, 117, 112, 95, 105, 100, 59, 68, 83, - (3405): 76, 95, 79, 102, 102, 115, 101, 116, 32, 115, 117, 112, 95, 99, - (3419): 97, 116, 95, 105, 100, 59, 68, 83, 76, 95, 79, 102, 102, 115, - (3433): 101, 116, 32, 115, 117, 112, 95, 100, 101, 99, 111, 109, 112, - (3446): 95, 99, 97, 116, 95, 105, 100, 59, 101, 110, 117, 109, 32, 82, - (3460): 101, 108, 75, 105, 110, 100, 123, 86, 66, 84, 95, 82, 69, 76, - (3474): 75, 73, 78, 68, 95, 83, 85, 66, 83, 69, 84, 61, 48, 44, 86, 66, - (3490): 84, 95, 82, 69, 76, 75, 73, 78, 68, 95, 83, 85, 80, 83, 69, 84, - (3506): 61, 49, 44, 86, 66, 84, 95, 82, 69, 76, 75, 73, 78, 68, 95, 66, - (3522): 79, 85, 78, 68, 61, 50, 44, 86, 66, 84, 95, 82, 69, 76, 75, 73, - (3538): 78, 68, 95, 80, 69, 82, 77, 85, 84, 69, 61, 51, 44, 86, 66, 84, - (3554): 95, 82, 69, 76, 75, 73, 78, 68, 95, 78, 69, 73, 71, 72, 66, 79, - (3570): 82, 61, 52, 44, 86, 66, 84, 95, 82, 69, 76, 75, 73, 78, 68, 95, - (3586): 67, 79, 80, 89, 61, 53, 44, 86, 66, 84, 95, 82, 69, 76, 75, 73, - (3602): 78, 68, 95, 69, 81, 85, 65, 76, 61, 54, 44, 86, 66, 84, 95, 82, - (3618): 69, 76, 75, 73, 78, 68, 95, 65, 78, 89, 61, 45, 49, 44, 86, 66, - (3634): 84, 95, 82, 69, 76, 75, 73, 78, 68, 95, 73, 78, 86, 65, 76, 73, - (3650): 68, 61, 45, 50, 44, 86, 66, 84, 95, 82, 69, 76, 75, 73, 78, 68, - (3666): 95, 78, 65, 61, 45, 51, 44, 86, 66, 84, 95, 82, 69, 76, 75, 73, - (3682): 78, 68, 95, 85, 78, 75, 78, 79, 87, 78, 61, 45, 52, 125, 107, - (3697): 105, 110, 100, 59, 101, 110, 117, 109, 32, 82, 101, 108, 82, - (3710): 101, 112, 123, 86, 66, 84, 95, 82, 69, 76, 82, 69, 80, 95, 73, - (3725): 68, 69, 78, 84, 73, 84, 89, 61, 48, 44, 86, 66, 84, 95, 82, 69, - (3741): 76, 82, 69, 80, 95, 72, 76, 73, 83, 84, 61, 49, 44, 86, 66, 84, - (3757): 95, 82, 69, 76, 82, 69, 80, 95, 84, 76, 73, 83, 84, 61, 50, 44, - (3773): 86, 66, 84, 95, 82, 69, 76, 82, 69, 80, 95, 84, 76, 73, 83, 84, - (3789): 95, 49, 61, 51, 44, 86, 66, 84, 95, 82, 69, 76, 82, 69, 80, 95, - (3805): 69, 76, 73, 83, 84, 61, 52, 44, 86, 66, 84, 95, 82, 69, 76, 82, - (3821): 69, 80, 95, 83, 84, 82, 85, 67, 84, 85, 82, 69, 68, 61, 53, 44, - (3837): 86, 66, 84, 95, 82, 69, 76, 82, 69, 80, 95, 85, 78, 83, 84, 82, - (3853): 85, 67, 84, 85, 82, 69, 68, 61, 54, 44, 86, 66, 84, 95, 82, 69, - (3869): 76, 82, 69, 80, 95, 65, 82, 66, 73, 84, 82, 65, 82, 89, 95, 82, - (3885): 61, 55, 44, 86, 66, 84, 95, 82, 69, 76, 82, 69, 80, 95, 65, 82, - (3901): 66, 73, 84, 82, 65, 82, 89, 95, 68, 82, 61, 56, 44, 86, 66, 84, - (3917): 95, 82, 69, 76, 82, 69, 80, 95, 65, 78, 89, 61, 45, 49, 44, 86, - (3933): 66, 84, 95, 82, 69, 76, 82, 69, 80, 95, 73, 78, 86, 65, 76, 73, - (3949): 68, 61, 45, 50, 44, 86, 66, 84, 95, 82, 69, 76, 82, 69, 80, 95, - (3965): 78, 65, 61, 45, 51, 44, 86, 66, 84, 95, 82, 69, 76, 82, 69, 80, - (3981): 95, 85, 78, 75, 78, 79, 87, 78, 61, 45, 52, 125, 114, 101, 112, - (3996): 95, 116, 121, 112, 101, 59, 68, 83, 76, 95, 79, 102, 102, 115, - (4010): 101, 116, 32, 100, 95, 98, 108, 111, 98, 95, 105, 100, 59, 68, - (4024): 83, 76, 95, 79, 102, 102, 115, 101, 116, 32, 114, 95, 98, 108, - (4038): 111, 98, 95, 105, 100, 59, 68, 83, 76, 95, 79, 102, 102, 115, - (4052): 101, 116, 32, 98, 97, 115, 101, 95, 105, 100, 59, 68, 83, 76, - (4066): 95, 79, 102, 102, 115, 101, 116, 32, 110, 117, 109, 95, 114, - (4079): 101, 99, 115, 59, 125, 59, 10, 47, 70, 105, 101, 108, 100, 84, - (4093): 109, 112, 108, 32, 68, 65, 84, 65, 83, 69, 84, 32, 115, 116, - (4107): 114, 117, 99, 116, 32, 70, 105, 101, 108, 100, 84, 109, 112, - (4120): 108, 123, 99, 104, 97, 114, 32, 110, 97, 109, 101, 91, 54, 52, - (4134): 93, 59, 68, 83, 76, 95, 79, 102, 102, 115, 101, 116, 32, 98, 97, - (4149): 115, 101, 95, 115, 112, 97, 99, 101, 95, 105, 100, 59, 101, 110, - (4163): 117, 109, 32, 65, 108, 103, 101, 98, 114, 97, 105, 99, 84, 121, - (4177): 112, 101, 123, 86, 66, 84, 95, 65, 76, 71, 69, 66, 82, 65, 73, - (4192): 67, 95, 84, 89, 80, 69, 95, 67, 79, 78, 83, 84, 65, 78, 84, 61, - (4208): 48, 44, 86, 66, 84, 95, 65, 76, 71, 69, 66, 82, 65, 73, 67, 95, - (4224): 84, 89, 80, 69, 95, 67, 79, 77, 80, 79, 78, 69, 78, 84, 61, 49, - (4240): 44, 86, 66, 84, 95, 65, 76, 71, 69, 66, 82, 65, 73, 67, 95, 84, - (4256): 89, 80, 69, 95, 83, 67, 65, 76, 65, 82, 61, 50, 44, 86, 66, 84, - (4272): 95, 65, 76, 71, 69, 66, 82, 65, 73, 67, 95, 84, 89, 80, 69, 95, - (4288): 86, 69, 67, 84, 79, 82, 61, 51, 44, 86, 66, 84, 95, 65, 76, 71, - (4304): 69, 66, 82, 65, 73, 67, 95, 84, 89, 80, 69, 95, 84, 69, 78, 83, - (4320): 79, 82, 61, 52, 44, 86, 66, 84, 95, 65, 76, 71, 69, 66, 82, 65, - (4336): 73, 67, 95, 84, 89, 80, 69, 95, 83, 89, 77, 95, 84, 69, 78, 83, - (4352): 79, 82, 61, 53, 44, 86, 66, 84, 95, 65, 76, 71, 69, 66, 82, 65, - (4368): 73, 67, 95, 84, 89, 80, 69, 95, 70, 73, 69, 76, 68, 61, 54, 44, - (4384): 86, 66, 84, 95, 65, 76, 71, 69, 66, 82, 65, 73, 67, 95, 84, 89, - (4400): 80, 69, 95, 83, 84, 65, 84, 69, 61, 55, 44, 86, 66, 84, 95, 65, - (4416): 76, 71, 69, 66, 82, 65, 73, 67, 95, 84, 89, 80, 69, 95, 84, 85, - (4432): 80, 76, 69, 61, 56, 44, 86, 66, 84, 95, 65, 76, 71, 69, 66, 82, - (4448): 65, 73, 67, 95, 84, 89, 80, 69, 95, 65, 78, 89, 61, 45, 49, 44, - (4464): 86, 66, 84, 95, 65, 76, 71, 69, 66, 82, 65, 73, 67, 95, 84, 89, - (4480): 80, 69, 95, 73, 78, 86, 65, 76, 73, 68, 61, 45, 50, 44, 86, 66, - (4496): 84, 95, 65, 76, 71, 69, 66, 82, 65, 73, 67, 95, 84, 89, 80, 69, - (4512): 95, 78, 65, 61, 45, 51, 44, 86, 66, 84, 95, 65, 76, 71, 69, 66, - (4528): 82, 65, 73, 67, 95, 84, 89, 80, 69, 95, 85, 78, 75, 78, 79, 87, - (4544): 78, 61, 45, 52, 125, 97, 108, 103, 95, 116, 121, 112, 101, 59, - (4558): 101, 110, 117, 109, 32, 66, 97, 115, 105, 115, 84, 121, 112, - (4571): 101, 123, 86, 66, 84, 95, 66, 65, 83, 73, 83, 95, 84, 89, 80, - (4586): 69, 95, 85, 78, 73, 84, 89, 61, 48, 44, 86, 66, 84, 95, 66, 65, - (4602): 83, 73, 83, 95, 84, 89, 80, 69, 95, 67, 65, 82, 84, 69, 83, 73, - (4618): 65, 78, 61, 49, 44, 86, 66, 84, 95, 66, 65, 83, 73, 83, 95, 84, - (4634): 89, 80, 69, 95, 83, 80, 72, 69, 82, 73, 67, 65, 76, 61, 50, 44, - (4650): 86, 66, 84, 95, 66, 65, 83, 73, 83, 95, 84, 89, 80, 69, 95, 67, - (4666): 89, 76, 73, 78, 68, 82, 73, 67, 65, 76, 61, 51, 44, 86, 66, 84, - (4682): 95, 66, 65, 83, 73, 83, 95, 84, 89, 80, 69, 95, 85, 80, 80, 69, - (4698): 82, 95, 84, 82, 73, 61, 52, 44, 86, 66, 84, 95, 66, 65, 83, 73, - (4714): 83, 95, 84, 89, 80, 69, 95, 70, 79, 85, 82, 73, 69, 82, 61, 53, - (4730): 44, 86, 66, 84, 95, 66, 65, 83, 73, 83, 95, 84, 89, 80, 69, 95, - (4746): 86, 65, 82, 73, 65, 66, 76, 69, 61, 54, 44, 86, 66, 84, 95, 66, - (4762): 65, 83, 73, 83, 95, 84, 89, 80, 69, 95, 65, 78, 89, 61, 45, 49, - (4778): 44, 86, 66, 84, 95, 66, 65, 83, 73, 83, 95, 84, 89, 80, 69, 95, - (4794): 73, 78, 86, 65, 76, 73, 68, 61, 45, 50, 44, 86, 66, 84, 95, 66, - (4810): 65, 83, 73, 83, 95, 84, 89, 80, 69, 95, 78, 65, 61, 45, 51, 44, - (4826): 86, 66, 84, 95, 66, 65, 83, 73, 83, 95, 84, 89, 80, 69, 95, 85, - (4842): 78, 75, 78, 79, 87, 78, 61, 45, 52, 125, 98, 97, 115, 105, 115, - (4857): 59, 68, 83, 76, 95, 79, 102, 102, 115, 101, 116, 32, 113, 117, - (4871): 97, 110, 116, 105, 116, 121, 95, 105, 100, 59, 105, 110, 116, - (4884): 32, 110, 117, 109, 95, 99, 111, 109, 112, 115, 59, 68, 83, 76, - (4898): 95, 79, 102, 102, 115, 101, 116, 32, 102, 116, 109, 112, 108, - (4911): 95, 105, 100, 115, 95, 98, 108, 111, 98, 95, 105, 100, 59, 68, - (4925): 83, 76, 95, 79, 102, 102, 115, 101, 116, 32, 98, 97, 115, 101, - (4939): 95, 105, 100, 59, 68, 83, 76, 95, 79, 102, 102, 115, 101, 116, - (4953): 32, 110, 117, 109, 95, 114, 101, 99, 115, 59, 125, 59, 10, 47, - (4967): 70, 105, 101, 108, 100, 32, 68, 65, 84, 65, 83, 69, 84, 32, 115, - (4982): 116, 114, 117, 99, 116, 32, 70, 105, 101, 108, 100, 123, 68, 83, - (4996): 76, 95, 79, 102, 102, 115, 101, 116, 32, 102, 116, 109, 112, - (5009): 108, 95, 105, 100, 59, 99, 104, 97, 114, 32, 110, 97, 109, 101, - (5023): 91, 54, 52, 93, 59, 68, 83, 76, 95, 79, 102, 102, 115, 101, 116, - (5038): 32, 117, 110, 105, 116, 115, 95, 105, 100, 59, 68, 83, 76, 95, - (5052): 79, 102, 102, 115, 101, 116, 32, 115, 116, 111, 114, 97, 103, - (5065): 101, 95, 100, 101, 99, 111, 109, 112, 95, 99, 97, 116, 95, 105, - (5079): 100, 59, 101, 110, 117, 109, 32, 73, 110, 116, 101, 114, 108, - (5092): 101, 97, 118, 101, 123, 86, 66, 84, 95, 73, 78, 84, 69, 82, 76, - (5107): 69, 65, 86, 69, 95, 67, 79, 77, 80, 79, 78, 69, 78, 84, 61, 48, - (5123): 44, 86, 66, 84, 95, 73, 78, 84, 69, 82, 76, 69, 65, 86, 69, 95, - (5139): 86, 69, 67, 84, 79, 82, 61, 49, 44, 86, 66, 84, 95, 73, 78, 84, - (5155): 69, 82, 76, 69, 65, 86, 69, 95, 73, 78, 68, 69, 80, 69, 78, 68, - (5171): 69, 78, 84, 61, 50, 44, 86, 66, 84, 95, 73, 78, 84, 69, 82, 76, - (5187): 69, 65, 86, 69, 95, 78, 79, 78, 69, 61, 51, 44, 86, 66, 84, 95, - (5203): 73, 78, 84, 69, 82, 76, 69, 65, 86, 69, 95, 65, 78, 89, 61, 45, - (5219): 49, 44, 86, 66, 84, 95, 73, 78, 84, 69, 82, 76, 69, 65, 86, 69, - (5235): 95, 73, 78, 86, 65, 76, 73, 68, 61, 45, 50, 44, 86, 66, 84, 95, - (5251): 73, 78, 84, 69, 82, 76, 69, 65, 86, 69, 95, 78, 65, 61, 45, 51, - (5267): 44, 86, 66, 84, 95, 73, 78, 84, 69, 82, 76, 69, 65, 86, 69, 95, - (5283): 85, 78, 75, 78, 79, 87, 78, 61, 45, 52, 125, 99, 111, 109, 112, - (5298): 95, 105, 110, 116, 108, 118, 59, 68, 83, 76, 95, 79, 102, 102, - (5312): 115, 101, 116, 32, 105, 110, 100, 101, 120, 105, 110, 103, 95, - (5325): 105, 100, 59, 68, 83, 76, 95, 79, 102, 102, 115, 101, 116, 32, - (5339): 100, 111, 102, 95, 97, 115, 115, 111, 99, 95, 99, 97, 116, 95, - (5353): 105, 100, 59, 105, 110, 116, 32, 97, 115, 115, 111, 99, 95, 114, - (5367): 97, 116, 105, 111, 59, 68, 83, 76, 95, 79, 102, 102, 115, 101, - (5381): 116, 32, 101, 118, 97, 108, 95, 100, 101, 99, 111, 109, 112, 95, - (5395): 99, 97, 116, 95, 105, 100, 59, 101, 110, 117, 109, 32, 69, 118, - (5409): 97, 108, 70, 117, 110, 99, 123, 86, 66, 84, 95, 69, 86, 65, 76, - (5424): 95, 70, 85, 78, 67, 95, 67, 79, 78, 83, 84, 65, 78, 84, 61, 48, - (5440): 44, 86, 66, 84, 95, 69, 86, 65, 76, 95, 70, 85, 78, 67, 95, 85, - (5456): 78, 73, 70, 79, 82, 77, 61, 49, 44, 86, 66, 84, 95, 69, 86, 65, - (5472): 76, 95, 70, 85, 78, 67, 95, 80, 87, 67, 79, 78, 83, 84, 61, 50, - (5488): 44, 86, 66, 84, 95, 69, 86, 65, 76, 95, 70, 85, 78, 67, 95, 80, - (5504): 87, 76, 73, 78, 69, 65, 82, 61, 51, 44, 86, 66, 84, 95, 69, 86, - (5520): 65, 76, 95, 70, 85, 78, 67, 95, 65, 78, 89, 61, 45, 49, 44, 86, - (5536): 66, 84, 95, 69, 86, 65, 76, 95, 70, 85, 78, 67, 95, 73, 78, 86, - (5552): 65, 76, 73, 68, 61, 45, 50, 44, 86, 66, 84, 95, 69, 86, 65, 76, - (5568): 95, 70, 85, 78, 67, 95, 78, 65, 61, 45, 51, 44, 86, 66, 84, 95, - (5584): 69, 86, 65, 76, 95, 70, 85, 78, 67, 95, 85, 78, 75, 78, 79, 87, - (5600): 78, 61, 45, 52, 125, 101, 118, 97, 108, 95, 102, 117, 110, 99, - (5614): 59, 105, 110, 116, 32, 105, 115, 95, 104, 111, 109, 111, 103, - (5627): 101, 110, 101, 111, 117, 115, 59, 105, 110, 116, 32, 105, 115, - (5640): 95, 99, 111, 111, 114, 100, 95, 102, 105, 101, 108, 100, 59, 68, - (5654): 83, 76, 95, 79, 102, 102, 115, 101, 116, 32, 99, 111, 109, 112, - (5668): 95, 105, 100, 115, 95, 98, 108, 111, 98, 95, 105, 100, 59, 68, - (5682): 83, 76, 95, 79, 102, 102, 115, 101, 116, 32, 99, 111, 109, 112, - (5696): 95, 111, 114, 100, 101, 114, 95, 98, 108, 111, 98, 95, 105, 100, - (5710): 59, 68, 83, 76, 95, 79, 102, 102, 115, 101, 116, 32, 118, 98, - (5724): 97, 115, 105, 115, 95, 98, 108, 111, 98, 95, 105, 100, 59, 68, - (5738): 83, 76, 95, 79, 102, 102, 115, 101, 116, 32, 100, 111, 102, 95, - (5752): 98, 108, 111, 98, 95, 105, 100, 59, 68, 83, 76, 95, 79, 102, - (5766): 102, 115, 101, 116, 32, 98, 97, 115, 101, 95, 105, 100, 59, 68, - (5780): 83, 76, 95, 79, 102, 102, 115, 101, 116, 32, 110, 117, 109, 95, - (5794): 114, 101, 99, 115, 59, 125, 59, 10, 47, 109, 101, 116, 97, 98, - (5808): 108, 111, 98, 48, 48, 48, 48, 48, 46, 105, 110, 100, 101, 120, - (5822): 32, 68, 65, 84, 65, 83, 69, 84, 32, 115, 116, 114, 117, 99, 116, - (5837): 32, 73, 110, 100, 101, 120, 80, 97, 105, 114, 123, 68, 83, 76, - (5851): 95, 79, 102, 102, 115, 101, 116, 32, 105, 110, 100, 101, 120, - (5864): 59, 105, 110, 116, 32, 108, 101, 110, 103, 116, 104, 59, 125, - (5877): 59, 10, 47, 109, 101, 116, 97, 98, 108, 111, 98, 48, 48, 48, 48, - (5892): 48, 46, 98, 108, 111, 98, 32, 68, 65, 84, 65, 83, 69, 84, 32, - (5907): 68, 83, 76, 95, 79, 102, 102, 115, 101, 116, 59, 10 + (0): 47, 32, 67, 79, 78, 84, 65, 73, 78, 69, 82, 10, 47, 46, 97, + (15): 116, 116, 114, 105, 98, 117, 116, 101, 115, 32, 67, 79, + (27): 78, 84, 65, 73, 78, 69, 82, 10, 47, 46, 97, 116, 116, + (40): 114, 105, 98, 117, 116, 101, 115, 47, 100, 97, 116, 97, + (52): 98, 97, 115, 101, 32, 67, 79, 78, 84, 65, 73, 78, 69, + (65): 82, 10, 47, 46, 97, 116, 116, 114, 105, 98, 117, 116, + (77): 101, 115, 47, 100, 97, 116, 97, 98, 97, 115, 101, 47, + (89): 46, 83, 65, 70, 95, 68, 98, 80, 114, 111, 112, 115, 32, + (102): 68, 65, 84, 65, 83, 69, 84, 32, 115, 116, 114, 117, + (114): 99, 116, 32, 83, 65, 70, 95, 68, 98, 80, 114, 111, + (126): 112, 115, 123, 105, 110, 116, 32, 109, 97, 103, 105, + (137): 99, 59, 99, 104, 97, 114, 32, 83, 70, 105, 108, 101, + (149): 68, 105, 114, 91, 49, 48, 50, 52, 93, 59, 99, 104, + (161): 97, 114, 32, 73, 109, 112, 111, 114, 116, 70, 105, + (172): 108, 101, 91, 49, 48, 50, 52, 93, 59, 105, 110, 116, + (184): 32, 112, 97, 114, 97, 108, 108, 101, 108, 59, 115, + (195): 116, 114, 117, 99, 116, 32, 83, 65, 70, 95, 86, 101, + (207): 114, 115, 105, 111, 110, 73, 110, 102, 111, 123, + (217): 105, 110, 116, 32, 118, 109, 97, 106, 111, 114, 59, + (228): 105, 110, 116, 32, 118, 109, 105, 110, 111, 114, 59, + (239): 105, 110, 116, 32, 114, 101, 108, 59, 99, 104, 97, + (250): 114, 32, 97, 110, 110, 111, 116, 91, 49, 48, 93, 59, + (262): 125, 115, 97, 102, 97, 112, 105, 59, 115, 116, 114, + (273): 117, 99, 116, 32, 83, 65, 70, 95, 86, 101, 114, 115, + (285): 105, 111, 110, 73, 110, 102, 111, 123, 105, 110, + (295): 116, 32, 118, 109, 97, 106, 111, 114, 59, 105, 110, + (306): 116, 32, 118, 109, 105, 110, 111, 114, 59, 105, 110, + (317): 116, 32, 114, 101, 108, 59, 99, 104, 97, 114, 32, + (328): 97, 110, 110, 111, 116, 91, 49, 48, 93, 59, 125, + (339): 115, 97, 102, 108, 105, 98, 59, 115, 116, 114, 117, + (350): 99, 116, 32, 83, 65, 70, 95, 86, 101, 114, 115, 105, + (362): 111, 110, 73, 110, 102, 111, 123, 105, 110, 116, 32, + (373): 118, 109, 97, 106, 111, 114, 59, 105, 110, 116, 32, + (384): 118, 109, 105, 110, 111, 114, 59, 105, 110, 116, 32, + (395): 114, 101, 108, 59, 99, 104, 97, 114, 32, 97, 110, + (406): 110, 111, 116, 91, 49, 48, 93, 59, 125, 118, 98, + (417): 116, 59, 115, 116, 114, 117, 99, 116, 32, 83, 65, + (428): 70, 95, 86, 101, 114, 115, 105, 111, 110, 73, 110, + (439): 102, 111, 123, 105, 110, 116, 32, 118, 109, 97, 106, + (450): 111, 114, 59, 105, 110, 116, 32, 118, 109, 105, 110, + (461): 111, 114, 59, 105, 110, 116, 32, 114, 101, 108, 59, + (472): 99, 104, 97, 114, 32, 97, 110, 110, 111, 116, 91, + (483): 49, 48, 93, 59, 125, 100, 115, 108, 59, 115, 116, + (494): 114, 117, 99, 116, 32, 83, 65, 70, 95, 86, 101, 114, + (506): 115, 105, 111, 110, 73, 110, 102, 111, 123, 105, + (516): 110, 116, 32, 118, 109, 97, 106, 111, 114, 59, 105, + (527): 110, 116, 32, 118, 109, 105, 110, 111, 114, 59, 105, + (538): 110, 116, 32, 114, 101, 108, 59, 99, 104, 97, 114, + (549): 32, 97, 110, 110, 111, 116, 91, 49, 48, 93, 59, 125, + (561): 104, 100, 102, 53, 59, 115, 116, 114, 117, 99, 116, + (572): 32, 83, 65, 70, 95, 86, 101, 114, 115, 105, 111, + (583): 110, 73, 110, 102, 111, 123, 105, 110, 116, 32, 118, + (594): 109, 97, 106, 111, 114, 59, 105, 110, 116, 32, 118, + (605): 109, 105, 110, 111, 114, 59, 105, 110, 116, 32, 114, + (616): 101, 108, 59, 99, 104, 97, 114, 32, 97, 110, 110, + (627): 111, 116, 91, 49, 48, 93, 59, 125, 109, 112, 105, + (638): 59, 105, 110, 116, 32, 68, 111, 84, 111, 99, 59, + (649): 105, 110, 116, 32, 82, 101, 97, 100, 79, 110, 108, + (660): 121, 59, 105, 110, 116, 32, 67, 108, 111, 98, 98, + (671): 101, 114, 59, 105, 110, 116, 32, 79, 83, 77, 111, + (682): 100, 101, 115, 59, 125, 59, 10, 47, 115, 115, 114, + (693): 101, 108, 45, 95, 48, 48, 48, 48, 32, 68, 65, 84, + (705): 65, 83, 69, 84, 32, 105, 110, 116, 59, 10, 47, 115, + (717): 115, 114, 101, 108, 45, 95, 48, 48, 48, 49, 32, 68, + (729): 65, 84, 65, 83, 69, 84, 32, 105, 110, 116, 59, 10, + (741): 47, 115, 115, 114, 101, 108, 45, 95, 48, 48, 48, 50, + (753): 32, 68, 65, 84, 65, 83, 69, 84, 32, 105, 110, 116, + (765): 59, 10, 47, 115, 115, 114, 101, 108, 45, 95, 48, 48, + (777): 48, 51, 32, 68, 65, 84, 65, 83, 69, 84, 32, 105, + (789): 110, 116, 59, 10, 47, 115, 115, 114, 101, 108, 45, + (800): 95, 48, 48, 48, 52, 32, 68, 65, 84, 65, 83, 69, 84, + (813): 32, 105, 110, 116, 59, 10, 47, 115, 115, 114, 101, + (824): 108, 45, 95, 48, 48, 48, 53, 32, 68, 65, 84, 65, 83, + (837): 69, 84, 32, 105, 110, 116, 59, 10, 47, 115, 115, + (848): 114, 101, 108, 45, 95, 48, 48, 48, 54, 32, 68, 65, + (860): 84, 65, 83, 69, 84, 32, 105, 110, 116, 59, 10, 47, + (872): 115, 115, 114, 101, 108, 45, 95, 48, 48, 48, 55, 32, + (884): 68, 65, 84, 65, 83, 69, 84, 32, 105, 110, 116, 59, + (896): 10, 47, 115, 115, 114, 101, 108, 45, 95, 48, 48, 48, + (908): 56, 32, 68, 65, 84, 65, 83, 69, 84, 32, 105, 110, + (920): 116, 59, 10, 47, 115, 115, 114, 101, 108, 45, 95, + (931): 48, 48, 48, 57, 32, 68, 65, 84, 65, 83, 69, 84, 32, + (944): 105, 110, 116, 59, 10, 47, 115, 115, 114, 101, 108, + (955): 45, 95, 48, 48, 49, 48, 32, 68, 65, 84, 65, 83, 69, + (968): 84, 32, 105, 110, 116, 59, 10, 47, 115, 115, 114, + (979): 101, 108, 45, 95, 48, 48, 49, 49, 32, 68, 65, 84, + (991): 65, 83, 69, 84, 32, 105, 110, 116, 59, 10, 47, 115, + (1003): 115, 114, 101, 108, 45, 95, 48, 48, 49, 50, 32, + (1014): 68, 65, 84, 65, 83, 69, 84, 32, 105, 110, 116, + (1025): 59, 10, 47, 116, 111, 112, 111, 114, 101, 108, + (1035): 45, 95, 48, 48, 49, 55, 32, 68, 65, 84, 65, 83, + (1047): 69, 84, 32, 105, 110, 116, 59, 10, 47, 116, 111, + (1058): 112, 111, 114, 101, 108, 45, 95, 48, 48, 49, 56, + (1069): 32, 68, 65, 84, 65, 83, 69, 84, 32, 105, 110, + (1080): 116, 59, 10, 47, 116, 111, 112, 111, 114, 101, + (1090): 108, 45, 95, 48, 48, 49, 57, 32, 68, 65, 84, 65, + (1102): 83, 69, 84, 32, 105, 110, 116, 59, 10, 47, 116, + (1113): 111, 112, 111, 114, 101, 108, 45, 95, 48, 48, + (1123): 50, 48, 32, 68, 65, 84, 65, 83, 69, 84, 32, 105, + (1135): 110, 116, 59, 10, 47, 102, 105, 101, 108, 100, + (1145): 45, 99, 111, 111, 114, 100, 115, 95, 48, 48, 48, + (1156): 50, 32, 68, 65, 84, 65, 83, 69, 84, 32, 102, + (1167): 108, 111, 97, 116, 59, 10, 47, 102, 105, 101, + (1177): 108, 100, 45, 100, 105, 115, 116, 114, 105, 98, + (1187): 117, 116, 105, 111, 110, 95, 102, 97, 99, 116, + (1197): 111, 114, 115, 95, 48, 48, 48, 51, 32, 68, 65, + (1208): 84, 65, 83, 69, 84, 32, 102, 108, 111, 97, 116, + (1219): 59, 10, 47, 102, 105, 101, 108, 100, 45, 116, + (1229): 101, 109, 112, 101, 114, 97, 116, 117, 114, 101, + (1239): 95, 48, 48, 48, 52, 32, 68, 65, 84, 65, 83, 69, + (1251): 84, 32, 102, 108, 111, 97, 116, 59, 10, 47, 102, + (1262): 105, 101, 108, 100, 45, 100, 105, 115, 112, 108, + (1272): 97, 99, 101, 109, 101, 110, 116, 115, 95, 48, + (1282): 48, 48, 55, 32, 68, 65, 84, 65, 83, 69, 84, 32, + (1294): 102, 108, 111, 97, 116, 59, 10, 47, 102, 105, + (1304): 101, 108, 100, 45, 115, 116, 114, 101, 115, 115, + (1314): 95, 48, 48, 49, 49, 32, 68, 65, 84, 65, 83, 69, + (1326): 84, 32, 102, 108, 111, 97, 116, 59, 10, 47, 102, + (1337): 105, 101, 108, 100, 45, 116, 101, 109, 112, 101, + (1347): 114, 97, 116, 117, 114, 101, 95, 48, 48, 49, 50, + (1358): 32, 68, 65, 84, 65, 83, 69, 84, 32, 102, 108, + (1369): 111, 97, 116, 59, 10, 47, 102, 105, 101, 108, + (1379): 100, 45, 112, 114, 101, 115, 115, 117, 114, 101, + (1389): 95, 48, 48, 49, 51, 32, 68, 65, 84, 65, 83, 69, + (1401): 84, 32, 102, 108, 111, 97, 116, 59, 10, 47, 66, + (1412): 108, 111, 98, 32, 68, 65, 84, 65, 83, 69, 84, + (1423): 32, 115, 116, 114, 117, 99, 116, 32, 66, 108, + (1433): 111, 98, 123, 68, 83, 76, 95, 79, 102, 102, 115, + (1444): 101, 116, 32, 102, 105, 108, 101, 95, 105, 100, + (1454): 59, 68, 83, 76, 95, 79, 102, 102, 115, 101, 116, + (1465): 32, 100, 97, 116, 97, 115, 101, 116, 95, 105, + (1475): 100, 59, 68, 83, 76, 95, 79, 102, 102, 115, 101, + (1486): 116, 32, 111, 102, 102, 115, 101, 116, 59, 68, + (1496): 83, 76, 95, 79, 102, 102, 115, 101, 116, 32, + (1506): 115, 116, 114, 105, 100, 101, 59, 68, 83, 76, + (1516): 95, 79, 102, 102, 115, 101, 116, 32, 99, 111, + (1526): 117, 110, 116, 59, 68, 83, 76, 95, 79, 102, 102, + (1537): 115, 101, 116, 32, 98, 97, 115, 101, 95, 105, + (1547): 100, 59, 68, 83, 76, 95, 79, 102, 102, 115, 101, + (1558): 116, 32, 110, 117, 109, 95, 114, 101, 99, 115, + (1568): 59, 125, 59, 10, 47, 73, 110, 100, 101, 120, 83, + (1579): 112, 101, 99, 32, 68, 65, 84, 65, 83, 69, 84, + (1590): 32, 115, 116, 114, 117, 99, 116, 32, 73, 110, + (1600): 100, 101, 120, 83, 112, 101, 99, 123, 105, 110, + (1610): 116, 32, 110, 100, 105, 109, 115, 59, 105, 110, + (1620): 116, 32, 111, 114, 105, 103, 105, 110, 115, 91, + (1630): 56, 93, 59, 105, 110, 116, 32, 115, 105, 122, + (1640): 101, 115, 91, 56, 93, 59, 105, 110, 116, 32, + (1650): 111, 114, 100, 101, 114, 91, 56, 93, 59, 101, + (1660): 110, 117, 109, 32, 73, 110, 100, 101, 120, 84, + (1670): 121, 112, 101, 123, 86, 66, 84, 95, 73, 78, 68, + (1681): 69, 88, 95, 84, 89, 80, 69, 95, 67, 95, 79, 82, + (1693): 68, 69, 82, 61, 48, 44, 86, 66, 84, 95, 73, 78, + (1705): 68, 69, 88, 95, 84, 89, 80, 69, 95, 70, 95, 79, + (1717): 82, 68, 69, 82, 61, 49, 44, 86, 66, 84, 95, 73, + (1729): 78, 68, 69, 88, 95, 84, 89, 80, 69, 95, 65, 78, + (1741): 89, 61, 45, 49, 44, 86, 66, 84, 95, 73, 78, 68, + (1753): 69, 88, 95, 84, 89, 80, 69, 95, 73, 78, 86, 65, + (1765): 76, 73, 68, 61, 45, 50, 44, 86, 66, 84, 95, 73, + (1777): 78, 68, 69, 88, 95, 84, 89, 80, 69, 95, 78, 65, + (1789): 61, 45, 51, 44, 86, 66, 84, 95, 73, 78, 68, 69, + (1801): 88, 95, 84, 89, 80, 69, 95, 85, 78, 75, 78, 79, + (1813): 87, 78, 61, 45, 52, 125, 105, 110, 100, 101, + (1823): 120, 95, 116, 121, 112, 101, 59, 68, 83, 76, 95, + (1834): 79, 102, 102, 115, 101, 116, 32, 98, 97, 115, + (1844): 101, 95, 105, 100, 59, 68, 83, 76, 95, 79, 102, + (1855): 102, 115, 101, 116, 32, 110, 117, 109, 95, 114, + (1865): 101, 99, 115, 59, 125, 59, 10, 47, 67, 97, 116, + (1876): 32, 68, 65, 84, 65, 83, 69, 84, 32, 115, 116, + (1887): 114, 117, 99, 116, 32, 67, 97, 116, 123, 99, + (1897): 104, 97, 114, 32, 110, 97, 109, 101, 91, 54, 52, + (1908): 93, 59, 101, 110, 117, 109, 32, 82, 111, 108, + (1918): 101, 123, 86, 66, 84, 95, 82, 79, 76, 69, 95, + (1929): 84, 79, 80, 79, 61, 48, 44, 86, 66, 84, 95, 82, + (1941): 79, 76, 69, 95, 66, 78, 68, 61, 49, 44, 86, 66, + (1953): 84, 95, 82, 79, 76, 69, 95, 80, 82, 79, 67, 61, + (1965): 50, 44, 86, 66, 84, 95, 82, 79, 76, 69, 95, 68, + (1977): 79, 77, 78, 61, 51, 44, 86, 66, 84, 95, 82, 79, + (1989): 76, 69, 95, 66, 76, 79, 67, 75, 61, 52, 44, 86, + (2001): 66, 84, 95, 82, 79, 76, 69, 95, 65, 83, 83, 89, + (2013): 61, 53, 44, 86, 66, 84, 95, 82, 79, 76, 69, 95, + (2025): 77, 65, 84, 61, 54, 44, 86, 66, 84, 95, 82, 79, + (2037): 76, 69, 95, 88, 80, 82, 79, 68, 61, 55, 44, 86, + (2049): 66, 84, 95, 82, 79, 76, 69, 95, 85, 83, 69, 82, + (2061): 68, 61, 56, 44, 86, 66, 84, 95, 82, 79, 76, 69, + (2073): 95, 65, 78, 89, 61, 45, 49, 44, 86, 66, 84, 95, + (2085): 82, 79, 76, 69, 95, 73, 78, 86, 65, 76, 73, 68, + (2097): 61, 45, 50, 44, 86, 66, 84, 95, 82, 79, 76, 69, + (2109): 95, 78, 65, 61, 45, 51, 44, 86, 66, 84, 95, 82, + (2121): 79, 76, 69, 95, 85, 78, 75, 78, 79, 87, 78, 61, + (2133): 45, 52, 125, 114, 111, 108, 101, 59, 105, 110, + (2143): 116, 32, 116, 100, 105, 109, 59, 68, 83, 76, 95, + (2154): 79, 102, 102, 115, 101, 116, 32, 98, 97, 115, + (2164): 101, 95, 105, 100, 59, 68, 83, 76, 95, 79, 102, + (2175): 102, 115, 101, 116, 32, 110, 117, 109, 95, 114, + (2185): 101, 99, 115, 59, 125, 59, 10, 47, 83, 101, 116, + (2196): 32, 68, 65, 84, 65, 83, 69, 84, 32, 115, 116, + (2207): 114, 117, 99, 116, 32, 83, 101, 116, 123, 105, + (2217): 110, 116, 32, 117, 115, 101, 114, 95, 105, 100, + (2227): 59, 99, 104, 97, 114, 32, 110, 97, 109, 101, 91, + (2238): 54, 52, 93, 59, 105, 110, 116, 32, 116, 100, + (2248): 105, 109, 59, 101, 110, 117, 109, 32, 83, 105, + (2258): 108, 82, 111, 108, 101, 123, 86, 66, 84, 95, 83, + (2269): 82, 79, 76, 69, 95, 84, 73, 77, 69, 61, 48, 44, + (2281): 86, 66, 84, 95, 83, 82, 79, 76, 69, 95, 83, 80, + (2293): 65, 67, 69, 61, 49, 44, 86, 66, 84, 95, 83, 82, + (2305): 79, 76, 69, 95, 83, 84, 65, 84, 69, 61, 50, 44, + (2317): 86, 66, 84, 95, 83, 82, 79, 76, 69, 95, 80, 65, + (2329): 82, 65, 77, 61, 51, 44, 86, 66, 84, 95, 83, 82, + (2341): 79, 76, 69, 95, 67, 84, 89, 80, 69, 61, 52, 44, + (2353): 86, 66, 84, 95, 83, 82, 79, 76, 69, 95, 65, 84, + (2365): 89, 80, 69, 61, 53, 44, 86, 66, 84, 95, 83, 82, + (2377): 79, 76, 69, 95, 85, 83, 69, 82, 68, 61, 54, 44, + (2389): 86, 66, 84, 95, 83, 82, 79, 76, 69, 95, 65, 78, + (2401): 89, 61, 45, 49, 44, 86, 66, 84, 95, 83, 82, 79, + (2413): 76, 69, 95, 73, 78, 86, 65, 76, 73, 68, 61, 45, + (2425): 50, 44, 86, 66, 84, 95, 83, 82, 79, 76, 69, 95, + (2437): 78, 65, 61, 45, 51, 44, 86, 66, 84, 95, 83, 82, + (2449): 79, 76, 69, 95, 85, 78, 75, 78, 79, 87, 78, 61, + (2461): 45, 52, 125, 115, 114, 111, 108, 101, 59, 68, + (2471): 83, 76, 95, 79, 102, 102, 115, 101, 116, 32, 99, + (2482): 111, 108, 108, 95, 105, 100, 115, 91, 49, 54, + (2492): 93, 59, 105, 110, 116, 32, 105, 115, 95, 116, + (2502): 111, 112, 59, 105, 110, 116, 32, 105, 115, 95, + (2512): 101, 120, 116, 101, 110, 100, 105, 98, 108, 101, + (2522): 59, 68, 83, 76, 95, 79, 102, 102, 115, 101, 116, + (2533): 32, 100, 102, 108, 116, 95, 99, 111, 111, 114, + (2543): 100, 102, 108, 100, 95, 105, 100, 59, 68, 83, + (2553): 76, 95, 79, 102, 102, 115, 101, 116, 32, 98, + (2563): 110, 100, 95, 115, 101, 116, 95, 105, 100, 59, + (2573): 68, 83, 76, 95, 79, 102, 102, 115, 101, 116, 32, + (2584): 98, 97, 115, 101, 95, 105, 100, 59, 68, 83, 76, + (2595): 95, 79, 102, 102, 115, 101, 116, 32, 110, 117, + (2605): 109, 95, 114, 101, 99, 115, 59, 125, 59, 10, 47, + (2616): 67, 111, 108, 108, 101, 99, 116, 105, 111, 110, + (2626): 32, 68, 65, 84, 65, 83, 69, 84, 32, 115, 116, + (2637): 114, 117, 99, 116, 32, 67, 111, 108, 108, 101, + (2647): 99, 116, 105, 111, 110, 123, 68, 83, 76, 95, 79, + (2658): 102, 102, 115, 101, 116, 32, 99, 111, 110, 116, + (2668): 97, 105, 110, 105, 110, 103, 95, 115, 101, 116, + (2678): 95, 105, 100, 59, 68, 83, 76, 95, 79, 102, 102, + (2689): 115, 101, 116, 32, 99, 97, 116, 95, 105, 100, + (2699): 59, 101, 110, 117, 109, 32, 67, 101, 108, 108, + (2709): 84, 121, 112, 101, 123, 86, 66, 84, 95, 67, 69, + (2720): 76, 76, 95, 84, 89, 80, 69, 95, 78, 79, 78, 69, + (2732): 61, 48, 44, 86, 66, 84, 95, 67, 69, 76, 76, 95, + (2744): 84, 89, 80, 69, 95, 80, 79, 73, 78, 84, 61, 49, + (2756): 44, 86, 66, 84, 95, 67, 69, 76, 76, 95, 84, 89, + (2768): 80, 69, 95, 76, 73, 78, 69, 61, 50, 44, 86, 66, + (2780): 84, 95, 67, 69, 76, 76, 95, 84, 89, 80, 69, 95, + (2792): 84, 82, 73, 61, 51, 44, 86, 66, 84, 95, 67, 69, + (2804): 76, 76, 95, 84, 89, 80, 69, 95, 81, 85, 65, 68, + (2816): 61, 52, 44, 86, 66, 84, 95, 67, 69, 76, 76, 95, + (2828): 84, 89, 80, 69, 95, 84, 69, 84, 61, 53, 44, 86, + (2840): 66, 84, 95, 67, 69, 76, 76, 95, 84, 89, 80, 69, + (2852): 95, 80, 89, 82, 65, 77, 73, 68, 61, 54, 44, 86, + (2864): 66, 84, 95, 67, 69, 76, 76, 95, 84, 89, 80, 69, + (2876): 95, 80, 82, 73, 83, 77, 61, 55, 44, 86, 66, 84, + (2888): 95, 67, 69, 76, 76, 95, 84, 89, 80, 69, 95, 72, + (2900): 69, 88, 61, 56, 44, 86, 66, 84, 95, 67, 69, 76, + (2912): 76, 95, 84, 89, 80, 69, 95, 77, 73, 88, 69, 68, + (2924): 61, 57, 44, 86, 66, 84, 95, 67, 69, 76, 76, 95, + (2936): 84, 89, 80, 69, 95, 65, 82, 66, 61, 49, 48, 44, + (2948): 86, 66, 84, 95, 67, 69, 76, 76, 95, 84, 89, 80, + (2960): 69, 95, 49, 66, 65, 76, 76, 61, 49, 49, 44, 86, + (2972): 66, 84, 95, 67, 69, 76, 76, 95, 84, 89, 80, 69, + (2984): 95, 50, 66, 65, 76, 76, 61, 49, 50, 44, 86, 66, + (2996): 84, 95, 67, 69, 76, 76, 95, 84, 89, 80, 69, 95, + (3008): 51, 66, 65, 76, 76, 61, 49, 51, 44, 86, 66, 84, + (3020): 95, 67, 69, 76, 76, 95, 84, 89, 80, 69, 95, 49, + (3032): 83, 72, 69, 76, 76, 61, 49, 52, 44, 86, 66, 84, + (3044): 95, 67, 69, 76, 76, 95, 84, 89, 80, 69, 95, 50, + (3056): 83, 72, 69, 76, 76, 61, 49, 53, 44, 86, 66, 84, + (3068): 95, 67, 69, 76, 76, 95, 84, 89, 80, 69, 95, 65, + (3080): 78, 89, 61, 45, 49, 44, 86, 66, 84, 95, 67, 69, + (3092): 76, 76, 95, 84, 89, 80, 69, 95, 73, 78, 86, 65, + (3104): 76, 73, 68, 61, 45, 50, 44, 86, 66, 84, 95, 67, + (3116): 69, 76, 76, 95, 84, 89, 80, 69, 95, 78, 65, 61, + (3128): 45, 51, 44, 86, 66, 84, 95, 67, 69, 76, 76, 95, + (3140): 84, 89, 80, 69, 95, 85, 78, 75, 78, 79, 87, 78, + (3152): 61, 45, 52, 125, 99, 101, 108, 108, 95, 116, + (3162): 121, 112, 101, 59, 105, 110, 116, 32, 99, 111, + (3172): 117, 110, 116, 59, 68, 83, 76, 95, 79, 102, 102, + (3183): 115, 101, 116, 32, 105, 110, 100, 101, 120, 105, + (3193): 110, 103, 95, 105, 100, 59, 105, 110, 116, 32, + (3203): 105, 115, 95, 100, 101, 99, 111, 109, 112, 59, + (3213): 68, 83, 76, 95, 79, 102, 102, 115, 101, 116, 32, + (3224): 109, 101, 109, 98, 101, 114, 115, 95, 98, 108, + (3234): 111, 98, 95, 105, 100, 59, 68, 83, 76, 95, 79, + (3245): 102, 102, 115, 101, 116, 32, 98, 97, 115, 101, + (3255): 95, 105, 100, 59, 68, 83, 76, 95, 79, 102, 102, + (3266): 115, 101, 116, 32, 110, 117, 109, 95, 114, 101, + (3276): 99, 115, 59, 125, 59, 10, 47, 82, 101, 108, 97, + (3287): 116, 105, 111, 110, 32, 68, 65, 84, 65, 83, 69, + (3298): 84, 32, 115, 116, 114, 117, 99, 116, 32, 82, + (3308): 101, 108, 97, 116, 105, 111, 110, 123, 68, 83, + (3318): 76, 95, 79, 102, 102, 115, 101, 116, 32, 115, + (3328): 117, 98, 95, 105, 100, 59, 68, 83, 76, 95, 79, + (3339): 102, 102, 115, 101, 116, 32, 115, 117, 98, 95, + (3349): 99, 97, 116, 95, 105, 100, 59, 68, 83, 76, 95, + (3360): 79, 102, 102, 115, 101, 116, 32, 115, 117, 98, + (3370): 95, 100, 101, 99, 111, 109, 112, 95, 99, 97, + (3380): 116, 95, 105, 100, 59, 68, 83, 76, 95, 79, 102, + (3391): 102, 115, 101, 116, 32, 115, 117, 112, 95, 105, + (3401): 100, 59, 68, 83, 76, 95, 79, 102, 102, 115, 101, + (3412): 116, 32, 115, 117, 112, 95, 99, 97, 116, 95, + (3422): 105, 100, 59, 68, 83, 76, 95, 79, 102, 102, 115, + (3433): 101, 116, 32, 115, 117, 112, 95, 100, 101, 99, + (3443): 111, 109, 112, 95, 99, 97, 116, 95, 105, 100, + (3453): 59, 101, 110, 117, 109, 32, 82, 101, 108, 75, + (3463): 105, 110, 100, 123, 86, 66, 84, 95, 82, 69, 76, + (3474): 75, 73, 78, 68, 95, 83, 85, 66, 83, 69, 84, 61, + (3486): 48, 44, 86, 66, 84, 95, 82, 69, 76, 75, 73, 78, + (3498): 68, 95, 83, 85, 80, 83, 69, 84, 61, 49, 44, 86, + (3510): 66, 84, 95, 82, 69, 76, 75, 73, 78, 68, 95, 66, + (3522): 79, 85, 78, 68, 61, 50, 44, 86, 66, 84, 95, 82, + (3534): 69, 76, 75, 73, 78, 68, 95, 80, 69, 82, 77, 85, + (3546): 84, 69, 61, 51, 44, 86, 66, 84, 95, 82, 69, 76, + (3558): 75, 73, 78, 68, 95, 78, 69, 73, 71, 72, 66, 79, + (3570): 82, 61, 52, 44, 86, 66, 84, 95, 82, 69, 76, 75, + (3582): 73, 78, 68, 95, 67, 79, 80, 89, 61, 53, 44, 86, + (3594): 66, 84, 95, 82, 69, 76, 75, 73, 78, 68, 95, 69, + (3606): 81, 85, 65, 76, 61, 54, 44, 86, 66, 84, 95, 82, + (3618): 69, 76, 75, 73, 78, 68, 95, 65, 78, 89, 61, 45, + (3630): 49, 44, 86, 66, 84, 95, 82, 69, 76, 75, 73, 78, + (3642): 68, 95, 73, 78, 86, 65, 76, 73, 68, 61, 45, 50, + (3654): 44, 86, 66, 84, 95, 82, 69, 76, 75, 73, 78, 68, + (3666): 95, 78, 65, 61, 45, 51, 44, 86, 66, 84, 95, 82, + (3678): 69, 76, 75, 73, 78, 68, 95, 85, 78, 75, 78, 79, + (3690): 87, 78, 61, 45, 52, 125, 107, 105, 110, 100, 59, + (3701): 101, 110, 117, 109, 32, 82, 101, 108, 82, 101, + (3711): 112, 123, 86, 66, 84, 95, 82, 69, 76, 82, 69, + (3722): 80, 95, 73, 68, 69, 78, 84, 73, 84, 89, 61, 48, + (3734): 44, 86, 66, 84, 95, 82, 69, 76, 82, 69, 80, 95, + (3746): 72, 76, 73, 83, 84, 61, 49, 44, 86, 66, 84, 95, + (3758): 82, 69, 76, 82, 69, 80, 95, 84, 76, 73, 83, 84, + (3770): 61, 50, 44, 86, 66, 84, 95, 82, 69, 76, 82, 69, + (3782): 80, 95, 84, 76, 73, 83, 84, 95, 49, 61, 51, 44, + (3794): 86, 66, 84, 95, 82, 69, 76, 82, 69, 80, 95, 69, + (3806): 76, 73, 83, 84, 61, 52, 44, 86, 66, 84, 95, 82, + (3818): 69, 76, 82, 69, 80, 95, 83, 84, 82, 85, 67, 84, + (3830): 85, 82, 69, 68, 61, 53, 44, 86, 66, 84, 95, 82, + (3842): 69, 76, 82, 69, 80, 95, 85, 78, 83, 84, 82, 85, + (3854): 67, 84, 85, 82, 69, 68, 61, 54, 44, 86, 66, 84, + (3866): 95, 82, 69, 76, 82, 69, 80, 95, 65, 82, 66, 73, + (3878): 84, 82, 65, 82, 89, 95, 82, 61, 55, 44, 86, 66, + (3890): 84, 95, 82, 69, 76, 82, 69, 80, 95, 65, 82, 66, + (3902): 73, 84, 82, 65, 82, 89, 95, 68, 82, 61, 56, 44, + (3914): 86, 66, 84, 95, 82, 69, 76, 82, 69, 80, 95, 65, + (3926): 78, 89, 61, 45, 49, 44, 86, 66, 84, 95, 82, 69, + (3938): 76, 82, 69, 80, 95, 73, 78, 86, 65, 76, 73, 68, + (3950): 61, 45, 50, 44, 86, 66, 84, 95, 82, 69, 76, 82, + (3962): 69, 80, 95, 78, 65, 61, 45, 51, 44, 86, 66, 84, + (3974): 95, 82, 69, 76, 82, 69, 80, 95, 85, 78, 75, 78, + (3986): 79, 87, 78, 61, 45, 52, 125, 114, 101, 112, 95, + (3997): 116, 121, 112, 101, 59, 68, 83, 76, 95, 79, 102, + (4008): 102, 115, 101, 116, 32, 100, 95, 98, 108, 111, + (4018): 98, 95, 105, 100, 59, 68, 83, 76, 95, 79, 102, + (4029): 102, 115, 101, 116, 32, 114, 95, 98, 108, 111, + (4039): 98, 95, 105, 100, 59, 68, 83, 76, 95, 79, 102, + (4050): 102, 115, 101, 116, 32, 98, 97, 115, 101, 95, + (4060): 105, 100, 59, 68, 83, 76, 95, 79, 102, 102, 115, + (4071): 101, 116, 32, 110, 117, 109, 95, 114, 101, 99, + (4081): 115, 59, 125, 59, 10, 47, 70, 105, 101, 108, + (4091): 100, 84, 109, 112, 108, 32, 68, 65, 84, 65, 83, + (4102): 69, 84, 32, 115, 116, 114, 117, 99, 116, 32, 70, + (4113): 105, 101, 108, 100, 84, 109, 112, 108, 123, 99, + (4123): 104, 97, 114, 32, 110, 97, 109, 101, 91, 54, 52, + (4134): 93, 59, 68, 83, 76, 95, 79, 102, 102, 115, 101, + (4145): 116, 32, 98, 97, 115, 101, 95, 115, 112, 97, 99, + (4156): 101, 95, 105, 100, 59, 101, 110, 117, 109, 32, + (4166): 65, 108, 103, 101, 98, 114, 97, 105, 99, 84, + (4176): 121, 112, 101, 123, 86, 66, 84, 95, 65, 76, 71, + (4187): 69, 66, 82, 65, 73, 67, 95, 84, 89, 80, 69, 95, + (4199): 67, 79, 78, 83, 84, 65, 78, 84, 61, 48, 44, 86, + (4211): 66, 84, 95, 65, 76, 71, 69, 66, 82, 65, 73, 67, + (4223): 95, 84, 89, 80, 69, 95, 67, 79, 77, 80, 79, 78, + (4235): 69, 78, 84, 61, 49, 44, 86, 66, 84, 95, 65, 76, + (4247): 71, 69, 66, 82, 65, 73, 67, 95, 84, 89, 80, 69, + (4259): 95, 83, 67, 65, 76, 65, 82, 61, 50, 44, 86, 66, + (4271): 84, 95, 65, 76, 71, 69, 66, 82, 65, 73, 67, 95, + (4283): 84, 89, 80, 69, 95, 86, 69, 67, 84, 79, 82, 61, + (4295): 51, 44, 86, 66, 84, 95, 65, 76, 71, 69, 66, 82, + (4307): 65, 73, 67, 95, 84, 89, 80, 69, 95, 84, 69, 78, + (4319): 83, 79, 82, 61, 52, 44, 86, 66, 84, 95, 65, 76, + (4331): 71, 69, 66, 82, 65, 73, 67, 95, 84, 89, 80, 69, + (4343): 95, 83, 89, 77, 95, 84, 69, 78, 83, 79, 82, 61, + (4355): 53, 44, 86, 66, 84, 95, 65, 76, 71, 69, 66, 82, + (4367): 65, 73, 67, 95, 84, 89, 80, 69, 95, 70, 73, 69, + (4379): 76, 68, 61, 54, 44, 86, 66, 84, 95, 65, 76, 71, + (4391): 69, 66, 82, 65, 73, 67, 95, 84, 89, 80, 69, 95, + (4403): 83, 84, 65, 84, 69, 61, 55, 44, 86, 66, 84, 95, + (4415): 65, 76, 71, 69, 66, 82, 65, 73, 67, 95, 84, 89, + (4427): 80, 69, 95, 84, 85, 80, 76, 69, 61, 56, 44, 86, + (4439): 66, 84, 95, 65, 76, 71, 69, 66, 82, 65, 73, 67, + (4451): 95, 84, 89, 80, 69, 95, 65, 78, 89, 61, 45, 49, + (4463): 44, 86, 66, 84, 95, 65, 76, 71, 69, 66, 82, 65, + (4475): 73, 67, 95, 84, 89, 80, 69, 95, 73, 78, 86, 65, + (4487): 76, 73, 68, 61, 45, 50, 44, 86, 66, 84, 95, 65, + (4499): 76, 71, 69, 66, 82, 65, 73, 67, 95, 84, 89, 80, + (4511): 69, 95, 78, 65, 61, 45, 51, 44, 86, 66, 84, 95, + (4523): 65, 76, 71, 69, 66, 82, 65, 73, 67, 95, 84, 89, + (4535): 80, 69, 95, 85, 78, 75, 78, 79, 87, 78, 61, 45, + (4547): 52, 125, 97, 108, 103, 95, 116, 121, 112, 101, + (4557): 59, 101, 110, 117, 109, 32, 66, 97, 115, 105, + (4567): 115, 84, 121, 112, 101, 123, 86, 66, 84, 95, 66, + (4578): 65, 83, 73, 83, 95, 84, 89, 80, 69, 95, 85, 78, + (4590): 73, 84, 89, 61, 48, 44, 86, 66, 84, 95, 66, 65, + (4602): 83, 73, 83, 95, 84, 89, 80, 69, 95, 67, 65, 82, + (4614): 84, 69, 83, 73, 65, 78, 61, 49, 44, 86, 66, 84, + (4626): 95, 66, 65, 83, 73, 83, 95, 84, 89, 80, 69, 95, + (4638): 83, 80, 72, 69, 82, 73, 67, 65, 76, 61, 50, 44, + (4650): 86, 66, 84, 95, 66, 65, 83, 73, 83, 95, 84, 89, + (4662): 80, 69, 95, 67, 89, 76, 73, 78, 68, 82, 73, 67, + (4674): 65, 76, 61, 51, 44, 86, 66, 84, 95, 66, 65, 83, + (4686): 73, 83, 95, 84, 89, 80, 69, 95, 85, 80, 80, 69, + (4698): 82, 95, 84, 82, 73, 61, 52, 44, 86, 66, 84, 95, + (4710): 66, 65, 83, 73, 83, 95, 84, 89, 80, 69, 95, 70, + (4722): 79, 85, 82, 73, 69, 82, 61, 53, 44, 86, 66, 84, + (4734): 95, 66, 65, 83, 73, 83, 95, 84, 89, 80, 69, 95, + (4746): 86, 65, 82, 73, 65, 66, 76, 69, 61, 54, 44, 86, + (4758): 66, 84, 95, 66, 65, 83, 73, 83, 95, 84, 89, 80, + (4770): 69, 95, 65, 78, 89, 61, 45, 49, 44, 86, 66, 84, + (4782): 95, 66, 65, 83, 73, 83, 95, 84, 89, 80, 69, 95, + (4794): 73, 78, 86, 65, 76, 73, 68, 61, 45, 50, 44, 86, + (4806): 66, 84, 95, 66, 65, 83, 73, 83, 95, 84, 89, 80, + (4818): 69, 95, 78, 65, 61, 45, 51, 44, 86, 66, 84, 95, + (4830): 66, 65, 83, 73, 83, 95, 84, 89, 80, 69, 95, 85, + (4842): 78, 75, 78, 79, 87, 78, 61, 45, 52, 125, 98, 97, + (4854): 115, 105, 115, 59, 68, 83, 76, 95, 79, 102, 102, + (4865): 115, 101, 116, 32, 113, 117, 97, 110, 116, 105, + (4875): 116, 121, 95, 105, 100, 59, 105, 110, 116, 32, + (4885): 110, 117, 109, 95, 99, 111, 109, 112, 115, 59, + (4895): 68, 83, 76, 95, 79, 102, 102, 115, 101, 116, 32, + (4906): 102, 116, 109, 112, 108, 95, 105, 100, 115, 95, + (4916): 98, 108, 111, 98, 95, 105, 100, 59, 68, 83, 76, + (4927): 95, 79, 102, 102, 115, 101, 116, 32, 98, 97, + (4937): 115, 101, 95, 105, 100, 59, 68, 83, 76, 95, 79, + (4948): 102, 102, 115, 101, 116, 32, 110, 117, 109, 95, + (4958): 114, 101, 99, 115, 59, 125, 59, 10, 47, 70, 105, + (4969): 101, 108, 100, 32, 68, 65, 84, 65, 83, 69, 84, + (4980): 32, 115, 116, 114, 117, 99, 116, 32, 70, 105, + (4990): 101, 108, 100, 123, 68, 83, 76, 95, 79, 102, + (5000): 102, 115, 101, 116, 32, 102, 116, 109, 112, 108, + (5010): 95, 105, 100, 59, 99, 104, 97, 114, 32, 110, 97, + (5021): 109, 101, 91, 54, 52, 93, 59, 68, 83, 76, 95, + (5032): 79, 102, 102, 115, 101, 116, 32, 117, 110, 105, + (5042): 116, 115, 95, 105, 100, 59, 68, 83, 76, 95, 79, + (5053): 102, 102, 115, 101, 116, 32, 115, 116, 111, 114, + (5063): 97, 103, 101, 95, 100, 101, 99, 111, 109, 112, + (5073): 95, 99, 97, 116, 95, 105, 100, 59, 101, 110, + (5083): 117, 109, 32, 73, 110, 116, 101, 114, 108, 101, + (5093): 97, 118, 101, 123, 86, 66, 84, 95, 73, 78, 84, + (5104): 69, 82, 76, 69, 65, 86, 69, 95, 67, 79, 77, 80, + (5116): 79, 78, 69, 78, 84, 61, 48, 44, 86, 66, 84, 95, + (5128): 73, 78, 84, 69, 82, 76, 69, 65, 86, 69, 95, 86, + (5140): 69, 67, 84, 79, 82, 61, 49, 44, 86, 66, 84, 95, + (5152): 73, 78, 84, 69, 82, 76, 69, 65, 86, 69, 95, 73, + (5164): 78, 68, 69, 80, 69, 78, 68, 69, 78, 84, 61, 50, + (5176): 44, 86, 66, 84, 95, 73, 78, 84, 69, 82, 76, 69, + (5188): 65, 86, 69, 95, 78, 79, 78, 69, 61, 51, 44, 86, + (5200): 66, 84, 95, 73, 78, 84, 69, 82, 76, 69, 65, 86, + (5212): 69, 95, 65, 78, 89, 61, 45, 49, 44, 86, 66, 84, + (5224): 95, 73, 78, 84, 69, 82, 76, 69, 65, 86, 69, 95, + (5236): 73, 78, 86, 65, 76, 73, 68, 61, 45, 50, 44, 86, + (5248): 66, 84, 95, 73, 78, 84, 69, 82, 76, 69, 65, 86, + (5260): 69, 95, 78, 65, 61, 45, 51, 44, 86, 66, 84, 95, + (5272): 73, 78, 84, 69, 82, 76, 69, 65, 86, 69, 95, 85, + (5284): 78, 75, 78, 79, 87, 78, 61, 45, 52, 125, 99, + (5295): 111, 109, 112, 95, 105, 110, 116, 108, 118, 59, + (5305): 68, 83, 76, 95, 79, 102, 102, 115, 101, 116, 32, + (5316): 105, 110, 100, 101, 120, 105, 110, 103, 95, 105, + (5326): 100, 59, 68, 83, 76, 95, 79, 102, 102, 115, 101, + (5337): 116, 32, 100, 111, 102, 95, 97, 115, 115, 111, + (5347): 99, 95, 99, 97, 116, 95, 105, 100, 59, 105, 110, + (5358): 116, 32, 97, 115, 115, 111, 99, 95, 114, 97, + (5368): 116, 105, 111, 59, 68, 83, 76, 95, 79, 102, 102, + (5379): 115, 101, 116, 32, 101, 118, 97, 108, 95, 100, + (5389): 101, 99, 111, 109, 112, 95, 99, 97, 116, 95, + (5399): 105, 100, 59, 101, 110, 117, 109, 32, 69, 118, + (5409): 97, 108, 70, 117, 110, 99, 123, 86, 66, 84, 95, + (5420): 69, 86, 65, 76, 95, 70, 85, 78, 67, 95, 67, 79, + (5432): 78, 83, 84, 65, 78, 84, 61, 48, 44, 86, 66, 84, + (5444): 95, 69, 86, 65, 76, 95, 70, 85, 78, 67, 95, 85, + (5456): 78, 73, 70, 79, 82, 77, 61, 49, 44, 86, 66, 84, + (5468): 95, 69, 86, 65, 76, 95, 70, 85, 78, 67, 95, 80, + (5480): 87, 67, 79, 78, 83, 84, 61, 50, 44, 86, 66, 84, + (5492): 95, 69, 86, 65, 76, 95, 70, 85, 78, 67, 95, 80, + (5504): 87, 76, 73, 78, 69, 65, 82, 61, 51, 44, 86, 66, + (5516): 84, 95, 69, 86, 65, 76, 95, 70, 85, 78, 67, 95, + (5528): 65, 78, 89, 61, 45, 49, 44, 86, 66, 84, 95, 69, + (5540): 86, 65, 76, 95, 70, 85, 78, 67, 95, 73, 78, 86, + (5552): 65, 76, 73, 68, 61, 45, 50, 44, 86, 66, 84, 95, + (5564): 69, 86, 65, 76, 95, 70, 85, 78, 67, 95, 78, 65, + (5576): 61, 45, 51, 44, 86, 66, 84, 95, 69, 86, 65, 76, + (5588): 95, 70, 85, 78, 67, 95, 85, 78, 75, 78, 79, 87, + (5600): 78, 61, 45, 52, 125, 101, 118, 97, 108, 95, 102, + (5611): 117, 110, 99, 59, 105, 110, 116, 32, 105, 115, + (5621): 95, 104, 111, 109, 111, 103, 101, 110, 101, 111, + (5631): 117, 115, 59, 105, 110, 116, 32, 105, 115, 95, + (5641): 99, 111, 111, 114, 100, 95, 102, 105, 101, 108, + (5651): 100, 59, 68, 83, 76, 95, 79, 102, 102, 115, 101, + (5662): 116, 32, 99, 111, 109, 112, 95, 105, 100, 115, + (5672): 95, 98, 108, 111, 98, 95, 105, 100, 59, 68, 83, + (5683): 76, 95, 79, 102, 102, 115, 101, 116, 32, 99, + (5693): 111, 109, 112, 95, 111, 114, 100, 101, 114, 95, + (5703): 98, 108, 111, 98, 95, 105, 100, 59, 68, 83, 76, + (5714): 95, 79, 102, 102, 115, 101, 116, 32, 118, 98, + (5724): 97, 115, 105, 115, 95, 98, 108, 111, 98, 95, + (5734): 105, 100, 59, 68, 83, 76, 95, 79, 102, 102, 115, + (5745): 101, 116, 32, 100, 111, 102, 95, 98, 108, 111, + (5755): 98, 95, 105, 100, 59, 68, 83, 76, 95, 79, 102, + (5766): 102, 115, 101, 116, 32, 98, 97, 115, 101, 95, + (5776): 105, 100, 59, 68, 83, 76, 95, 79, 102, 102, 115, + (5787): 101, 116, 32, 110, 117, 109, 95, 114, 101, 99, + (5797): 115, 59, 125, 59, 10, 47, 109, 101, 116, 97, 98, + (5808): 108, 111, 98, 48, 48, 48, 48, 48, 46, 105, 110, + (5819): 100, 101, 120, 32, 68, 65, 84, 65, 83, 69, 84, + (5830): 32, 115, 116, 114, 117, 99, 116, 32, 73, 110, + (5840): 100, 101, 120, 80, 97, 105, 114, 123, 68, 83, + (5850): 76, 95, 79, 102, 102, 115, 101, 116, 32, 105, + (5860): 110, 100, 101, 120, 59, 105, 110, 116, 32, 108, + (5870): 101, 110, 103, 116, 104, 59, 125, 59, 10, 47, + (5880): 109, 101, 116, 97, 98, 108, 111, 98, 48, 48, 48, + (5891): 48, 48, 46, 98, 108, 111, 98, 32, 68, 65, 84, + (5902): 65, 83, 69, 84, 32, 68, 83, 76, 95, 79, 102, + (5913): 102, 115, 101, 116, 59, 10 } } GROUP ".attributes" { @@ -500,52 +627,52 @@ GROUP "/" { } DATASPACE SIMPLE { ( 1 ) / ( 1 ) } DATA { - (0): { - -604320037, - ".", - "don't import", - 1, - { - 0, - 0, - 0, - "none" - }, - { - 0, - 1, - 0, - "devel" - }, - { - 1, - 3, - 0, - "" - }, - { - 0, - 0, - 0, - "none" - }, - { - 1, - 2, - 1, - "" - }, - { - 1, - 2, - 0, - "" - }, - 1, - 0, - 1, - 0 - } + (0): { + -604320037, + ".", + "don't import", + 1, + { + 0, + 0, + 0, + "none" + }, + { + 0, + 1, + 0, + "devel" + }, + { + 1, + 3, + 0, + "" + }, + { + 0, + 0, + 0, + "none" + }, + { + 1, + 2, + 1, + "" + }, + { + 1, + 2, + 0, + "" + }, + 1, + 0, + 1, + 0 + } } } } @@ -562,7 +689,7 @@ GROUP "/" { } DATASPACE SIMPLE { ( 24 ) / ( H5S_UNLIMITED ) } DATA { - (0): { + (0): { -1, 1, 0, @@ -571,7 +698,7 @@ GROUP "/" { 0, 1 }, - (1): { + (1): { -1, 2, 0, @@ -580,7 +707,7 @@ GROUP "/" { 1, 1 }, - (2): { + (2): { -1, 3, 0, @@ -589,7 +716,7 @@ GROUP "/" { 2, 1 }, - (3): { + (3): { -1, 4, 0, @@ -598,7 +725,7 @@ GROUP "/" { 3, 1 }, - (4): { + (4): { -1, 5, 0, @@ -607,7 +734,7 @@ GROUP "/" { 4, 1 }, - (5): { + (5): { -1, 6, 0, @@ -616,7 +743,7 @@ GROUP "/" { 5, 1 }, - (6): { + (6): { -1, 7, 0, @@ -625,7 +752,7 @@ GROUP "/" { 6, 1 }, - (7): { + (7): { -1, 8, 0, @@ -634,7 +761,7 @@ GROUP "/" { 7, 1 }, - (8): { + (8): { -1, 9, 0, @@ -643,7 +770,7 @@ GROUP "/" { 8, 1 }, - (9): { + (9): { -1, 10, 0, @@ -652,7 +779,7 @@ GROUP "/" { 9, 1 }, - (10): { + (10): { -1, 11, 0, @@ -661,7 +788,7 @@ GROUP "/" { 10, 1 }, - (11): { + (11): { -1, 12, 0, @@ -670,7 +797,7 @@ GROUP "/" { 11, 1 }, - (12): { + (12): { -1, 13, 0, @@ -679,7 +806,7 @@ GROUP "/" { 12, 1 }, - (13): { + (13): { -1, 14, 0, @@ -688,7 +815,7 @@ GROUP "/" { 13, 1 }, - (14): { + (14): { -1, 15, 0, @@ -697,7 +824,7 @@ GROUP "/" { 14, 1 }, - (15): { + (15): { -1, 16, 0, @@ -706,7 +833,7 @@ GROUP "/" { 15, 1 }, - (16): { + (16): { -1, 17, 0, @@ -715,7 +842,7 @@ GROUP "/" { 16, 1 }, - (17): { + (17): { -1, 18, 0, @@ -724,7 +851,7 @@ GROUP "/" { 17, 1 }, - (18): { + (18): { -1, 19, 0, @@ -733,7 +860,7 @@ GROUP "/" { 18, 1 }, - (19): { + (19): { -1, 20, 0, @@ -742,7 +869,7 @@ GROUP "/" { 19, 1 }, - (20): { + (20): { -1, 21, 0, @@ -751,7 +878,7 @@ GROUP "/" { 20, 1 }, - (21): { + (21): { -1, 22, 0, @@ -760,7 +887,7 @@ GROUP "/" { 21, 1 }, - (22): { + (22): { -1, 23, 0, @@ -769,7 +896,7 @@ GROUP "/" { 22, 1 }, - (23): { + (23): { -1, 24, 0, @@ -810,35 +937,35 @@ GROUP "/" { } DATASPACE SIMPLE { ( 5 ) / ( H5S_UNLIMITED ) } DATA { - (0): { + (0): { "nodes", TOPO, 0, 0, 1 }, - (1): { + (1): { "elems", TOPO, 2, 1, 1 }, - (2): { + (2): { "edges", USERD, 1, 2, 1 }, - (3): { + (3): { "blocks", BLOCK, 2, 3, 1 }, - (4): { + (4): { "side_sets", USERD, 1, @@ -883,7 +1010,7 @@ GROUP "/" { } DATASPACE SIMPLE { ( 24 ) / ( H5S_UNLIMITED ) } DATA { - (0): { + (0): { 0, 0, POINT, @@ -894,7 +1021,7 @@ GROUP "/" { 0, 1 }, - (1): { + (1): { 0, 1, MIXED, @@ -905,7 +1032,7 @@ GROUP "/" { 1, 1 }, - (2): { + (2): { 0, 3, NONE, @@ -916,7 +1043,7 @@ GROUP "/" { 2, 1 }, - (3): { + (3): { 0, 4, NONE, @@ -927,7 +1054,7 @@ GROUP "/" { 3, 1 }, - (4): { + (4): { 1, 0, POINT, @@ -938,7 +1065,7 @@ GROUP "/" { 4, 1 }, - (5): { + (5): { 1, 1, QUAD, @@ -949,7 +1076,7 @@ GROUP "/" { 5, 1 }, - (6): { + (6): { 1, 3, NONE, @@ -960,7 +1087,7 @@ GROUP "/" { 6, 1 }, - (7): { + (7): { 2, 0, POINT, @@ -971,7 +1098,7 @@ GROUP "/" { 7, 1 }, - (8): { + (8): { 2, 1, MIXED, @@ -982,7 +1109,7 @@ GROUP "/" { 8, 1 }, - (9): { + (9): { 2, 3, NONE, @@ -993,7 +1120,7 @@ GROUP "/" { 9, 1 }, - (10): { + (10): { 3, 0, POINT, @@ -1004,7 +1131,7 @@ GROUP "/" { 10, 1 }, - (11): { + (11): { 3, 1, QUAD, @@ -1015,7 +1142,7 @@ GROUP "/" { 11, 1 }, - (12): { + (12): { 3, 3, NONE, @@ -1026,7 +1153,7 @@ GROUP "/" { 12, 1 }, - (13): { + (13): { 4, 0, POINT, @@ -1037,7 +1164,7 @@ GROUP "/" { 13, 1 }, - (14): { + (14): { 4, 2, LINE, @@ -1048,7 +1175,7 @@ GROUP "/" { 14, 1 }, - (15): { + (15): { 5, 0, POINT, @@ -1059,7 +1186,7 @@ GROUP "/" { 15, 1 }, - (16): { + (16): { 5, 2, LINE, @@ -1070,7 +1197,7 @@ GROUP "/" { 16, 1 }, - (17): { + (17): { 6, 0, POINT, @@ -1081,7 +1208,7 @@ GROUP "/" { 17, 1 }, - (18): { + (18): { 7, 0, POINT, @@ -1092,7 +1219,7 @@ GROUP "/" { 18, 1 }, - (19): { + (19): { 7, 1, TRI, @@ -1103,7 +1230,7 @@ GROUP "/" { 19, 1 }, - (20): { + (20): { 7, 3, NONE, @@ -1114,7 +1241,7 @@ GROUP "/" { 20, 1 }, - (21): { + (21): { 8, 0, POINT, @@ -1125,7 +1252,7 @@ GROUP "/" { 21, 1 }, - (22): { + (22): { 8, 1, QUAD, @@ -1136,7 +1263,7 @@ GROUP "/" { 22, 1 }, - (23): { + (23): { 8, 3, NONE, @@ -1197,7 +1324,7 @@ GROUP "/" { } DATASPACE SIMPLE { ( 14 ) / ( H5S_UNLIMITED ) } DATA { - (0): { + (0): { 1, "X", -7, @@ -1217,7 +1344,7 @@ GROUP "/" { 0, 1 }, - (1): { + (1): { 1, "Y", -7, @@ -1237,7 +1364,7 @@ GROUP "/" { 1, 1 }, - (2): { + (2): { 0, "coords", -7, @@ -1257,7 +1384,7 @@ GROUP "/" { 2, 1 }, - (3): { + (3): { 2, "distribution factors", -5, @@ -1277,7 +1404,7 @@ GROUP "/" { 3, 1 }, - (4): { + (4): { 3, "temperature", -7, @@ -1297,7 +1424,7 @@ GROUP "/" { 4, 1 }, - (5): { + (5): { 1, "dX", -7, @@ -1317,7 +1444,7 @@ GROUP "/" { 5, 1 }, - (6): { + (6): { 1, "dY", -7, @@ -1337,7 +1464,7 @@ GROUP "/" { 6, 1 }, - (7): { + (7): { 0, "displacements", -7, @@ -1357,7 +1484,7 @@ GROUP "/" { 7, 1 }, - (8): { + (8): { 5, "Sx", -7, @@ -1377,7 +1504,7 @@ GROUP "/" { 8, 1 }, - (9): { + (9): { 5, "Sy", -7, @@ -1397,7 +1524,7 @@ GROUP "/" { 9, 1 }, - (10): { + (10): { 5, "Sxy", -7, @@ -1417,7 +1544,7 @@ GROUP "/" { 10, 1 }, - (11): { + (11): { 4, "stress", -7, @@ -1437,7 +1564,7 @@ GROUP "/" { 11, 1 }, - (12): { + (12): { 6, "temperature", -7, @@ -1457,7 +1584,7 @@ GROUP "/" { 12, 1 }, - (13): { + (13): { 7, "pressure", -7, @@ -1526,7 +1653,7 @@ GROUP "/" { } DATASPACE SIMPLE { ( 8 ) / ( H5S_UNLIMITED ) } DATA { - (0): { + (0): { "coordinate_tmpl", 0, VECTOR, @@ -1537,7 +1664,7 @@ GROUP "/" { 0, 1 }, - (1): { + (1): { "coordinate_tmpl_component", 0, SCALAR, @@ -1548,7 +1675,7 @@ GROUP "/" { 1, 1 }, - (2): { + (2): { "distrib_factors_tmpl", 5, SCALAR, @@ -1559,7 +1686,7 @@ GROUP "/" { 2, 1 }, - (3): { + (3): { "temp_on_ns1_tmpl", 6, SCALAR, @@ -1570,7 +1697,7 @@ GROUP "/" { 3, 1 }, - (4): { + (4): { "stress_on_cell_1_tmpl", 1, SYM_TENSOR, @@ -1581,7 +1708,7 @@ GROUP "/" { 4, 1 }, - (5): { + (5): { "stress_on_cell_1_tmpl_component", 1, SCALAR, @@ -1592,7 +1719,7 @@ GROUP "/" { 5, 1 }, - (6): { + (6): { "temp_on_cell_2_tmpl", 2, SCALAR, @@ -1603,7 +1730,7 @@ GROUP "/" { 6, 1 }, - (7): { + (7): { "pressure_on_ss1", 4, SCALAR, @@ -1642,7 +1769,7 @@ GROUP "/" { } DATASPACE SIMPLE { ( 24 ) / ( H5S_UNLIMITED ) } DATA { - (0): { + (0): { 1, { [ 0, 0, 0, 0, 0, 0, 0, 0 ] @@ -1657,7 +1784,7 @@ GROUP "/" { 0, 1 }, - (1): { + (1): { 1, { [ 0, 0, 0, 0, 0, 0, 0, 0 ] @@ -1672,7 +1799,7 @@ GROUP "/" { 1, 1 }, - (2): { + (2): { 1, { [ 0, 0, 0, 0, 0, 0, 0, 0 ] @@ -1687,7 +1814,7 @@ GROUP "/" { 2, 1 }, - (3): { + (3): { 1, { [ 0, 0, 0, 0, 0, 0, 0, 0 ] @@ -1702,7 +1829,7 @@ GROUP "/" { 3, 1 }, - (4): { + (4): { 1, { [ 0, 0, 0, 0, 0, 0, 0, 0 ] @@ -1717,7 +1844,7 @@ GROUP "/" { 4, 1 }, - (5): { + (5): { 1, { [ 0, 0, 0, 0, 0, 0, 0, 0 ] @@ -1732,7 +1859,7 @@ GROUP "/" { 5, 1 }, - (6): { + (6): { 1, { [ 0, 0, 0, 0, 0, 0, 0, 0 ] @@ -1747,7 +1874,7 @@ GROUP "/" { 6, 1 }, - (7): { + (7): { 1, { [ 0, 0, 0, 0, 0, 0, 0, 0 ] @@ -1762,7 +1889,7 @@ GROUP "/" { 7, 1 }, - (8): { + (8): { 1, { [ 0, 0, 0, 0, 0, 0, 0, 0 ] @@ -1777,7 +1904,7 @@ GROUP "/" { 8, 1 }, - (9): { + (9): { 1, { [ 0, 0, 0, 0, 0, 0, 0, 0 ] @@ -1792,7 +1919,7 @@ GROUP "/" { 9, 1 }, - (10): { + (10): { 1, { [ 0, 0, 0, 0, 0, 0, 0, 0 ] @@ -1807,7 +1934,7 @@ GROUP "/" { 10, 1 }, - (11): { + (11): { 1, { [ 0, 0, 0, 0, 0, 0, 0, 0 ] @@ -1822,7 +1949,7 @@ GROUP "/" { 11, 1 }, - (12): { + (12): { 1, { [ 0, 0, 0, 0, 0, 0, 0, 0 ] @@ -1837,7 +1964,7 @@ GROUP "/" { 12, 1 }, - (13): { + (13): { 1, { [ 0, 0, 0, 0, 0, 0, 0, 0 ] @@ -1852,7 +1979,7 @@ GROUP "/" { 13, 1 }, - (14): { + (14): { 1, { [ 0, 0, 0, 0, 0, 0, 0, 0 ] @@ -1867,7 +1994,7 @@ GROUP "/" { 14, 1 }, - (15): { + (15): { 1, { [ 0, 0, 0, 0, 0, 0, 0, 0 ] @@ -1882,7 +2009,7 @@ GROUP "/" { 15, 1 }, - (16): { + (16): { 1, { [ 0, 0, 0, 0, 0, 0, 0, 0 ] @@ -1897,7 +2024,7 @@ GROUP "/" { 16, 1 }, - (17): { + (17): { 1, { [ 0, 0, 0, 0, 0, 0, 0, 0 ] @@ -1912,7 +2039,7 @@ GROUP "/" { 17, 1 }, - (18): { + (18): { 1, { [ 0, 0, 0, 0, 0, 0, 0, 0 ] @@ -1927,7 +2054,7 @@ GROUP "/" { 18, 1 }, - (19): { + (19): { 1, { [ 0, 0, 0, 0, 0, 0, 0, 0 ] @@ -1942,7 +2069,7 @@ GROUP "/" { 19, 1 }, - (20): { + (20): { 1, { [ 0, 0, 0, 0, 0, 0, 0, 0 ] @@ -1957,7 +2084,7 @@ GROUP "/" { 20, 1 }, - (21): { + (21): { 1, { [ 0, 0, 0, 0, 0, 0, 0, 0 ] @@ -1972,7 +2099,7 @@ GROUP "/" { 21, 1 }, - (22): { + (22): { 1, { [ 0, 0, 0, 0, 0, 0, 0, 0 ] @@ -1987,7 +2114,7 @@ GROUP "/" { 22, 1 }, - (23): { + (23): { 1, { [ 0, 0, 0, 0, 0, 0, 0, 0 ] @@ -2049,7 +2176,7 @@ GROUP "/" { } DATASPACE SIMPLE { ( 21 ) / ( H5S_UNLIMITED ) } DATA { - (0): { + (0): { 1, 0, -2, @@ -2063,7 +2190,7 @@ GROUP "/" { 0, 1 }, - (1): { + (1): { 1, 1, -2, @@ -2077,7 +2204,7 @@ GROUP "/" { 1, 1 }, - (2): { + (2): { 2, 0, -2, @@ -2091,7 +2218,7 @@ GROUP "/" { 2, 1 }, - (3): { + (3): { 2, 1, -2, @@ -2105,7 +2232,7 @@ GROUP "/" { 3, 1 }, - (4): { + (4): { 7, 0, -2, @@ -2119,7 +2246,7 @@ GROUP "/" { 4, 1 }, - (5): { + (5): { 7, 1, -2, @@ -2133,7 +2260,7 @@ GROUP "/" { 5, 1 }, - (6): { + (6): { 8, 0, -2, @@ -2147,7 +2274,7 @@ GROUP "/" { 6, 1 }, - (7): { + (7): { 8, 1, -2, @@ -2161,7 +2288,7 @@ GROUP "/" { 7, 1 }, - (8): { + (8): { 3, 0, -2, @@ -2175,7 +2302,7 @@ GROUP "/" { 8, 1 }, - (9): { + (9): { 3, 1, -2, @@ -2189,7 +2316,7 @@ GROUP "/" { 9, 1 }, - (10): { + (10): { 4, 0, -2, @@ -2203,7 +2330,7 @@ GROUP "/" { 10, 1 }, - (11): { + (11): { 5, 0, -2, @@ -2217,7 +2344,7 @@ GROUP "/" { 11, 1 }, - (12): { + (12): { 6, 0, -2, @@ -2231,7 +2358,7 @@ GROUP "/" { 12, 1 }, - (13): { + (13): { 1, 3, -2, @@ -2245,7 +2372,7 @@ GROUP "/" { 13, 1 }, - (14): { + (14): { 7, 3, -2, @@ -2259,7 +2386,7 @@ GROUP "/" { 14, 1 }, - (15): { + (15): { 8, 3, -2, @@ -2273,7 +2400,7 @@ GROUP "/" { 15, 1 }, - (16): { + (16): { 3, 3, -2, @@ -2287,7 +2414,7 @@ GROUP "/" { 16, 1 }, - (17): { + (17): { 1, 1, -2, @@ -2301,7 +2428,7 @@ GROUP "/" { 17, 1 }, - (18): { + (18): { 7, 1, -2, @@ -2315,7 +2442,7 @@ GROUP "/" { 18, 1 }, - (19): { + (19): { 8, 1, -2, @@ -2329,7 +2456,7 @@ GROUP "/" { 19, 1 }, - (20): { + (20): { 3, 1, -2, @@ -2381,7 +2508,7 @@ GROUP "/" { } DATASPACE SIMPLE { ( 9 ) / ( H5S_UNLIMITED ) } DATA { - (0): { + (0): { 0, "TOP_CELL", 2, @@ -2396,7 +2523,7 @@ GROUP "/" { 0, 1 }, - (1): { + (1): { 0, "CELL_1", 2, @@ -2411,7 +2538,7 @@ GROUP "/" { 1, 1 }, - (2): { + (2): { 0, "CELL_2", 2, @@ -2426,7 +2553,7 @@ GROUP "/" { 2, 1 }, - (3): { + (3): { 0, "CELL_3", 2, @@ -2441,7 +2568,7 @@ GROUP "/" { 3, 1 }, - (4): { + (4): { 0, "SIDE_SET_1", 1, @@ -2456,7 +2583,7 @@ GROUP "/" { 4, 1 }, - (5): { + (5): { 0, "SIDE_SET_2", 1, @@ -2471,7 +2598,7 @@ GROUP "/" { 5, 1 }, - (6): { + (6): { 0, "NODE_SET_1", 0, @@ -2486,7 +2613,7 @@ GROUP "/" { 6, 1 }, - (7): { + (7): { 0, "CELL_2_TRIS", 2, @@ -2501,7 +2628,7 @@ GROUP "/" { 7, 1 }, - (8): { + (8): { 0, "CELL_2_QUADS", 2, @@ -2522,60 +2649,62 @@ GROUP "/" { DATATYPE H5T_IEEE_F32BE DATASPACE SIMPLE { ( 36 ) / ( 36 ) } DATA { - (0): 0, 4, 1, 4, 2, 4, 2.5, 4, 0, 3, 1, 3, 2, 3, 2.5, 3, 0, 2, 1, 2, 2, - (21): 2, 2.5, 2, 0, 1, 2, 1, 2.5, 1, 0, 0, 2, 0, 2.5, 0 + (0): 0, 4, 1, 4, 2, 4, 2.5, 4, 0, 3, 1, 3, 2, 3, 2.5, 3, 0, 2, 1, + (19): 2, 2, 2, 2.5, 2, 0, 1, 2, 1, 2.5, 1, 0, 0, 2, 0, 2.5, 0 } } DATASET "field-displacements_0007" { DATATYPE H5T_IEEE_F32BE DATASPACE SIMPLE { ( 36 ) / ( 36 ) } DATA { - (0): 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, - (11): 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, - (22): 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, - (33): 0.25, 0.25, 0.25 + (0): 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, + (10): 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, + (19): 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, + (28): 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25 } } DATASET "field-distribution_factors_0003" { DATATYPE H5T_IEEE_F32BE DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { - (0): 4, 3, 2, 1, 0 + (0): 4, 3, 2, 1, 0 } } DATASET "field-pressure_0013" { DATATYPE H5T_IEEE_F32BE DATASPACE SIMPLE { ( 2 ) / ( 2 ) } DATA { - (0): 45, 55 + (0): 45, 55 } } DATASET "field-stress_0011" { DATATYPE H5T_IEEE_F32BE DATASPACE SIMPLE { ( 12 ) / ( 12 ) } DATA { - (0): 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): 0.5, 0.25, 0.5, 0.5, 0.25, 0.5, 0.5, 0.25, 0.5, 0.5, 0.25, + (11): 0.5 } } DATASET "field-temperature_0004" { DATATYPE H5T_IEEE_F32BE DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { - (0): 100, 150, 150, 100, 75 + (0): 100, 150, 150, 100, 75 } } DATASET "field-temperature_0012" { DATATYPE H5T_IEEE_F32BE DATASPACE SIMPLE { ( 7 ) / ( 7 ) } DATA { - (0): 75, 95, 120, 80, 115, 85, 110 + (0): 75, 95, 120, 80, 115, 85, 110 } } DATASET "metablob00000.blob" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 19 ) / ( H5S_UNLIMITED ) } DATA { - (0): 1, 7, 8, 3, -2, -2, -2, -2, -2, -2, -2, -2, 0, 1, 5, 6, 8, 9, 10 + (0): 1, 7, 8, 3, -2, -2, -2, -2, -2, -2, -2, -2, 0, 1, 5, 6, 8, + (17): 9, 10 } } DATASET "metablob00000.index" { @@ -2585,43 +2714,43 @@ GROUP "/" { } DATASPACE SIMPLE { ( 10 ) / ( H5S_UNLIMITED ) } DATA { - (0): { + (0): { 0, 4 }, - (1): { + (1): { 4, 2 }, - (2): { + (2): { 6, 1 }, - (3): { + (3): { 7, 2 }, - (4): { + (4): { 9, 1 }, - (5): { + (5): { 10, 1 }, - (6): { + (6): { 11, 1 }, - (7): { + (7): { 12, 2 }, - (8): { + (8): { 14, 2 }, - (9): { + (9): { 16, 3 } @@ -2631,119 +2760,119 @@ GROUP "/" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 9 ) / ( 9 ) } DATA { - (0): 1, 2, 3, 5, 6, 7, 9, 10, 11 + (0): 1, 2, 3, 5, 6, 7, 9, 10, 11 } } DATASET "ssrel-_0001" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { - (0): 1, 2, 4, 5 + (0): 1, 2, 4, 5 } } DATASET "ssrel-_0002" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 7 ) / ( 7 ) } DATA { - (0): 9, 10, 11, 13, 14, 16, 17 + (0): 9, 10, 11, 13, 14, 16, 17 } } DATASET "ssrel-_0003" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { - (0): 7, 8, 9, 11 + (0): 7, 8, 9, 11 } } DATASET "ssrel-_0004" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { - (0): 9, 10, 11, 13, 14 + (0): 9, 10, 11, 13, 14 } } DATASET "ssrel-_0005" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 3 ) / ( 3 ) } DATA { - (0): 7, 8, 9 + (0): 7, 8, 9 } } DATASET "ssrel-_0006" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { - (0): 13, 14, 16, 17 + (0): 13, 14, 16, 17 } } DATASET "ssrel-_0007" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 1 ) / ( 1 ) } DATA { - (0): 11 + (0): 11 } } DATASET "ssrel-_0008" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { - (0): 3, 4, 7, 8, 11, 12, 14, 15, 17, 18 + (0): 3, 4, 7, 8, 11, 12, 14, 15, 17, 18 } } DATASET "ssrel-_0009" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { - (0): 3, 6, 10, 12 + (0): 3, 6, 10, 12 } } DATASET "ssrel-_0010" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 3 ) / ( 3 ) } DATA { - (0): 9, 10, 11 + (0): 9, 10, 11 } } DATASET "ssrel-_0011" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { - (0): 1, 5, 9, 13, 16 + (0): 1, 5, 9, 13, 16 } } DATASET "ssrel-_0012" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { - (0): 4, 8, 12, 15, 18 + (0): 4, 8, 12, 15, 18 } } DATASET "toporel-_0017" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 16 ) / ( 16 ) } DATA { - (0): 1, 2, 6, 5, 2, 3, 7, 6, 5, 6, 10, 9, 6, 7, 11, 10 + (0): 1, 2, 6, 5, 2, 3, 7, 6, 5, 6, 10, 9, 6, 7, 11, 10 } } DATASET "toporel-_0018" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 9 ) / ( 9 ) } DATA { - (0): 9, 10, 13, 10, 14, 13, 10, 11, 14 + (0): 9, 10, 13, 10, 14, 13, 10, 11, 14 } } DATASET "toporel-_0019" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { - (0): 13, 14, 17, 16 + (0): 13, 14, 17, 16 } } DATASET "toporel-_0020" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 16 ) / ( 16 ) } DATA { - (0): 3, 4, 8, 7, 7, 8, 12, 11, 11, 12, 15, 14, 14, 15, 18, 17 + (0): 3, 4, 8, 7, 7, 8, 12, 11, 11, 12, 15, 14, 14, 15, 18, 17 } } } diff --git a/tools/testfiles/tsplit_file.ddl b/tools/testfiles/tsplit_file.ddl index edb5900..f7f4b9d 100644 --- a/tools/testfiles/tsplit_file.ddl +++ b/tools/testfiles/tsplit_file.ddl @@ -12,23 +12,29 @@ GROUP "/" { } DATASPACE SIMPLE { ( 1 ) / ( 1 ) } DATA { - "this is some metadata on this file" + (0): "this is some metadata on this file" } } DATASET "dset1" { DATATYPE H5T_STD_I32BE DATASPACE SIMPLE { ( 10, 15 ) / ( 10, 15 ) } DATA { - (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - (1,0): 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - (2,0): 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - (3,0): 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - (4,0): 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - (5,0): 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - (6,0): 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - (7,0): 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - (8,0): 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, - (9,0): 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23 + (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + (1,0): 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + (2,0): 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + (3,0): 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + (4,0): 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + (4,14): 18, + (5,0): 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + (5,14): 19, + (6,0): 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + (6,14): 20, + (7,0): 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + (7,14): 21, + (8,0): 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + (8,13): 21, 22, + (9,0): 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + (9,13): 22, 23 } } } diff --git a/tools/testfiles/tstr-1.ddl b/tools/testfiles/tstr-1.ddl index eb47202..3dabcf6 100644 --- a/tools/testfiles/tstr-1.ddl +++ b/tools/testfiles/tstr-1.ddl @@ -15,239 +15,239 @@ GROUP "/" { } DATASPACE SIMPLE { ( 3, 6 ) / ( 3, 6 ) } DATA { - (0,0): { + (0,0): { [ 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 ], + 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" ] + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ] }, - (0,1): { + (0,1): { [ 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 ], + 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" ] + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ] }, - (0,2): { + (0,2): { [ 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 ], + 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" ] + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ] }, - (0,3): { + (0,3): { [ 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 ], + 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" ] + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ] }, - (0,4): { + (0,4): { [ 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 ], + 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" ] + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ] }, - (0,5): { + (0,5): { [ 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 ], + 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" ] + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ] }, - (1,0): { + (1,0): { [ 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 ], + 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" ] + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ] }, - (1,1): { + (1,1): { [ 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 ], + 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" ] + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ] }, - (1,2): { + (1,2): { [ 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 ], + 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" ] + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ] }, - (1,3): { + (1,3): { [ 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 ], + 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" ] + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ] }, - (1,4): { + (1,4): { [ 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 ], + 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" ] + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ] }, - (1,5): { + (1,5): { [ 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 ], + 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" ] + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ] }, - (2,0): { + (2,0): { [ 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 ], + 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" ] + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ] }, - (2,1): { + (2,1): { [ 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 ], + 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" ] + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ] }, - (2,2): { + (2,2): { [ 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 ], + 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" ] + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ] }, - (2,3): { + (2,3): { [ 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 ], + 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" ] + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ] }, - (2,4): { + (2,4): { [ 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 ], + 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" ] + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ] }, - (2,5): { + (2,5): { [ 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 ], + 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" ] + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh12345678" ] } } } @@ -260,9 +260,9 @@ GROUP "/" { } DATASPACE SIMPLE { ( 3, 4 ) / ( 3, 4 ) } DATA { - (0,0): "s1", "s2", "s3", "s4", - (1,0): "s5", "s6", "s7", "s8", - (2,0): "s9", "s0", "s1", "s2" + (0,0): "s1", "s2", "s3", "s4", + (1,0): "s5", "s6", "s7", "s8", + (2,0): "s9", "s0", "s1", "s2" } } DATASET "string2" { @@ -274,11 +274,12 @@ GROUP "/" { } DATASPACE SIMPLE { ( 20 ) / ( 20 ) } DATA { - (0): "ab cd ef1 ", "ab cd ef2 ", "ab cd ef3 ", "ab cd ef4 ", - (4): "ab cd ef5 ", "ab cd ef6 ", "ab cd ef7 ", "ab cd ef8 ", - (8): "ab cd ef9 ", "ab cd ef0 ", "ab cd ef1 ", "ab cd ef2 ", - (12): "ab cd ef3 ", "ab cd ef4 ", "ab cd ef5 ", "ab cd ef6 ", - (16): "ab cd ef7 ", "ab cd ef8 ", "ab cd ef9 ", "ab cd ef0 " + (0): "ab cd ef1 ", "ab cd ef2 ", "ab cd ef3 ", "ab cd ef4 ", + (4): "ab cd ef5 ", "ab cd ef6 ", "ab cd ef7 ", "ab cd ef8 ", + (8): "ab cd ef9 ", "ab cd ef0 ", "ab cd ef1 ", "ab cd ef2 ", + (12): "ab cd ef3 ", "ab cd ef4 ", "ab cd ef5 ", + (15): "ab cd ef6 ", "ab cd ef7 ", "ab cd ef8 ", + (18): "ab cd ef9 ", "ab cd ef0 " } } DATASET "string3" { @@ -290,15 +291,20 @@ GROUP "/" { } DATASPACE SIMPLE { ( 27 ) / ( 27 ) } DATA { - (0): "abcd0\000\000\000", "abcd1\000\000\000", "abcd2\000\000\000", - (3): "abcd3\000\000\000", "abcd4\000\000\000", "abcd5\000\000\000", - (6): "abcd6\000\000\000", "abcd7\000\000\000", "abcd8\000\000\000", - (9): "abcd9\000\000\000", "abcd0\000\000\000", "abcd1\000\000\000", - (12): "abcd2\000\000\000", "abcd3\000\000\000", "abcd4\000\000\000", - (15): "abcd5\000\000\000", "abcd6\000\000\000", "abcd7\000\000\000", - (18): "abcd8\000\000\000", "abcd9\000\000\000", "abcd0\000\000\000", - (21): "abcd1\000\000\000", "abcd2\000\000\000", "abcd3\000\000\000", - (24): "abcd4\000\000\000", "abcd5\000\000\000", "abcd6\000\000\000" + (0): "abcd0\000\000\000", "abcd1\000\000\000", + (2): "abcd2\000\000\000", "abcd3\000\000\000", + (4): "abcd4\000\000\000", "abcd5\000\000\000", + (6): "abcd6\000\000\000", "abcd7\000\000\000", + (8): "abcd8\000\000\000", "abcd9\000\000\000", + (10): "abcd0\000\000\000", "abcd1\000\000\000", + (12): "abcd2\000\000\000", "abcd3\000\000\000", + (14): "abcd4\000\000\000", "abcd5\000\000\000", + (16): "abcd6\000\000\000", "abcd7\000\000\000", + (18): "abcd8\000\000\000", "abcd9\000\000\000", + (20): "abcd0\000\000\000", "abcd1\000\000\000", + (22): "abcd2\000\000\000", "abcd3\000\000\000", + (24): "abcd4\000\000\000", "abcd5\000\000\000", + (26): "abcd6\000\000\000" } } DATASET "string4" { @@ -310,9 +316,9 @@ GROUP "/" { } DATASPACE SIMPLE { ( 3 ) / ( 3 ) } DATA { - (0): "s1234567890123456789 ", - (1): "s1234567890123456789 ", - (2): "s1234567890123456789 " + (0): "s1234567890123456789 ", + (1): "s1234567890123456789 ", + (2): "s1234567890123456789 " } } } diff --git a/tools/testfiles/tstr-2.ddl b/tools/testfiles/tstr-2.ddl index 884f420..ab7cb42 100644 --- a/tools/testfiles/tstr-2.ddl +++ b/tools/testfiles/tstr-2.ddl @@ -13,16 +13,16 @@ GROUP "/" { } DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { - (0): "This is row 0 of type H5T_STR_NULLTERM of", - (1): "This is row 1 of type H5T_STR_NULLTERM of", - (2): "This is row 2 of type H5T_STR_NULLTERM of", - (3): "This is row 3 of type H5T_STR_NULLTERM of", - (4): "This is row 4 of type H5T_STR_NULLTERM of", - (5): "This is row 5 of type H5T_STR_NULLTERM of", - (6): "This is row 6 of type H5T_STR_NULLTERM of", - (7): "This is row 7 of type H5T_STR_NULLTERM of", - (8): "This is row 8 of type H5T_STR_NULLTERM of", - (9): "This is row 9 of type H5T_STR_NULLTERM of" + (0): "This is row 0 of type H5T_STR_NULLTERM of", + (1): "This is row 1 of type H5T_STR_NULLTERM of", + (2): "This is row 2 of type H5T_STR_NULLTERM of", + (3): "This is row 3 of type H5T_STR_NULLTERM of", + (4): "This is row 4 of type H5T_STR_NULLTERM of", + (5): "This is row 5 of type H5T_STR_NULLTERM of", + (6): "This is row 6 of type H5T_STR_NULLTERM of", + (7): "This is row 7 of type H5T_STR_NULLTERM of", + (8): "This is row 8 of type H5T_STR_NULLTERM of", + (9): "This is row 9 of type H5T_STR_NULLTERM of" } ATTRIBUTE "attr1" { DATATYPE H5T_STRING { @@ -33,7 +33,7 @@ GROUP "/" { } DATASPACE SIMPLE { ( 3 ) / ( 3 ) } DATA { - (0): "0123456789", "abcdefghij", "ABCDEFGHIJ" + (0): "0123456789", "abcdefghij", "ABCDEFGHIJ" } } } @@ -48,16 +48,16 @@ GROUP "/" { } DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { - (0): "This is row 0 of type H5T_STR_NULLTERM of string ", - (1): "This is row 1 of type H5T_STR_NULLTERM of string ", - (2): "This is row 2 of type H5T_STR_NULLTERM of string ", - (3): "This is row 3 of type H5T_STR_NULLTERM of string ", - (4): "This is row 4 of type H5T_STR_NULLTERM of string ", - (5): "This is row 5 of type H5T_STR_NULLTERM of string ", - (6): "This is row 6 of type H5T_STR_NULLTERM of string ", - (7): "This is row 7 of type H5T_STR_NULLTERM of string ", - (8): "This is row 8 of type H5T_STR_NULLTERM of string ", - (9): "This is row 9 of type H5T_STR_NULLTERM of string " + (0): "This is row 0 of type H5T_STR_NULLTERM of string ", + (1): "This is row 1 of type H5T_STR_NULLTERM of string ", + (2): "This is row 2 of type H5T_STR_NULLTERM of string ", + (3): "This is row 3 of type H5T_STR_NULLTERM of string ", + (4): "This is row 4 of type H5T_STR_NULLTERM of string ", + (5): "This is row 5 of type H5T_STR_NULLTERM of string ", + (6): "This is row 6 of type H5T_STR_NULLTERM of string ", + (7): "This is row 7 of type H5T_STR_NULLTERM of string ", + (8): "This is row 8 of type H5T_STR_NULLTERM of string ", + (9): "This is row 9 of type H5T_STR_NULLTERM of string " } } } @@ -71,16 +71,16 @@ GROUP "/" { } 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", - (1): "This is row 1 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", - (2): "This is row 2 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", - (3): "This is row 3 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", - (4): "This is row 4 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", - (5): "This is row 5 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", - (6): "This is row 6 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", - (7): "This is row 7 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", - (8): "This is row 8 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", - (9): "This is row 9 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000" + (0): "This is row 0 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", + (1): "This is row 1 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", + (2): "This is row 2 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", + (3): "This is row 3 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", + (4): "This is row 4 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", + (5): "This is row 5 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", + (6): "This is row 6 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", + (7): "This is row 7 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", + (8): "This is row 8 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", + (9): "This is row 9 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000" } } } @@ -94,16 +94,16 @@ GROUP "/" { } DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { - (0): "This is row 0 of type H5T_STR_NULLPAD of string ar", - (1): "This is row 1 of type H5T_STR_NULLPAD of string ar", - (2): "This is row 2 of type H5T_STR_NULLPAD of string ar", - (3): "This is row 3 of type H5T_STR_NULLPAD of string ar", - (4): "This is row 4 of type H5T_STR_NULLPAD of string ar", - (5): "This is row 5 of type H5T_STR_NULLPAD of string ar", - (6): "This is row 6 of type H5T_STR_NULLPAD of string ar", - (7): "This is row 7 of type H5T_STR_NULLPAD of string ar", - (8): "This is row 8 of type H5T_STR_NULLPAD of string ar", - (9): "This is row 9 of type H5T_STR_NULLPAD of string ar" + (0): "This is row 0 of type H5T_STR_NULLPAD of string ar", + (1): "This is row 1 of type H5T_STR_NULLPAD of string ar", + (2): "This is row 2 of type H5T_STR_NULLPAD of string ar", + (3): "This is row 3 of type H5T_STR_NULLPAD of string ar", + (4): "This is row 4 of type H5T_STR_NULLPAD of string ar", + (5): "This is row 5 of type H5T_STR_NULLPAD of string ar", + (6): "This is row 6 of type H5T_STR_NULLPAD of string ar", + (7): "This is row 7 of type H5T_STR_NULLPAD of string ar", + (8): "This is row 8 of type H5T_STR_NULLPAD of string ar", + (9): "This is row 9 of type H5T_STR_NULLPAD of string ar" } } } @@ -117,16 +117,16 @@ GROUP "/" { } DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { - (0): "This is row 0 of type H5T_STR_SPACEPAD of ", - (1): "This is row 1 of type H5T_STR_SPACEPAD of ", - (2): "This is row 2 of type H5T_STR_SPACEPAD of ", - (3): "This is row 3 of type H5T_STR_SPACEPAD of ", - (4): "This is row 4 of type H5T_STR_SPACEPAD of ", - (5): "This is row 5 of type H5T_STR_SPACEPAD of ", - (6): "This is row 6 of type H5T_STR_SPACEPAD of ", - (7): "This is row 7 of type H5T_STR_SPACEPAD of ", - (8): "This is row 8 of type H5T_STR_SPACEPAD of ", - (9): "This is row 9 of type H5T_STR_SPACEPAD of " + (0): "This is row 0 of type H5T_STR_SPACEPAD of ", + (1): "This is row 1 of type H5T_STR_SPACEPAD of ", + (2): "This is row 2 of type H5T_STR_SPACEPAD of ", + (3): "This is row 3 of type H5T_STR_SPACEPAD of ", + (4): "This is row 4 of type H5T_STR_SPACEPAD of ", + (5): "This is row 5 of type H5T_STR_SPACEPAD of ", + (6): "This is row 6 of type H5T_STR_SPACEPAD of ", + (7): "This is row 7 of type H5T_STR_SPACEPAD of ", + (8): "This is row 8 of type H5T_STR_SPACEPAD of ", + (9): "This is row 9 of type H5T_STR_SPACEPAD of " } } } @@ -140,16 +140,16 @@ GROUP "/" { } DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { - (0): "This is row 0 of type H5T_STR_SPACEPAD of string a", - (1): "This is row 1 of type H5T_STR_SPACEPAD of string a", - (2): "This is row 2 of type H5T_STR_SPACEPAD of string a", - (3): "This is row 3 of type H5T_STR_SPACEPAD of string a", - (4): "This is row 4 of type H5T_STR_SPACEPAD of string a", - (5): "This is row 5 of type H5T_STR_SPACEPAD of string a", - (6): "This is row 6 of type H5T_STR_SPACEPAD of string a", - (7): "This is row 7 of type H5T_STR_SPACEPAD of string a", - (8): "This is row 8 of type H5T_STR_SPACEPAD of string a", - (9): "This is row 9 of type H5T_STR_SPACEPAD of string a" + (0): "This is row 0 of type H5T_STR_SPACEPAD of string a", + (1): "This is row 1 of type H5T_STR_SPACEPAD of string a", + (2): "This is row 2 of type H5T_STR_SPACEPAD of string a", + (3): "This is row 3 of type H5T_STR_SPACEPAD of string a", + (4): "This is row 4 of type H5T_STR_SPACEPAD of string a", + (5): "This is row 5 of type H5T_STR_SPACEPAD of string a", + (6): "This is row 6 of type H5T_STR_SPACEPAD of string a", + (7): "This is row 7 of type H5T_STR_SPACEPAD of string a", + (8): "This is row 8 of type H5T_STR_SPACEPAD of string a", + (9): "This is row 9 of type H5T_STR_SPACEPAD of string a" } } } diff --git a/tools/testfiles/tstring.ddl b/tools/testfiles/tstring.ddl index 6881371..bd21463 100644 --- a/tools/testfiles/tstring.ddl +++ b/tools/testfiles/tstring.ddl @@ -11,7 +11,7 @@ DATASET "string" { } DATASPACE SIMPLE { ( 1 ) / ( 1 ) } DATA { - (0): "quote " backspace form feed new line + (0): "quote " backspace form feed new line tab new line carriage return " diff --git a/tools/testfiles/tstringe.ddl b/tools/testfiles/tstringe.ddl index 74ba59b..ffab45b 100644 --- a/tools/testfiles/tstringe.ddl +++ b/tools/testfiles/tstringe.ddl @@ -11,7 +11,7 @@ DATASET "string" { } DATASPACE SIMPLE { ( 1 ) / ( 1 ) } DATA { - (0): "quote \" backspace\b form feed\f new line\n tab\t new line\n carriage return\r" + (0): "quote \" backspace\b form feed\f new line\n tab\t new line\n carriage return\r" } } } diff --git a/tools/testfiles/tvldtypes1.ddl b/tools/testfiles/tvldtypes1.ddl index 2c2103b..e798d09 100644 --- a/tools/testfiles/tvldtypes1.ddl +++ b/tools/testfiles/tvldtypes1.ddl @@ -7,21 +7,21 @@ GROUP "/" { DATATYPE H5T_VLEN { H5T_STD_I32LE} DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { - (0): (0), (10, 11), (20, 21, 22), (30, 31, 32, 33) + (0): (0), (10, 11), (20, 21, 22), (30, 31, 32, 33) } } DATASET "Dataset2.0" { DATATYPE H5T_VLEN { H5T_IEEE_F32LE} DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { - (0): (0), (10, 10.1), (20, 20.1, 20.2), (30, 30.1, 30.2, 30.3) + (0): (0), (10, 10.1), (20, 20.1, 20.2), (30, 30.1, 30.2, 30.3) } } DATASET "Dataset3.0" { DATATYPE H5T_VLEN { H5T_STD_I32LE} DATASPACE SCALAR DATA { - (0): (0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72) + (0): (0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72) } } } diff --git a/tools/testfiles/tvldtypes2.ddl b/tools/testfiles/tvldtypes2.ddl index dc35566..6c9e7fd 100644 --- a/tools/testfiles/tvldtypes2.ddl +++ b/tools/testfiles/tvldtypes2.ddl @@ -7,8 +7,9 @@ GROUP "/" { DATATYPE H5T_VLEN { H5T_VLEN { H5T_STD_U32LE}} DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { - (0): ((0)), ((100), (110, 111)), ((200), (210, 211), (220, 221, 222)), - (3): ((300), (310, 311), (320, 321, 322), (330, 331, 332, 333)) + (0): ((0)), ((100), (110, 111)), + (2): ((200), (210, 211), (220, 221, 222)), + (3): ((300), (310, 311), (320, 321, 322), (330, 331, 332, 333)) } } } diff --git a/tools/testfiles/tvldtypes3.ddl b/tools/testfiles/tvldtypes3.ddl index e3a3828..692f485 100644 --- a/tools/testfiles/tvldtypes3.ddl +++ b/tools/testfiles/tvldtypes3.ddl @@ -11,22 +11,22 @@ GROUP "/" { } DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { - (0): { + (0): { 0, 0, (0) }, - (1): { + (1): { 10, 6.66667, (10, 11) }, - (2): { + (2): { 20, 13.3333, (20, 21, 22) }, - (3): { + (3): { 30, 20, (30, 31, 32, 33) diff --git a/tools/testfiles/tvldtypes4.ddl b/tools/testfiles/tvldtypes4.ddl index cfa2f73..50ae28b 100644 --- a/tools/testfiles/tvldtypes4.ddl +++ b/tools/testfiles/tvldtypes4.ddl @@ -10,18 +10,18 @@ GROUP "/" { }} DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { - (0): ({ + (0): ({ 0, 0 }), - (1): ({ + (1): ({ 10, 6.66667 }, { 11, 7 }), - (2): ({ + (2): ({ 20, 13.3333 }, { @@ -31,7 +31,7 @@ GROUP "/" { 22, 14 }), - (3): ({ + (3): ({ 30, 20 }, { diff --git a/tools/testfiles/tvldtypes5.ddl b/tools/testfiles/tvldtypes5.ddl index 47bf877..57462d7 100644 --- a/tools/testfiles/tvldtypes5.ddl +++ b/tools/testfiles/tvldtypes5.ddl @@ -7,7 +7,7 @@ GROUP "/" { DATATYPE H5T_VLEN { H5T_STD_U32LE} DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { - (0): (0, 2, 4, 6, 8), (), (0, 2, 4, 6, 8, 10, 12), () + (0): (0, 2, 4, 6, 8), (), (0, 2, 4, 6, 8, 10, 12), () } } } diff --git a/tools/testfiles/tvlstr.ddl b/tools/testfiles/tvlstr.ddl index 7d7c42a..3b67af6 100644 --- a/tools/testfiles/tvlstr.ddl +++ b/tools/testfiles/tvlstr.ddl @@ -7,7 +7,7 @@ GROUP "/" { DATATYPE "/vl_string_type" DATASPACE SCALAR DATA { - "This is the string for the attribute" + (0): "This is the string for the attribute" } } DATASET "Dataset1" { @@ -19,9 +19,9 @@ GROUP "/" { } DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { - (0): "Four score and seven years ago our forefathers brought forth on this continent a new nation,", - (1): "conceived in liberty and dedicated to the proposition that all men are created equal.", - (2): "", NULL + (0): "Four score and seven years ago our forefathers brought forth on this continent a new nation,", + (1): "conceived in liberty and dedicated to the proposition that all men are created equal.", + (2): "", NULL } } DATATYPE "vl_string_type" H5T_STRING { |