[Octave-cvsupdate] SF.net SVN: octave:[10681] trunk/octave-forge/extra/ncArray/inst

[<aba...@us...>]

Revision: 10681
          http://octave.svn.sourceforge.net/octave/?rev=10681&view=rev
Author:   abarth93
Date:     2012-06-24 10:34:56 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/octave-forge/extra/ncArray/inst/@BaseArray/sum.m
    trunk/octave-forge/extra/ncArray/inst/test_ncarray.m

Added Paths:
-----------
    trunk/octave-forge/extra/ncArray/inst/@BaseArray/max.m
    trunk/octave-forge/extra/ncArray/inst/@BaseArray/min.m

Added: trunk/octave-forge/extra/ncArray/inst/@BaseArray/max.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@BaseArray/max.m	                        (rev 0)
+++ trunk/octave-forge/extra/ncArray/inst/@BaseArray/max.m	2012-06-24 10:34:56 UTC (rev 10681)
@@ -0,0 +1,13 @@
+% s = max (x, [], dim)
+% compute the maximum along dimension dim
+% See also
+%   max
+
+function s = max(self,B,varargin)
+
+assert(isempty(B))
+
+funred = @max;
+funelem = @(x) x;
+
+s = reduce(self,funred,funelem,varargin{:});

Added: trunk/octave-forge/extra/ncArray/inst/@BaseArray/min.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@BaseArray/min.m	                        (rev 0)
+++ trunk/octave-forge/extra/ncArray/inst/@BaseArray/min.m	2012-06-24 10:34:56 UTC (rev 10681)
@@ -0,0 +1,13 @@
+% s = min (x, [], dim)
+% compute the minimum along dimension dim
+% See also
+%   min
+
+function s = min(self,B,varargin)
+
+assert(isempty(B))
+
+funred = @min;
+funelem = @(x) x;
+
+s = reduce(self,funred,funelem,varargin{:});

Modified: trunk/octave-forge/extra/ncArray/inst/@BaseArray/sum.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@BaseArray/sum.m	2012-06-24 10:26:23 UTC (rev 10680)
+++ trunk/octave-forge/extra/ncArray/inst/@BaseArray/sum.m	2012-06-24 10:34:56 UTC (rev 10681)
@@ -1,4 +1,4 @@
-% s = sum (X, DIM)
+% s = sum (x, dim)
 % compute the sum along dimension dim
 % See also
 %   sum

Modified: trunk/octave-forge/extra/ncArray/inst/test_ncarray.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/test_ncarray.m	2012-06-24 10:26:23 UTC (rev 10680)
+++ trunk/octave-forge/extra/ncArray/inst/test_ncarray.m	2012-06-24 10:34:56 UTC (rev 10681)
@@ -132,7 +132,15 @@
 stdSSTref = std(SST_ref,[],2);
 assert(isequalwithequalnans(stdSST, stdSSTref))
 
+maxSST = max(SST,[],2);
+maxSSTref = max(SST_ref,[],2);
+assert(isequalwithequalnans(maxSST, maxSSTref))
 
+minSST = min(SST,[],2);
+minSSTref = min(SST_ref,[],2);
+assert(isequalwithequalnans(minSST, minSSTref))
+
+
 % writing
 
 r = round(randn(size(SST)));

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