multiple write value options

Author: mpsonntag

+nix/Section.m

@@ -96,6 +96,9 @@
         end;
 
         function p = create_property_with_value(obj, name, val)
+            if(~iscell(val))
+                val = num2cell(val);
+            end;
             p = nix.Property(nix_mx('Section::createPropertyWithValue', ...
                 obj.nix_handle, name, val));
             obj.propsCache.lastUpdate = 0;

src/nixsection.cc

@@ -72,28 +72,22 @@ void create_property_with_value(const extractor &input, infusor &output)
     std::vector<nix::Value> currVec;
 
     mxClassID currID = input.class_id(3);
-    if (currID == mxCELL_CLASS){
-        mexPrintf("Cell\n");
+    if (currID == mxCELL_CLASS)
+    {
         const mxArray *cell_element_ptr = input.cellElemPtr(3, 0);
 
-        if (mxGetClassID(cell_element_ptr) == mxSTRUCT_CLASS){
-            mexPrintf("Struct\n");
+        if (mxGetClassID(cell_element_ptr) == mxSTRUCT_CLASS)
+        {
             currVec = input.extractFromStruct(3);
         }
         else
         {
-            mexPrintf("Cell with normal values\n");
             currVec = input.vec(3);
         }
     }
-    else if (currID == mxCHAR_CLASS){
-        mexPrintf("Just char\n");
-    }
-    else if (currID == mxDOUBLE_CLASS){
-        mexPrintf("Just double\n");
-    }
-    else if (currID == mxLOGICAL_CLASS){
-        mexPrintf("Just logical\n");
+    else
+    {
+        mexPrintf("Unsupported data type\n");
     }
 
     nix::Property p = currObj.createProperty(input.str(2), currVec);

tests/TestSection.m

@@ -156,24 +156,58 @@
     f = nix.File(fullfile(pwd,'tests','testRW.h5'), nix.FileMode.Overwrite);
     s = f.createSection('mainSection', 'nixSection');
 
-    tmp = s.create_property_with_value('doubleProperty', {5, 6, 7, 8});
-    assert(strcmp(s.allProperties{1}.name, 'doubleProperty'));
-    assert(s.open_property(s.allProperties{1}.id).values{1}.value == 5);
-    assert(size(s.open_property(s.allProperties{1}.id).values, 1) == 4);
+    tmp = s.create_property_with_value('doubleProperty1', [5, 6, 7, 8]);
+    assert(strcmp(s.allProperties{end}.name, 'doubleProperty1'));
+    assert(s.open_property(s.allProperties{end}.id).values{1}.value == 5);
+    assert(size(s.open_property(s.allProperties{end}.id).values, 1) == 4);
+    assert(strcmpi(tmp.datatype,'double'));
+    
+    tmp = s.create_property_with_value('doubleProperty2', {5, 6, 7, 8});
+    assert(strcmp(s.allProperties{end}.name, 'doubleProperty2'));
+    assert(s.open_property(s.allProperties{end}.id).values{1}.value == 5);
+    assert(size(s.open_property(s.allProperties{end}.id).values, 1) == 4);
     assert(strcmpi(tmp.datatype,'double'));
 
-    tmp = s.create_property_with_value('stringProperty', {'this', 'has', 'strings'});
-    assert(strcmp(s.allProperties{2}.name, 'stringProperty'));
-    assert(strcmp(s.open_property(s.allProperties{2}.id).values{1}.value, 'this'));
-    assert(size(s.open_property(s.allProperties{2}.id).values, 1) == 3);
+    tmp = s.create_property_with_value('stringProperty1', ['a', 'string']);
+    assert(strcmp(s.allProperties{end}.name, 'stringProperty1'));
+    assert(strcmp(s.open_property(s.allProperties{end}.id).values{1}.value, 'a'));
+    assert(size(s.open_property(s.allProperties{end}.id).values, 1) == 7);
     assert(strcmpi(tmp.datatype, 'string'));
+    
+    tmp = s.create_property_with_value('stringProperty2', {'this', 'has', 'strings'});
+    assert(strcmp(s.allProperties{end}.name, 'stringProperty2'));
+    assert(strcmp(s.open_property(s.allProperties{end}.id).values{1}.value, 'this'));
+    assert(size(s.open_property(s.allProperties{end}.id).values, 1) == 3);
+    assert(strcmpi(tmp.datatype, 'string'));
+
+    tmp = s.create_property_with_value('booleanProperty1', [true, false, true]);
+    assert(strcmp(s.allProperties{end}.name, 'booleanProperty1'));
+    assert(s.open_property(s.allProperties{end}.id).values{1}.value);
+    assert(~s.open_property(s.allProperties{end}.id).values{2}.value);
+    assert(size(s.open_property(s.allProperties{end}.id).values, 1) == 3);
+    assert(strcmpi(tmp.datatype, 'bool'));
 
-    tmp = s.create_property_with_value('booleanProperty', {true, false, true});
-    assert(strcmp(s.allProperties{3}.name, 'booleanProperty'));
-    assert(s.open_property(s.allProperties{3}.id).values{1}.value);
-    assert(~s.open_property(s.allProperties{3}.id).values{2}.value);
-    assert(size(s.open_property(s.allProperties{3}.id).values, 1) == 3);
+    tmp = s.create_property_with_value('booleanProperty2', {true, false, true});
+    assert(strcmp(s.allProperties{end}.name, 'booleanProperty2'));
+    assert(s.open_property(s.allProperties{end}.id).values{1}.value);
+    assert(~s.open_property(s.allProperties{end}.id).values{2}.value);
+    assert(size(s.open_property(s.allProperties{end}.id).values, 1) == 3);
     assert(strcmpi(tmp.datatype, 'bool'));
+    
+    val1 = s.open_property(s.allProperties{1}.id).values{1};
+    val2 = s.open_property(s.allProperties{1}.id).values{2};
+    tmp = s.create_property_with_value('doubleByStrunct1', [val1, val2]);
+    assert(strcmp(s.allProperties{end}.name, 'doubleByStrunct1'));
+    assert(s.open_property(s.allProperties{end}.id).values{1}.value == 5);
+    assert(size(s.open_property(s.allProperties{end}.id).values, 1) == 2);
+    assert(strcmpi(tmp.datatype,'double'));
+    
+    val3 = s.open_property(s.allProperties{1}.id).values{3};
+    tmp = s.create_property_with_value('doubleByStrunct2', {val1, val2, val3});
+    assert(strcmp(s.allProperties{end}.name, 'doubleByStrunct2'));
+    assert(s.open_property(s.allProperties{end}.id).values{3}.value == 7);
+    assert(size(s.open_property(s.allProperties{end}.id).values, 1) == 3);
+    assert(strcmpi(tmp.datatype,'double'));
 end
 
 %% Test: Delete property by entity, propertyStruct, ID and name