Changeset 6690

Timestamp:

12/07/10 11:39:03 (14 years ago)

Author:

jschierm

Message:

QMU with Dakota: handle case of single row of data in dakota tabular output file.

File:

• issm/trunk/src/m/qmu/dakota_out_parse.m (modified) (1 diff)

issm/trunk/src/m/qmu/dakota_out_parse.m

@@ -192 +192 @@
 %  calculate statistics
 
-%dmean  =mean   (data);
-%dstddev=std    (data,0);
-[dmean,dstddev,dmeanci,dstddevci]=...
-    normfit(data,0.05);
-
-dmin   =min    (data);
-dquart1=prctile(data,25);
-dmedian=median (data);
-dquart3=prctile(data,75);
-dmax   =max    (data);
+%  since normfit doesn't have a dim argument, and matlab isvector is true
+%  for a 1xn matrix, handle the case of one row explicitly
+if (size(data,1) > 1)
+    %dmean  =mean   (data);
+    %dstddev=std    (data,0);
+    [dmean,dstddev,dmeanci,dstddevci]=...
+        normfit(data,0.05);
+else
+    dmean    =zeros(1,size(data,2));
+    dstddev  =zeros(1,size(data,2));
+    dmeanci  =zeros(2,size(data,2));
+    dstddevci=zeros(2,size(data,2));
+    for i=1:size(data,2)
+        [dmean(1,i),dstddev(1,i),dmeanci(:,i),dstddevci(:,i)]=...
+            normfit(data(:,i),0.05);
+    end
+end
+
+dmin   =min    (data,[],1);
+dquart1=prctile(data,25,1);
+dmedian=median (data,1);
+dquart3=prctile(data,75,1);
+dmax   =max    (data,[],1);
 
 %  same as Dakota scm, Excel correl