Skip to content

Commit 9abc489

Browse files
asobolevasobolev
committed
Merge pull request #53 from mpsonntag/dev
migrate to glue: add boolean methods, remove has_metadata
2 parents 03622d1 + 76d3fd9 commit 9abc489

26 files changed

+9
-220
lines changed

‎+nix/Block.m‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@
5858
% -----------------
5959

6060
function hasTag = has_tag(obj, id_or_name)
61-
getHasTag = nix_mx('Block::hasTag', obj.nix_handle, id_or_name);
62-
hasTag = logical(getHasTag.hasTag);
61+
hasTag = nix_mx('Block::hasTag', obj.nix_handle, id_or_name);
6362
end;
6463

6564
function tagList = list_tags(obj)
@@ -86,8 +85,7 @@
8685
% -----------------
8786

8887
function hasMTag = has_multi_tag(obj, id_or_name)
89-
getHasMTag = nix_mx('Block::hasMultiTag', obj.nix_handle, id_or_name);
90-
hasMTag = logical(getHasMTag.hasMultiTag);
88+
hasMTag = nix_mx('Block::hasMultiTag', obj.nix_handle, id_or_name);
9189
end;
9290

9391
function tagList = list_multi_tags(obj)
@@ -106,11 +104,6 @@
106104
% Metadata methods
107105
% -----------------
108106

109-
function hasMetadata = has_metadata(obj)
110-
getHasMetadata = nix_mx('Block::hasMetadataSection', obj.nix_handle);
111-
hasMetadata = logical(getHasMetadata.hasMetadataSection);
112-
end;
113-
114107
function metadata = open_metadata(obj)
115108
[obj.metadataCache, metadata] = nix.Utils.fetchObj(obj.updatedAt, ...
116109
'Block::openMetadataSection', obj.nix_handle, obj.metadataCache, @nix.Section);

‎+nix/DataArray.m‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,6 @@
9191
% Metadata methods
9292
% -----------------
9393

94-
function hasMetadata = has_metadata(obj)
95-
getHasMetadata = nix_mx('DataArray::hasMetadataSection', obj.nix_handle);
96-
hasMetadata = logical(getHasMetadata.hasMetadataSection);
97-
end;
98-
9994
function metadata = open_metadata(obj)
10095
[obj.metadataCache, metadata] = nix.Utils.fetchObj(obj.updatedAt, ...
10196
'DataArray::openMetadataSection', obj.nix_handle, obj.metadataCache, @nix.Section);

‎+nix/MultiTag.m‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,7 @@
163163
% ------------------
164164

165165
function hasPositions = has_positions(obj)
166-
getHasPositions = nix_mx('MultiTag::hasPositions', obj.nix_handle);
167-
hasPositions = logical(getHasPositions.hasPositions);
166+
hasPositions = nix_mx('MultiTag::hasPositions', obj.nix_handle);
168167
end;
169168

170169
function retObj = open_positions(obj)
@@ -191,11 +190,6 @@
191190
% Metadata methods
192191
% ------------------
193192

194-
function hasMetadata = has_metadata(obj)
195-
getHasMetadata = nix_mx('MultiTag::hasMetadataSection', obj.nix_handle);
196-
hasMetadata = logical(getHasMetadata.hasMetadataSection);
197-
end;
198-
199193
function metadata = open_metadata(obj)
200194
[obj.metadataCache, metadata] = nix.Utils.fetchObj(obj.updatedAt, ...
201195
'MultiTag::openMetadataSection', obj.nix_handle, obj.metadataCache, @nix.Section);

‎+nix/Section.m‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@
9191
end;
9292

9393
function hs = has_section(obj, id_or_name)
94-
r = nix_mx('Section::hasSection', obj.nix_handle, id_or_name);
95-
hs = logical(r.hasSection);
94+
hs = nix_mx('Section::hasSection', obj.nix_handle, id_or_name);
9695
end;
9796

9897
% ----------------

‎+nix/Source.m‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,6 @@
7373
% Metadata methods
7474
% ------------------
7575

76-
function hasMetadata = has_metadata(obj)
77-
getHasMetadata = nix_mx('Source::hasMetadataSection', obj.nix_handle);
78-
hasMetadata = logical(getHasMetadata.hasMetadataSection);
79-
end;
80-
8176
function metadata = open_metadata(obj)
8277
[obj.metadataCache, metadata] = nix.Utils.fetchObj(obj.updatedAt, ...
8378
'Source::openMetadataSection', obj.nix_handle, obj.metadataCache, @nix.Section);

‎+nix/Tag.m‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,6 @@
168168
% Metadata methods
169169
% ------------------
170170

171-
function hasMetadata = has_metadata(obj)
172-
getHasMetadata = nix_mx('Tag::hasMetadataSection', obj.nix_handle);
173-
hasMetadata = logical(getHasMetadata.hasMetadataSection);
174-
end;
175-
176171
function metadata = open_metadata(obj)
177172
[obj.metadataCache, metadata] = nix.Utils.fetchObj(obj.updatedAt, ...
178173
'Tag::openMetadataSection', obj.nix_handle, obj.metadataCache, @nix.Section);

‎nix_mx.cc‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,25 +68,20 @@ const std::vector<fendpoint> funcs = {
6868
{ "Block::describe", nixblock::describe },
6969
{ "Block::listDataArrays", nixblock::list_data_arrays },
7070
{ "Block::listSources", nixblock::list_sources },
71-
{ "Block::hasTag", nixblock::has_tag },
7271
{ "Block::listTags", nixblock::list_tags },
73-
{ "Block::hasMultiTag", nixblock::has_multi_tag },
7472
{ "Block::listMultiTags", nixblock::list_multi_tags },
75-
{ "Block::hasMetadataSection", nixblock::has_metadata_section },
7673
{ "Block::openMetadataSection", nixblock::open_metadata_section },
7774

7875
// Data Array
7976
{ "DataArray::describe", nixdataarray::describe },
8077
{ "DataArray::readAll", nixdataarray::read_all },
81-
{ "DataArray::hasMetadataSection", nixdataarray::has_metadata_section },
8278
{ "DataArray::openMetadataSection", nixdataarray::open_metadata_section },
8379

8480
// Tag
8581
{ "Tag::describe", nixtag::describe },
8682
{ "Tag::listReferences", nixtag::list_references_array },
8783
{ "Tag::listFeatures", nixtag::list_features },
8884
{ "Tag::listSources", nixtag::list_sources },
89-
{ "Tag::hasMetadataSection", nixtag::has_metadata_section },
9085
{ "Tag::openMetadataSection", nixtag::open_metadata_section },
9186
{ "Tag::retrieveData", nixtag::retrieve_data },
9287
{ "Tag::featureRetrieveData", nixtag::retrieve_feature_data },
@@ -96,16 +91,13 @@ const std::vector<fendpoint> funcs = {
9691
{ "MultiTag::listReferences", nixmultitag::list_references_array },
9792
{ "MultiTag::listFeatures", nixmultitag::list_features },
9893
{ "MultiTag::listSources", nixmultitag::list_sources },
99-
{ "MultiTag::hasPositions", nixmultitag::has_positions },
100-
{ "MultiTag::hasMetadataSection", nixmultitag::has_metadata_section },
10194
{ "MultiTag::openMetadataSection", nixmultitag::open_metadata_section },
10295
{ "MultiTag::retrieveData", nixmultitag::retrieve_data },
10396
{ "MultiTag::featureRetrieveData", nixmultitag::retrieve_feature_data },
10497

10598
// Source
10699
{ "Source::describe", nixsource::describe },
107100
{ "Source::listSources", nixsource::list_sources },
108-
{ "Source::hasMetadataSection", nixsource::has_metadata_section },
109101
{ "Source::openMetadataSection", nixsource::open_metadata_section },
110102

111103
// Feature
@@ -115,9 +107,7 @@ const std::vector<fendpoint> funcs = {
115107

116108
// Section
117109
{ "Section::describe", nixsection::describe },
118-
{ "Section::hasSection", nixsection::has_section },
119110
{ "Section::listSections", nixsection::list_sections },
120-
{ "Section::hasProperty", nixsection::has_property },
121111
{ "Section::listProperties", nixsection::list_properties }
122112
};
123113

@@ -174,6 +164,8 @@ void mexFunction(int nlhs,
174164
.reg("sources", &nix::Block::sources)
175165
.reg("tags", &nix::Block::tags)
176166
.reg("multiTags", &nix::Block::multiTags)
167+
.reg("hasTag", GETBYSTR(bool, nix::Block, hasTag))
168+
.reg("hasMultiTag", GETBYSTR(bool, nix::Block, hasMultiTag))
177169
.reg("openDataArray", GETBYSTR(nix::DataArray, nix::Block, getDataArray))
178170
.reg("openSource", GETBYSTR(nix::Source, nix::Block, getSource))
179171
.reg("openTag", GETBYSTR(nix::Tag, nix::Block, getTag))
@@ -198,6 +190,7 @@ void mexFunction(int nlhs,
198190
.reg("references", GETTER(std::vector<nix::DataArray>, nix::MultiTag, references))
199191
.reg("features", &nix::MultiTag::features)
200192
.reg("sources", static_cast<std::vector<nix::Source>(nix::base::EntityWithSources<nix::base::IMultiTag>::*)(std::function<bool(const nix::Source &)>)const>(&nix::base::EntityWithSources<nix::base::IMultiTag>::sources))
193+
.reg("hasPositions", GETCONTENT(bool, nix::MultiTag, hasPositions))
201194
.reg("openPositions", GETCONTENT(nix::DataArray, nix::MultiTag, positions))
202195
.reg("openExtents", GETCONTENT(nix::DataArray, nix::MultiTag, extents))
203196
.reg("openReferences", GETBYSTR(nix::DataArray, nix::MultiTag, getReference))
@@ -207,6 +200,8 @@ void mexFunction(int nlhs,
207200
classdef<nix::Section>("Section", methods)
208201
.reg("sections", &nix::Section::sections)
209202
.reg("openSection", GETBYSTR(nix::Section, nix::Section, getSection))
203+
.reg("hasProperty", GETBYSTR(bool, nix::Section, hasProperty))
204+
.reg("hasSection", GETBYSTR(bool, nix::Section, hasSection))
210205
.reg("link", GETCONTENT(nix::Section, nix::Section, link))
211206
.reg("parent", GETCONTENT(nix::Section, nix::Section, parent));
212207

‎src/nixblock.cc‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,6 @@ namespace nixblock {
3737
output.set(0, nixgen::list_sources(currSource.sources()));
3838
}
3939

40-
void has_tag(const extractor &input, infusor &output)
41-
{
42-
nix::Block block = input.entity<nix::Block>(1);
43-
output.set(0, nixgen::has_entity(block.hasTag(input.str(2)), { "hasTag" }));
44-
}
45-
4640
void list_tags(const extractor &input, infusor &output)
4741
{
4842
nix::Block block = input.entity<nix::Block>(1);
@@ -64,12 +58,6 @@ namespace nixblock {
6458
output.set(0, sb.array());
6559
}
6660

67-
void has_multi_tag(const extractor &input, infusor &output)
68-
{
69-
nix::Block block = input.entity<nix::Block>(1);
70-
output.set(0, nixgen::has_entity(block.hasMultiTag(input.str(2)), { "hasMultiTag" }));
71-
}
72-
7361
void list_multi_tags(const extractor &input, infusor &output)
7462
{
7563
nix::Block block = input.entity<nix::Block>(1);
@@ -89,12 +77,6 @@ namespace nixblock {
8977
output.set(0, sb.array());
9078
}
9179

92-
void has_metadata_section(const extractor &input, infusor &output)
93-
{
94-
nix::Block currObj = input.entity<nix::Block>(1);
95-
output.set(0, nixgen::has_metadata_section(currObj.metadata()));
96-
}
97-
9880
void open_metadata_section(const extractor &input, infusor &output)
9981
{
10082
nix::Block currObj = input.entity<nix::Block>(1);

‎src/nixblock.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,10 @@ namespace nixblock {
1111

1212
void list_sources(const extractor &input, infusor &output);
1313

14-
void has_tag(const extractor &input, infusor &output);
15-
1614
void list_tags(const extractor &input, infusor &output);
1715

18-
void has_multi_tag(const extractor &input, infusor &output);
19-
2016
void list_multi_tags(const extractor &input, infusor &output);
2117

22-
void has_metadata_section(const extractor &input, infusor &output);
23-
2418
void open_metadata_section(const extractor &input, infusor &output);
2519

2620
} // namespace nixblock

‎src/nixdataarray.cc‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,6 @@ namespace nixdataarray {
6363
output.set(0, data);
6464
}
6565

66-
void has_metadata_section(const extractor &input, infusor &output)
67-
{
68-
nix::DataArray currObj = input.entity<nix::DataArray>(1);
69-
output.set(0, nixgen::has_metadata_section(currObj.metadata()));
70-
}
71-
7266
void open_metadata_section(const extractor &input, infusor &output)
7367
{
7468
nix::DataArray currObj = input.entity<nix::DataArray>(1);

0 commit comments

Comments
 (0)