dimensions cell array to struct array

Author: asobolev

+nix/DataArray.m

@@ -32,8 +32,17 @@
                 currList = nix_mx('DataArray::dimensions', obj.nix_handle);
                 obj.dimsCache.data = cell(length(currList), 1);
                 for i = 1:length(currList)
-                    % TODO convert to a proper type 
-                	obj.dimsCache.data{i} = nix.SetDimension(currList{i});
+                    
+                    switch currList(i).name
+                        case 'set'
+                            obj.dimsCache.data{i} = nix.SetDimension(currList(i).dimension);
+                        case 'sample'
+                            obj.dimsCache.data{i} = nix.SetDimension(currList(i).dimension);
+                        case 'range'
+                            obj.dimsCache.data{i} = nix.SetDimension(currList(i).dimension);
+                        otherwise
+                           disp('for some dimension type is unknown! skip')
+                    end
                 end;
                 obj.dimsCache.lastUpdate = obj.updatedAt;
             end;

src/utils/mkarray.h

@@ -129,18 +129,26 @@ inline mxArray* make_mx_array(const std::vector<nix::Dimension> &dims) {
         return nullptr;
     }
 
+    const char *field_names[] = { "dtype", "dimension" };
+    mwSize dim_arr[2] = {1, dims.size()};
     nix::DimensionType dt;
 
-    mxArray *data = mxCreateCellMatrix(1, dims.size());
+    mxArray *data = mxCreateStructArray(2, dim_arr, 2, field_names);
     for (size_t i = 0; i < dims.size(); i++) {
         dt = dims[i].dimensionType();
 
         switch (dt) {
-        case nix::DimensionType::Set: mxSetCell(data, i, make_mx_array(dims[i].asSetDimension()));
+        case nix::DimensionType::Set: 
+            mxSetFieldByNumber(data, i, 0, mxCreateString("set"));
+            mxSetFieldByNumber(data, i, 1, make_mx_array(dims[i].asSetDimension()));
             break;
-        case nix::DimensionType::Range: mxSetCell(data, i, make_mx_array(dims[i].asRangeDimension()));
+        case nix::DimensionType::Range:
+            mxSetFieldByNumber(data, i, 0, mxCreateString("range"));
+            mxSetFieldByNumber(data, i, 1, make_mx_array(dims[i].asRangeDimension()));
             break;
-        case nix::DimensionType::Sample: mxSetCell(data, i, make_mx_array(dims[i].asSampledDimension()));
+        case nix::DimensionType::Sample:
+            mxSetFieldByNumber(data, i, 0, mxCreateString("sample"));
+            mxSetFieldByNumber(data, i, 1, make_mx_array(dims[i].asSampledDimension()));
             break;
         default: throw std::invalid_argument("Encountered unknown dimension type");
             break;