[feat] support bjdata draft 3 optimized ND column-major array

Author: fangq

loadbj.m

@@ -247,6 +247,7 @@
 pos = parse_char(inputstr, pos, '[');
 object = cell(0, 1);
 dim = [];
+iscolumn = 0;
 type = '';
 count = -1;
 [cc, pos] = next_char(inputstr, pos);
@@ -263,6 +264,9 @@
  error_pos('ND array size specifier does not support embedding', inputstr, pos);
  end
  varargin{1}.noembedding_ = 1;
+ if (pos + 1 < length(inputstr) && inputstr(pos + 1) == '[')
+ iscolumn = 1;
+ end
  [dim, pos] = parse_array(inputstr, pos, varargin{:});
  count = prod(double(dim));
  varargin{1}.noembedding_ = 0;
@@ -275,7 +279,11 @@
  if (count >= 0)
  [object, adv] = parse_block(inputstr, pos, type, count, varargin{:});
  if (~isempty(dim) && length(dim) > 1)
- object = permute(reshape(object, fliplr(dim(:)')), length(dim):-1:1);
+ if (iscolumn == 0)
+ object = permute(reshape(object, fliplr(dim(:)')), length(dim):-1:1);
+ else
+ object = reshape(object, dim);
+ end
  end
  pos = pos + adv;
  return

test/run_jsonlab_test.m

@@ -241,6 +241,9 @@ function run_jsonlab_test(tests)
  '[{U<1>iD<1.1>U<1>dSU<3>str}{U<1>iD<1.1>U<1>dSU<3>str}]', 'debug', 1);
  test_jsonlab('encoded fieldnames', @savebj, struct(encodevarname('_i'), 1, encodevarname('i_'), 'str'), ...
  '{U<2>_iU<1>U<2>i_SU<3>str}', 'debug', 1);
+ test_jsonlab('optimized 2D row-major array', @savebj, loadbj(['[$i#[$U#U' 2 2 3 61 62 65 66 67 68]), '[$U#[$U#U<2><2><3><61><62><65><66><67><68>', 'debug', 1);
+ test_jsonlab('optimized 2D column-major array', @savebj, loadbj(['[$U#[[$U#U' 2 2 3 ']' 61 62 65 66 67 68]), '[$U#[$U#U<2><2><3><61><65><67><62><66><68>', 'debug', 1);
+
  test_jsonlab('single byte', @savebj, loadbj(['B' 65]), 'C<65>', 'debug', 1);
  test_jsonlab('byte 1D vector', @savebj, loadbj(['[$B#U' 3 61 62 65]), 'SU<3>=>A', 'debug', 1);
  test_jsonlab('optimized byte 1D vector', @savebj, loadbj(['[$B#[$U#U' 1 4 61 62 65 66]), 'SU<4>=>AB', 'debug', 1);