[c++/m] Refactor nix.Tag retrieveFeatureData func

See comments for Refactor nix.Tag retrieveData commit

Author: mpsonntag

+nix/Tag.m

@@ -113,10 +113,8 @@
                 'Tag::openFeatureIdx', idx, @nix.Feature);
         end;
 
-        function data = retrieve_feature_data(obj, index)
-            % convert Matlab-like to C-like index
-            assert(index > 0, 'Subscript indices must be positive');
-            tmp = nix_mx('Tag::featureRetrieveData', obj.nix_handle, index - 1);
+        function data = retrieve_feature_data_idx(obj, idx)
+            tmp = nix_mx('Tag::featureRetrieveDataIdx', obj.nix_handle, idx);
 
             % data must agree with file & dimensions
             % see mkarray.cc(42)

nix_mx.cc

@@ -317,7 +317,6 @@ void mexFunction(int            nlhs,
             .reg("sourceCount", GETTER(nix::ndsize_t, nix::Tag, sourceCount))
             .reg("referenceCount", GETTER(nix::ndsize_t, nix::Tag, referenceCount))
             .reg("featureCount", GETTER(nix::ndsize_t, nix::Tag, featureCount));
-        methods->add("Tag::featureRetrieveData", nixtag::retrieveFeatureData);
         methods->add("Tag::addReference", nixtag::addReference);
         methods->add("Tag::addReferences", nixtag::addReferences);
         methods->add("Tag::addSource", nixtag::addSource);
@@ -331,6 +330,7 @@ void mexFunction(int            nlhs,
         methods->add("Tag::referencesFiltered", nixtag::referencesFiltered);
         methods->add("Tag::featuresFiltered", nixtag::featuresFiltered);
         methods->add("Tag::retrieveDataIdx", nixtag::retrieveDataIdx);
+        methods->add("Tag::featureRetrieveDataIdx", nixtag::retrieveFeatureDataIdx);
 
         classdef<nix::MultiTag>("MultiTag", methods)
             .desc(&nixmultitag::describe)

src/nixtag.cc

@@ -63,14 +63,6 @@ namespace nixtag {
         output.set(0, handle(newFeat));
     }
 
-    void retrieveFeatureData(const extractor &input, infusor &output) {
-        nix::Tag currObj = input.entity<nix::Tag>(1);
-        double index = input.num<double>(2);
-
-        mxArray *data = make_mx_array_from_ds(currObj.retrieveFeatureData(index));
-        output.set(0, data);
-    }
-
     void openReferenceIdx(const extractor &input, infusor &output) {
         nix::Tag currObj = input.entity<nix::Tag>(1);
         nix::ndsize_t idx = (nix::ndsize_t)input.num<double>(2);
@@ -130,4 +122,12 @@ namespace nixtag {
         output.set(0, data);
     }
 
+    void retrieveFeatureDataIdx(const extractor &input, infusor &output) {
+        nix::Tag currObj = input.entity<nix::Tag>(1);
+        nix::ndsize_t idx = (nix::ndsize_t)input.num<double>(2);
+
+        mxArray *data = make_mx_array_from_ds(currObj.retrieveFeatureData(idx));
+        output.set(0, data);
+    }
+
 } // namespace nixtag

src/nixtag.h

@@ -25,8 +25,6 @@ namespace nixtag {
 
     void createFeature(const extractor &input, infusor &output);
 
-    void retrieveFeatureData(const extractor &input, infusor &output);
-
     void openReferenceIdx(const extractor &input, infusor &output);
 
     void openFeatureIdx(const extractor &input, infusor &output);
@@ -43,6 +41,8 @@ namespace nixtag {
 
     void retrieveDataIdx(const extractor &input, infusor &output);
 
+    void retrieveFeatureDataIdx(const extractor &input, infusor &output);
+
 } // namespace nixtag
 
 #endif

tests/TestTag.m

@@ -35,7 +35,7 @@
     funcs{end+1} = @test_set_metadata;
     funcs{end+1} = @test_open_metadata;
     funcs{end+1} = @test_retrieve_data_idx;
-    funcs{end+1} = @test_retrieve_feature_data;
+    funcs{end+1} = @test_retrieve_feature_data_idx;
     funcs{end+1} = @test_attrs;
     funcs{end+1} = @test_has_feature;
     funcs{end+1} = @test_has_reference;
@@ -548,10 +548,47 @@
     assert(retData(1) == raw(t.position + 1), 'Position check failed');
 end
 
-%% Test: Retrieve feature data
-function [] = test_retrieve_feature_data( varargin )
-    % TODO
-    disp('Test Tag: retrieve feature ... TODO (proper testfile)');
+%% Test: Retrieve feature data by index
+function [] = test_retrieve_feature_data_idx( varargin )
+    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    b = f.create_block('testBlock', 'nixBlock');
+    raw = [1, 2, 3, 4, 5, 6, 7, 8, 9];
+    d = b.create_data_array_from_data('testDataArray', 'nixDataArray', raw);
+    d.append_sampled_dimension(1);
+    tagStartPos = [3];
+    t = b.create_tag('testTag', 'nixTag', tagStartPos);
+    t.extent = [3];
+    t.add_reference(d);
+
+    rawFeature = [10, 11, 12, 13, 14, 15, 16, 17, 18, 19];
+
+    % test retrieve untagged feature data 
+    df = b.create_data_array_from_data('testUntagged', 'nixDataArray', rawFeature);
+    df.append_sampled_dimension(1);
+    t.add_feature(df, nix.LinkType.Untagged);
+    retData = t.retrieve_feature_data_idx(0);
+    assert(size(retData, 2) == size(rawFeature, 2), 'Untagged size check fail');
+
+    % test retrieve tagged feature data 
+    df = b.create_data_array_from_data('testTagged', 'nixDataArray', rawFeature);
+    df.append_sampled_dimension(1);
+    t.add_feature(df, nix.LinkType.Tagged);
+    retData = t.retrieve_feature_data_idx(1);
+    assert(size(retData, 2) == t.extent, 'Tagged Extent check fail');
+    assert(retData(1) == rawFeature(t.position + 1), 'Tagged Position check fail');
+
+    % test retrieve indexed feature data
+    df = b.create_data_array_from_data('testIndexed', 'nixDataArray', rawFeature);
+    df.append_sampled_dimension(1);
+    t.add_feature(df, nix.LinkType.Indexed);
+    retData = t.retrieve_feature_data_idx(2);
+    assert(size(retData, 2) == size(rawFeature, 2), 'Indexed size check fail');
+
+    try
+        t.retrieve_feature_data_idx(12);
+    catch ME
+        assert(~isempty(strfind(ME.message, 'out of bounds')), 'Invalid index check fail');
+    end
 end
 
 %% Test: Read and write nix.Tag attributes