removeCache: refactor Section and Property

Author: mpsonntag

+nix/Property.m

@@ -5,7 +5,6 @@
     properties(Hidden)
         % namespace reference for nix-mx functions
         alias = 'Property'
-        valuesCache
     end;
 
     properties(Dependent)
@@ -20,13 +19,10 @@
             nix.Dynamic.add_dyn_attr(obj, 'unit', 'rw');
             nix.Dynamic.add_dyn_attr(obj, 'mapping', 'rw');
             nix.Dynamic.add_dyn_attr(obj, 'datatype', 'r');
-            
-            obj.valuesCache = nix.CacheStruct();
         end;
 
         function retVals = get.values(obj)
-            [obj.valuesCache, retVals] = nix.Utils.fetchPropList(obj.updatedAt, ...
-                'Property::values', obj.nix_handle, obj.valuesCache);
+            retVals = nix_mx('Property::values', obj.nix_handle);
         end
 
         function [] = set.values(obj, val)
@@ -48,13 +44,11 @@
             end
 
             nix_mx('Property::updateValues', obj.nix_handle, values);
-            obj.valuesCache.lastUpdate = 0;
 
             dispStr = 'Note: nix only supports updating the actual value at the moment.';
             dispStr = [dispStr, char(10), 'Attributes like uncertainty or checksum cannot be set at the moment.'];
             disp(dispStr);
         end
     end
-    
-end
 
+end

+nix/Section.m

@@ -5,7 +5,6 @@
     properties(Hidden)
         % namespace reference for nix-mx functions
         alias = 'Section'
-        propsCache
     end;
 
     properties(Dependent)
@@ -23,8 +22,6 @@
 
             % assign relations
             nix.Dynamic.add_dyn_relation(obj, 'sections', @nix.Section);
-            
-            obj.propsCache = nix.CacheStruct();
         end;
 
         function section = parent(obj)
@@ -65,13 +62,13 @@
         % ----------------
 
         function newSec = createSection(obj, name, type)
-            newSec = nix.Section(nix_mx('Section::createSection', obj.nix_handle, name, type));
-            obj.sectionsCache.lastUpdate = 0;
+            newSec = nix.Section(nix_mx('Section::createSection', ...
+                obj.nix_handle, name, type));
         end;
 
         function delCheck = deleteSection(obj, del)
-            delCheck = nix.Utils.delete_entity(obj, del, 'nix.Section', 'Section::deleteSection');
-            obj.sectionsCache.lastUpdate = 0;
+            delCheck = nix.Utils.delete_entity_(obj, del, ...
+                'nix.Section', 'Section::deleteSection');
         end;
 
         function retObj = open_section(obj, id_or_name)
@@ -92,7 +89,6 @@
         function p = create_property(obj, name, datatype)
             p = nix.Property(nix_mx('Section::createProperty', ...
                 obj.nix_handle, name, datatype));
-            obj.propsCache.lastUpdate = 0;
         end;
 
         function p = create_property_with_value(obj, name, val)
@@ -101,7 +97,6 @@
             end;
             p = nix.Property(nix_mx('Section::createPropertyWithValue', ...
                 obj.nix_handle, name, val));
-            obj.propsCache.lastUpdate = 0;
         end;
 
         function delCheck = delete_property(obj, del)
@@ -113,7 +108,6 @@
                 delID = del;
             end;
             delCheck = nix_mx('Section::deleteProperty', obj.nix_handle, delID);
-            obj.propsCache.lastUpdate = 0;
         end;
 
         function retObj = open_property(obj, id_or_name)
@@ -122,15 +116,8 @@
         end;
 
         function props = get.allProperties(obj)
-            %-- if a value in a property is updated, this will not
-            %-- update the lastUpdate of the propertyCache of
-            %-- a loaded section. Therefore caching of the properties
-            %-- of a section is disabled by always resetting the lastUpdate
-            obj.propsCache.lastUpdate = 0;
-
-            [obj.propsCache, props] = nix.Utils.fetchPropList(obj.updatedAt, ...
-                'Section::properties', obj.nix_handle, obj.propsCache);
-        end
+            props = nix_mx('Section::properties', obj.nix_handle);
+        end;
 
         function p_map = get.allPropertiesMap(obj)
             p_map = containers.Map();
@@ -139,9 +126,7 @@
             for i=1:length(props)
                 p_map(props{i}.name) = cell2mat(props{i}.values);
             end
-        end
+        end;
 
     end
-
 end
-

+nix/Utils.m

@@ -9,14 +9,6 @@
             end;
         end;
 
-        function [currCache, retCell] = fetchPropList(currUpdatedAt, nixMxFunc, handle, currCache)
-            if currCache.lastUpdate ~= currUpdatedAt
-                currCache.data = nix_mx(nixMxFunc, handle);
-                currCache.lastUpdate = currUpdatedAt;
-            end;
-            retCell = currCache.data;
-        end;
-
         function [currCache, retCell] = fetchObj(currUpdatedAt, nixMxFunc, handle, currCache, objConstructor)
             if currCache.lastUpdate ~= currUpdatedAt
                 sh = nix_mx(nixMxFunc, handle);