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

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

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


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

Added Paths:
-----------
    trunk/octave-forge/extra/ncArray/inst/ncData/

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

Modified: trunk/octave-forge/extra/ncArray/inst/ncCatArray.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/ncCatArray.m	2012-06-22 15:09:28 UTC (rev 10667)
+++ trunk/octave-forge/extra/ncArray/inst/ncCatArray.m	2012-06-22 15:13:45 UTC (rev 10668)
@@ -56,7 +56,7 @@
 arrays = cell(1,length(filenames));
 
 for i=1:length(filenames)
-    arrays{i} = ncArray(filenames{i},varname);
+    arrays{i} = ncBaseArray(filenames{i},varname);
 end
 
 

Modified: trunk/octave-forge/extra/ncArray/inst/ncCatData.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/ncCatData.m	2012-06-22 15:09:28 UTC (rev 10667)
+++ trunk/octave-forge/extra/ncArray/inst/ncCatData.m	2012-06-22 15:13:45 UTC (rev 10668)
@@ -87,7 +87,7 @@
 function CA = arr(dim,filenames,varname)
 arrays = cell(1,length(filenames));
 for i=1:length(filenames)
-    arrays{i} = ncArray(filenames{i},varname);
+    arrays{i} = ncBaseArray(filenames{i},varname);
 end
 
 CA = CatArray(dim,arrays);

Modified: trunk/octave-forge/extra/ncArray/inst/ncData/ncData.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@ncData/ncData.m	2012-06-22 15:05:53 UTC (rev 10665)
+++ trunk/octave-forge/extra/ncArray/inst/ncData/ncData.m	2012-06-22 15:13:45 UTC (rev 10668)
@@ -7,11 +7,11 @@
 if ischar(varargin{1})
     filename = varargin{1};
     varname = varargin{2};
-    var = ncArray(filename,varname);    
+    var = ncBaseArray(filename,varname);    
     [dims,coord] = nccoord(cached_decompress(filename),varname);
     
     for i=1:length(coord)
-        coord(i).val = ncArray(filename,coord(i).name);
+        coord(i).val = ncBaseArray(filename,coord(i).name);
     end
 else
     var = varargin{1};    

Modified: trunk/octave-forge/extra/ncArray/inst/ncData/subsref.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@ncData/subsref.m	2012-06-22 15:05:53 UTC (rev 10665)
+++ trunk/octave-forge/extra/ncArray/inst/ncData/subsref.m	2012-06-22 15:13:45 UTC (rev 10668)
@@ -27,6 +27,6 @@
         varargout{i} = subsref(self.coord(i).val,idx_c);
     end       
 else
-    % pass subsref to underlying ncArray
+    % pass subsref to underlying ncBaseArray
     varargout{1} = subsref(self.var,idx);
 end
\ No newline at end of file

Modified: trunk/octave-forge/extra/ncArray/inst/test_ncarray.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/test_ncarray.m	2012-06-22 15:09:28 UTC (rev 10667)
+++ trunk/octave-forge/extra/ncArray/inst/test_ncarray.m	2012-06-22 15:13:45 UTC (rev 10668)
@@ -1,5 +1,5 @@
 function test_ncarray()
-% test ncArray, ncCatArray, ncData and ncCatData
+% test ncBaseArray, ncCatArray, ncData and ncCatData
 
 varname = 'SST';
 
@@ -30,12 +30,12 @@
 assert(isequalwithequalnans(test,SST_ref))
 
 
-%%% test ncArray
+%%% test ncBaseArray
 
 % reading
 
 copyfile(files{2},tmpfname);
-SST = ncArray(tmpfname,varname);
+SST = ncBaseArray(tmpfname,varname);
 test = SST(:,:,:);
 SST_ref = ncread(tmpfname,varname);
 
@@ -63,9 +63,9 @@
 % reading
 
 CA = CatArray(3,{...
-    ncArray(filename,varname),...
-    ncArray(files{2},varname),...
-    ncArray(files{3},varname)...
+    ncBaseArray(filename,varname),...
+    ncBaseArray(files{2},varname),...
+    ncBaseArray(files{3},varname)...
     });
 
 assert(isequalwithequalnans(size(CA),[220   144     3]))
@@ -84,9 +84,9 @@
 assert(isequalwithequalnans(SST_test,SST_ref))
 
 CA2 = CatArray(4,{...
-    ncArray(files{1},varname),...
-    ncArray(files{2},varname),...
-    ncArray(files{3},varname)...
+    ncBaseArray(files{1},varname),...
+    ncBaseArray(files{2},varname),...
+    ncBaseArray(files{3},varname)...
     });
 
 SST_test = CA2(:,:,:,2);
@@ -164,17 +164,17 @@
 if 1
     % test ncData (constructor: ncData(var,dims,coord)
     
-    SST = ncArray(filename,varname);
+    SST = ncBaseArray(filename,varname);
     SST_ref = ncread(filename,varname);
     lon_ref = ncread(filename,'lon');
     
-    coord(1).val = ncArray(filename,'lon');
+    coord(1).val = ncBaseArray(filename,'lon');
     coord(1).dims = {'x','y'};
     
-    coord(2).val = ncArray(filename,'lat');
+    coord(2).val = ncBaseArray(filename,'lat');
     coord(2).dims = {'x','y'};
     
-    coord(3).val = ncArray(filename,'time');
+    coord(3).val = ncBaseArray(filename,'time');
     coord(3).dims = {'time'};
     
     data = ncData(SST,{'x','y','time'},coord);

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