LinkType make_mx_array

Author: mpsonntag

src/nixfeature.cc

@@ -12,19 +12,9 @@ namespace nixfeature {
 
     mxArray *describe(const nix::Feature &feat)
     {
-        nix::LinkType link_type = feat.linkType();
-        uint8_t ltype;
-
-        switch (link_type) {
-        case nix::LinkType::Tagged: ltype = 0; break;
-        case nix::LinkType::Untagged: ltype = 1; break;
-        case nix::LinkType::Indexed: ltype = 2; break;
-        default: throw std::invalid_argument("unkown link type");
-        }
-
         struct_builder sb({ 1 }, { "id", "linkType" });
         sb.set(feat.id());
-        sb.set(ltype);
+        sb.set(feat.linkType());
         return sb.array();
     }
 

src/utils/mkarray.cc

@@ -13,6 +13,22 @@ mxArray* make_mx_array(const nix::NDSize &size)
 	return res;
 }
 
+mxArray* make_mx_array(const nix::LinkType &ltype)
+{
+    uint8_t link_type;
+
+    switch (ltype) {
+        case nix::LinkType::Tagged: link_type = 0; break;
+        case nix::LinkType::Untagged: link_type = 1; break;
+        case nix::LinkType::Indexed: link_type = 2; break;
+        default: throw std::invalid_argument("unkown link type");
+    }
+    mxArray *data = mxCreateDoubleScalar(link_type);
+
+    return data;
+}
+
+
 mxArray* make_mx_array(const nix::Value &v)
 {
 	mxArray *res;

src/utils/mkarray.h

@@ -23,6 +23,8 @@ mxArray *make_mx_array(const nix::Value &value);
 
 mxArray* make_mx_array(const nix::NDSize &size);
 
+mxArray* make_mx_array(const nix::LinkType &ltype);
+
 template<typename T, nix::DataType dt = nix::to_data_type<T>::value>
 mxArray* make_mx_array(const std::vector<T> &v) {
 	DType2 dtype = dtype_nix2mex(dt);