range dim fix create_data_array

Author: mpsonntag

+nix/Block.m

@@ -53,6 +53,14 @@
         end;
 
         function da = create_data_array(obj, name, nixtype, datatype, shape)
+            %-- Quick fix to enable alias range dimension with
+            %-- 1D data arrays created with this function.
+            %-- e.g. size([1 2 3]) returns shape [1 3], which would not
+            %-- be accepted when trying to add an alias range dimension.
+            if(shape(1) == 1)
+                shape(2:size(shape,2));
+            end;
+            
             errorStruct.identifier = 'Block:unsupportedDataType';
             if(~isa(datatype, 'nix.DataType'))
                 errorStruct.message = 'Please provide a valid nix.DataType';

src/nixdataarray.cc

@@ -56,7 +56,15 @@ namespace nixdataarray {
 
         mwSize ndims = mxGetNumberOfDimensions(arr);
         const mwSize *dims = mxGetDimensions(arr);
-
+        
+        mwSize tmp = ndims;
+        
+        // Quick fix for writing data arrays that have exactly one row.
+        // This fix does not resolve more complex arrays that have a 
+        // last dimension of exactly one row.
+        if (dims[ndims-1] == 1) {
+            ndims--;
+        }
         nix::NDSize count(ndims);
 
         for (mwSize i = 0; i < ndims; i++) {

tests/TestDataArray.m

@@ -149,7 +149,7 @@
     charData = ['a' 'b' 'c' 'd' 'e'];
     cellData = {1 2 3 4 5};
 
-    da = b.create_data_array('numericArray', typeDA, nix.DataType.Double, [1 5]);
+    da = b.create_data_array('numericArray', typeDA, nix.DataType.Double, 5);
     da.write_all(numData);
     assert(isequal(da.read_all(), numData));
 
@@ -185,7 +185,7 @@
     numData = [1 2 3 4 5];
     charData = ['a' 'b' 'c' 'd' 'e'];
 
-    da = b.create_data_array('logicalArray', typeDA, nix.DataType.Bool, [1 5]);
+    da = b.create_data_array('logicalArray', typeDA, nix.DataType.Bool, 5);
     da.write_all(logData);
     assert(isequal(da.read_all, logData));
     try
@@ -213,7 +213,7 @@
 
     numData = [1.3 2.4143 3.9878 4.1239 5];
 
-    da = b.create_data_array('floatArray', typeDA, nix.DataType.Float, [1 5]);
+    da = b.create_data_array('floatArray', typeDA, nix.DataType.Float, 5);
     da.write_all(numData);
     assert(isequal(da.read_all, single(numData)));