[c++/m] Add Section findSections

mpsonntag · mpsonntag · commit e4df318ff226 · 2017-07-27T11:59:06.000+02:00
diff --git a/+nix/Section.m b/+nix/Section.m
@@ -107,6 +107,30 @@
                 'Section::sectionsFiltered', @nix.Section);
         end
 
+        % maxdepth is an index
+        function sec = find_sections(obj, max_depth)
+            sec = obj.find_filtered_sections(max_depth, nix.Filter.accept_all, '');
+        end
+
+        % maxdepth is an index
+        function sec = find_filtered_sections(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('Section::findSections', obj.nix_handle, ...
+                                            max_depth, uint8(filter), val);
+            sec = cell(length(ret), 1);
+            for i = 1:length(ret)
+                sec{i} = nix.Section(ret{i});
+            end;
+        end
+
         % ----------------
         % Property methods
         % ----------------
diff --git a/nix_mx.cc b/nix_mx.cc
@@ -417,6 +417,7 @@ void mexFunction(int            nlhs,
         methods->add("Section::compare", nixsection::compare);
         methods->add("Section::sectionsFiltered", nixsection::sectionsFiltered);
         methods->add("Section::propertiesFiltered", nixsection::propertiesFiltered);
+        methods->add("Section::findSections", nixsection::findSections);
 
         classdef<nix::Feature>("Feature", methods)
             .desc(&nixfeature::describe)
diff --git a/src/nixsection.cc b/src/nixsection.cc
@@ -142,4 +142,17 @@ namespace nixsection {
         output.set(0, res);
     }
 
+    void findSections(const extractor &input, infusor &output) {
+        nix::Section currObj = input.entity<nix::Section>(1);
+        size_t max_depth = (size_t)input.num<double>(2);
+        uint8_t filter_id = input.num<uint8_t>(3);
+
+        std::vector<nix::Section> res = filterNameTypeEntity<nix::Section>(input, filter_id, 4, max_depth,
+            [currObj](const nix::util::Filter<nix::Section>::type &filter, size_t &md) {
+                return currObj.findSections(filter, md);
+        });
+
+        output.set(0, res);
+    }
+
 } // namespace nixsection
diff --git a/src/nixsection.h b/src/nixsection.h
@@ -39,6 +39,8 @@ namespace nixsection {
 
     void propertiesFiltered(const extractor &input, infusor &output);
 
+    void findSections(const extractor &input, infusor &output);
+
 } // namespace nixsection
 
 #endif
diff --git a/tests/TestSection.m b/tests/TestSection.m
@@ -41,6 +41,8 @@
     funcs{end+1} = @test_compare;
     funcs{end+1} = @test_filter_section;
     funcs{end+1} = @test_filter_property;
+    funcs{end+1} = @test_find_section;
+    funcs{end+1} = @test_find_section_filtered;
 end
 
 %% Test: Create Section
@@ -734,3 +736,122 @@
         assert(strcmp(ME.message, err));
     end
 end
+
+%% Test: Find sections w/o filter
+function [] = test_find_section
+    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    main = f.create_section('testSection', 'nixSection');
+    sl1 = main.create_section('sectionLvl1', 'nixSection');
+
+    sl21 = sl1.create_section('sectionLvl2_1', 'nixSection');
+    sl22 = sl1.create_section('sectionLvl2_2', 'nixSection');
+
+    sl31 = sl21.create_section('sectionLvl3_1', 'nixSection');
+    sl32 = sl21.create_section('sectionLvl3_2', 'nixSection');
+    sl33 = sl21.create_section('sectionLvl3_3', 'nixSection');
+
+    sl41 = sl31.create_section('sectionLvl4_1', 'nixSection');
+    sl42 = sl31.create_section('sectionLvl4_2', 'nixSection');
+    sl43 = sl31.create_section('sectionLvl4_3', 'nixSection');
+    sl44 = sl31.create_section('sectionLvl4_4', 'nixSection');
+
+    side = f.create_section('sideSection', 'nixSection');
+    side1 = side.create_section('sideSubSection', 'nixSection');
+
+    % Check invalid entry
+    err = 'Provide a valid search depth';
+    try
+        sl1.find_sections('hurra');
+    catch ME
+        assert(strcmp(ME.message, err));
+    end
+
+    % find all
+    filtered = sl1.find_sections(4);
+    assert(size(filtered, 1) == 10);
+
+    % find until level 4
+    filtered = sl1.find_sections(3);
+    assert(size(filtered, 1) == 10);
+
+    % find until level 3
+    filtered = sl1.find_sections(2);
+    assert(size(filtered, 1) == 6);
+
+    % find until level 2
+    filtered = sl1.find_sections(1);
+    assert(size(filtered, 1) == 3);
+
+    % find until level 1
+    filtered = sl1.find_sections(0);
+    assert(size(filtered, 1) == 1);
+end
+
+%% Test: Find sections with filters
+function [] = test_find_section_filtered
+    findSection = 'nixFindSection';
+    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    main = f.create_section('testSection', 'nixSection');
+    sl1 = main.create_section('sectionLvl1', 'nixSection');
+
+    sl21 = sl1.create_section('sectionLvl2_1', 'nixSection');
+    sl22 = sl1.create_section('sectionLvl2_2', findSection);
+
+    sl31 = sl21.create_section('sectionLvl3_1', findSection);
+    sl32 = sl21.create_section('sectionLvl3_2', 'nixSection');
+    sl33 = sl21.create_section('sectionLvl3_3', 'nixSection');
+
+    sl41 = sl31.create_section('sectionLvl4_1', findSection);
+    sl42 = sl31.create_section('sectionLvl4_2', 'nixSection');
+    sl43 = sl31.create_section('sectionLvl4_3', 'nixSection');
+    sl44 = sl31.create_section('sectionLvl4_4', 'nixSection');
+
+    sideName = 'sideSubSection';
+    side = f.create_section('sideSection', 'nixSection');
+    side1 = side.create_section(sideName, 'nixSection');
+
+    % test find by id
+    filtered = sl1.find_filtered_sections(0, nix.Filter.id, sl41.id);
+    assert(isempty(filtered));
+    filtered = sl1.find_filtered_sections(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 = sl1.find_filtered_sections(0, nix.Filter.ids, filterids);
+    assert(size(filtered, 1) == 1);
+    filtered = sl1.find_filtered_sections(3, nix.Filter.ids, filterids);
+    assert(size(filtered, 1) == 2);
+
+    % test find by name
+    filtered = sl1.find_filtered_sections(4, nix.Filter.name, sideName);
+    assert(isempty(filtered));
+    filtered = sl1.find_filtered_sections(0, nix.Filter.name, sl41.name);
+    assert(isempty(filtered));
+    filtered = sl1.find_filtered_sections(3, nix.Filter.name, sl41.name);
+    assert(size(filtered, 1) == 1);
+    assert(strcmp(filtered{1}.name, sl41.name));
+
+    % test find by type
+    filtered = sl1.find_filtered_sections(0, nix.Filter.type, findSection);
+    assert(isempty(filtered));
+    filtered = sl1.find_filtered_sections(3, nix.Filter.type, findSection);
+    assert(size(filtered, 1) == 3);
+    assert(strcmp(filtered{1}.type, findSection));
+
+    % test fail on nix.Filter.metadata
+    err = 'unknown or unsupported filter';
+    try
+        sl1.find_filtered_sections(1, nix.Filter.metadata, 'metadata');
+    catch ME
+        assert(strcmp(ME.message, err));
+    end
+
+    % test fail on nix.Filter.source
+    try
+        sl1.find_filtered_sections(1, nix.Filter.source, 'source');
+    catch ME
+        assert(strcmp(ME.message, err));
+    end
+end
