[Octave-cvsupdate] SF.net SVN: octave:[10997] trunk/octave-forge/main/control/inst

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

Revision: 10997
          http://octave.svn.sourceforge.net/octave/?rev=10997&view=rev
Author:   paramaniac
Date:     2012-09-12 10:39:10 +0000 (Wed, 12 Sep 2012)
Log Message:
-----------
control: remove anonymous function calls in cellfun statements if possible

Modified Paths:
--------------
    trunk/octave-forge/main/control/inst/@iddata/cat.m
    trunk/octave-forge/main/control/inst/@iddata/detrend.m
    trunk/octave-forge/main/control/inst/@iddata/diff.m
    trunk/octave-forge/main/control/inst/@iddata/resample.m
    trunk/octave-forge/main/control/inst/__adjust_iddata_tsam__.m

Modified: trunk/octave-forge/main/control/inst/@iddata/cat.m
===================================================================
--- trunk/octave-forge/main/control/inst/@iddata/cat.m	2012-09-11 09:09:31 UTC (rev 10996)
+++ trunk/octave-forge/main/control/inst/@iddata/cat.m	2012-09-12 10:39:10 UTC (rev 10997)
@@ -231,7 +231,7 @@
 
   if (nargin > 1)
     ## compare n-th string of first cell with n-th string of remaining cells
-    tmp = cellfun (@(x) strcmp (str, x), varargin, "uniformoutput", false);
+    tmp = cellfun (@strcmp, {str}, varargin, "uniformoutput", false);
     ## check whether all strings of each pair are equal
     tmp = cellfun (@all, tmp);
     ## check whether all pairs are equal

Modified: trunk/octave-forge/main/control/inst/@iddata/detrend.m
===================================================================
--- trunk/octave-forge/main/control/inst/@iddata/detrend.m	2012-09-11 09:09:31 UTC (rev 10996)
+++ trunk/octave-forge/main/control/inst/@iddata/detrend.m	2012-09-12 10:39:10 UTC (rev 10997)
@@ -40,8 +40,8 @@
 
   [n, p, m] = size (dat);
 
-  dat.y = cellfun (@(y) detrend (y, ord), dat.y, "uniformoutput", false);
-  dat.u = cellfun (@(u) detrend (u, ord), dat.u, "uniformoutput", false);
+  dat.y = cellfun (@detrend, dat.y, {ord}, "uniformoutput", false);
+  dat.u = cellfun (@detrend, dat.u, {ord}, "uniformoutput", false);
 
   ## if a MIMO experiment has only 1 sample, detrend works
   ## row-wisely instead of column-wisely

Modified: trunk/octave-forge/main/control/inst/@iddata/diff.m
===================================================================
--- trunk/octave-forge/main/control/inst/@iddata/diff.m	2012-09-11 09:09:31 UTC (rev 10996)
+++ trunk/octave-forge/main/control/inst/@iddata/diff.m	2012-09-12 10:39:10 UTC (rev 10997)
@@ -32,7 +32,7 @@
     print_usage ();
   endif
 
-  dat.y = cellfun (@(y) diff (y, k, 1), dat.y, "uniformoutput", false);
-  dat.u = cellfun (@(u) diff (u, k, 1), dat.u, "uniformoutput", false);
+  dat.y = cellfun (@diff, dat.y, {k}, {1}, "uniformoutput", false);
+  dat.u = cellfun (@diff, dat.u, {k}, {1}, "uniformoutput", false);
 
 endfunction

Modified: trunk/octave-forge/main/control/inst/@iddata/resample.m
===================================================================
--- trunk/octave-forge/main/control/inst/@iddata/resample.m	2012-09-11 09:09:31 UTC (rev 10996)
+++ trunk/octave-forge/main/control/inst/@iddata/resample.m	2012-09-12 10:39:10 UTC (rev 10997)
@@ -66,7 +66,7 @@
     error ("iddata: resample: fourth argument invalid");
   endif
 
-  dat.y = cellfun (@(y) resample (y, p, q, h), dat.y, "uniformoutput", false);
-  dat.u = cellfun (@(u) resample (u, p, q, h), dat.u, "uniformoutput", false);
+  dat.y = cellfun (@resample, dat.y, {p}, {q}, {h}, "uniformoutput", false);
+  dat.u = cellfun (@resample, dat.u, {p}, {q}, {h}, "uniformoutput", false);
 
 endfunction

Modified: trunk/octave-forge/main/control/inst/__adjust_iddata_tsam__.m
===================================================================
--- trunk/octave-forge/main/control/inst/__adjust_iddata_tsam__.m	2012-09-11 09:09:31 UTC (rev 10996)
+++ trunk/octave-forge/main/control/inst/__adjust_iddata_tsam__.m	2012-09-12 10:39:10 UTC (rev 10997)
@@ -34,7 +34,7 @@
     tsam = {tsam};
   endif
 
-  tmp = cellfun (@(x) issample (x, -1), tsam);
+  tmp = cellfun (@issample, tsam, {-1});
   
   if (any (! tmp))
     error ("iddata: invalid sampling time");

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