Skip to content

Commit e51e2ed

Browse files
committed
[Matlab] Refactor Tag function names
- Refactors all Tag function names to CamelCase. - Refactors all affected tests.
1 parent fcc65f7 commit e51e2ed

File tree

3 files changed

+255
-256
lines changed

3 files changed

+255
-256
lines changed

+nix/Tag.m

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -34,98 +34,98 @@
3434
% References methods
3535
% ------------------
3636

37-
function [] = add_reference(obj, add_this)
38-
nix.Utils.add_entity(obj, 'addReference', add_this, 'nix.DataArray');
37+
function [] = addReference(obj, entity)
38+
nix.Utils.add_entity(obj, 'addReference', entity, 'nix.DataArray');
3939
end
4040

41-
function [] = add_references(obj, add_cell_array)
42-
nix.Utils.add_entity_array(obj, 'addReferences', add_cell_array, 'nix.DataArray');
41+
function [] = addReferences(obj, entityArray)
42+
nix.Utils.add_entity_array(obj, 'addReferences', entityArray, 'nix.DataArray');
4343
end
4444

45-
function r = has_reference(obj, id_or_name)
46-
r = nix.Utils.fetchHasEntity(obj, 'hasReference', id_or_name);
45+
function r = hasReference(obj, idName)
46+
r = nix.Utils.fetchHasEntity(obj, 'hasReference', idName);
4747
end
4848

49-
function r = remove_reference(obj, del)
49+
function r = removeReference(obj, del)
5050
r = nix.Utils.delete_entity(obj, 'removeReference', del, 'nix.DataArray');
5151
end
5252

53-
function r = open_reference(obj, id_or_name)
54-
r = nix.Utils.open_entity(obj, 'openReferenceDataArray', id_or_name, @nix.DataArray);
53+
function r = openReference(obj, idName)
54+
r = nix.Utils.open_entity(obj, 'openReferenceDataArray', idName, @nix.DataArray);
5555
end
5656

57-
function r = open_reference_idx(obj, index)
57+
function r = openReferenceIdx(obj, index)
5858
idx = nix.Utils.handle_index(index);
5959
r = nix.Utils.open_entity(obj, 'openReferenceIdx', idx, @nix.DataArray);
6060
end
6161

62-
function r = retrieve_data(obj, id_or_name)
62+
function r = retrieveData(obj, idName)
6363
fname = strcat(obj.alias, '::retrieveData');
64-
data = nix_mx(fname, obj.nix_handle, id_or_name);
64+
data = nix_mx(fname, obj.nix_handle, idName);
6565
r = nix.Utils.transpose_array(data);
6666
end
6767

68-
function r = retrieve_data_idx(obj, index)
68+
function r = retrieveDataIdx(obj, index)
6969
idx = nix.Utils.handle_index(index);
7070
fname = strcat(obj.alias, '::retrieveDataIdx');
7171
data = nix_mx(fname, obj.nix_handle, idx);
7272
r = nix.Utils.transpose_array(data);
7373
end
7474

75-
function r = reference_count(obj)
75+
function r = referenceCount(obj)
7676
r = nix.Utils.fetchEntityCount(obj, 'referenceCount');
7777
end
7878

79-
function r = filter_references(obj, filter, val)
79+
function r = filterReferences(obj, filter, val)
8080
r = nix.Utils.filter(obj, 'referencesFiltered', filter, val, @nix.DataArray);
8181
end
8282

8383
% ------------------
8484
% Features methods
8585
% ------------------
8686

87-
function r = add_feature(obj, add_this, link_type)
88-
id = nix.Utils.parseEntityId(add_this, 'nix.DataArray');
87+
function r = addFeature(obj, entity, linkType)
88+
id = nix.Utils.parseEntityId(entity, 'nix.DataArray');
8989
fname = strcat(obj.alias, '::createFeature');
90-
h = nix_mx(fname, obj.nix_handle, id, link_type);
90+
h = nix_mx(fname, obj.nix_handle, id, linkType);
9191
r = nix.Utils.createEntity(h, @nix.Feature);
9292
end
9393

94-
function r = has_feature(obj, id_or_name)
95-
r = nix.Utils.fetchHasEntity(obj, 'hasFeature', id_or_name);
94+
function r = hasFeature(obj, idName)
95+
r = nix.Utils.fetchHasEntity(obj, 'hasFeature', idName);
9696
end
9797

98-
function r = remove_feature(obj, del)
98+
function r = removeFeature(obj, del)
9999
r = nix.Utils.delete_entity(obj, 'deleteFeature', del, 'nix.Feature');
100100
end
101101

102-
function r = open_feature(obj, id_or_name)
103-
r = nix.Utils.open_entity(obj, 'openFeature', id_or_name, @nix.Feature);
102+
function r = openFeature(obj, idName)
103+
r = nix.Utils.open_entity(obj, 'openFeature', idName, @nix.Feature);
104104
end
105105

106-
function r = open_feature_idx(obj, index)
106+
function r = openFeatureIdx(obj, index)
107107
idx = nix.Utils.handle_index(index);
108108
r = nix.Utils.open_entity(obj, 'openFeatureIdx', idx, @nix.Feature);
109109
end
110110

111-
function r = retrieve_feature_data(obj, id_or_name)
111+
function r = retrieveFeatureData(obj, idName)
112112
fname = strcat(obj.alias, '::featureRetrieveData');
113-
data = nix_mx(fname, obj.nix_handle, id_or_name);
113+
data = nix_mx(fname, obj.nix_handle, idName);
114114
r = nix.Utils.transpose_array(data);
115115
end
116116

117-
function r = retrieve_feature_data_idx(obj, index)
117+
function r = retrieveFeatureDataIdx(obj, index)
118118
idx = nix.Utils.handle_index(index);
119119
fname = strcat(obj.alias, '::featureRetrieveDataIdx');
120120
data = nix_mx(fname, obj.nix_handle, idx);
121121
r = nix.Utils.transpose_array(data);
122122
end
123123

124-
function r = feature_count(obj)
124+
function r = featureCount(obj)
125125
r = nix.Utils.fetchEntityCount(obj, 'featureCount');
126126
end
127127

128-
function r = filter_features(obj, filter, val)
128+
function r = filterFeatures(obj, filter, val)
129129
r = nix.Utils.filter(obj, 'featuresFiltered', filter, val, @nix.Feature);
130130
end
131131
end

tests/TestFeature.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
b = f.createBlock('featureTest', 'nixBlock');
2323
tmp = b.createDataArray('featureTestDataArray', 'nixDataArray', nix.DataType.Double, [1 2 3 4 5 6]);
2424
t = b.createTag('featureTest', 'nixTag', [1, 2]);
25-
tmp = t.add_feature(b.dataArrays{1}, nix.LinkType.Tagged);
25+
tmp = t.addFeature(b.dataArrays{1}, nix.LinkType.Tagged);
2626

2727
getFeature = t.features{1};
2828
assert(~isempty(getFeature.open_data));
@@ -35,7 +35,7 @@
3535
b = f.createBlock('featureTest', 'nixBlock');
3636
da = b.createDataArray('featureTestDataArray', 'nixDataArray', nix.DataType.Double, [1 2 3 4 5 6]);
3737
t = b.createTag('featureTest', 'nixTag', [1, 2]);
38-
feat = t.add_feature(b.dataArrays{1}, nix.LinkType.Tagged);
38+
feat = t.addFeature(b.dataArrays{1}, nix.LinkType.Tagged);
3939

4040
try
4141
feat.linkType = '';
@@ -80,7 +80,7 @@
8080
da3 = b.createDataArray(daName3, daType, nix.DataType.Double, daData);
8181
da4 = b.createDataArray(daName4, daType, nix.DataType.Double, daData);
8282
t = b.createTag('featureTest', 'nixTag', [1, 2]);
83-
feat = t.add_feature(b.dataArrays{1}, nix.LinkType.Tagged);
83+
feat = t.addFeature(b.dataArrays{1}, nix.LinkType.Tagged);
8484

8585
assert(strcmp(feat.open_data.name, daName1));
8686
feat.set_data(da2);

0 commit comments

Comments
 (0)