printf ("</category>\n");
}
-static void
+static int
dump_dim(int indx)
{
int n_categories;
check_permutation(indexes, n_indexes, "categories");
fprintf (stdout, "</dimension>\n");
+ return n_indexes;
}
int n_dims;
+static int dim_n_cats[64];
+#define MAX_DIMS (sizeof dim_n_cats / sizeof *dim_n_cats)
+
static void
dump_dims(void)
{
n_dims = get_u32();
+ assert(n_dims < MAX_DIMS);
for (int i = 0; i < n_dims; i++)
- dump_dim (i);
+ dim_n_cats[i] = dump_dim (i);
}
static void
dump_data(void)
{
/* The first three numbers add to the number of dimensions. */
- int t = get_u32();
- t += get_u32();
- match_u32_assert(n_dims - t);
+ int l = get_u32();
+ int r = get_u32();
+ int c = n_dims - l - r;
+ match_u32_assert(c);
/* The next n_dims numbers are a permutation of the dimension numbers. */
int a[n_dims];
for (int i = 0; i < n_dims; i++)
- a[i] = get_u32();
+ {
+ int dim = get_u32();
+ a[i] = dim;
+
+ const char *name = i < l ? "layer" : i < l + r ? "row" : "column";
+ printf ("<%s dimension=\"%d\"/>\n", name, dim);
+ }
check_permutation(a, n_dims, "dimensions");
int x = get_u32();
printf ("<data>\n");
for (int i = 0; i < x; i++)
{
- printf (" <datum index=\"%d\">\n", get_u32());
+ unsigned int indx = get_u32();
+ printf (" <datum index=\"%d\" coords=", indx);
+
+ int coords[MAX_DIMS];
+ for (int i = n_dims; i-- > 0; )
+ {
+ coords[i] = indx % dim_n_cats[i];
+ indx /= dim_n_cats[i];
+ }
+ for (int i = 0; i < n_dims; i++)
+ printf("%c%d", i ? ',' : '"', coords[i]);
+
+ printf ("\">\n");
match_u32_assert(0);
if (version == 1)
match_byte(0);