Changeset 3587

Timestamp:

04/21/10 09:20:54 (15 years ago)

Author:

jschierm

Message:

QMU with Dakota: implement switch for string_dim vector option.

Location:

issm/trunk/src/m

Files:

• classes/continuous_design.m (modified) (1 diff)
• classes/continuous_state.m (modified) (1 diff)
• classes/least_squares_term.m (modified) (1 diff)
• classes/nonlinear_equality_constraint.m (modified) (1 diff)
• classes/nonlinear_inequality_constraint.m (modified) (1 diff)
• classes/normal_uncertain.m (modified) (1 diff)
• classes/objective_function.m (modified) (1 diff)
• classes/response_function.m (modified) (1 diff)
• classes/uniform_uncertain.m (modified) (1 diff)
• utils/Array/string_dim.m (modified) (2 diffs)

issm/trunk/src/m/classes/continuous_design.m

@@ -73 +73 @@
                             cdv(i).descriptor=varargin{1}{i};
                         else
-                            cdv(i).descriptor=[char(varargin{1}) string_dim(cdv,i)];
+                            cdv(i).descriptor=[char(varargin{1}) string_dim(cdv,i,'vector')];
                         end
                     end

issm/trunk/src/m/classes/continuous_state.m

@@ -69 +69 @@
                             csv(i).descriptor=varargin{1}{i};
                         else
-                            csv(i).descriptor=[char(varargin{1}) string_dim(csv,i)];
+                            csv(i).descriptor=[char(varargin{1}) string_dim(csv,i,'vector')];
                         end
                     end

issm/trunk/src/m/classes/least_squares_term.m

@@ -62 +62 @@
                                 lst(i).descriptor=varargin{1}{i};
                             else
-                                lst(i).descriptor=[char(varargin{1}) string_dim(lst,i)];
+                                lst(i).descriptor=[char(varargin{1}) string_dim(lst,i,'vector')];
                             end
                         end

issm/trunk/src/m/classes/nonlinear_equality_constraint.m

@@ -69 +69 @@
                             nec(i).descriptor=varargin{1}{i};
                         else
-                            nec(i).descriptor=[char(varargin{1}) string_dim(nec,i)];
+                            nec(i).descriptor=[char(varargin{1}) string_dim(nec,i,'vector')];
                         end
                         if (numel(varargin{2}) > 1)

issm/trunk/src/m/classes/nonlinear_inequality_constraint.m

@@ -77 +77 @@
                             nic(i).descriptor=varargin{1}{i};
                         else
-                            nic(i).descriptor=[char(varargin{1}) string_dim(nic,i)];
+                            nic(i).descriptor=[char(varargin{1}) string_dim(nic,i,'vector')];
                         end
                         if (numel(varargin{2}) > 1)

issm/trunk/src/m/classes/normal_uncertain.m

@@ -77 +77 @@
                             nuv(i).descriptor=varargin{1}{i};
                         else
-                            nuv(i).descriptor=[char(varargin{1}) string_dim(nuv,i)];
+                            nuv(i).descriptor=[char(varargin{1}) string_dim(nuv,i,'vector')];
                         end
                         if (numel(varargin{2}) > 1)

issm/trunk/src/m/classes/objective_function.m

@@ -62 +62 @@
                                 of(i).descriptor=varargin{1}{i};
                             else
-                                of(i).descriptor=[char(varargin{1}) string_dim(of,i)];
+                                of(i).descriptor=[char(varargin{1}) string_dim(of,i,'vector')];
                             end
                         end

issm/trunk/src/m/classes/response_function.m

@@ -64 +64 @@
                                 rf(i).descriptor=varargin{1}{i};
                             else
-                                rf(i).descriptor=[char(varargin{1}) string_dim(rf,i)];
+                                rf(i).descriptor=[char(varargin{1}) string_dim(rf,i,'vector')];
                             end
                         end

issm/trunk/src/m/classes/uniform_uncertain.m

@@ -72 +72 @@
                             uuv(i).descriptor=varargin{1}{i};
                         else
-                            uuv(i).descriptor=[char(varargin{1}) string_dim(uuv,i)];
+                            uuv(i).descriptor=[char(varargin{1}) string_dim(uuv,i,'vector')];
                         end
                         if (numel(varargin{2}) > 1)

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

@@ -2 +2 @@
 %  function to return the string dimension of an array element
 %
-%  function [sdim]=string_dim(a,idim)
+%  function [sdim]=string_dim(a,idim,varargin)
 %
-function [sdim]=string_dim(a,idim)
+function [sdim]=string_dim(a,idim,varargin)
 
 if ~nargin
@@ -33 +33 @@
 %  dimensions, so this won't match Matlab standard output)
 
-if (ndims(a) == 2) && ((size(a,1) == 1) || (size(a,2) == 1))
-    sdim =['(' num2str(idim) ')'];
-    return
+for iarg=1:nargin-2
+    if strcmpi(varargin{iarg},'vector')
+        if (ndims(a) == 2) && ((size(a,1) == 1) || (size(a,2) == 1))
+            sdim =['(' num2str(idim) ')'];
+            return
+        end
+    end
 end