fix stale properties value cache

Author: mpsonntag

+nix/Property.m

@@ -30,9 +30,6 @@
         end
 
         function [] = set.values(obj, val)
-            % TODO: the properties cache in the parent nix.Section
-            % cannot be easily invalidated and will therefore show stale
-            % values at the moment.
             nix_mx('Property::updateValues', obj.nix_handle, val);
             obj.valuesCache.lastUpdate = 0;
 

+nix/Section.m

@@ -10,7 +10,7 @@
 
     properties(Dependent)
         allProperties
-        allPropertiesMap
+        %allPropertiesMap
     end;
 
     methods
@@ -123,14 +123,19 @@
                 'Section::properties', obj.nix_handle, obj.propsCache);
         end
 
-        function p_map = get.allPropertiesMap(obj)
-            p_map = containers.Map();
-            props = obj.allProperties;
+        %-- values has been removed from section.properties due to
+        %-- stale entries in the section.properties cache when the acutal
+        %-- properties values are updated. therefore the current mapping 
+        %-- function cannot be used at the moment.
+        %-- could be refactored at a later moment in time
+        %function p_map = get.allPropertiesMap(obj)
+        %    p_map = containers.Map();
+        %    props = obj.allProperties;
 
-            for i=1:length(props)
-                p_map(props{i}.name) = cell2mat(props{i}.values);
-            end
-        end
+        %    for i=1:length(props)
+        %        p_map(props{i}.name) = cell2mat(props{i}.values);
+        %    end
+        %end
 
     end
 

src/nixsection.cc

@@ -38,20 +38,16 @@ void properties(const extractor &input, infusor &output)
     for (size_t i = 0; i < properties.size(); i++) {
 
         nix::Property pr = properties[i];
-        std::vector<nix::Value> values = pr.values();
-
-        mxArray *mx_values = make_mx_array(values);
 
         struct_builder sb({ 1 }, {
-            "name", "id", "definition", "mapping", "unit", "values"
+            "name", "id", "definition", "mapping", "unit"
         });
 
         sb.set(pr.name());
         sb.set(pr.id());
         sb.set(pr.definition());
         sb.set(pr.mapping());
         sb.set(pr.unit());
-        sb.set(mx_values);
 
         mxSetCell(lst, i, sb.array());
     }

tests/TestSection.m

@@ -130,9 +130,6 @@
 
     p1 = trial.allProperties{1};
     assert(strcmp(p1.name, 'ExperimentalCondition'));
-    assert(p1.values{1} == 1);
-    
-    assert(trial.allPropertiesMap('ExperimentalCondition') == p1.values{1});
 
     disp(f.sections{3}.allProperties);
 
@@ -161,21 +158,21 @@
 
     tmp = s.create_property_with_value('doubleProperty', {5, 6, 7, 8});
     assert(strcmp(s.allProperties{1}.name, 'doubleProperty'));
-    assert(s.allProperties{1}.values{1} == 5);
-    assert(size(s.allProperties{1}.values, 2) == 4);
+    assert(s.open_property(s.allProperties{1}.id).values{1}.value == 5);
+    assert(size(s.open_property(s.allProperties{1}.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.allProperties{2}.values{1}, 'this'));
-    assert(size(s.allProperties{2}.values, 2) == 3);
+    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);
     assert(strcmpi(tmp.datatype, 'string'));
 
     tmp = s.create_property_with_value('booleanProperty', {true, false, true});
     assert(strcmp(s.allProperties{3}.name, 'booleanProperty'));
-    assert(s.allProperties{3}.values{1});
-    assert(~s.allProperties{3}.values{2});
-    assert(size(s.allProperties{3}.values, 2) == 3);
+    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);
     assert(strcmpi(tmp.datatype, 'bool'));
 end