Changeset 3569

Timestamp:

04/19/10 14:26:25 (15 years ago)

Author:

jschierm

Message:

QMU with Dakota: addition of two new utilities and some error message changes.

Location:

issm/trunk/src/m/utils/Array

Files:

• array_numel.m (added)
• array_size.m (added)
• item2str.m (modified) (1 diff)
• string_dim.m (modified) (1 diff)
• struc_desc.m (modified) (1 diff)

issm/trunk/src/m/utils/Array/item2str.m

@@ -17 +17 @@
     svec=num2str(a);
 else
-    warning('item2str:item_unrecog',...
-        'Item ''%s'' is of unrecognized type ''%s''.',...
-        inputname(1),class(a));
+    if ~isempty(inputname(1))
+        warning('item2str:item_unrecog',...
+            'Item ''%s'' is of unrecognized type ''%s''.',...
+            inputname(1),class(a));
+    else
+        warning('item2str:item_unrecog',...
+            'Item %d is of unrecognized type ''%s''.',...
+            1,class(a));
+    end
     return
 end

issm/trunk/src/m/utils/Array/string_dim.m

@@ -16 +16 @@
 end
 if (idim > numel(a))
-    error('Index %d exceeds number of elements in ''%s''.',...
-        idim,inputname(1));
+    if ~isempty(inputname(1))
+        error('Index %d exceeds number of elements in array ''%s''.',...
+            idim,inputname(1));
+    else
+        error('Index %d exceeds number of elements in array %d.',...
+            idim,1);
+    end
 end
 

issm/trunk/src/m/utils/Array/struc_desc.m

@@ -7 +7 @@
 
 if ~isfield(sarray,'descriptor')
-    error(['Field ''descriptor'' not found in array ''' inputname(1) '''.']);
+    if ~isempty(inputname(1))
+        error('Field ''descriptor'' not found in array ''%s''.',inputname(1));
+    else
+        error('Field ''descriptor'' not found in array %d.',1);
+    end
 end