add create/delete feature for tag

Author: mpsonntag

+nix/Tag.m

@@ -55,6 +55,21 @@
         % 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('Tag::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', 'Tag::deleteFeature', obj.featuresCache);
+        end;
+
         function retObj = open_feature(obj, id_or_name)
             retObj = nix.Utils.open_entity(obj, ...
                 'Tag::openFeature', id_or_name, @nix.Feature);

nix_mx.cc

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

src/nixtag.cc

@@ -38,6 +38,24 @@ namespace nixtag {
         currObj.addSource(input.str(2));
     }
 
+    void create_feature(const extractor &input, infusor &output)
+    {
+        nix::Tag currObj = input.entity<nix::Tag>(1);
+
+        uint8_t ltype = input.num<uint8_t>(3);
+        nix::LinkType link_type;
+
+        switch (ltype) {
+        case 0: link_type = nix::LinkType::Tagged; break;
+        case 1: link_type = nix::LinkType::Untagged; break;
+        case 2: link_type = nix::LinkType::Indexed; break;
+        default: throw std::invalid_argument("unkown link type");
+        }
+
+        nix::Feature newFeat = currObj.createFeature(input.str(2), link_type);
+        output.set(0, handle(newFeat));
+    }
+
     void retrieve_data(const extractor &input, infusor &output) {
         nix::Tag currObj = input.entity<nix::Tag>(1);
         double index = input.num<double>(2);

src/nixtag.h

@@ -11,6 +11,8 @@ namespace nixtag {
 
     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/TestTag.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;
@@ -92,6 +94,48 @@
     assert(size(getBlock.dataArrays, 1) == 2);
 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('featureTestDataArray1', 'nixDataArray', 'double', [1 2]);
+    tmp = b.create_data_array('featureTestDataArray2', 'nixDataArray', 'double', [3 4]);
+    tmp = b.create_data_array('featureTestDataArray3', 'nixDataArray', 'double', [5 6]);
+    tmp = b.create_data_array('featureTestDataArray4', 'nixDataArray', 'double', [7 8]);
+    tmp = b.create_data_array('featureTestDataArray5', 'nixDataArray', 'double', [9 10]);
+    tmp = b.create_data_array('featureTestDataArray6', 'nixDataArray', 'double', [11 12]);
+    position = [1.0 1.2 1.3 15.9];
+    getTag = b.create_tag('featureTest', 'nixTag', position);
+    
+    assert(isempty(getTag.features));
+    tmp = getTag.add_feature(b.dataArrays{1}.id, nix.LinkType.Tagged);
+    tmp = getTag.add_feature(b.dataArrays{2}, nix.LinkType.Tagged);
+    tmp = getTag.add_feature(b.dataArrays{3}.id, nix.LinkType.Untagged);
+    tmp = getTag.add_feature(b.dataArrays{4}, nix.LinkType.Untagged);
+    tmp = getTag.add_feature(b.dataArrays{5}.id, nix.LinkType.Indexed);
+    tmp = getTag.add_feature(b.dataArrays{6}, nix.LinkType.Indexed);
+    assert(size(getTag.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('featureTestDataArray1', 'nixDataArray', 'double', [1 2]);
+    tmp = b.create_data_array('featureTestDataArray2', 'nixDataArray', 'double', [3 4]);
+    position = [1.0 1.2 1.3 15.9];
+    getTag = b.create_tag('featureTest', 'nixTag', position);
+    tmp = getTag.add_feature(b.dataArrays{1}.id, nix.LinkType.Tagged);
+    tmp = getTag.add_feature(b.dataArrays{2}, nix.LinkType.Tagged);
+
+    assert(getTag.remove_feature(getTag.features{2}.id));
+    assert(getTag.remove_feature(getTag.features{1}));
+    assert(isempty(getTag.features));
+
+    assert(~getTag.remove_feature('I do not exist'));
+    assert(size(b.dataArrays, 1) == 2);
+end
+
 %% Test: fetch references
 function [] = test_fetch_references( varargin )
     test_file = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);