Changeset 3590

Timestamp:

04/21/10 09:27:56 (15 years ago)

Author:

jschierm

Message:

QMU with Dakota: more occurrences of string_dim vector option.

Location:

issm/trunk/src/m/classes

Files:

• continuous_design.m (modified) (1 diff)
• continuous_state.m (modified) (1 diff)
• least_squares_term.m (modified) (1 diff)
• nonlinear_equality_constraint.m (modified) (1 diff)
• nonlinear_inequality_constraint.m (modified) (1 diff)
• normal_uncertain.m (modified) (1 diff)
• objective_function.m (modified) (1 diff)
• response_function.m (modified) (1 diff)
• uniform_uncertain.m (modified) (1 diff)

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

@@ -158 +158 @@
                     desc(i)=cellstr(cdv(i).descriptor);
                 elseif ~isempty(inputname(1))
-                    desc(i)=cellstr([inputname(1) string_dim(cdv,i)]);
+                    desc(i)=cellstr([inputname(1) string_dim(cdv,i,'vector')]);
                 elseif exist('dstr','var')
-                    desc(i)=cellstr([dstr         string_dim(cdv,i)]);
+                    desc(i)=cellstr([dstr         string_dim(cdv,i,'vector')]);
                 else
-                    desc(i)=cellstr(['cdv'        string_dim(cdv,i)]);
+                    desc(i)=cellstr(['cdv'        string_dim(cdv,i,'vector')]);
                 end
             end

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

@@ -131 +131 @@
                     desc(i)=cellstr(csv(i).descriptor);
                 elseif ~isempty(inputname(1))
-                    desc(i)=cellstr([inputname(1) string_dim(csv,i)]);
+                    desc(i)=cellstr([inputname(1) string_dim(csv,i,'vector')]);
                 elseif exist('dstr','var')
-                    desc(i)=cellstr([dstr         string_dim(csv,i)]);
+                    desc(i)=cellstr([dstr         string_dim(csv,i,'vector')]);
                 else
-                    desc(i)=cellstr(['csv'        string_dim(csv,i)]);
+                    desc(i)=cellstr(['csv'        string_dim(csv,i,'vector')]);
                 end
             end

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

@@ -129 +129 @@
                     desc(i)=cellstr(lst(i).descriptor);
                 elseif ~isempty(inputname(1))
-                    desc(i)=cellstr([inputname(1) string_dim(lst,i)]);
+                    desc(i)=cellstr([inputname(1) string_dim(lst,i,'vector')]);
                 elseif exist('dstr','var')
-                    desc(i)=cellstr([dstr         string_dim(lst,i)]);
+                    desc(i)=cellstr([dstr         string_dim(lst,i,'vector')]);
                 else
-                    desc(i)=cellstr(['lst'        string_dim(lst,i)]);
+                    desc(i)=cellstr(['lst'        string_dim(lst,i,'vector')]);
                 end
             end

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

@@ -131 +131 @@
                     desc(i)=cellstr(nec(i).descriptor);
                 elseif ~isempty(inputname(1))
-                    desc(i)=cellstr([inputname(1) string_dim(nec,i)]);
+                    desc(i)=cellstr([inputname(1) string_dim(nec,i,'vector')]);
                 elseif exist('dstr','var')
-                    desc(i)=cellstr([dstr         string_dim(nec,i)]);
+                    desc(i)=cellstr([dstr         string_dim(nec,i,'vector')]);
                 else
-                    desc(i)=cellstr(['nec'        string_dim(nec,i)]);
+                    desc(i)=cellstr(['nec'        string_dim(nec,i,'vector')]);
                 end
             end

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

@@ -145 +145 @@
                     desc(i)=cellstr(nic(i).descriptor);
                 elseif ~isempty(inputname(1))
-                    desc(i)=cellstr([inputname(1) string_dim(nic,i)]);
+                    desc(i)=cellstr([inputname(1) string_dim(nic,i,'vector')]);
                 elseif exist('dstr','var')
-                    desc(i)=cellstr([dstr         string_dim(nic,i)]);
+                    desc(i)=cellstr([dstr         string_dim(nic,i,'vector')]);
                 else
-                    desc(i)=cellstr(['nic'        string_dim(nic,i)]);
+                    desc(i)=cellstr(['nic'        string_dim(nic,i,'vector')]);
                 end
             end

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

@@ -141 +141 @@
                     desc(i)=cellstr(nuv(i).descriptor);
                 elseif ~isempty(inputname(1))
-                    desc(i)=cellstr([inputname(1) string_dim(nuv,i)]);
+                    desc(i)=cellstr([inputname(1) string_dim(nuv,i,'vector')]);
                 elseif exist('dstr','var')
-                    desc(i)=cellstr([dstr         string_dim(nuv,i)]);
+                    desc(i)=cellstr([dstr         string_dim(nuv,i,'vector')]);
                 else
-                    desc(i)=cellstr(['nuv'        string_dim(nuv,i)]);
+                    desc(i)=cellstr(['nuv'        string_dim(nuv,i,'vector')]);
                 end
             end

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

@@ -129 +129 @@
                     desc(i)=cellstr(of(i).descriptor);
                 elseif ~isempty(inputname(1))
-                    desc(i)=cellstr([inputname(1) string_dim(of,i)]);
+                    desc(i)=cellstr([inputname(1) string_dim(of,i,'vector')]);
                 elseif exist('dstr','var')
-                    desc(i)=cellstr([dstr         string_dim(of,i)]);
+                    desc(i)=cellstr([dstr         string_dim(of,i,'vector')]);
                 else
-                    desc(i)=cellstr(['of'         string_dim(of,i)]);
+                    desc(i)=cellstr(['of'         string_dim(of,i,'vector')]);
                 end
             end

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

@@ -122 +122 @@
                     desc(i)=cellstr(rf(i).descriptor);
                 elseif ~isempty(inputname(1))
-                    desc(i)=cellstr([inputname(1) string_dim(rf,i)]);
+                    desc(i)=cellstr([inputname(1) string_dim(rf,i,'vector')]);
                 elseif exist('dstr','var')
-                    desc(i)=cellstr([dstr         string_dim(rf,i)]);
+                    desc(i)=cellstr([dstr         string_dim(rf,i,'vector')]);
                 else
-                    desc(i)=cellstr(['rf'         string_dim(rf,i)]);
+                    desc(i)=cellstr(['rf'         string_dim(rf,i,'vector')]);
                 end
             end

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

@@ -110 +110 @@
                     desc(i)=cellstr(uuv(i).descriptor);
                 elseif ~isempty(inputname(1))
-                    desc(i)=cellstr([inputname(1) string_dim(uuv,i)]);
+                    desc(i)=cellstr([inputname(1) string_dim(uuv,i,'vector')]);
                 elseif exist('dstr','var')
-                    desc(i)=cellstr([dstr         string_dim(uuv,i)]);
+                    desc(i)=cellstr([dstr         string_dim(uuv,i,'vector')]);
                 else
-                    desc(i)=cellstr(['uuv'        string_dim(uuv,i)]);
+                    desc(i)=cellstr(['uuv'        string_dim(uuv,i,'vector')]);
                 end
             end