add create/delete feature for multitag

Author: mpsonntag

+nix/MultiTag.m

@@ -54,7 +54,22 @@
         % ------------------
         % Features methods
         % ------------------
-        
+
+        function retObj = add_feature(obj, add_this, link_type)
+            if(strcmp(class(add_this), 'nix.DataArray'))
+                addID = add_this.id;
+            else
+                addID = add_this;
+            end;
+            retObj = nix.Feature(nix_mx('MultiTag::createFeature', obj.nix_handle, addID, link_type));
+            obj.featuresCache.lastUpdate = 0;
+        end;
+
+        function delCheck = remove_feature(obj, del)
+            [delCheck, obj.featuresCache] = nix.Utils.delete_entity(obj, ...
+                del, 'nix.Feature', 'MultiTag::deleteFeature', obj.featuresCache);
+        end;
+
         function retObj = open_feature(obj, id_or_name)
             retObj = nix.Utils.open_entity(obj, ...
                 'MultiTag::openFeature', id_or_name, @nix.Feature);

nix_mx.cc

@@ -171,11 +171,13 @@ void mexFunction(int            nlhs,
             .reg("openSource", GETBYSTR(nix::Source, nix::MultiTag, getSource))
             .reg("openMetadataSection", GETCONTENT(nix::Section, nix::MultiTag, metadata))
             .reg("removeReference", REMOVER(nix::DataArray, nix::MultiTag, removeReference))
-            .reg("removeSource", REMOVER(nix::Source, nix::MultiTag, removeSource));
+            .reg("removeSource", REMOVER(nix::Source, nix::MultiTag, removeSource))
+            .reg("deleteFeature", REMOVER(nix::Feature, nix::MultiTag, deleteFeature));
         methods->add("MultiTag::retrieveData", nixmultitag::retrieve_data);
         methods->add("MultiTag::featureRetrieveData", nixmultitag::retrieve_feature_data);
         methods->add("MultiTag::addReference", nixmultitag::add_reference);
         methods->add("MultiTag::addSource", nixmultitag::add_source);
+        methods->add("MultiTag::createFeature", nixmultitag::create_feature);
 
         classdef<nix::Section>("Section", methods)
             .desc(&nixsection::describe)

src/nixmultitag.cc

@@ -36,6 +36,16 @@ namespace nixmultitag {
         currObj.addSource(input.str(2));
     }
 
+    void create_feature(const extractor &input, infusor &output)
+    {
+        nix::MultiTag currObj = input.entity<nix::MultiTag>(1);
+
+        nix::LinkType link_type = nixgen::get_link_type(input.num<uint8_t>(3));
+
+        nix::Feature newFeat = currObj.createFeature(input.str(2), link_type);
+        output.set(0, handle(newFeat));
+    }
+
     void retrieve_data(const extractor &input, infusor &output) {
         nix::MultiTag currObj = input.entity<nix::MultiTag>(1);
         double p_index = input.num<double>(2);

src/nixmultitag.h

@@ -11,6 +11,8 @@ namespace nixmultitag {
 
     void add_source(const extractor &input, infusor &output);
 
+    void create_feature(const extractor &input, infusor &output);
+
     void retrieve_data(const extractor &input, infusor &output);
 
     void retrieve_feature_data(const extractor &input, infusor &output);

tests/TestMultiTag.m

@@ -7,6 +7,8 @@
     funcs{end+1} = @test_remove_source;
     funcs{end+1} = @test_add_reference;
     funcs{end+1} = @test_remove_reference;
+    funcs{end+1} = @test_add_feature;
+    funcs{end+1} = @test_remove_feature;
     funcs{end+1} = @test_fetch_references;
     funcs{end+1} = @test_fetch_sources;
     funcs{end+1} = @test_fetch_features;
@@ -94,6 +96,51 @@
     assert(size(b.dataArrays, 1) == 3);
 end
 
+%% Test: Add features by entity and id
+function [] = test_add_feature ( varargin )
+    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    b = f.createBlock('featureTest', 'nixBlock');
+    tmp = b.create_data_array('featureTestDataArray', 'nixDataArray', 'double', [1 2]);
+    getMTag = b.create_multi_tag('featuretest', 'nixMultiTag', b.dataArrays{1});
+
+    tmp = b.create_data_array('featTestDA1', 'nixDataArray', 'double', [1 2]);
+    tmp = b.create_data_array('featTestDA2', 'nixDataArray', 'double', [3 4]);
+    tmp = b.create_data_array('featTestDA3', 'nixDataArray', 'double', [5 6]);
+    tmp = b.create_data_array('featTestDA4', 'nixDataArray', 'double', [7 8]);
+    tmp = b.create_data_array('featTestDA5', 'nixDataArray', 'double', [9 10]);
+    tmp = b.create_data_array('featTestDA6', 'nixDataArray', 'double', [11 12]);
+
+    assert(isempty(getMTag.features));
+    tmp = getMTag.add_feature(b.dataArrays{2}.id, nix.LinkType.Tagged);
+    tmp = getMTag.add_feature(b.dataArrays{3}, nix.LinkType.Tagged);
+    tmp = getMTag.add_feature(b.dataArrays{4}.id, nix.LinkType.Untagged);
+    tmp = getMTag.add_feature(b.dataArrays{5}, nix.LinkType.Untagged);
+    tmp = getMTag.add_feature(b.dataArrays{6}.id, nix.LinkType.Indexed);
+    tmp = getMTag.add_feature(b.dataArrays{7}, nix.LinkType.Indexed);
+    assert(size(getMTag.features, 1) == 6);
+end
+
+%% Test: Remove features by entity and id
+function [] = test_remove_feature ( varargin )
+    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    b = f.createBlock('featureTest', 'nixBlock');
+	tmp = b.create_data_array('featureTestDataArray', 'nixDataArray', 'double', [1 2]);
+    getMTag = b.create_multi_tag('featuretest', 'nixMultiTag', b.dataArrays{1});
+
+    tmp = b.create_data_array('featTestDA1', 'nixDataArray', 'double', [1 2]);
+    tmp = b.create_data_array('featTestDA2', 'nixDataArray', 'double', [3 4]);
+
+    tmp = getMTag.add_feature(b.dataArrays{2}.id, nix.LinkType.Tagged);
+    tmp = getMTag.add_feature(b.dataArrays{3}, nix.LinkType.Tagged);
+
+    assert(getMTag.remove_feature(getMTag.features{2}.id));
+    assert(getMTag.remove_feature(getMTag.features{1}));
+    assert(isempty(getMTag.features));
+
+    assert(~getMTag.remove_feature('I do not exist'));
+    assert(size(b.dataArrays, 1) == 3);
+end
+
 %% Test: fetch references
 function [] = test_fetch_references( varargin )
     test_file = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);