Skip to content

Commit ad1faa8

Browse files
committed
update email address, tag v1.8
1 parent bf3b526 commit ad1faa8

File tree

12 files changed

+59
-39
lines changed

12 files changed

+59
-39
lines changed

ChangeLog.txt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
JSONlab ChangeLog (key features marked by *):
88

9-
== JSONlab 1.2 (codename: Optimus - Update 2), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
9+
== JSONlab 1.2 (codename: Optimus - Update 2), FangQ <q.fang <at> neu.edu> ==
1010

1111
2015/12/16 replacing string concatenation by str cells to gain 2x speed in savejson (Issue#17)
1212
2015/12/11 fix FileName option case bug (SVN rev#495)
@@ -15,7 +15,7 @@ JSONlab ChangeLog (key features marked by *):
1515
2015/10/16 fix bug for cell with transposed data - by Insik Kim (Pull#12)
1616
2015/09/25 support exporting matlab object to JSON - by Sertan Senturk (Pull#10, #11)
1717

18-
== JSONlab 1.1 (codename: Optimus - Update 1), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
18+
== JSONlab 1.1 (codename: Optimus - Update 1), FangQ <q.fang <at> neu.edu> ==
1919

2020
2015/05/05 *massively accelerating loadjson for parsing large collection of unstructured small objects
2121
2015/05/05 force array bracket in 1x1 struct to maintain depth (Issue#1)
@@ -28,64 +28,64 @@ JSONlab ChangeLog (key features marked by *):
2828
2015/01/24 *implement the UBJSON Draft12 new name format
2929
2015/01/13 correct cell array indentation inconsistency
3030

31-
== JSONlab 1.0 (codename: Optimus - Final), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
31+
== JSONlab 1.0 (codename: Optimus - Final), FangQ <q.fang <at> neu.edu> ==
3232

3333
2015/01/02 polish help info for all major functions, update examples, finalize 1.0
3434
2014/12/19 fix a bug to strictly respect NoRowBracket in savejson
3535

36-
== JSONlab 1.0.0-RC2 (codename: Optimus - RC2), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
36+
== JSONlab 1.0.0-RC2 (codename: Optimus - RC2), FangQ <q.fang <at> neu.edu> ==
3737

3838
2014/11/22 show progress bar in loadjson ('ShowProgress')
3939
2014/11/17 *add Compact option in savejson to output compact JSON format ('Compact')
4040
2014/11/17 add FastArrayParser in loadjson to specify fast parser applicable levels
4141
2014/09/18 *start official github mirror: https://github.com/fangq/jsonlab
4242

43-
== JSONlab 1.0.0-RC1 (codename: Optimus - RC1), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
43+
== JSONlab 1.0.0-RC1 (codename: Optimus - RC1), FangQ <q.fang <at> neu.edu> ==
4444

4545
2014/09/17 fix several compatibility issues when running on octave versions 3.2-3.8
4646
2014/09/17 *support 2D cell and struct arrays in both savejson and saveubjson
4747
2014/08/04 escape special characters in a JSON string
4848
2014/02/16 fix a bug when saving ubjson files
4949

50-
== JSONlab 0.9.9 (codename: Optimus - beta), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
50+
== JSONlab 0.9.9 (codename: Optimus - beta), FangQ <q.fang <at> neu.edu> ==
5151

5252
2014/01/22 use binary read and write in saveubjson and loadubjson
5353

54-
== JSONlab 0.9.8-1 (codename: Optimus - alpha update 1), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
54+
== JSONlab 0.9.8-1 (codename: Optimus - alpha update 1), FangQ <q.fang <at> neu.edu> ==
5555

5656
2013/10/07 better round-trip conservation for empty arrays and structs (patch submitted by Yul Kang)
5757

58-
== JSONlab 0.9.8 (codename: Optimus - alpha), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
58+
== JSONlab 0.9.8 (codename: Optimus - alpha), FangQ <q.fang <at> neu.edu> ==
5959
2013/08/23 *universal Binary JSON (UBJSON) support, including both saveubjson and loadubjson
6060

61-
== JSONlab 0.9.1 (codename: Rodimus, update 1), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
61+
== JSONlab 0.9.1 (codename: Rodimus, update 1), FangQ <q.fang <at> neu.edu> ==
6262
2012/12/18 *handling of various empty and sparse matrices (fixes submitted by Niclas Borlin)
6363

64-
== JSONlab 0.9.0 (codename: Rodimus), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
64+
== JSONlab 0.9.0 (codename: Rodimus), FangQ <q.fang <at> neu.edu> ==
6565

6666
2012/06/17 *new format for an invalid leading char, unpacking hex code in savejson
6767
2012/06/01 support JSONP in savejson
6868
2012/05/25 fix the empty cell bug (reported by Cyril Davin)
6969
2012/04/05 savejson can save to a file (suggested by Patrick Rapin)
7070

71-
== JSONlab 0.8.1 (codename: Sentiel, Update 1), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
71+
== JSONlab 0.8.1 (codename: Sentiel, Update 1), FangQ <q.fang <at> neu.edu> ==
7272

7373
2012/02/28 loadjson quotation mark escape bug, see http://bit.ly/yyk1nS
7474
2012/01/25 patch to handle root-less objects, contributed by Blake Johnson
7575

76-
== JSONlab 0.8.0 (codename: Sentiel), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
76+
== JSONlab 0.8.0 (codename: Sentiel), FangQ <q.fang <at> neu.edu> ==
7777

7878
2012/01/13 *speed up loadjson by 20 fold when parsing large data arrays in matlab
7979
2012/01/11 remove row bracket if an array has 1 element, suggested by Mykel Kochenderfer
8080
2011/12/22 *accept sequence of 'param',value input in savejson and loadjson
8181
2011/11/18 fix struct array bug reported by Mykel Kochenderfer
8282

83-
== JSONlab 0.5.1 (codename: Nexus Update 1), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
83+
== JSONlab 0.5.1 (codename: Nexus Update 1), FangQ <q.fang <at> neu.edu> ==
8484

8585
2011/10/21 fix a bug in loadjson, previous code does not use any of the acceleration
8686
2011/10/20 loadjson supports JSON collections - concatenated JSON objects
8787

88-
== JSONlab 0.5.0 (codename: Nexus), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
88+
== JSONlab 0.5.0 (codename: Nexus), FangQ <q.fang <at> neu.edu> ==
8989

9090
2011/10/16 package and release jsonlab 0.5.0
9191
2011/10/15 *add json demo and regression test, support cpx numbers, fix double quote bug

LICENSE_BSD.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2011-2015 Qianqian Fang <fangq at nmr.mgh.harvard.edu>. All rights reserved.
1+
Copyright 2011-2017 Qianqian Fang <q.fang <at> neu.edu>. All rights reserved.
22

33
Redistribution and use in source and binary forms, with or without modification, are
44
permitted provided that the following conditions are met:

LICENSE_GPLv3.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
= An open-source MATLAB/Octave JSON encoder and decoder =
44
===============================================================================
55

6-
Copyright (C) 2011-2015 Qianqian Fang <fangq at nmr.mgh.harvard.edu>
6+
Copyright (C) 2011-2017 Qianqian Fang <q.fang <at> neu.edu>
77

88
-------------------------------------------------------------------------------
99

README.txt

Lines changed: 35 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
= An open-source MATLAB/Octave JSON encoder and decoder =
44
===============================================================================
55

6-
*Copyright (C) 2011-2015 Qianqian Fang <fangq at nmr.mgh.harvard.edu>
6+
*Copyright (C) 2011-2017 Qianqian Fang <q.fang at neu.edu>
77
*License: BSD or GNU General Public License version 3 (GPL v3), see License*.txt
8-
*Version: 1.2 (Optimus - Update 2)
8+
*Version: 1.8 (Magnus - alpha)
99

1010
-------------------------------------------------------------------------------
1111

@@ -83,7 +83,7 @@ JSON. The detailed help info for the four functions can be found below:
8383

8484
parse a JSON (JavaScript Object Notation) file or string
8585

86-
authors:Qianqian Fang (fangq<at> nmr.mgh.harvard.edu)
86+
authors:Qianqian Fang (q.fang <at> neu.edu)
8787
created on 2011/09/09, including previous works from
8888

8989
Nedialko Krouchev: http://www.mathworks.com/matlabcentral/fileexchange/25713
@@ -94,7 +94,7 @@ JSON. The detailed help info for the four functions can be found below:
9494
http://www.mathworks.com/matlabcentral/fileexchange/20565
9595
created on 2008/07/03
9696

97-
$Id: loadjson.m 487 2015-05-06 18:19:07Z fangq $
97+
$Id$
9898

9999
input:
100100
fname: input file name, if fname contains "{}" or "[]", fname
@@ -131,7 +131,10 @@ JSON. The detailed help info for the four functions can be found below:
131131
dat=loadjson('{"obj":{"string":"value","array":[1,2,3]}}')
132132
dat=loadjson(['examples' filesep 'example1.json'])
133133
dat=loadjson(['examples' filesep 'example1.json'],'SimplifyCell',1)
134-
</pre>
134+
135+
license:
136+
BSD or GPL version 3, see LICENSE_{BSD,GPLv3}.txt files for details
137+
</pre>
135138

136139
=== savejson.m ===
137140

@@ -144,16 +147,17 @@ JSON. The detailed help info for the four functions can be found below:
144147
convert a MATLAB object (cell, struct or array) into a JSON (JavaScript
145148
Object Notation) string
146149

147-
author: Qianqian Fang (fangq<at> nmr.mgh.harvard.edu)
150+
author: Qianqian Fang (q.fang <at> neu.edu)
148151
created on 2011/09/09
149152

150-
$Id: savejson.m 486 2015-05-05 20:37:11Z fangq $
153+
$Id$
151154

152155
input:
153156
rootname: the name of the root-object, when set to '', the root name
154157
is ignored, however, when opt.ForceRootName is set to 1 (see below),
155158
the MATLAB variable name will be used as the root name.
156-
obj: a MATLAB object (array, cell, cell array, struct, struct array).
159+
obj: a MATLAB object (array, cell, cell array, struct, struct array,
160+
class instance).
157161
filename: a string for the file name to save the output JSON data.
158162
opt: a struct for additional options, ignore to use default values.
159163
opt can have the following fields (first in [.|.] is the default)
@@ -176,10 +180,13 @@ JSON. The detailed help info for the four functions can be found below:
176180
parts, and also "_ArrayIsComplex_":1 is added.
177181
opt.ParseLogical [0|1]: if this is set to 1, logical array elem
178182
will use true/false rather than 1/0.
179-
opt.NoRowBracket [1|0]: if this is set to 1, arrays with a single
183+
opt.SingletArray [0|1]: if this is set to 1, arrays with a single
180184
numerical element will be shown without a square
181185
bracket, unless it is the root object; if 0, square
182186
brackets are forced for any numerical arrays.
187+
opt.SingletCell [1|0]: if 1, always enclose a cell with "[]"
188+
even it has only one element; if 0, brackets
189+
are ignored when a cell has only 1 element.
183190
opt.ForceRootName [0|1]: when set to 1 and rootname is empty, savejson
184191
will use the name of the passed obj variable as the
185192
root object name; if obj is an expression and
@@ -214,6 +221,9 @@ JSON. The detailed help info for the four functions can be found below:
214221
'SpecialData',[nan, inf, -inf]);
215222
savejson('jmesh',jsonmesh)
216223
savejson('',jsonmesh,'ArrayIndent',0,'FloatFormat','\t%.5g')
224+
225+
license:
226+
BSD or GPL version 3, see LICENSE_{BSD,GPLv3}.txt files for details
217227
</pre>
218228

219229
=== loadubjson.m ===
@@ -225,10 +235,10 @@ JSON. The detailed help info for the four functions can be found below:
225235

226236
parse a JSON (JavaScript Object Notation) file or string
227237

228-
authors:Qianqian Fang (fangq<at> nmr.mgh.harvard.edu)
238+
authors:Qianqian Fang (q.fang <at> neu.edu)
229239
created on 2013/08/01
230240

231-
$Id: loadubjson.m 487 2015-05-06 18:19:07Z fangq $
241+
$Id$
232242

233243
input:
234244
fname: input file name, if fname contains "{}" or "[]", fname
@@ -261,6 +271,9 @@ JSON. The detailed help info for the four functions can be found below:
261271
dat=loadubjson(ubjdata)
262272
dat=loadubjson(['examples' filesep 'example1.ubj'])
263273
dat=loadubjson(['examples' filesep 'example1.ubj'],'SimplifyCell',1)
274+
275+
license:
276+
BSD or GPL version 3, see LICENSE_{BSD,GPLv3}.txt files for details
264277
</pre>
265278

266279
=== saveubjson.m ===
@@ -274,16 +287,17 @@ JSON. The detailed help info for the four functions can be found below:
274287
convert a MATLAB object (cell, struct or array) into a Universal
275288
Binary JSON (UBJSON) binary string
276289

277-
author: Qianqian Fang (fangq<at> nmr.mgh.harvard.edu)
290+
author: Qianqian Fang (q.fang <at> neu.edu)
278291
created on 2013/08/17
279292

280-
$Id: saveubjson.m 465 2015-01-25 00:46:07Z fangq $
293+
$Id$
281294

282295
input:
283296
rootname: the name of the root-object, when set to '', the root name
284297
is ignored, however, when opt.ForceRootName is set to 1 (see below),
285298
the MATLAB variable name will be used as the root name.
286-
obj: a MATLAB object (array, cell, cell array, struct, struct array)
299+
obj: a MATLAB object (array, cell, cell array, struct, struct array,
300+
class instance)
287301
filename: a string for the file name to save the output UBJSON data
288302
opt: a struct for additional options, ignore to use default values.
289303
opt can have the following fields (first in [.|.] is the default)
@@ -302,10 +316,13 @@ JSON. The detailed help info for the four functions can be found below:
302316
parts, and also "_ArrayIsComplex_":1 is added.
303317
opt.ParseLogical [1|0]: if this is set to 1, logical array elem
304318
will use true/false rather than 1/0.
305-
opt.NoRowBracket [1|0]: if this is set to 1, arrays with a single
319+
opt.SingletArray [0|1]: if this is set to 1, arrays with a single
306320
numerical element will be shown without a square
307321
bracket, unless it is the root object; if 0, square
308322
brackets are forced for any numerical arrays.
323+
opt.SingletCell [1|0]: if 1, always enclose a cell with "[]"
324+
even it has only one element; if 0, brackets
325+
are ignored when a cell has only 1 element.
309326
opt.ForceRootName [0|1]: when set to 1 and rootname is empty, saveubjson
310327
will use the name of the passed obj variable as the
311328
root object name; if obj is an expression and
@@ -332,6 +349,9 @@ JSON. The detailed help info for the four functions can be found below:
332349
'SpecialData',[nan, inf, -inf]);
333350
saveubjson('jsonmesh',jsonmesh)
334351
saveubjson('jsonmesh',jsonmesh,'meshdata.ubj')
352+
353+
license:
354+
BSD or GPL version 3, see LICENSE_{BSD,GPLv3}.txt files for details
335355
</pre>
336356

337357

jsonopt.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
% setting options based on a struct. The struct can be produced
66
% by varargin2struct from a list of 'param','value' pairs
77
%
8-
% authors:Qianqian Fang (fangq<at> nmr.mgh.harvard.edu)
8+
% authors:Qianqian Fang (q.fang <at> neu.edu)
99
%
1010
% $Id: loadjson.m 371 2012-06-20 12:43:06Z fangq $
1111
%

loadjson.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
%
77
% parse a JSON (JavaScript Object Notation) file or string
88
%
9-
% authors:Qianqian Fang (fangq<at> nmr.mgh.harvard.edu)
9+
% authors:Qianqian Fang (q.fang <at> neu.edu)
1010
% created on 2011/09/09, including previous works from
1111
%
1212
% Nedialko Krouchev: http://www.mathworks.com/matlabcentral/fileexchange/25713

loadubjson.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
%
77
% parse a JSON (JavaScript Object Notation) file or string
88
%
9-
% authors:Qianqian Fang (fangq<at> nmr.mgh.harvard.edu)
9+
% authors:Qianqian Fang (q.fang <at> neu.edu)
1010
% created on 2013/08/01
1111
%
1212
% $Id$

mergestruct.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
%
55
% merge two struct objects into one
66
%
7-
% authors:Qianqian Fang (fangq<at> nmr.mgh.harvard.edu)
7+
% authors:Qianqian Fang (q.fang <at> neu.edu)
88
% date: 2012/12/22
99
%
1010
% input:

savejson.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
% convert a MATLAB object (cell, struct or array) into a JSON (JavaScript
99
% Object Notation) string
1010
%
11-
% author: Qianqian Fang (fangq<at> nmr.mgh.harvard.edu)
11+
% author: Qianqian Fang (q.fang <at> neu.edu)
1212
% created on 2011/09/09
1313
%
1414
% $Id$

saveubjson.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
% convert a MATLAB object (cell, struct or array) into a Universal
99
% Binary JSON (UBJSON) binary string
1010
%
11-
% author: Qianqian Fang (fangq<at> nmr.mgh.harvard.edu)
11+
% author: Qianqian Fang (q.fang <at> neu.edu)
1212
% created on 2013/08/17
1313
%
1414
% $Id$

0 commit comments

Comments
 (0)