Changeset 261

Timestamp:

05/06/09 14:17:53 (16 years ago)

Author:

jschierm

Message:

Change display of Dakota output data.

File:

• issm/trunk/src/m/classes/public/displayqmu.m (modified) (2 diffs)

issm/trunk/src/m/classes/public/displayqmu.m

@@ -11 +11 @@
 disp(sprintf('      ''%s''','qmu using Dakota'));
 
-disp(sprintf('         variables:  (arrays of each variable class)'));
-fnames=fieldnames(md.variables);
-for i=1:length(fnames);
-    disp(sprintf('            %s    [%ix%i]    ''%s''',...
-        fnames{i},size(md.variables.(fnames{i})),class(md.variables.(fnames{i}))));
+for i=1:numel(md.variables)
+    disp(sprintf('         variables%s:  (arrays of each variable class)',...
+        string_dim(md.variables,i)));
+    fnames=fieldnames(md.variables(i));
+    maxlen=0;
+    for j=1:numel(fnames)
+        maxlen=max(maxlen,length(fnames{j}));
+    end
+    
+    for j=1:numel(fnames)
+        disp(sprintf(['            %-' num2str(maxlen+1) 's:    [%ix%i]    ''%s'''],...
+            fnames{j},size(md.variables.(fnames{j})),class(md.variables.(fnames{j}))));
+    end
 end
 
-disp(sprintf('         responses:  (arrays of each response class)'));
-fnames=fieldnames(md.responses);
-for i=1:length(fnames);
-    disp(sprintf('            %s    [%ix%i]    ''%s''',...
-        fnames{i},size(md.responses.(fnames{i})),class(md.responses.(fnames{i}))));
+
+for i=1:numel(md.responses)
+    disp(sprintf('         responses%s:  (arrays of each response class)',...
+        string_dim(md.responses,i)));
+    fnames=fieldnames(md.responses(i));
+    maxlen=0;
+    for j=1:numel(fnames)
+        maxlen=max(maxlen,length(fnames{j}));
+    end
+    
+    for j=1:numel(fnames)
+        disp(sprintf(['            %-' num2str(maxlen+1) 's:    [%ix%i]    ''%s'''],...
+            fnames{j},size(md.responses.(fnames{j})),class(md.responses.(fnames{j}))));
+    end
 end
+
 
 disp(sprintf('         qmu_method:  (array of dakota_method class)'));
@@ -48 +66 @@
 end
 
-disp(sprintf('         dakotaresults: 1x%i   {dvar,rfunc,scm,pcm,srcm,prcm}',length(md.dakotaresults)));
-if isempty(md.dakotain), disp(sprintf('         dakotain: N/A')); else disp(sprintf('         dakotain: not displayed (can be accessed by typing md.dakotain)'));end
-if isempty(md.dakotaout), disp(sprintf('         dakotaout: N/A')); else disp(sprintf('         dakotaout: not displayed (can be accessed by typing md.dakotaout)'));end
-if isempty(md.dakotadat), disp(sprintf('         dakotadat: N/A')); else disp(sprintf('         dakotadat: not displayed (can be accessed by typing md.dakotadat)'));end
+for i=1:numel(md.dakotaresults)
+    disp(sprintf('         dakotaresults%s:  (information from dakota files)',...
+        string_dim(md.dakotaresults,i)));
+    fnames=fieldnames(md.dakotaresults(i));
+    maxlen=0;
+    for j=1:numel(fnames)
+        maxlen=max(maxlen,length(fnames{j}));
+    end
+    
+    for j=1:numel(fnames)
+        disp(sprintf(['            %-' num2str(maxlen+1) 's:    [%ix%i]    ''%s'''],...
+            fnames{j},size(md.dakotaresults.(fnames{j})),class(md.dakotaresults.(fnames{j}))));
+    end
+end
+
+if isempty(md.dakotain), disp(sprintf('         dakotain: N/A')); else disp(sprintf('         dakotain:    [%ix%i]    (can be accessed by typing md.dakotain)',size(md.dakotain)));end
+if isempty(md.dakotaout), disp(sprintf('         dakotaout: N/A')); else disp(sprintf('         dakotaout:    [%ix%i]    (can be accessed by typing md.dakotaout)',size(md.dakotaout)));end
+if isempty(md.dakotadat), disp(sprintf('         dakotadat: N/A')); else disp(sprintf('         dakotadat:    [%ix%i]    (can be accessed by typing md.dakotadat)',size(md.dakotadat)));end
 disp(sprintf('         npart   : %i (number of partitions for semi-descrete qmu)',md.npart));
 disp(sprintf('         numrifts: %i (number of rifts for semi-descrete qmu)',md.numrifts));