Skip to content

Commit

Permalink
upgrade all jsonlab files to the latest version, bump to v0.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
fangq committed May 18, 2022
1 parent 72deacf commit c985103
Show file tree
Hide file tree
Showing 9 changed files with 368 additions and 64 deletions.
7 changes: 4 additions & 3 deletions AUTHORS.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
EasyH5 is written by Qianqian Fang as part of the NeuroJData/OpenJData project.
EasyH5 is written by Qianqian Fang as part of the
NeuroJSON project (https://neurojson.org).

Qianqian is currently an Assistant Professor in the
Qianqian is currently an Associate Professor in the
Department of Bioengineering at Northeastern University.

Address: Dept. of Bioengineering
Expand All @@ -9,5 +10,5 @@ Address: Dept. of Bioengineering
URL: http://fanglab.org
Email: <q.fang at neu.edu>

OpenJData Website : http://openjdata.org
NeuroJSON Website : https://neurojson.org

4 changes: 2 additions & 2 deletions LICENSE_BSD-3.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2019, Qianqian Fang <q.fang at neu.edu>
Copyright (c) 2019,2022, Qianqian Fang <q.fang at neu.edu>
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand All @@ -24,4 +24,4 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6 changes: 1 addition & 5 deletions LICENSE_GPLv3.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
===============================================================================
= Monte Carlo eXtreme (MCX) -- CUDA =
===============================================================================

Copyright (c) 2010-2019 Qianqian Fang <q.fang at neu.edu>
Copyright (c) 2019,2022 Qianqian Fang <q.fang at neu.edu>

-------------------------------------------------------------------------------

Expand Down
12 changes: 9 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# EasyH5 Toolbox - An easy-to-use HDF5 data interface (loadh5 and saveh5)

* Copyright (C) 2019 Qianqian Fang <q.fang at neu.edu>
* Copyright (C) 2019,2022 Qianqian Fang <q.fang at neu.edu>
* License: GNU General Public License version 3 (GPL v3) or 3-clause BSD license, see LICENSE*.txt
* Version: 0.8 (code name: Go - Japanese 5)
* URL: http://github.com/fangq/easyh5
* Version: 0.9 (code name: Daseot - Korean 5)
* URL: http://github.com/NeuroJSON/easyh5
* Compatibility: MATLAB R2010b or newer
* Acknowledgement: This project is supported by US National Institute of Health (NIH)
grant [U24-NS124027 (NeuroJSON)](https://reporter.nih.gov/project-details/10308329)

## Overview

Expand Down Expand Up @@ -57,6 +60,8 @@ Example:
saveh5(a,'test.h5');
saveh5(a(1),'test2.h5','rootname','');
saveh5(a(1),'test2.h5','compression','deflate','compressarraysize',1);
saveh5('appending data to existing file','test.h5','rootname','/name','append',1);
saveh5(a,'test.h5j','jdata',1);
```
### `loadh5` - Load data in an HDF5 file to a MATLAB structure.
Load data in an HDF5 file to a MATLAB structure.
Expand Down Expand Up @@ -91,6 +96,7 @@ Example:
- EasyH5 currently does not support 2D cell and struct arrays
- If a cell name ends with a number, such as `a10={...}`; `regrouph5` can not group the cell correctly
- If a database/group name is longer than 63 characters, it may have the risk of being truncated
- When saving a dynamic expression instead of a named variable, the data are stored under path `/data`

## Contribute to EasyH5

Expand Down
4 changes: 4 additions & 0 deletions decodevarname.m
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@
h2u=@hex2unicode;
newname=regexprep(name,'(^x|_){1}0x([0-9a-fA-F]+)_','${h2u($2)}');
else
if(isunpack && strcmp(name,'x0x0_'))
newname='';
return;
end
pos=regexp(name,'(^x|_){1}0x([0-9a-fA-F]+)_','start');
pend=regexp(name,'(^x|_){1}0x([0-9a-fA-F]+)_','end');
if(isempty(pos))
Expand Down
4 changes: 2 additions & 2 deletions encodevarname.m
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

if(~isvarname(str(1)))
if(exist('unicode2native','builtin'))
str=regexprep(str,'^([^A-Za-z])','x0x${sprintf(''%X'',unicode2native($1))}_','once');
str=sprintf('x0x%s_%s',sprintf('%X',unicode2native(str(1))),str(2:end));
else
str=sprintf('x0x%X_%s',char(str(1))+0,str(2:end));
end
Expand All @@ -64,4 +64,4 @@
str=[str str0(pos0(end-1)+1:pos0(end))];
end
end
end
end
Loading

0 comments on commit c985103

Please sign in to comment.