Support tables in getRow and addRow tests

With fixes pertaining to getting the tests passing.

Author: Lawrence

+tests/+system/DynamicTableTest.m

@@ -6,23 +6,21 @@ function addContainer(~, file)
                 'description', 'test dynamic table column',...
                 'colnames', colnames);
 
+            id = primes(2000) .';
             for i = 1:100
                 start_time = i;
                 stop_time = i + 1;
                 rand_data = rand(5,1);
-                id = primes(i);
-                if isempty(id)
-                    id = 0;
-                else
-                    id = id(end);
-                end
                 file.intervals_trials.addRow(...
                     'start_time', start_time,...
                     'stop_time', stop_time,...
                     'randomvalues', rand_data,...
-                    'id', id,...
+                    'id', id(i),...
                     'tablepath', '/intervals/trials');
             end
+            t = table(id(101:200), (101:200) .', (102:201) .', mat2cell(rand(500,1), repmat(5, 100, 1)),...
+                'VariableNames', {'id', 'start_time', 'stop_time', 'randomvalues'});
+            file.intervals_trials.addRow(t);
         end
 
         function c = getContainer(~, file)
@@ -49,8 +47,8 @@ function getRowTest(testCase)
             ExpectedTable = testCase.file.intervals_trials;
             testCase.verifyEqual(ExpectedTable.getRow(5), ActualTable.getRow(5));
             testCase.verifyEqual(ExpectedTable.getRow([5 6]), ActualTable.getRow([5 6]));
-            testCase.verifyEqual(ExpectedTable.getRow(97, 'useId', true),...
-                ActualTable.getRow(97, 'useId', true));
+            testCase.verifyEqual(ExpectedTable.getRow([1153, 1217], 'useId', true),...
+                ActualTable.getRow([1153, 1217], 'useId', true));
         end
     end
 end

+types/+util/+dynamictable/addRow.m

@@ -31,8 +31,7 @@ function addRow(DynamicTable, varargin)
     'MatNWB:DynamicTable:AddRow:NoColumns',...
     ['The `colnames` property of the Dynamic Table needs to be populated with a cell array '...
     'of column names before being able to add row data.']);
-assert(nargin > 2, 'MatNWB:DynamicTable:AddRow:NoData',...
-    'Not enough arguments');
+assert(nargin > 1, 'MatNWB:DynamicTable:AddRow:NoData', 'Not enough arguments');
 
 if isempty(DynamicTable.id)
     DynamicTable.id = types.hdmf_common.ElementIdentifiers();

+types/+util/+dynamictable/addTableRow.m

@@ -5,13 +5,13 @@ function addTableRow(DynamicTable, subTable, varargin)
 addParameter(p, 'tablepath', '', @(x)ischar(x)); % required for ragged arrays.
 parse(p, varargin{:});
 
-rowNames = subTable.VariableNames;
+rowNames = subTable.Properties.VariableNames;
 missingColumns = setdiff(DynamicTable.colnames, rowNames);
 assert(isempty(missingColumns),...
     'MatNWB:DynamicTable:AddRow:MissingColumns',...
     'Missing columns { %s }', strjoin(missingColumns, ', '));
 
-isIdInTable = any(strcmp(subTable.VariableNames, 'id'));
+isIdInTable = any(strcmp(rowNames, 'id'));
 isIdKeywordArg = ~any(strcmp(p.UsingDefaults, 'id'));
 if isIdInTable
     idData = subTable.id;
@@ -37,7 +37,7 @@ function addTableRow(DynamicTable, subTable, varargin)
     rv = subTable.(rn);
 
     if isKey(TypeMap, rn)
-        rv = validateType(TypeMap(rn), rv);
+        validateType(TypeMap(rn), rv);
     end
 
     % instantiate vector index here because it's dependent on the table

+types/+util/+dynamictable/addVarargRow.m

@@ -9,6 +9,8 @@ function addVarargRow(DynamicTable, varargin)
     addParameter(p, DynamicTable.colnames{i}, []);
 end
 
+parse(p, varargin{:});
+
 assert(isempty(fieldnames(p.Unmatched)),...
     'MatNWB:DynamicTable:AddRow:InvalidColumns',...
     'Invalid column name(s) { %s }', strjoin(fieldnames(p.Unmatched), ', '));

+types/+util/+dynamictable/addVecInd.m

@@ -11,13 +11,13 @@
 if ~endsWith(tablepath, '/')
     tablepath = [tablepath '/'];
 end
-vecTarget = types.untyped.ObjectView([tablepath rn]);
+vecTarget = types.untyped.ObjectView([tablepath colName]);
 oldDataHeight = 0;
-if isKey(DynamicTable.vectordata, rn) || isprop(DynamicTable, rn)
-    if isprop(DynamicTable, rn)
-        VecData = DynamicTable.(rn);
+if isKey(DynamicTable.vectordata, colName) || isprop(DynamicTable, colName)
+    if isprop(DynamicTable, colName)
+        VecData = DynamicTable.(colName);
     else
-        VecData = DynamicTable.vectordata.get(rn);
+        VecData = DynamicTable.vectordata.get(colName);
     end
     if isa(VecData.data, 'types.untyped.DataPipe')
         oldDataHeight = VecData.data.offset;

+types/+util/+dynamictable/getIndex.m

@@ -2,10 +2,13 @@
 %GETINDEX Given a dynamic table and its column name, get its VectorIndex column name
 validateattributes(DynamicTable, {'types.hdmf_common.DynamicTable'}, {'scalar'});
 validateattributes(column, {'char'}, {'scalartext'});
+indexName = '';
+if strcmp(column, 'id')
+    return;
+end
 assert(any(strcmp(DynamicTable.colnames, column)),...
     'MatNWB:GetIndex:InvalidColumn',...
     'Column name not found `%s`', column);
-indexName = '';
 
 vecIndKeys = keys(DynamicTable.vectorindex);
 for i = 1:length(vecIndKeys)