Skip to content

Commit fcc65f7

Browse files
mpsonntagmpsonntag
committed
[Matlab] Refactor Source function names
- Refactors all Source function names to CamelCase. - Refactors all affected tests.
1 parent 19bf81e commit fcc65f7

File tree

6 files changed

+194
-196
lines changed

6 files changed

+194
-196
lines changed

‎+nix/Source.m‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,61 +27,61 @@
2727
% Sources methods
2828
% ------------------
2929

30-
function r = source_count(obj)
30+
function r = sourceCount(obj)
3131
r = nix.Utils.fetchEntityCount(obj, 'sourceCount');
3232
end
3333

34-
function r = create_source(obj, name, type)
34+
function r = createSource(obj, name, type)
3535
fname = strcat(obj.alias, '::createSource');
3636
h = nix_mx(fname, obj.nix_handle, name, type);
3737
r = nix.Utils.createEntity(h, @nix.Source);
3838
end
3939

40-
function r = has_source(obj, id_or_name)
41-
r = nix.Utils.fetchHasEntity(obj, 'hasSource', id_or_name);
40+
function r = hasSource(obj, idName)
41+
r = nix.Utils.fetchHasEntity(obj, 'hasSource', idName);
4242
end
4343

44-
function r = delete_source(obj, del)
44+
function r = deleteSource(obj, del)
4545
r = nix.Utils.delete_entity(obj, 'deleteSource', del, 'nix.Source');
4646
end
4747

48-
function r = open_source(obj, id_or_name)
49-
r = nix.Utils.open_entity(obj, 'openSource', id_or_name, @nix.Source);
48+
function r = openSource(obj, idName)
49+
r = nix.Utils.open_entity(obj, 'openSource', idName, @nix.Source);
5050
end
5151

52-
function r = open_source_idx(obj, index)
52+
function r = openSourceIdx(obj, index)
5353
idx = nix.Utils.handle_index(index);
5454
r = nix.Utils.open_entity(obj, 'openSourceIdx', idx, @nix.Source);
5555
end
5656

57-
function r = parent_source(obj)
57+
function r = parentSource(obj)
5858
r = nix.Utils.fetchObj(obj, 'parentSource', @nix.Source);
5959
end
6060

61-
function r = referring_data_arrays(obj)
61+
function r = referringDataArrays(obj)
6262
r = nix.Utils.fetchObjList(obj, 'referringDataArrays', @nix.DataArray);
6363
end
6464

65-
function r = referring_tags(obj)
65+
function r = referringTags(obj)
6666
r = nix.Utils.fetchObjList(obj, 'referringTags', @nix.Tag);
6767
end
6868

69-
function r = referring_multi_tags(obj)
69+
function r = referringMultiTags(obj)
7070
r = nix.Utils.fetchObjList(obj, 'referringMultiTags', @nix.MultiTag);
7171
end
7272

73-
function r = filter_sources(obj, filter, val)
73+
function r = filterSources(obj, filter, val)
7474
r = nix.Utils.filter(obj, 'sourcesFiltered', filter, val, @nix.Source);
7575
end
7676

7777
% maxdepth is an index where idx = 0 corresponds to the calling source
78-
function r = find_sources(obj, max_depth)
79-
r = obj.find_filtered_sources(max_depth, nix.Filter.accept_all, '');
78+
function r = findSources(obj, maxDepth)
79+
r = obj.filterFindSources(maxDepth, nix.Filter.accept_all, '');
8080
end
8181

8282
% maxdepth is an index where idx = 0 corresponds to the calling source
83-
function r = find_filtered_sources(obj, max_depth, filter, val)
84-
r = nix.Utils.find(obj, 'findSources', max_depth, filter, val, @nix.Source);
83+
function r = filterFindSources(obj, maxDepth, filter, val)
84+
r = nix.Utils.find(obj, 'findSources', maxDepth, filter, val, @nix.Source);
8585
end
8686
end
8787

‎tests/TestBlock.m‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,7 @@
817817
mainSource = b.createSource(mainName, 'nixSource');
818818
mainID = mainSource.id;
819819
subName = 'testSubSource1';
820-
s = mainSource.create_source(subName, 'nixSource');
820+
s = mainSource.createSource(subName, 'nixSource');
821821
subID = s.id;
822822

823823
assert(isempty(f.blocks{1}.filterSources(nix.Filter.source, 'Do not exist')));
@@ -1104,17 +1104,17 @@
11041104
b = f.createBlock('testBlock', 'nixBlock');
11051105
sl1 = b.createSource('sourceLvl1', 'nixSource');
11061106

1107-
sl21 = sl1.create_source('sourceLvl2_1', 'nixSource');
1108-
sl22 = sl1.create_source('sourceLvl2_2', 'nixSource');
1107+
sl21 = sl1.createSource('sourceLvl2_1', 'nixSource');
1108+
sl22 = sl1.createSource('sourceLvl2_2', 'nixSource');
11091109

1110-
sl31 = sl21.create_source('sourceLvl3_1', 'nixSource');
1111-
sl32 = sl21.create_source('sourceLvl3_2', 'nixSource');
1112-
sl33 = sl21.create_source('sourceLvl3_3', 'nixSource');
1110+
sl31 = sl21.createSource('sourceLvl3_1', 'nixSource');
1111+
sl32 = sl21.createSource('sourceLvl3_2', 'nixSource');
1112+
sl33 = sl21.createSource('sourceLvl3_3', 'nixSource');
11131113

1114-
sl41 = sl31.create_source('sourceLvl4_1', 'nixSource');
1115-
sl42 = sl31.create_source('sourceLvl4_2', 'nixSource');
1116-
sl43 = sl31.create_source('sourceLvl4_3', 'nixSource');
1117-
sl44 = sl31.create_source('sourceLvl4_4', 'nixSource');
1114+
sl41 = sl31.createSource('sourceLvl4_1', 'nixSource');
1115+
sl42 = sl31.createSource('sourceLvl4_2', 'nixSource');
1116+
sl43 = sl31.createSource('sourceLvl4_3', 'nixSource');
1117+
sl44 = sl31.createSource('sourceLvl4_4', 'nixSource');
11181118

11191119
% Check invalid entry
11201120
err = 'Provide a valid search depth';
@@ -1152,17 +1152,17 @@
11521152
b = f.createBlock('testBlock', 'nixBlock');
11531153
sl1 = b.createSource('sourceLvl1', 'nixSource');
11541154

1155-
sl21 = sl1.create_source('sourceLvl2_1', 'nixSource');
1156-
sl22 = sl1.create_source('sourceLvl2_2', findSource);
1155+
sl21 = sl1.createSource('sourceLvl2_1', 'nixSource');
1156+
sl22 = sl1.createSource('sourceLvl2_2', findSource);
11571157

1158-
sl31 = sl21.create_source('sourceLvl3_1', findSource);
1159-
sl32 = sl21.create_source('sourceLvl3_2', 'nixSource');
1160-
sl33 = sl21.create_source('sourceLvl3_3', 'nixSource');
1158+
sl31 = sl21.createSource('sourceLvl3_1', findSource);
1159+
sl32 = sl21.createSource('sourceLvl3_2', 'nixSource');
1160+
sl33 = sl21.createSource('sourceLvl3_3', 'nixSource');
11611161

1162-
sl41 = sl31.create_source('sourceLvl4_1', findSource);
1163-
sl42 = sl31.create_source('sourceLvl4_2', 'nixSource');
1164-
sl43 = sl31.create_source('sourceLvl4_3', 'nixSource');
1165-
sl44 = sl31.create_source('sourceLvl4_4', 'nixSource');
1162+
sl41 = sl31.createSource('sourceLvl4_1', findSource);
1163+
sl42 = sl31.createSource('sourceLvl4_2', 'nixSource');
1164+
sl43 = sl31.createSource('sourceLvl4_3', 'nixSource');
1165+
sl44 = sl31.createSource('sourceLvl4_4', 'nixSource');
11661166

11671167
% test find by id
11681168
filtered = b.filterFindSources(2, nix.Filter.id, sl41.id);

‎tests/TestDataArray.m‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,8 @@
307307
f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
308308
b = f.createBlock('sourceTest', 'nixBlock');
309309
s = b.createSource('sourceTest', 'nixSource');
310-
tmp = s.create_source('nestedSource1', 'nixSource');
311-
tmp = s.create_source('nestedSource2', 'nixSource');
310+
tmp = s.createSource('nestedSource1', 'nixSource');
311+
tmp = s.createSource('nestedSource2', 'nixSource');
312312
getDataArray = b.createDataArray('sourceTestDataArray', 'nixDataArray', nix.DataType.Double, [1 2]);
313313

314314
assert(isempty(getDataArray.sources));
@@ -357,7 +357,7 @@
357357
b = f.createBlock('test', 'nixBlock');
358358
s = b.createSource('test', 'nixSource');
359359
sourceName = 'nestedSource';
360-
nSource = s.create_source(sourceName, 'nixSource');
360+
nSource = s.createSource(sourceName, 'nixSource');
361361

362362
d = b.createDataArray('sourceTest', 'nixDataArray', nix.DataType.Double, [1 2]);
363363
d.add_source(nSource);
@@ -394,8 +394,8 @@
394394
f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
395395
b = f.createBlock('sourceTest', 'nixBlock');
396396
s = b.createSource('sourceTest', 'nixSource');
397-
tmp = s.create_source('nestedSource1', 'nixSource');
398-
tmp = s.create_source('nestedSource2', 'nixSource');
397+
tmp = s.createSource('nestedSource1', 'nixSource');
398+
tmp = s.createSource('nestedSource2', 'nixSource');
399399
getDataArray = b.createDataArray('sourceTestDataArray', 'nixDataArray', nix.DataType.Double, [1 2]);
400400

401401
getDataArray.add_source(s.sources{1}.id);
@@ -660,7 +660,7 @@
660660
d.add_source(main);
661661
mainID = main.id;
662662
subName = 'testSubSource1';
663-
s = main.create_source(subName, 'nixSource');
663+
s = main.createSource(subName, 'nixSource');
664664
subID = s.id;
665665

666666
assert(isempty(f.blocks{1}.dataArrays{1}.filter_sources(nix.Filter.source, 'Do not exist')));

‎tests/TestGroup.m‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -617,8 +617,8 @@
617617
f = nix.File(fileName, nix.FileMode.Overwrite);
618618
b = f.createBlock('sourceTest', 'nixBlock');
619619
s = b.createSource('sourceTest', 'nixSource');
620-
tmp = s.create_source('nestedSource1', 'nixSource');
621-
tmp = s.create_source('nestedSource2', 'nixSource');
620+
tmp = s.createSource('nestedSource1', 'nixSource');
621+
tmp = s.createSource('nestedSource2', 'nixSource');
622622
g = b.createGroup('sourceTest', 'nixGroup');
623623

624624
assert(isempty(g.sources));
@@ -672,8 +672,8 @@
672672
testFile = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
673673
b = testFile.createBlock('test', 'nixBlock');
674674
s = b.createSource('test', 'nixSource');
675-
tmp = s.create_source('nestedSource1', 'nixSource');
676-
tmp = s.create_source('nestedSource2', 'nixSource');
675+
tmp = s.createSource('nestedSource1', 'nixSource');
676+
tmp = s.createSource('nestedSource2', 'nixSource');
677677
g = b.createGroup('sourceTest', 'nixGroup');
678678
g.add_source(s.sources{1}.id);
679679
g.add_source(s.sources{2});
@@ -713,9 +713,9 @@
713713
testFile = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
714714
b = testFile.createBlock('test', 'nixBlock');
715715
s = b.createSource('test','nixSource');
716-
tmp = s.create_source('nestedsource1', 'nixSource');
717-
tmp = s.create_source('nestedsource2', 'nixSource');
718-
tmp = s.create_source('nestedsource3', 'nixSource');
716+
tmp = s.createSource('nestedsource1', 'nixSource');
717+
tmp = s.createSource('nestedsource2', 'nixSource');
718+
tmp = s.createSource('nestedsource3', 'nixSource');
719719
g = b.createGroup('sourceTest', 'nixGroup');
720720

721721
g.add_source(s.sources{1});
@@ -730,7 +730,7 @@
730730
b = testFile.createBlock('test', 'nixBlock');
731731
s = b.createSource('test', 'nixSource');
732732
sourceName = 'nestedSource';
733-
nSource = s.create_source(sourceName, 'nixSource');
733+
nSource = s.createSource(sourceName, 'nixSource');
734734

735735
g = b.createGroup('sourceTest', 'nixGroup');
736736
g.add_source(s.sources{1});
@@ -952,7 +952,7 @@
952952
g.add_source(mainSource);
953953
mainID = mainSource.id;
954954
subName = 'testSubSource1';
955-
s = mainSource.create_source(subName, 'nixSource');
955+
s = mainSource.createSource(subName, 'nixSource');
956956
subID = s.id;
957957

958958
assert(isempty(f.blocks{1}.groups{1}.filter_sources(nix.Filter.source, 'Do not exist')));

‎tests/TestMultiTag.m‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
b = f.createBlock('sourceTest', 'nixBlock');
6060
tmp = b.createDataArray('sourceTestDataArray', 'nixDataArray', nix.DataType.Double, [1 2]);
6161
s = b.createSource('sourceTest', 'nixSource');
62-
tmp = s.create_source('nestedSource1', 'nixSource');
63-
tmp = s.create_source('nestedSource2', 'nixSource');
62+
tmp = s.createSource('nestedSource1', 'nixSource');
63+
tmp = s.createSource('nestedSource2', 'nixSource');
6464
mTag = b.createMultiTag('sourcetest', 'nixMultiTag', b.dataArrays{1});
6565

6666
assert(isempty(mTag.sources));
@@ -121,8 +121,8 @@
121121
tmp = b.createDataArray(...
122122
'sourceTestDataArray', 'nixDataArray', nix.DataType.Double, [1 2]);
123123
s = b.createSource('sourceTest', 'nixSource');
124-
tmp = s.create_source('nestedSource1', 'nixSource');
125-
tmp = s.create_source('nestedSource2', 'nixSource');
124+
tmp = s.createSource('nestedSource1', 'nixSource');
125+
tmp = s.createSource('nestedSource2', 'nixSource');
126126
t = b.createMultiTag('sourcetest', 'nixMultiTag', b.dataArrays{1});
127127

128128
t.add_source(s.sources{1}.id);
@@ -303,8 +303,8 @@
303303
b = f.createBlock('sourceTest', 'nixBlock');
304304
tmp = b.createDataArray('sourceTestDataArray', 'nixDataArray', nix.DataType.Double, [1 2]);
305305
s = b.createSource('sourceTest', 'nixSource');
306-
tmp = s.create_source('nestedSource1', 'nixSource');
307-
tmp = s.create_source('nestedSource2', 'nixSource');
306+
tmp = s.createSource('nestedSource1', 'nixSource');
307+
tmp = s.createSource('nestedSource2', 'nixSource');
308308
t = b.createMultiTag('sourcetest', 'nixMultiTag', b.dataArrays{1});
309309
t.add_source(s.sources{1}.id);
310310
t.add_source(s.sources{2});
@@ -332,7 +332,7 @@
332332
tmp = b.createDataArray('sourceTestDataArray', 'nixDataArray', nix.DataType.Double, [1 2]);
333333
s = b.createSource('sourceTest', 'nixSource');
334334
sName = 'nestedSource';
335-
tmp = s.create_source(sName, 'nixSource');
335+
tmp = s.createSource(sName, 'nixSource');
336336
t = b.createMultiTag('sourcetest', 'nixMultiTag', b.dataArrays{1});
337337
t.add_source(s.sources{1});
338338

@@ -1132,7 +1132,7 @@
11321132
t.add_source(main);
11331133
mainID = main.id;
11341134
subName = 'testSubSource1';
1135-
s = main.create_source(subName, 'nixSource');
1135+
s = main.createSource(subName, 'nixSource');
11361136
subID = s.id;
11371137

11381138
assert(isempty(f.blocks{1}.multiTags{1}.filter_sources(nix.Filter.source, 'Do not exist')));

0 commit comments

Comments
 (0)