refactor feature entity

Author: mpsonntag

+nix/Feature.m

@@ -8,24 +8,24 @@
 
     properties(Dependent)
         id
+        linkType
     end;
 
     methods
         function obj = Feature(h)
            [email protected](h);
         end;
-        
+
         function id = get.id(obj)
            id = obj.info.id; 
         end;
-        
-        function linkType = link_type(obj)
-            linkType = nix_mx('Feature::linkType', obj.nix_handle);
+
+        function linkType = get.linkType(obj)
+            linkType = obj.info.linkType;
         end;
-        
-        function dataArray = open_data(obj, id_or_name)
-           daHandle = nix_mx('Feature::openData', obj.nix_handle, id_or_name); 
-           dataArray = nix.Feature(daHandle);
+
+        function dataArray = open_data(obj)
+           dataArray = nix.DataArray(nix_mx('Feature::openData', obj.nix_handle));
         end;
     end;
 

nix_mx.cc

@@ -195,7 +195,6 @@ void mexFunction(int            nlhs,
         classdef<nix::Feature>("Feature", methods)
             .desc(&nixfeature::describe)
             .reg("openData", GETCONTENT(nix::DataArray, nix::Feature, data));
-        methods->add("Feature::linkType", nixfeature::link_type);
 
         mexAtExit(on_exit);
     });

src/nixfeature.cc

@@ -12,18 +12,20 @@ namespace nixfeature {
 
     mxArray *describe(const nix::Feature &feat)
     {
-        struct_builder sb({ 1 }, { "id" });
+        nix::LinkType link_type = feat.linkType();
+        uint8_t ltype;
+
+        switch (link_type) {
+        case nix::LinkType::Tagged: ltype = 0; break;
+        case nix::LinkType::Untagged: ltype = 1; break;
+        case nix::LinkType::Indexed: ltype = 2; break;
+        default: throw std::invalid_argument("unkown link type");
+        }
+
+        struct_builder sb({ 1 }, { "id", "linkType" });
         sb.set(feat.id());
+        sb.set(ltype);
         return sb.array();
     }
 
-    void link_type(const extractor &input, infusor &output)
-    {
-        nix::Feature currFeat = input.entity<nix::Feature>(1);
-        //TODO properly implement link type
-        struct_builder sb({ 1 }, { "linkType" });
-        sb.set("linkType");
-        output.set(0, sb.array());
-    }
-
 } // namespace nixfeature

src/nixfeature.h

@@ -7,8 +7,6 @@ namespace nixfeature {
 
     mxArray *describe(const nix::Feature &feat);
 
-    void link_type(const extractor &input, infusor &output);
-
 } // namespace nixfeature
 
 #endif

tests/RunTests.m

@@ -27,11 +27,11 @@
 t6.tests = TestMultiTag();
 t7.name = 'SECTION';
 t7.tests = TestSection();
-
-%-- TODO: TestFeature
+t8.name = 'FEATURE';
+t8.tests = TestFeature();
 
 % concatenate all test handles
-all_tests = {t1, t2, t3, t4, t5, t6, t7};
+all_tests = {t1, t2, t3, t4, t5, t6, t7, t8};
 
 for i = 1:length(all_tests)
     fprintf([10 'Execute ' all_tests{i}.name ' tests:\n\n']);

tests/TestFeature.m

@@ -0,0 +1,19 @@
+function funcs = TestFeature
+%TESTTag tests for Tag
+%   Detailed explanation goes here
+
+    funcs = {};
+    funcs{end+1} = @test_open_data;
+end
+
+%% Test: Open data from feature
+function [] = test_open_data ( varargin )
+    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    b = f.createBlock('featureTest', 'nixBlock');
+    tmp = b.create_data_array('featureTestDataArray', 'nixDataArray', 'double', [1 2 3 4 5 6]);
+    getTag = b.create_tag('featureTest', 'nixTag', [1, 2]);
+    tmp = getTag.add_feature(b.dataArrays{1}, nix.LinkType.Tagged);
+    
+    getFeature = getTag.features{1};
+    assert(~isempty(getFeature.open_data));
+end