[c++/m] Add MultiTag featuresFilter

Author: mpsonntag

+nix/MultiTag.m

@@ -132,6 +132,11 @@
             c = nix_mx('MultiTag::featureCount', obj.nix_handle);
         end
 
+        function filtered = filter_features(obj, filter, val)
+            filtered = nix.Utils.filter(obj, filter, val, ...
+                'MultiTag::featuresFiltered', @nix.Feature);
+        end
+
         % ------------------
         % Positions methods
         % ------------------

nix_mx.cc

@@ -373,6 +373,7 @@ void mexFunction(int            nlhs,
         methods->add("MultiTag::compare", nixmultitag::compare);
         methods->add("MultiTag::sourcesFiltered", nixmultitag::sourcesFiltered);
         methods->add("MultiTag::referencesFiltered", nixmultitag::referencesFiltered);
+        methods->add("MultiTag::featuresFiltered", nixmultitag::featuresFiltered);
 
         classdef<nix::Section>("Section", methods)
             .desc(&nixsection::describe)

src/nixmultitag.cc

@@ -126,4 +126,13 @@ namespace nixmultitag {
         output.set(0, res);
     }
 
+    void featuresFiltered(const extractor &input, infusor &output) {
+        nix::MultiTag currObj = input.entity<nix::MultiTag>(1);
+        std::vector<nix::Feature> res = filterFeature<nix::Feature>(input,
+                                            [currObj](const nix::util::Filter<nix::Feature>::type &filter) {
+            return currObj.features(filter);
+        });
+        output.set(0, res);
+    }
+
 } // namespace nixmultitag

src/nixmultitag.h

@@ -43,6 +43,8 @@ namespace nixmultitag {
 
     void referencesFiltered(const extractor &input, infusor &output);
 
+    void featuresFiltered(const extractor &input, infusor &output);
+
 } // namespace nixmultitag
 
 #endif

tests/TestMultiTag.m

@@ -47,6 +47,7 @@
     funcs{end+1} = @test_compare;
     funcs{end+1} = @test_filter_source;
     funcs{end+1} = @test_filter_reference;
+    funcs{end+1} = @test_filter_feature;
 end
 
 %% Test: Add sources by entity and id
@@ -932,3 +933,65 @@
     assert(size(filtered, 1) == 1);
     assert(strcmp(filtered{1}.name, mainName));
 end
+
+%% Test: filter features
+function [] = test_filter_feature( varargin )
+    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    b = f.create_block('testBlock', 'nixBlock');
+    d = b.create_data_array('testDataArray', 'nixDataArray', nix.DataType.Double, [2 7]);
+    t = b.create_multi_tag('testMultiTag', 'nixMultiTag', d);
+    d = b.create_data_array('testDataArray1', 'nixDataArray', nix.DataType.Double, [1 2]);
+    feat = t.add_feature(d, nix.LinkType.Tagged);
+    filterID = feat.id;
+	d = b.create_data_array('testDataArray2', 'nixDataArray', nix.DataType.Double, [1 2]);
+    feat = t.add_feature(d, nix.LinkType.Tagged);
+    filterIDs = {filterID, feat.id};
+
+    % test empty id filter
+    assert(isempty(f.blocks{1}.multiTags{1}.filter_features(nix.Filter.id, 'IdoNotExist')));
+
+    % test nix.Filter.accept_all
+    filtered = f.blocks{1}.multiTags{1}.filter_features(nix.Filter.accept_all, '');
+    assert(size(filtered, 1) == 2);
+
+    % test nix.Filter.id
+    filtered = f.blocks{1}.multiTags{1}.filter_features(nix.Filter.id, filterID);
+    assert(size(filtered, 1) == 1);
+    assert(strcmp(filtered{1}.id, filterID));
+
+    % test nix.Filter.ids
+    filtered = f.blocks{1}.multiTags{1}.filter_features(nix.Filter.ids, filterIDs);
+    assert(size(filtered, 1) == 2);
+    assert(strcmp(filtered{1}.id, filterIDs{1}) || strcmp(filtered{1}.id, filterIDs{2}));
+
+    % test fail on nix.Filter.name
+    err = 'unknown or unsupported filter';
+    try
+        f.blocks{1}.multiTags{1}.filter_features(nix.Filter.name, 'someName');
+    catch ME
+        assert(strcmp(ME.message, err));
+    end
+
+    % test fail on nix.Filter.type
+    err = 'unknown or unsupported filter';
+    try
+        f.blocks{1}.multiTags{1}.filter_features(nix.Filter.type, 'someType');
+    catch ME
+        assert(strcmp(ME.message, err));
+    end
+
+    % test fail on nix.Filter.metadata
+    err = 'unknown or unsupported filter';
+    try
+        f.blocks{1}.multiTags{1}.filter_features(nix.Filter.metadata, 'someMetadata');
+    catch ME
+        assert(strcmp(ME.message, err));
+    end
+
+    % test fail on nix.Filter.source
+    try
+        f.blocks{1}.multiTags{1}.filter_features(nix.Filter.source, 'someSource');
+    catch ME
+        assert(strcmp(ME.message, err));
+    end
+end