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

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

Revision: 10669
          http://octave.svn.sourceforge.net/octave/?rev=10669&view=rev
Author:   abarth93
Date:     2012-06-22 15:15:16 +0000 (Fri, 22 Jun 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/octave-forge/extra/ncArray/inst/ncCatData.m
    trunk/octave-forge/extra/ncArray/inst/test_ncarray.m

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

Removed Paths:
-------------
    trunk/octave-forge/extra/ncArray/inst/@ncArray/ncData.m
    trunk/octave-forge/extra/ncArray/inst/ncData/

Copied: trunk/octave-forge/extra/ncArray/inst/@ncArray/ncArray.m (from rev 10668, trunk/octave-forge/extra/ncArray/inst/ncData/ncData.m)
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@ncArray/ncArray.m	                        (rev 0)
+++ trunk/octave-forge/extra/ncArray/inst/@ncArray/ncArray.m	2012-06-22 15:15:16 UTC (rev 10669)
@@ -0,0 +1,30 @@
+% data = ncArray(filename,varname)
+% data = ncArray(var,dims,coord)
+% data with coordinate values
+
+function retval = ncArray(varargin)
+
+if ischar(varargin{1})
+    filename = varargin{1};
+    varname = varargin{2};
+    var = ncBaseArray(filename,varname);    
+    [dims,coord] = nccoord(cached_decompress(filename),varname);
+    
+    for i=1:length(coord)
+        coord(i).val = ncBaseArray(filename,coord(i).name);
+    end
+else
+    var = varargin{1};    
+    dims = varargin{2};
+    coord = varargin{3};
+end
+
+self.var = var;
+self.dims = dims;
+self.nd = length(self.dims);
+self.coord = coord;
+
+retval = class(self,'ncArray',BaseArray(size(self.var)));
+
+
+

Deleted: trunk/octave-forge/extra/ncArray/inst/@ncArray/ncData.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/ncData/ncData.m	2012-06-22 15:13:45 UTC (rev 10668)
+++ trunk/octave-forge/extra/ncArray/inst/@ncArray/ncData.m	2012-06-22 15:15:16 UTC (rev 10669)
@@ -1,30 +0,0 @@
-% data = ncData(filename,varname)
-% data = ncData(var,dims,coord)
-% data with coordinate values
-
-function retval = ncData(varargin)
-
-if ischar(varargin{1})
-    filename = varargin{1};
-    varname = varargin{2};
-    var = ncBaseArray(filename,varname);    
-    [dims,coord] = nccoord(cached_decompress(filename),varname);
-    
-    for i=1:length(coord)
-        coord(i).val = ncBaseArray(filename,coord(i).name);
-    end
-else
-    var = varargin{1};    
-    dims = varargin{2};
-    coord = varargin{3};
-end
-
-self.var = var;
-self.dims = dims;
-self.nd = length(self.dims);
-self.coord = coord;
-
-retval = class(self,'ncData',BaseArray(size(self.var)));
-
-
-

Modified: trunk/octave-forge/extra/ncArray/inst/ncCatData.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/ncCatData.m	2012-06-22 15:13:45 UTC (rev 10668)
+++ trunk/octave-forge/extra/ncArray/inst/ncCatData.m	2012-06-22 15:15:16 UTC (rev 10669)
@@ -79,7 +79,7 @@
     end
 end
 
-data = ncData(var,dims,coord);
+data = ncArray(var,dims,coord);
 
 end
 

Modified: trunk/octave-forge/extra/ncArray/inst/test_ncarray.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/test_ncarray.m	2012-06-22 15:13:45 UTC (rev 10668)
+++ trunk/octave-forge/extra/ncArray/inst/test_ncarray.m	2012-06-22 15:15:16 UTC (rev 10669)
@@ -1,5 +1,5 @@
 function test_ncarray()
-% test ncBaseArray, ncCatArray, ncData and ncCatData
+% test ncBaseArray, ncCatArray, ncArray and ncCatData
 
 varname = 'SST';
 
@@ -162,7 +162,7 @@
 
 
 if 1
-    % test ncData (constructor: ncData(var,dims,coord)
+    % test ncArray (constructor: ncData(var,dims,coord)
     
     SST = ncBaseArray(filename,varname);
     SST_ref = ncread(filename,varname);
@@ -177,7 +177,7 @@
     coord(3).val = ncBaseArray(filename,'time');
     coord(3).dims = {'time'};
     
-    data = ncData(SST,{'x','y','time'},coord);
+    data = ncArray(SST,{'x','y','time'},coord);
     
     [x,y,t] = data(:,:,:).coord;
     
@@ -192,8 +192,8 @@
     [x,y,t] = data(1:3:end,:,:).coord;
     assert(isequalwithequalnans(x,lon_ref(1:3:end,:)))
     
-    % test ncData (constructor: ncData(filename,varname)
-    SST = ncData(filename,varname);
+    % test ncArray (constructor: ncData(filename,varname)
+    SST = ncArray(filename,varname);
     [x,y,t] = data(:,:,:).coord;
     
     assert(isequalwithequalnans(data(:,:,:),SST_ref))
@@ -218,7 +218,7 @@
 zname = [tmpfname '.gz'];
 system(['gzip --stdout ' tmpfname ' > ' zname]);
 
-SST = ncData(zname,'SST');
+SST = ncArray(zname,'SST');
 SST_ref = ncread(tmpfname,'SST');
 assert(isequalwithequalnans(SST(),SST_ref))
 

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