[Matlab] Refactor Tag index use

Author: mpsonntag

+nix/Tag.m

@@ -54,7 +54,8 @@
             r = nix.Utils.open_entity(obj, 'openReferenceDataArray', id_or_name, @nix.DataArray);
         end
 
-        function r = open_reference_idx(obj, idx)
+        function r = open_reference_idx(obj, index)
+            idx = nix.Utils.handle_index(index);
             r = nix.Utils.open_entity(obj, 'openReferenceIdx', idx, @nix.DataArray);
         end
 
@@ -64,7 +65,8 @@
             r = nix.Utils.transpose_array(data);
         end
 
-        function r = retrieve_data_idx(obj, idx)
+        function r = retrieve_data_idx(obj, index)
+            idx = nix.Utils.handle_index(index);
             fname = strcat(obj.alias, '::retrieveDataIdx');
             data = nix_mx(fname, obj.nix_handle, idx);
             r = nix.Utils.transpose_array(data);
@@ -101,7 +103,8 @@
             r = nix.Utils.open_entity(obj, 'openFeature', id_or_name, @nix.Feature);
         end
 
-        function r = open_feature_idx(obj, idx)
+        function r = open_feature_idx(obj, index)
+            idx = nix.Utils.handle_index(index);
             r = nix.Utils.open_entity(obj, 'openFeatureIdx', idx, @nix.Feature);
         end
 
@@ -111,7 +114,8 @@
             r = nix.Utils.transpose_array(data);
         end
 
-        function r = retrieve_feature_data_idx(obj, idx)
+        function r = retrieve_feature_data_idx(obj, index)
+            idx = nix.Utils.handle_index(index);
             fname = strcat(obj.alias, '::featureRetrieveDataIdx');
             data = nix_mx(fname, obj.nix_handle, idx);
             r = nix.Utils.transpose_array(data);

tests/TestTag.m

@@ -440,9 +440,9 @@
     t.add_feature(d2, nix.LinkType.Untagged);
     t.add_feature(d3, nix.LinkType.Indexed);
 
-    assert(f.blocks{1}.tags{1}.open_feature_idx(0).linkType == nix.LinkType.Tagged);
-    assert(f.blocks{1}.tags{1}.open_feature_idx(1).linkType == nix.LinkType.Untagged);
-    assert(f.blocks{1}.tags{1}.open_feature_idx(2).linkType == nix.LinkType.Indexed);
+    assert(f.blocks{1}.tags{1}.open_feature_idx(1).linkType == nix.LinkType.Tagged);
+    assert(f.blocks{1}.tags{1}.open_feature_idx(2).linkType == nix.LinkType.Untagged);
+    assert(f.blocks{1}.tags{1}.open_feature_idx(3).linkType == nix.LinkType.Indexed);
 end
 
 %% Test: Open reference by ID or name
@@ -477,9 +477,9 @@
     t.add_reference(d2);
     t.add_reference(d3);
 
-    assert(strcmp(f.blocks{1}.tags{1}.open_reference_idx(0).name, d1.name));
-    assert(strcmp(f.blocks{1}.tags{1}.open_reference_idx(1).name, d2.name));
-    assert(strcmp(f.blocks{1}.tags{1}.open_reference_idx(2).name, d3.name));
+    assert(strcmp(f.blocks{1}.tags{1}.open_reference_idx(1).name, d1.name));
+    assert(strcmp(f.blocks{1}.tags{1}.open_reference_idx(2).name, d2.name));
+    assert(strcmp(f.blocks{1}.tags{1}.open_reference_idx(3).name, d3.name));
 end
 
 %% Test: Set metadata
@@ -582,7 +582,7 @@
         assert(~isempty(strfind(ME.message, 'out of bounds')), 'Invalid index failed');
     end
 
-    retData = t.retrieve_data_idx(0);
+    retData = t.retrieve_data_idx(1);
     assert(size(retData, 2) == t.extent, 'Extent check failed');
     assert(retData(1) == raw(t.position + 1), 'Position check failed');
 end
@@ -650,22 +650,22 @@
     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);
+    retData = t.retrieve_feature_data_idx(1);
     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);
+    retData = t.retrieve_feature_data_idx(2);
     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);
+    retData = t.retrieve_feature_data_idx(3);
     assert(size(retData, 2) == size(rawFeature, 2), 'Indexed size check fail');
 
     try