[c++/matlab] Add DataArray multiple sources create

Author: mpsonntag

nix_mx.cc

@@ -218,6 +218,7 @@ void mexFunction(int            nlhs,
         methods->add("DataArray::readAll", nixdataarray::readAll);
         methods->add("DataArray::writeAll", nixdataarray::writeAll);
         methods->add("DataArray::addSource", nixdataarray::addSource);
+        methods->add("DataArray::addSources", nixdataarray::addSources);
         // REMOVER for DataArray.removeSource leads to an error, therefore use method->add for now
         methods->add("DataArray::removeSource", nixdataarray::removeSource);
         methods->add("DataArray::openSource", nixdataarray::getSource);

src/nixdataarray.cc

@@ -40,6 +40,12 @@ namespace nixdataarray {
         currObj.addSource(input.str(2));
     }
 
+    void addSources(const extractor &input, infusor &output) {
+        nix::DataArray currObj = input.entity<nix::DataArray>(1);
+        std::vector<nix::Source> sv = input.entity_vec<nix::Source>(2);
+        currObj.sources(sv);
+    }
+
     void removeSource(const extractor &input, infusor &output) {
         nix::DataArray currObj = input.entity<nix::DataArray>(1);
         output.set(0, currObj.removeSource(input.str(2)));

src/nixdataarray.h

@@ -17,6 +17,8 @@ namespace nixdataarray {
 
     void addSource(const extractor &input, infusor &output);
 
+    void addSources(const extractor &input, infusor &output);
+
     void removeSource(const extractor &input, infusor &output);
 
     void hasSource(const extractor &input, infusor &output);

tests/TestDataArray.m

@@ -21,6 +21,7 @@
     funcs{end+1} = @test_write_data_float;
     funcs{end+1} = @test_write_data_integer;
     funcs{end+1} = @test_add_source;
+    funcs{end+1} = @test_add_sources;
     funcs{end+1} = @test_open_source;
     funcs{end+1} = @test_remove_source;
     funcs{end+1} = @test_has_source;
@@ -295,6 +296,40 @@
     assert(size(getDataArray.sources, 1) == 2);
 end
 
+%% Test: Add sources by entity cell array
+function [] = test_add_sources ( varargin )
+    testFile = fullfile(pwd, 'tests', 'testRW.h5');
+    f = nix.File(testFile, nix.FileMode.Overwrite);
+    b = f.create_block('testBlock', 'nixBlock');
+    d = b.create_data_array('testDataArray', 'nixDataArray', nix.DataType.Double, [1 2]);
+    tmp = b.create_source('testSource1', 'nixSource');
+    tmp = b.create_source('testSource2', 'nixSource');
+    tmp = b.create_source('testSource3', 'nixSource');
+
+    assert(isempty(d.sources));
+
+    try
+        d.add_sources('hurra');
+    catch ME
+        assert(strcmp(ME.message, 'Expected cell array'));
+    end;
+    assert(isempty(d.sources));
+
+    try
+        d.add_sources({12, 13});
+    catch ME
+        assert(~isempty(strfind(ME.message, 'not a nix.Source')));
+    end;
+    assert(isempty(d.sources));
+
+    d.add_sources(b.sources());
+    assert(size(d.sources, 1) == 3);
+
+    clear d tmp b f;
+    f = nix.File(testFile, nix.FileMode.ReadOnly);
+    assert(size(f.blocks{1}.dataArrays{1}.sources, 1) == 3);
+end
+
 %% Test: Open source by ID or name
 function [] = test_open_source( varargin )
     test_file = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);