removeCache: refactor DataArray and DataArrayTests

Author: mpsonntag

+nix/DataArray.m

@@ -4,8 +4,7 @@
     properties (Hidden)
         % namespace reference for nix-mx functions
         alias = 'DataArray'
-        dimsCache
-    end
+    end;
 
     properties(Dependent)
         dimensions % should not be dynamic due to complex set operation
@@ -23,58 +22,47 @@
             nix.Dynamic.add_dyn_attr(obj, 'expansionOrigin', 'rw');
             nix.Dynamic.add_dyn_attr(obj, 'polynom_coefficients', 'rw');
             nix.Dynamic.add_dyn_attr(obj, 'shape', 'rw');
-            
-            obj.dimsCache = nix.CacheStruct();
         end;
 
         % -----------------
         % Dimensions
         % -----------------
 
         function dimensions = get.dimensions(obj)
-            if obj.dimsCache.lastUpdate ~= obj.updatedAt
-                currList = nix_mx('DataArray::dimensions', obj.nix_handle);
-                obj.dimsCache.data = cell(length(currList), 1);
-                for i = 1:length(currList)
-                    
-                    switch currList(i).dtype
-                        case 'set'
-                            obj.dimsCache.data{i} = nix.SetDimension(currList(i).dimension);
-                        case 'sample'
-                            obj.dimsCache.data{i} = nix.SampledDimension(currList(i).dimension);
-                        case 'range'
-                            obj.dimsCache.data{i} = nix.RangeDimension(currList(i).dimension);
-                        otherwise
-                           disp('some dimension type is unknown! skip')
-                    end
+            dimensions = {};
+            currList = nix_mx('DataArray::dimensions', obj.nix_handle);
+            for i = 1:length(currList)
+                switch currList(i).dtype
+                    case 'set'
+                        dimensions{i} = nix.SetDimension(currList(i).dimension);
+                    case 'sample'
+                        dimensions{i} = nix.SampledDimension(currList(i).dimension);
+                    case 'range'
+                        dimensions{i} = nix.RangeDimension(currList(i).dimension);
+                    otherwise
+                       disp('some dimension type is unknown! skip')
                 end;
-                obj.dimsCache.lastUpdate = obj.updatedAt;
             end;
-            dimensions = obj.dimsCache.data;
         end;
 
         function dim = append_set_dimension(obj)
             func_name = strcat(obj.alias, '::append_set_dimension');
             dim = nix.SetDimension(nix_mx(func_name, obj.nix_handle));
-            obj.dimsCache.lastUpdate = 0;
         end
 
         function dim = append_sampled_dimension(obj, interval)
             func_name = strcat(obj.alias, '::append_sampled_dimension');
             dim = nix.SampledDimension(nix_mx(func_name, obj.nix_handle, interval));
-            obj.dimsCache.lastUpdate = 0;
         end
 
         function dim = append_range_dimension(obj, ticks)
             func_name = strcat(obj.alias, '::append_range_dimension');
             dim = nix.RangeDimension(nix_mx(func_name, obj.nix_handle, ticks));
-            obj.dimsCache.lastUpdate = 0;
         end
 
         function delCheck = delete_dimension(obj, index)
             func_name = strcat(obj.alias, '::delete_dimension');
             delCheck = nix_mx(func_name, obj.nix_handle, index);
-            obj.dimsCache.lastUpdate = 0;
         end;
 
         % -----------------

tests/TestDataArray.m

@@ -24,7 +24,6 @@
     assert(strcmp(da.name, 'daTest'));
     assert(strcmp(da.type, 'test nixDataArray'));
 
-    %-- TODO does not work at the moment on the c++ side
     da.type = 'nixDataArray';
     assert(strcmp(da.type, 'nixDataArray'));
 
@@ -153,21 +152,25 @@
     da = b.create_data_array('daTest', 'test nixDataArray', 'double', [1 2]);
 
     assert(isempty(da.dimensions));
+    assert(isempty(f.blocks{1}.dataArrays{1}.dimensions));
 
     da.append_set_dimension();
     assert(length(da.dimensions) == 1);
     assert(strcmp(da.dimensions{1}.dimensionType, 'set'));
+    assert(strcmp(f.blocks{1}.dataArrays{1}.dimensions{1}.dimensionType, 'set'));
 
     da.append_sampled_dimension(200);
     assert(length(da.dimensions) == 2);
     assert(strcmp(da.dimensions{2}.dimensionType, 'sample'));
     assert(da.dimensions{2}.samplingInterval == 200);
+    assert(f.blocks{1}.dataArrays{1}.dimensions{2}.samplingInterval == 200);
 
     ticks = [1, 2, 3, 4];
     da.append_range_dimension(ticks);
     assert(length(da.dimensions) == 3);
     assert(strcmp(da.dimensions{3}.dimensionType, 'range'));
     assert(isequal(da.dimensions{3}.ticks, ticks));
+    assert(isequal(f.blocks{1}.dataArrays{1}.dimensions{3}.ticks, ticks));
 
     da.delete_dimension(2);
     assert(length(da.dimensions) == 2);
@@ -180,4 +183,4 @@
 
     da.delete_dimension(1);
     assert(isempty(da.dimensions));
-end
+end