[c++/m] Add MultiTag multiple entities create

Closes #124.

Adds references and sources multiple entity create
methods to the MultiTag entity and introduces tests
for all added methods.

Author: mpsonntag

+nix/MultiTag.m

@@ -37,6 +37,11 @@
                 'nix.DataArray', 'MultiTag::addReference');
         end;
 
+        function [] = add_references(obj, add_cell_array)
+            nix.Utils.add_entity_array(obj, add_cell_array, ...
+                'nix.DataArray', strcat(obj.alias, '::addReferences'));
+        end
+
         function hasRef = has_reference(obj, id_or_name)
             hasRef = nix_mx('MultiTag::hasReference', ...
                 obj.nix_handle, id_or_name);

nix_mx.cc

@@ -314,7 +314,9 @@ void mexFunction(int            nlhs,
         methods->add("MultiTag::retrieveData", nixmultitag::retrieveData);
         methods->add("MultiTag::featureRetrieveData", nixmultitag::retrieveFeatureData);
         methods->add("MultiTag::addReference", nixmultitag::addReference);
+        methods->add("MultiTag::addReferences", nixmultitag::addReferences);
         methods->add("MultiTag::addSource", nixmultitag::addSource);
+        methods->add("MultiTag::addSources", nixmultitag::addSources);
         methods->add("MultiTag::createFeature", nixmultitag::createFeature);
         methods->add("MultiTag::addPositions", nixmultitag::addPositions);
 

src/nixmultitag.cc

@@ -36,11 +36,23 @@ namespace nixmultitag {
         currObj.addReference(input.str(2));
     }
 
+    void addReferences(const extractor &input, infusor &output) {
+        nix::MultiTag currObj = input.entity<nix::MultiTag>(1);
+        std::vector<nix::DataArray> curr = input.entity_vec<nix::DataArray>(2);
+        currObj.references(curr);
+    }
+
     void addSource(const extractor &input, infusor &output) {
         nix::MultiTag currObj = input.entity<nix::MultiTag>(1);
         currObj.addSource(input.str(2));
     }
 
+    void addSources(const extractor &input, infusor &output) {
+        nix::MultiTag currObj = input.entity<nix::MultiTag>(1);
+        std::vector<nix::Source> curr = input.entity_vec<nix::Source>(2);
+        currObj.sources(curr);
+    }
+
     void createFeature(const extractor &input, infusor &output) {
         nix::MultiTag currObj = input.entity<nix::MultiTag>(1);
 

src/nixmultitag.h

@@ -17,8 +17,12 @@ namespace nixmultitag {
 
     void addReference(const extractor &input, infusor &output);
 
+    void addReferences(const extractor &input, infusor &output);
+
     void addSource(const extractor &input, infusor &output);
 
+    void addSources(const extractor &input, infusor &output);
+
     void createFeature(const extractor &input, infusor &output);
 
     void retrieveData(const extractor &input, infusor &output);

tests/TestMultiTag.m

@@ -12,8 +12,10 @@
 
     funcs = {};
     funcs{end+1} = @test_add_source;
+    funcs{end+1} = @test_add_sources;
     funcs{end+1} = @test_remove_source;
     funcs{end+1} = @test_add_reference;
+    funcs{end+1} = @test_add_references;
     funcs{end+1} = @test_has_reference;
     funcs{end+1} = @test_remove_reference;
     funcs{end+1} = @test_add_feature;
@@ -68,6 +70,41 @@
     assert(size(f.blocks{1}.multiTags{1}.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');
+    tmp = b.create_data_array('testDataArray', 'nixDataArray', nix.DataType.Double, [1 2]);
+    t = b.create_multi_tag('testMultiTag', 'nixMultiTag', b.dataArrays{1});
+    tmp = b.create_source('testSource1', 'nixSource');
+    tmp = b.create_source('testSource2', 'nixSource');
+    tmp = b.create_source('testSource3', 'nixSource');
+
+    assert(isempty(t.sources));
+
+    try
+        t.add_sources('hurra');
+    catch ME
+        assert(strcmp(ME.message, 'Expected cell array'));
+    end;
+    assert(isempty(t.sources));
+
+    try
+        t.add_sources({12, 13});
+    catch ME
+        assert(~isempty(strfind(ME.message, 'not a nix.Source')));
+    end;
+    assert(isempty(t.sources));
+
+    t.add_sources(b.sources());
+    assert(size(t.sources, 1) == 3);
+
+    clear t tmp b f;
+    f = nix.File(testFile, nix.FileMode.ReadOnly);
+    assert(size(f.blocks{1}.multiTags{1}.sources, 1) == 3);
+end
+
 %% Test: Remove sources by entity and id
 function [] = test_remove_source ( varargin )
     test_file = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
@@ -119,6 +156,40 @@
     assert(size(f.blocks{1}.multiTags{1}.references, 1) == 2);
 end
 
+%% Test: Add references by entity cell array
+function [] = test_add_references ( varargin )
+    testFile = fullfile(pwd, 'tests', 'testRW.h5');
+    f = nix.File(testFile, nix.FileMode.Overwrite);
+    b = f.create_block('testBlock', 'nixBlock');
+    tmp = b.create_data_array('referenceTest1', 'nixDataArray', nix.DataType.Double, [1 2]);
+    t = b.create_multi_tag('referencetest', 'nixMultiTag', b.dataArrays{1});
+    tmp = b.create_data_array('referenceTest2', 'nixDataArray', nix.DataType.Double, [3 4]);
+    tmp = b.create_data_array('referenceTest3', 'nixDataArray', nix.DataType.Double, [3 4]);
+
+    assert(isempty(t.references));
+
+    try
+        t.add_references('hurra');
+    catch ME
+        assert(strcmp(ME.message, 'Expected cell array'));
+    end;
+    assert(isempty(t.references));
+
+    try
+        t.add_references({12, 13});
+    catch ME
+        assert(~isempty(strfind(ME.message, 'not a nix.DataArray')));
+    end;
+    assert(isempty(t.references));
+
+    t.add_references(b.dataArrays);
+    assert(size(t.references, 1) == 3);
+
+    clear t tmp b f;
+    f = nix.File(testFile, nix.FileMode.ReadOnly);
+    assert(size(f.blocks{1}.multiTags{1}.references, 1) == 3);
+end
+
 %% Test: Remove references by entity and id
 function [] = test_remove_reference ( varargin )
     test_file = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);