Changeset 3577 for issm/trunk/src/m/classes/normal_uncertain.m

Timestamp:

04/20/10 14:56:38 (15 years ago)

Author:

jschierm

Message:

QMU with Dakota: updated all Dakota variable/response class definitions to allow construction of multiple simultaneous instances.

File:

• issm/trunk/src/m/classes/normal_uncertain.m (modified) (1 diff)

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

@@ -66 +66 @@
 
                 otherwise
-                    nuv.descriptor=varargin{1};
-                    nuv.mean      =varargin{2};
-                    nuv.stddev    =varargin{3};
+                    asizec=num2cell(array_size(varargin{1:min(nargin,5)}));
+                    nuv(asizec{:})=normal_uncertain;
+                    clear asizec
+                    
+                    if ischar(varargin{1})
+                        varargin{1}=cellstr(varargin{1});
+                    end
+                    for i=1:numel(nuv)
+                        if (numel(varargin{1}) > 1)
+                            nuv(i).descriptor=varargin{1}{i};
+                        else
+                            nuv(i).descriptor=[char(varargin{1}) string_dim(nuv,i)];
+                        end
+                        if (numel(varargin{2}) > 1)
+                            nuv(i).mean      =varargin{2}(i);
+                        else
+                            nuv(i).mean      =varargin{2};
+                        end
+                        if (numel(varargin{3}) > 1)
+                            nuv(i).stddev    =varargin{3}(i);
+                        else
+                            nuv(i).stddev    =varargin{3};
+                        end
+                    end
 
                     if (nargin >= 4)
-                        nuv.lower     =varargin{4};
+                        for i=1:numel(nuv)
+                            if (numel(varargin{4}) > 1)
+                                nuv(i).lower     =varargin{4}(i);
+                            else
+                                nuv(i).lower     =varargin{4};
+                            end
+                        end
                         if (nargin >= 5)
-                            nuv.upper     =varargin{5};
+                            for i=1:numel(nuv)
+                                if (numel(varargin{5}) > 1)
+                                    nuv(i).upper     =varargin{5}(i);
+                                else
+                                    nuv(i).upper     =varargin{5};
+                                end
+                            end
                             if (nargin > 5)
                                 warning('normal_uncertain:extra_arg',...