[Octave-cvsupdate] SF.net SVN: octave:[10697] trunk/octave-forge/extra/control-devel/inst/@ iddata

[<par...@us...>]

Revision: 10697
          http://octave.svn.sourceforge.net/octave/?rev=10697&view=rev
Author:   paramaniac
Date:     2012-06-27 11:24:46 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------
control-devel: use correct titles for frequency domain datasets, mention time series in doc

Modified Paths:
--------------
    trunk/octave-forge/extra/control-devel/inst/@iddata/display.m
    trunk/octave-forge/extra/control-devel/inst/@iddata/iddata.m

Modified: trunk/octave-forge/extra/control-devel/inst/@iddata/display.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/@iddata/display.m	2012-06-26 23:15:34 UTC (rev 10696)
+++ trunk/octave-forge/extra/control-devel/inst/@iddata/display.m	2012-06-27 11:24:46 UTC (rev 10697)
@@ -31,14 +31,22 @@
   
   [n, p, m, e] = size (dat);
   
-  str = ["Time domain dataset '", datname, "' containing ", num2str(sum(n)), " samples"];
+  if (dat.timedomain)
+    domain = "Time";
+    sf = "Samples";
+  else
+    domain = "Frequency";
+    sf = "Frequencies";
+  endif
+  
+  str = [domain, " domain dataset '", datname, "' containing ", num2str(sum(n)), " ", lower(sf)];
 
   disp ("");
   disp (str);
   disp ("");
   
   disp (__horzcat__ (__col2str__ (expname, "Experiment"), \
-                     __vec2str__ (n, "Samples"), \
+                     __vec2str__ (n, sf), \
                      __vec2str__ (cell2mat (dat.tsam), "Sampling Interval")));
   disp ("");
   disp (__horzcat__ (__col2str__ (outname, "Outputs"), \

Modified: trunk/octave-forge/extra/control-devel/inst/@iddata/iddata.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/@iddata/iddata.m	2012-06-26 23:15:34 UTC (rev 10696)
+++ trunk/octave-forge/extra/control-devel/inst/@iddata/iddata.m	2012-06-27 11:24:46 UTC (rev 10697)
@@ -40,6 +40,8 @@
 ## e-by-1 or 1-by-e cell vector of n(i)-by-m matrices,
 ## where @var{e} denotes the number of experiments
 ## and n(i) the individual number of samples for each experiment.
+## If @var{u} is not specified or an empy element @code{[]} is passed,
+## @var{dat} becomes a time series dataset.
 ## @item tsam
 ## Sampling time.  If not specified, default value -1 (unspecified) is taken.
 ## For multi-experiment data, @var{tsam} becomes a

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.