[c++/m] Add Tag sourcesFilter

Author: mpsonntag

nix_mx.cc

@@ -323,6 +323,7 @@ void mexFunction(int            nlhs,
         methods->add("Tag::openFeatureIdx", nixtag::openFeatureIdx);
         methods->add("Tag::openSourceIdx", nixtag::openSourceIdx);
         methods->add("Tag::compare", nixtag::compare);
+        methods->add("Tag::sourcesFiltered", nixtag::sourcesFiltered);
 
         classdef<nix::MultiTag>("MultiTag", methods)
             .desc(&nixmultitag::describe)

src/nixtag.cc

@@ -7,14 +7,15 @@
 // LICENSE file in the root of the Project.
 
 #include "nixtag.h"
-#include "mkarray.h"
 
 #include "mex.h"
 
 #include <nix.hpp>
 
-#include "handle.h"
 #include "arguments.h"
+#include "filters.h"
+#include "handle.h"
+#include "mkarray.h"
 #include "struct.h"
 
 namespace nixtag {
@@ -102,4 +103,13 @@ namespace nixtag {
         output.set(0, currObj.compare(other));
     }
 
+    void sourcesFiltered(const extractor &input, infusor &output) {
+        nix::Tag currObj = input.entity<nix::Tag>(1);
+        std::vector<nix::Source> res = filterEntity<nix::Source>(input,
+                                            [currObj](const nix::util::Filter<nix::Source>::type &filter) {
+            return currObj.sources(filter);
+        });
+        output.set(0, res);
+    }
+
 } // namespace nixtag

src/nixtag.h

@@ -37,6 +37,8 @@ namespace nixtag {
 
     void compare(const extractor &input, infusor &output);
 
+    void sourcesFiltered(const extractor &input, infusor &output);
+
 } // namespace nixtag
 
 #endif

tests/TestTag.m

@@ -40,6 +40,7 @@
     funcs{end+1} = @test_has_feature;
     funcs{end+1} = @test_has_reference;
     funcs{end+1} = @test_compare;
+    funcs{end+1} = @test_filter_source;
 end
 
 %% Test: Add sources by entity and id
@@ -652,3 +653,78 @@
     assert(t2.compare(t1) > 0);
     assert(t1.compare(t3) ~= 0);
 end
+
+%% Test: filter sources
+function [] = test_filter_source( varargin )
+    filterName = 'filterMe';
+    filterType = 'filterType';
+    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    b = f.create_block('testBlock', 'nixBlock');
+    t = b.create_tag('testTag', 'nixTag', [1 2 3]);
+    s = b.create_source(filterName, 'nixSource');
+    t.add_source(s);
+    filterID = s.id;
+	s = b.create_source('testSource1', filterType);
+    t.add_source(s);
+    filterIDs = {filterID, s.id};
+    s = b.create_source('testSource2', filterType);
+    t.add_source(s);
+
+    % test empty id filter
+    assert(isempty(f.blocks{1}.tags{1}.filter_sources(nix.Filter.id, 'IdoNotExist')));
+
+    % test nix.Filter.accept_all
+    filtered = f.blocks{1}.tags{1}.filter_sources(nix.Filter.accept_all, '');
+    assert(size(filtered, 1) == 3);
+
+    % test nix.Filter.id
+    filtered = f.blocks{1}.tags{1}.filter_sources(nix.Filter.id, filterID);
+    assert(size(filtered, 1) == 1);
+    assert(strcmp(filtered{1}.id, filterID));
+
+    % test nix.Filter.ids
+    filtered = f.blocks{1}.tags{1}.filter_sources(nix.Filter.ids, filterIDs);
+    assert(size(filtered, 1) == 2);
+    assert(strcmp(filtered{1}.id, filterIDs{1}) || strcmp(filtered{1}.id, filterIDs{2}));
+    
+    % test nix.Filter.name
+    filtered  = f.blocks{1}.tags{1}.filter_sources(nix.Filter.name, filterName);
+    assert(size(filtered, 1) == 1);
+    assert(strcmp(filtered{1}.name, filterName));
+    
+    % test nix.Filter.type
+    filtered = f.blocks{1}.tags{1}.filter_sources(nix.Filter.type, filterType);
+    assert(size(filtered, 1) == 2);
+
+    % test nix.Filter.metadata
+    mainName = 'testSubSection';
+    mainSource = b.create_source(mainName, 'nixSource');
+    t.add_source(mainSource);
+    subName = 'testSubSection1';
+    s = f.create_section(subName, 'nixSection');
+    mainSource.set_metadata(s);
+    subID = s.id;
+
+    assert(isempty(f.blocks{1}.tags{1}.filter_sources(nix.Filter.metadata, 'Do not exist')));
+    filtered = f.blocks{1}.tags{1}.filter_sources(nix.Filter.metadata, subID);
+    assert(size(filtered, 1) == 1);
+    assert(strcmp(filtered{1}.name, mainName));
+
+    % test nix.Filter.source
+    mainName = 'testSubSource';
+    main = b.create_source(mainName, 'nixSource');
+    t.add_source(main);
+    mainID = main.id;
+    subName = 'testSubSource1';
+    s = main.create_source(subName, 'nixSource');
+    subID = s.id;
+
+    assert(isempty(f.blocks{1}.tags{1}.filter_sources(nix.Filter.source, 'Do not exist')));
+    filtered = f.blocks{1}.tags{1}.filter_sources(nix.Filter.source, subName);
+    assert(size(filtered, 1) == 1);
+    assert(strcmp(filtered{1}.id, mainID));
+
+    filtered = f.blocks{1}.tags{1}.filter_sources(nix.Filter.source, subID);
+    assert(size(filtered, 1) == 1);
+    assert(strcmp(filtered{1}.name, mainName));
+end