Changeset 3577 for issm/trunk/src/m/classes/objective_function.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/objective_function.m (modified) (1 diff)

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

@@ -51 +51 @@
                         of=varargin{1};
                     else
-                        of.descriptor=varargin{1};
+                        asizec=num2cell(array_size(varargin{1:min(nargin,4)}));
+                        of(asizec{:})=objective_function;
+                        clear asizec
+                    
+                        if ischar(varargin{1})
+                            varargin{1}=cellstr(varargin{1});
+                        end
+                        for i=1:numel(of)
+                            if (numel(varargin{1}) > 1)
+                                of(i).descriptor=varargin{1}{i};
+                            else
+                                of(i).descriptor=[char(varargin{1}) string_dim(of,i)];
+                            end
+                        end
 
                         if (nargin >= 2)
-                            of.scale_type=varargin{2};
+                            if ischar(varargin{2})
+                                varargin{2}=cellstr(varargin{2});
+                            end
+                            for i=1:numel(of)
+                                if (numel(varargin{2}) > 1)
+                                    of(i).scale_type=varargin{2}{i};
+                                else
+                                    of(i).scale_type=char(varargin{2});
+                                end
+                            end
                             if (nargin >= 3)
-                                of.scale     =varargin{3};
+                                for i=1:numel(of)
+                                    if (numel(varargin{3}) > 1)
+                                        of(i).scale     =varargin{3}(i);
+                                    else
+                                        of(i).scale     =varargin{3};
+                                    end
+                                end
                                 if (nargin >= 4)
-                                    of.weight    =varargin{4};
+                                    for i=1:numel(of)
+                                        if (numel(varargin{4}) > 1)
+                                            of(i).weight    =varargin{4}(i);
+                                        else
+                                            of(i).weight    =varargin{4};
+                                        end
+                                    end
 
                                     if (nargin > 4)