[c++/m] Add Block findSources function

Author: mpsonntag

+nix/Block.m

@@ -184,6 +184,30 @@
                 'Block::sourcesFiltered', @nix.Source);
         end
 
+        % maxdepth is an index
+        function sec = find_sources(obj, max_depth)
+            sec = obj.find_filtered_sources(max_depth, nix.Filter.accept_all, '');
+        end
+
+        % maxdepth is an index
+        function sec = find_filtered_sources(obj, max_depth, filter, val)
+            if (~isnumeric(max_depth))
+                error('Provide a valid search depth');
+            end
+
+            valid = nix.Utils.valid_filter(filter, val);
+            if(~isempty(valid))
+                error(valid);
+            end
+
+            ret = nix_mx('Block::findSources', obj.nix_handle, ...
+                                            max_depth, uint8(filter), val);
+            sec = cell(length(ret), 1);
+            for i = 1:length(ret)
+                sec{i} = nix.Source(ret{i});
+            end;
+        end
+
         % -----------------
         % Tags methods
         % -----------------

nix_mx.cc

@@ -174,6 +174,7 @@ void mexFunction(int            nlhs,
         methods->add("Block::tagsFiltered", nixblock::tagsFiltered);
         methods->add("Block::multiTagsFiltered", nixblock::multiTagsFiltered);
         methods->add("Block::dataArraysFiltered", nixblock::dataArraysFiltered);
+        methods->add("Block::findSources", nixblock::findSources);
 
         classdef<nix::Group>("Group", methods)
             .desc(&nixgroup::describe)

src/nixblock.cc

@@ -142,4 +142,17 @@ namespace nixblock {
         output.set(0, res);
     }
 
+    void findSources(const extractor &input, infusor &output) {
+        nix::Block currObj = input.entity<nix::Block>(1);
+        size_t max_depth = (size_t)input.num<double>(2);
+        uint8_t filter_id = input.num<uint8_t>(3);
+
+        std::vector<nix::Source> res = filterFullEntity<nix::Source>(input, filter_id, 4, max_depth,
+            [currObj](const nix::util::Filter<nix::Source>::type &filter, size_t &md) {
+                return currObj.findSources(filter, md);
+        });
+
+        output.set(0, res);
+    }
+
 } // namespace nixblock

src/nixblock.h

@@ -43,6 +43,8 @@ namespace nixblock {
 
     void dataArraysFiltered(const extractor &input, infusor &output);
 
+    void findSources(const extractor &input, infusor &output);
+
 } // namespace nixblock
 
 #endif

tests/TestBlock.m

@@ -55,6 +55,8 @@
     funcs{end+1} = @test_filter_tag;
     funcs{end+1} = @test_filter_multi_tag;
     funcs{end+1} = @test_filter_data_array;
+    funcs{end+1} = @test_find_source;
+    funcs{end+1} = @test_find_source_filtered;
 end
 
 function [] = test_attrs( varargin )
@@ -1095,3 +1097,114 @@
     assert(size(filtered, 1) == 1);
     assert(strcmp(filtered{1}.name, mainName));
 end
+
+%% Test: Find source w/o filter
+function [] = test_find_source
+    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    b = f.create_block('testBlock', 'nixBlock');
+    sl1 = b.create_source('sourceLvl1', 'nixSource');
+
+    sl21 = sl1.create_source('sourceLvl2_1', 'nixSource');
+    sl22 = sl1.create_source('sourceLvl2_2', 'nixSource');
+
+    sl31 = sl21.create_source('sourceLvl3_1', 'nixSource');
+    sl32 = sl21.create_source('sourceLvl3_2', 'nixSource');
+    sl33 = sl21.create_source('sourceLvl3_3', 'nixSource');
+
+    sl41 = sl31.create_source('sourceLvl4_1', 'nixSource');
+    sl42 = sl31.create_source('sourceLvl4_2', 'nixSource');
+    sl43 = sl31.create_source('sourceLvl4_3', 'nixSource');
+    sl44 = sl31.create_source('sourceLvl4_4', 'nixSource');
+
+    % Check invalid entry
+    err = 'Provide a valid search depth';
+    try
+        b.find_sources('hurra');
+    catch ME
+        assert(strcmp(ME.message, err));
+    end
+
+    % find all
+    filtered = b.find_sources(4);
+    assert(size(filtered, 1) == 10);
+
+    % find until level 4
+    filtered = b.find_sources(3);
+    assert(size(filtered, 1) == 10);
+
+    % find until level 3
+    filtered = b.find_sources(2);
+    assert(size(filtered, 1) == 6);
+
+    % find until level 2
+    filtered = b.find_sources(1);
+    assert(size(filtered, 1) == 3);
+
+    % find until level 1
+    filtered = b.find_sources(0);
+    assert(size(filtered, 1) == 1);
+end
+
+%% Test: Find sources with filters
+function [] = test_find_source_filtered
+    findSource = 'nixFindSection';
+    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    b = f.create_block('testBlock', 'nixBlock');
+    sl1 = b.create_source('sourceLvl1', 'nixSource');
+
+    sl21 = sl1.create_source('sourceLvl2_1', 'nixSource');
+    sl22 = sl1.create_source('sourceLvl2_2', findSource);
+
+    sl31 = sl21.create_source('sourceLvl3_1', findSource);
+    sl32 = sl21.create_source('sourceLvl3_2', 'nixSource');
+    sl33 = sl21.create_source('sourceLvl3_3', 'nixSource');
+
+    sl41 = sl31.create_source('sourceLvl4_1', findSource);
+    sl42 = sl31.create_source('sourceLvl4_2', 'nixSource');
+    sl43 = sl31.create_source('sourceLvl4_3', 'nixSource');
+    sl44 = sl31.create_source('sourceLvl4_4', 'nixSource');
+
+    % test find by id
+    filtered = b.find_filtered_sources(0, nix.Filter.id, sl41.id);
+    assert(isempty(filtered));
+    filtered = b.find_filtered_sources(3, nix.Filter.id, sl41.id);
+    assert(size(filtered, 1) == 1);
+    assert(strcmp(filtered{1}.id, sl41.id));
+
+    % test find by ids
+    filterids = {sl1.id, sl41.id};
+    filtered = b.find_filtered_sources(0, nix.Filter.ids, filterids);
+    assert(size(filtered, 1) == 1);
+    filtered = b.find_filtered_sources(3, nix.Filter.ids, filterids);
+    assert(size(filtered, 1) == 2);
+
+    % test find by name
+    filtered = b.find_filtered_sources(0, nix.Filter.name, sl41.name);
+    assert(isempty(filtered));
+    filtered = b.find_filtered_sources(3, nix.Filter.name, sl41.name);
+    assert(size(filtered, 1) == 1);
+    assert(strcmp(filtered{1}.name, sl41.name));
+
+    % test find by type
+    filtered = b.find_filtered_sources(0, nix.Filter.type, findSource);
+    assert(isempty(filtered));
+    filtered = b.find_filtered_sources(3, nix.Filter.type, findSource);
+    assert(size(filtered, 1) == 3);
+    assert(strcmp(filtered{1}.type, findSource));
+
+    % test nix.Filter.metadata
+    sec = f.create_section('testSection', 'nixSection');
+    sl43.set_metadata(sec);
+    filtered = b.find_filtered_sources(0, nix.Filter.metadata, sec.id);
+    assert(isempty(filtered));
+    filtered = b.find_filtered_sources(3, nix.Filter.metadata, sec.id);
+    assert(size(filtered, 1) == 1);
+    strcmp(filtered{1}.id, sl43.id);
+
+    % test nix.Filter.source
+    filtered = b.find_filtered_sources(0, nix.Filter.source, sl44.id);
+    assert(isempty(filtered));
+    filtered = b.find_filtered_sources(3, nix.Filter.source, sl44.id);
+    assert(size(filtered, 1) == 1);
+    assert(strcmp(filtered{1}.id, sl31.id));
+end