Skip to content

Commit 89b844c

Browse files
committed
remove forced root name, update internal test results
1 parent 60d7447 commit 89b844c

File tree

4 files changed

+42
-18
lines changed

4 files changed

+42
-18
lines changed

examples/jsonlab_basictest.matlab

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ ans =
4949

5050

5151
>>
52-
json2data =
52+
json2data =
5353

54-
[]
54+
Empty cell array: 0-by-1
5555

5656
>> >>
5757
%=================================================
@@ -148,10 +148,9 @@ ans =
148148

149149

150150
>>
151-
json2data =
151+
json2data =
152152

153-
AE
154-
CG
153+
'AC' 'EG'
155154

156155
>> >>
157156
%=================================================
@@ -738,7 +737,7 @@ ans =
738737
>>
739738
json2data =
740739

741-
empty_0by0_real: []
740+
empty_0by0_real: {0x1 cell}
742741

743742
>> >>
744743
%=================================================
@@ -1086,7 +1085,7 @@ ans =
10861085
>>
10871086
json2data =
10881087

1089-
data2json: {2x3 cell}
1088+
data2json: {{1x3 cell} {1x3 cell}}
10901089

10911090
>> >>
10921091
%=================================================
@@ -1143,7 +1142,7 @@ ans =
11431142
>>
11441143
json2data =
11451144

1146-
data2json: {3x2 cell}
1145+
data2json: {{1x2 cell} {1x2 cell} {1x2 cell}}
11471146

11481147
>> >> >>
11491148
%=================================================

examples/jsonlab_ubjson_basictest.matlab

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ ans =
2727
[D@ !ûTD-]
2828

2929
>>
30-
json2data =
30+
json2data =
3131

32-
[3.1416]
32+
3.1416
3333

3434
>> >>
3535
%=================================================
@@ -191,9 +191,40 @@ ans =
191191
UUU"U*][UU UUU$U,][UUUUU&U.][UUUU U(U0]]]
192192

193193
>>
194-
json2data =
194+
json2data(:,:,1) =
195+
196+
1 3 5 7
197+
2 4 6 8
198+
199+
200+
json2data(:,:,2) =
201+
202+
9 11 13 15
203+
10 12 14 16
204+
205+
206+
json2data(:,:,3) =
207+
208+
17 19 21 23
209+
18 20 22 24
210+
211+
212+
json2data(:,:,4) =
213+
214+
25 27 29 31
215+
26 28 30 32
216+
217+
218+
json2data(:,:,5) =
219+
220+
33 35 37 39
221+
34 36 38 40
222+
223+
224+
json2data(:,:,6) =
195225

196-
{1x4 cell} {1x4 cell}
226+
41 43 45 47
227+
42 44 46 48
197228

198229
>> >> >> >> >>
199230
%=================================================

savejson.m

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,6 @@
127127
if(nargin==1)
128128
varname=inputname(1);
129129
obj=rootname;
130-
if(isempty(varname))
131-
varname='root';
132-
end
133130
rootname=varname;
134131
else
135132
varname=inputname(2);

saveubjson.m

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,6 @@
138138
if(nargin==1)
139139
varname=inputname(1);
140140
obj=rootname;
141-
if(isempty(varname))
142-
varname='root';
143-
end
144141
rootname=varname;
145142
else
146143
varname=inputname(2);

0 commit comments

Comments
 (0)