Skip to content

Commit d22fb4e

Browse files
achilleas-kachilleas-k
authored
Merge pull request #164 from mpsonntag/rename
Refactor and Cleanup, part III: Renaming LGTM
2 parents a10fbe7 + f3ec14e commit d22fb4e

35 files changed

+3738
-3663
lines changed

‎+nix/Block.m‎

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -20,66 +20,66 @@
2020
[email protected]();
2121

2222
% assign relations
23-
nix.Dynamic.add_dyn_relation(obj, 'groups', @nix.Group);
24-
nix.Dynamic.add_dyn_relation(obj, 'dataArrays', @nix.DataArray);
25-
nix.Dynamic.add_dyn_relation(obj, 'sources', @nix.Source);
26-
nix.Dynamic.add_dyn_relation(obj, 'tags', @nix.Tag);
27-
nix.Dynamic.add_dyn_relation(obj, 'multiTags', @nix.MultiTag);
23+
nix.Dynamic.addGetChildEntities(obj, 'groups', @nix.Group);
24+
nix.Dynamic.addGetChildEntities(obj, 'dataArrays', @nix.DataArray);
25+
nix.Dynamic.addGetChildEntities(obj, 'sources', @nix.Source);
26+
nix.Dynamic.addGetChildEntities(obj, 'tags', @nix.Tag);
27+
nix.Dynamic.addGetChildEntities(obj, 'multiTags', @nix.MultiTag);
2828
end
2929

3030
% -----------------
3131
% Group methods
3232
% -----------------
3333

34-
function r = group_count(obj)
34+
function r = groupCount(obj)
3535
r = nix.Utils.fetchEntityCount(obj, 'groupCount');
3636
end
3737

38-
function r = create_group(obj, name, nixtype)
38+
function r = createGroup(obj, name, nixtype)
3939
fname = strcat(obj.alias, '::createGroup');
40-
h = nix_mx(fname, obj.nix_handle, name, nixtype);
40+
h = nix_mx(fname, obj.nixhandle, name, nixtype);
4141
r = nix.Utils.createEntity(h, @nix.Group);
4242
end
4343

44-
function r = has_group(obj, id_or_name)
45-
r = nix.Utils.fetchHasEntity(obj, 'hasGroup', id_or_name);
44+
function r = hasGroup(obj, idName)
45+
r = nix.Utils.fetchHasEntity(obj, 'hasGroup', idName);
4646
end
4747

48-
function r = get_group(obj, id_or_name)
49-
r = nix.Utils.open_entity(obj, 'getGroup', id_or_name, @nix.Group);
48+
function r = openGroup(obj, idName)
49+
r = nix.Utils.openEntity(obj, 'getGroup', idName, @nix.Group);
5050
end
5151

52-
function r = open_group_idx(obj, index)
53-
idx = nix.Utils.handle_index(index);
54-
r = nix.Utils.open_entity(obj, 'openGroupIdx', idx, @nix.Group);
52+
function r = openGroupIdx(obj, index)
53+
idx = nix.Utils.handleIndex(index);
54+
r = nix.Utils.openEntity(obj, 'openGroupIdx', idx, @nix.Group);
5555
end
5656

57-
function r = delete_group(obj, idNameEntity)
58-
r = nix.Utils.delete_entity(obj, 'deleteGroup', idNameEntity, 'nix.Group');
57+
function r = deleteGroup(obj, idNameEntity)
58+
r = nix.Utils.deleteEntity(obj, 'deleteGroup', idNameEntity, 'nix.Group');
5959
end
6060

61-
function r = filter_groups(obj, filter, val)
61+
function r = filterGroups(obj, filter, val)
6262
r = nix.Utils.filter(obj, 'groupsFiltered', filter, val, @nix.Group);
6363
end
6464

6565
% -----------------
6666
% DataArray methods
6767
% -----------------
6868

69-
function r = data_array_count(obj)
69+
function r = dataArrayCount(obj)
7070
r = nix.Utils.fetchEntityCount(obj, 'dataArrayCount');
7171
end
7272

73-
function r = data_array(obj, id_or_name)
74-
r = nix.Utils.open_entity(obj, 'openDataArray', id_or_name, @nix.DataArray);
73+
function r = openDataArray(obj, idName)
74+
r = nix.Utils.openEntity(obj, 'openDataArray', idName, @nix.DataArray);
7575
end
7676

77-
function r = open_data_array_idx(obj, index)
78-
idx = nix.Utils.handle_index(index);
79-
r = nix.Utils.open_entity(obj, 'openDataArrayIdx', idx, @nix.DataArray);
77+
function r = openDataArrayIdx(obj, index)
78+
idx = nix.Utils.handleIndex(index);
79+
r = nix.Utils.openEntity(obj, 'openDataArrayIdx', idx, @nix.DataArray);
8080
end
8181

82-
function r = create_data_array(obj, name, nixtype, datatype, shape)
82+
function r = createDataArray(obj, name, nixtype, datatype, shape)
8383
%-- Quick fix to enable alias range dimension with
8484
%-- 1D data arrays created with this function.
8585
%-- e.g. size([1 2 3]) returns shape [1 3], which would not
@@ -97,12 +97,12 @@
9797
error(err);
9898
else
9999
fname = strcat(obj.alias, '::createDataArray');
100-
h = nix_mx(fname, obj.nix_handle, name, nixtype, lower(datatype.char), shape);
100+
h = nix_mx(fname, obj.nixhandle, name, nixtype, lower(datatype.char), shape);
101101
r = nix.Utils.createEntity(h, @nix.DataArray);
102102
end
103103
end
104104

105-
function r = create_data_array_from_data(obj, name, nixtype, data)
105+
function r = createDataArrayFromData(obj, name, nixtype, data)
106106
shape = size(data);
107107
%-- Quick fix to enable alias range dimension with
108108
%-- 1D data arrays created with this function.
@@ -125,136 +125,136 @@
125125
error(err);
126126
end
127127

128-
r = obj.create_data_array(name, nixtype, dtype, shape);
129-
r.write_all(data);
128+
r = obj.createDataArray(name, nixtype, dtype, shape);
129+
r.writeAllData(data);
130130
end
131131

132-
function r = has_data_array(obj, id_or_name)
133-
r = nix.Utils.fetchHasEntity(obj, 'hasDataArray', id_or_name);
132+
function r = hasDataArray(obj, idName)
133+
r = nix.Utils.fetchHasEntity(obj, 'hasDataArray', idName);
134134
end
135135

136-
function r = delete_data_array(obj, del)
137-
r = nix.Utils.delete_entity(obj, 'deleteDataArray', del, 'nix.DataArray');
136+
function r = deleteDataArray(obj, del)
137+
r = nix.Utils.deleteEntity(obj, 'deleteDataArray', del, 'nix.DataArray');
138138
end
139139

140-
function r = filter_data_arrays(obj, filter, val)
140+
function r = filterDataArrays(obj, filter, val)
141141
r = nix.Utils.filter(obj, 'dataArraysFiltered', filter, val, @nix.DataArray);
142142
end
143143

144144
% -----------------
145145
% Sources methods
146146
% -----------------
147147

148-
function r = source_count(obj)
148+
function r = sourceCount(obj)
149149
r = nix.Utils.fetchEntityCount(obj, 'sourceCount');
150150
end
151151

152-
function r = create_source(obj, name, type)
152+
function r = createSource(obj, name, type)
153153
fname = strcat(obj.alias, '::createSource');
154-
h = nix_mx(fname, obj.nix_handle, name, type);
154+
h = nix_mx(fname, obj.nixhandle, name, type);
155155
r = nix.Utils.createEntity(h, @nix.Source);
156156
end
157157

158-
function r = has_source(obj, id_or_name)
159-
r = nix.Utils.fetchHasEntity(obj, 'hasSource', id_or_name);
158+
function r = hasSource(obj, idName)
159+
r = nix.Utils.fetchHasEntity(obj, 'hasSource', idName);
160160
end
161161

162-
function r = delete_source(obj, del)
163-
r = nix.Utils.delete_entity(obj, 'deleteSource', del, 'nix.Source');
162+
function r = deleteSource(obj, del)
163+
r = nix.Utils.deleteEntity(obj, 'deleteSource', del, 'nix.Source');
164164
end
165165

166-
function r = open_source(obj, id_or_name)
167-
r = nix.Utils.open_entity(obj, 'openSource', id_or_name, @nix.Source);
166+
function r = openSource(obj, idName)
167+
r = nix.Utils.openEntity(obj, 'openSource', idName, @nix.Source);
168168
end
169169

170-
function r = open_source_idx(obj, index)
171-
idx = nix.Utils.handle_index(index);
172-
r = nix.Utils.open_entity(obj, 'openSourceIdx', idx, @nix.Source);
170+
function r = openSourceIdx(obj, index)
171+
idx = nix.Utils.handleIndex(index);
172+
r = nix.Utils.openEntity(obj, 'openSourceIdx', idx, @nix.Source);
173173
end
174174

175-
function r = filter_sources(obj, filter, val)
175+
function r = filterSources(obj, filter, val)
176176
r = nix.Utils.filter(obj, 'sourcesFiltered', filter, val, @nix.Source);
177177
end
178178

179179
% maxdepth is an index
180-
function r = find_sources(obj, max_depth)
181-
r = obj.find_filtered_sources(max_depth, nix.Filter.accept_all, '');
180+
function r = findSources(obj, maxDepth)
181+
r = obj.filterFindSources(maxDepth, nix.Filter.acceptall, '');
182182
end
183183

184184
% maxdepth is an index
185-
function r = find_filtered_sources(obj, max_depth, filter, val)
186-
r = nix.Utils.find(obj, 'findSources', max_depth, filter, val, @nix.Source);
185+
function r = filterFindSources(obj, maxDepth, filter, val)
186+
r = nix.Utils.find(obj, 'findSources', maxDepth, filter, val, @nix.Source);
187187
end
188188

189189
% -----------------
190190
% Tags methods
191191
% -----------------
192192

193-
function r = tag_count(obj)
193+
function r = tagCount(obj)
194194
r = nix.Utils.fetchEntityCount(obj, 'tagCount');
195195
end
196196

197-
function r = has_tag(obj, id_or_name)
198-
r = nix.Utils.fetchHasEntity(obj, 'hasTag', id_or_name);
197+
function r = hasTag(obj, idName)
198+
r = nix.Utils.fetchHasEntity(obj, 'hasTag', idName);
199199
end
200200

201-
function r = open_tag(obj, id_or_name)
202-
r = nix.Utils.open_entity(obj, 'openTag', id_or_name, @nix.Tag);
201+
function r = openTag(obj, idName)
202+
r = nix.Utils.openEntity(obj, 'openTag', idName, @nix.Tag);
203203
end
204204

205-
function r = open_tag_idx(obj, index)
206-
idx = nix.Utils.handle_index(index);
207-
r = nix.Utils.open_entity(obj, 'openTagIdx', idx, @nix.Tag);
205+
function r = openTagIdx(obj, index)
206+
idx = nix.Utils.handleIndex(index);
207+
r = nix.Utils.openEntity(obj, 'openTagIdx', idx, @nix.Tag);
208208
end
209209

210-
function r = create_tag(obj, name, type, position)
210+
function r = createTag(obj, name, type, position)
211211
fname = strcat(obj.alias, '::createTag');
212-
h = nix_mx(fname, obj.nix_handle, name, type, position);
212+
h = nix_mx(fname, obj.nixhandle, name, type, position);
213213
r = nix.Utils.createEntity(h, @nix.Tag);
214214
end
215215

216-
function r = delete_tag(obj, del)
217-
r = nix.Utils.delete_entity(obj, 'deleteTag', del, 'nix.Tag');
216+
function r = deleteTag(obj, del)
217+
r = nix.Utils.deleteEntity(obj, 'deleteTag', del, 'nix.Tag');
218218
end
219219

220-
function r = filter_tags(obj, filter, val)
220+
function r = filterTags(obj, filter, val)
221221
r = nix.Utils.filter(obj, 'tagsFiltered', filter, val, @nix.Tag);
222222
end
223223

224224
% -----------------
225225
% MultiTag methods
226226
% -----------------
227227

228-
function r = multi_tag_count(obj)
228+
function r = multiTagCount(obj)
229229
r = nix.Utils.fetchEntityCount(obj, 'multiTagCount');
230230
end
231231

232-
function r = has_multi_tag(obj, id_or_name)
233-
r = nix.Utils.fetchHasEntity(obj, 'hasMultiTag', id_or_name);
232+
function r = hasMultiTag(obj, idName)
233+
r = nix.Utils.fetchHasEntity(obj, 'hasMultiTag', idName);
234234
end
235235

236-
function r = open_multi_tag(obj, id_or_name)
237-
r = nix.Utils.open_entity(obj, 'openMultiTag', id_or_name, @nix.MultiTag);
236+
function r = openMultiTag(obj, idName)
237+
r = nix.Utils.openEntity(obj, 'openMultiTag', idName, @nix.MultiTag);
238238
end
239239

240-
function r = open_multi_tag_idx(obj, index)
241-
idx = nix.Utils.handle_index(index);
242-
r = nix.Utils.open_entity(obj, 'openMultiTagIdx', idx, @nix.MultiTag);
240+
function r = openMultiTagIdx(obj, index)
241+
idx = nix.Utils.handleIndex(index);
242+
r = nix.Utils.openEntity(obj, 'openMultiTagIdx', idx, @nix.MultiTag);
243243
end
244244

245245
%-- Creating a multitag requires an already existing data array
246-
function r = create_multi_tag(obj, name, type, add_data_array)
246+
function r = createMultiTag(obj, name, type, refDataArray)
247247
fname = strcat(obj.alias, '::createMultiTag');
248-
id = nix.Utils.parseEntityId(add_data_array, 'nix.DataArray');
249-
h = nix_mx(fname, obj.nix_handle, name, type, id);
248+
id = nix.Utils.parseEntityId(refDataArray, 'nix.DataArray');
249+
h = nix_mx(fname, obj.nixhandle, name, type, id);
250250
r = nix.Utils.createEntity(h, @nix.MultiTag);
251251
end
252252

253-
function r = delete_multi_tag(obj, del)
254-
r = nix.Utils.delete_entity(obj, 'deleteMultiTag', del, 'nix.MultiTag');
253+
function r = deleteMultiTag(obj, del)
254+
r = nix.Utils.deleteEntity(obj, 'deleteMultiTag', del, 'nix.MultiTag');
255255
end
256256

257-
function r = filter_multi_tags(obj, filter, val)
257+
function r = filterMultiTags(obj, filter, val)
258258
r = nix.Utils.filter(obj, 'multiTagsFiltered', filter, val, @nix.MultiTag);
259259
end
260260
end

0 commit comments

Comments
 (0)