[c++/m] Add Section sectionsFilter

Author: mpsonntag

+nix/Section.m

@@ -102,6 +102,11 @@
             c = nix_mx('Section::sectionCount', obj.nix_handle);
         end
 
+        function filtered = filter_sections(obj, filter, val)
+            filtered = nix.Utils.filter(obj, filter, val, ...
+                'Section::sectionsFiltered', @nix.Section);
+        end
+
         % ----------------
         % Property methods
         % ----------------

nix_mx.cc

@@ -414,6 +414,7 @@ void mexFunction(int            nlhs,
         methods->add("Section::openSectionIdx", nixsection::openSectionIdx);
         methods->add("Section::openPropertyIdx", nixsection::openPropertyIdx);
         methods->add("Section::compare", nixsection::compare);
+        methods->add("Section::sectionsFiltered", nixsection::sectionsFiltered);
 
         classdef<nix::Feature>("Feature", methods)
             .desc(&nixfeature::describe)

src/nixsection.cc

@@ -7,14 +7,15 @@
 // LICENSE file in the root of the Project.
 
 #include "nixsection.h"
+
 #include "mex.h"
 #include <nix.hpp>
 
-#include "handle.h"
 #include "arguments.h"
-#include "struct.h"
+#include "filters.h"
+#include "handle.h"
 #include "mknix.h"
-
+#include "struct.h"
 
 namespace nixsection {
 
@@ -123,4 +124,13 @@ namespace nixsection {
         output.set(0, currObj.compare(other));
     }
 
+    void sectionsFiltered(const extractor &input, infusor &output) {
+        nix::Section currObj = input.entity<nix::Section>(1);
+        std::vector<nix::Section> res = filterFileEntity<nix::Section>(input,
+                                            [currObj](const nix::util::Filter<nix::Section>::type &filter) {
+            return currObj.sections(filter);
+        });
+        output.set(0, res);
+    }
+
 } // namespace nixsection

src/nixsection.h

@@ -35,6 +35,8 @@ namespace nixsection {
 
     void compare(const extractor &input, infusor &output);
 
+    void sectionsFiltered(const extractor &input, infusor &output);
+
 } // namespace nixsection
 
 #endif

tests/TestSection.m

@@ -39,6 +39,7 @@
     funcs{end+1} = @test_referring_block_sources;
     funcs{end+1} = @test_referring_blocks;
     funcs{end+1} = @test_compare;
+    funcs{end+1} = @test_filter_section;
 end
 
 %% Test: Create Section
@@ -619,4 +620,60 @@
     assert(s1.compare(s2) < 0);
     assert(s1.compare(s1) == 0);
     assert(s2.compare(s1) > 0);
-end
+end
+
+%% Test: filter Sections
+function [] = test_filter_section( varargin )
+    filterName = 'filterMe';
+    filterType = 'filterType';
+    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    ms = f.create_section('testSection', 'nixSection');
+    s = ms.create_section(filterName, 'nixSection');
+    filterID = s.id;
+	s = ms.create_section('testSection1', filterType);
+    filterIDs = {filterID, s.id};
+    s = ms.create_section('testSection2', filterType);
+
+    % ToDO add basic filter crash tests
+    
+    % test empty id filter
+    assert(isempty(f.sections{1}.filter_sections(nix.Filter.id, 'IdoNotExist')));
+
+    % test nix.Filter.accept_all
+    filtered = f.sections{1}.filter_sections(nix.Filter.accept_all, '');
+    assert(size(filtered, 1) == 3);
+    
+    % test nix.Filter.id
+    filtered = f.sections{1}.filter_sections(nix.Filter.id, filterID);
+    assert(size(filtered, 1) == 1);
+    assert(strcmp(filtered{1}.id, filterID));
+
+    % test nix.Filter.ids
+    filtered = f.sections{1}.filter_sections(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.sections{1}.filter_sections(nix.Filter.name, filterName);
+    assert(size(filtered, 1) == 1);
+    assert(strcmp(filtered{1}.name, filterName));
+    
+    % test nix.Filter.type
+    filtered = f.sections{1}.filter_sections(nix.Filter.type, filterType);
+    assert(size(filtered, 1) == 2);
+    
+    % test fail on nix.Filter.metadata
+    err = 'unknown or unsupported filter';
+    try
+        f.sections{1}.filter_sections(nix.Filter.metadata, 'someMetadata');
+    catch ME
+        assert(strcmp(ME.message, err));
+    end
+    
+    % test fail on nix.Filter.source
+    try
+        f.sections{1}.filter_sections(nix.Filter.source, 'someSource');
+    catch ME
+        assert(strcmp(ME.message, err));
+    end
+end