[Octave-cvsupdate] SF.net SVN: octave:[9634] trunk/octave-forge/main/octcdf

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

Revision: 9634
          http://octave.svn.sourceforge.net/octave/?rev=9634&view=rev
Author:   abarth93
Date:     2012-02-17 12:41:12 +0000 (Fri, 17 Feb 2012)
Log Message:
-----------
fix several bug in ncxxx methods

Modified Paths:
--------------
    trunk/octave-forge/main/octcdf/DESCRIPTION
    trunk/octave-forge/main/octcdf/inst/@ncatt/datatype.m
    trunk/octave-forge/main/octcdf/inst/@ncatt/name.m
    trunk/octave-forge/main/octcdf/inst/@ncdim/isrecord.m
    trunk/octave-forge/main/octcdf/inst/@ncdim/name.m
    trunk/octave-forge/main/octcdf/inst/@ncfile/att.m
    trunk/octave-forge/main/octcdf/inst/@ncfile/dim.m
    trunk/octave-forge/main/octcdf/inst/@ncfile/name.m
    trunk/octave-forge/main/octcdf/inst/@ncfile/var.m
    trunk/octave-forge/main/octcdf/inst/@ncvar/att.m
    trunk/octave-forge/main/octcdf/inst/@ncvar/autonan.m
    trunk/octave-forge/main/octcdf/inst/@ncvar/autoscale.m
    trunk/octave-forge/main/octcdf/inst/@ncvar/datatype.m
    trunk/octave-forge/main/octcdf/inst/@ncvar/dim.m
    trunk/octave-forge/main/octcdf/inst/@ncvar/fillval.m
    trunk/octave-forge/main/octcdf/inst/@ncvar/name.m
    trunk/octave-forge/main/octcdf/inst/nctest.m

Modified: trunk/octave-forge/main/octcdf/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/octcdf/DESCRIPTION	2012-02-16 07:43:22 UTC (rev 9633)
+++ trunk/octave-forge/main/octcdf/DESCRIPTION	2012-02-17 12:41:12 UTC (rev 9634)
@@ -1,6 +1,6 @@
 Name: octcdf
-Version: 1.1.3
-Date: 2012-02-06
+Version: 1.1.4
+Date: 2012-02-17
 Author: Alexander Barth <bar...@gm...>
 Maintainer: Alexander Barth <bar...@gm...>
 Title: octcdf

Modified: trunk/octave-forge/main/octcdf/inst/@ncatt/datatype.m
===================================================================
--- trunk/octave-forge/main/octcdf/inst/@ncatt/datatype.m	2012-02-16 07:43:22 UTC (rev 9633)
+++ trunk/octave-forge/main/octcdf/inst/@ncatt/datatype.m	2012-02-17 12:41:12 UTC (rev 9634)
@@ -1,3 +1,3 @@
-function datatype(self)
- ncdatatype(self)
+function dt = datatype(self)
+ dt = ncdatatype(self);
 end

Modified: trunk/octave-forge/main/octcdf/inst/@ncatt/name.m
===================================================================
--- trunk/octave-forge/main/octcdf/inst/@ncatt/name.m	2012-02-16 07:43:22 UTC (rev 9633)
+++ trunk/octave-forge/main/octcdf/inst/@ncatt/name.m	2012-02-17 12:41:12 UTC (rev 9634)
@@ -1,3 +1,7 @@
-function name(self)
- ncname(self)
+function n = name(self,varargin)
+ if nargin == 1
+   n = ncname(self);
+ else
+   ncname(self,varargin{:});
+ end
 end

Modified: trunk/octave-forge/main/octcdf/inst/@ncdim/isrecord.m
===================================================================
--- trunk/octave-forge/main/octcdf/inst/@ncdim/isrecord.m	2012-02-16 07:43:22 UTC (rev 9633)
+++ trunk/octave-forge/main/octcdf/inst/@ncdim/isrecord.m	2012-02-17 12:41:12 UTC (rev 9634)
@@ -1,3 +1,3 @@
-function isrecord(self)
- ncisrecord(self)
+function isr = isrecord(self)
+ isr = ncisrecord(self);
 end

Modified: trunk/octave-forge/main/octcdf/inst/@ncdim/name.m
===================================================================
--- trunk/octave-forge/main/octcdf/inst/@ncdim/name.m	2012-02-16 07:43:22 UTC (rev 9633)
+++ trunk/octave-forge/main/octcdf/inst/@ncdim/name.m	2012-02-17 12:41:12 UTC (rev 9634)
@@ -1,3 +1,7 @@
-function name(self)
- ncname(self)
+function n = name(self,varargin)
+ if nargin == 1
+   n = ncname(self);
+ else
+   ncname(self,varargin{:});
+ end
 end

Modified: trunk/octave-forge/main/octcdf/inst/@ncfile/att.m
===================================================================
--- trunk/octave-forge/main/octcdf/inst/@ncfile/att.m	2012-02-16 07:43:22 UTC (rev 9633)
+++ trunk/octave-forge/main/octcdf/inst/@ncfile/att.m	2012-02-17 12:41:12 UTC (rev 9634)
@@ -1,3 +1,3 @@
-function att(self)
- ncatt(self)
+function a = att(self)
+ a = ncatt(self);
 end

Modified: trunk/octave-forge/main/octcdf/inst/@ncfile/dim.m
===================================================================
--- trunk/octave-forge/main/octcdf/inst/@ncfile/dim.m	2012-02-16 07:43:22 UTC (rev 9633)
+++ trunk/octave-forge/main/octcdf/inst/@ncfile/dim.m	2012-02-17 12:41:12 UTC (rev 9634)
@@ -1,3 +1,3 @@
-function dim(self)
- ncdim(self)
+function d = dim(self)
+  d = ncdim(self);
 end

Modified: trunk/octave-forge/main/octcdf/inst/@ncfile/name.m
===================================================================
--- trunk/octave-forge/main/octcdf/inst/@ncfile/name.m	2012-02-16 07:43:22 UTC (rev 9633)
+++ trunk/octave-forge/main/octcdf/inst/@ncfile/name.m	2012-02-17 12:41:12 UTC (rev 9634)
@@ -1,3 +1,3 @@
-function name(self)
- ncname(self)
+function n = name(self)
+ n = ncname(self)
 end

Modified: trunk/octave-forge/main/octcdf/inst/@ncfile/var.m
===================================================================
--- trunk/octave-forge/main/octcdf/inst/@ncfile/var.m	2012-02-16 07:43:22 UTC (rev 9633)
+++ trunk/octave-forge/main/octcdf/inst/@ncfile/var.m	2012-02-17 12:41:12 UTC (rev 9634)
@@ -1,3 +1,3 @@
-function var(self)
- ncvar(self)
+function v = var(self)
+ v = ncvar(self);
 end

Modified: trunk/octave-forge/main/octcdf/inst/@ncvar/att.m
===================================================================
--- trunk/octave-forge/main/octcdf/inst/@ncvar/att.m	2012-02-16 07:43:22 UTC (rev 9633)
+++ trunk/octave-forge/main/octcdf/inst/@ncvar/att.m	2012-02-17 12:41:12 UTC (rev 9634)
@@ -1,3 +1,3 @@
-function att(self)
- ncatt(self)
+function a = att(self)
+ a = ncatt(self);
 end

Modified: trunk/octave-forge/main/octcdf/inst/@ncvar/autonan.m
===================================================================
--- trunk/octave-forge/main/octcdf/inst/@ncvar/autonan.m	2012-02-16 07:43:22 UTC (rev 9633)
+++ trunk/octave-forge/main/octcdf/inst/@ncvar/autonan.m	2012-02-17 12:41:12 UTC (rev 9634)
@@ -1,3 +1,3 @@
-function autonan(self)
- ncautonan(self)
+function nv = autonan(self,varargin)
+ nv = ncautonan(self,varargin{:});
 end

Modified: trunk/octave-forge/main/octcdf/inst/@ncvar/autoscale.m
===================================================================
--- trunk/octave-forge/main/octcdf/inst/@ncvar/autoscale.m	2012-02-16 07:43:22 UTC (rev 9633)
+++ trunk/octave-forge/main/octcdf/inst/@ncvar/autoscale.m	2012-02-17 12:41:12 UTC (rev 9634)
@@ -1,3 +1,3 @@
-function autoscale(self)
- ncautoscale(self)
+function nv = autoscale(self,varargin)
+  nv = ncautoscale(self,varargin{:});
 end

Modified: trunk/octave-forge/main/octcdf/inst/@ncvar/datatype.m
===================================================================
--- trunk/octave-forge/main/octcdf/inst/@ncvar/datatype.m	2012-02-16 07:43:22 UTC (rev 9633)
+++ trunk/octave-forge/main/octcdf/inst/@ncvar/datatype.m	2012-02-17 12:41:12 UTC (rev 9634)
@@ -1,3 +1,3 @@
-function datatype(self)
- ncdatatype(self)
+function dt = datatype(self)
+ dt = ncdatatype(self);
 end

Modified: trunk/octave-forge/main/octcdf/inst/@ncvar/dim.m
===================================================================
--- trunk/octave-forge/main/octcdf/inst/@ncvar/dim.m	2012-02-16 07:43:22 UTC (rev 9633)
+++ trunk/octave-forge/main/octcdf/inst/@ncvar/dim.m	2012-02-17 12:41:12 UTC (rev 9634)
@@ -1,3 +1,3 @@
-function dim(self)
- ncdim(self)
+function d = dim(self)
+  d = ncdim(self);
 end

Modified: trunk/octave-forge/main/octcdf/inst/@ncvar/fillval.m
===================================================================
--- trunk/octave-forge/main/octcdf/inst/@ncvar/fillval.m	2012-02-16 07:43:22 UTC (rev 9633)
+++ trunk/octave-forge/main/octcdf/inst/@ncvar/fillval.m	2012-02-17 12:41:12 UTC (rev 9634)
@@ -1,3 +1,7 @@
-function fillval(self)
- ncfillval(self)
+function n = fillval(self,varargin)
+ if nargin == 1
+   n = ncfillval(self);
+ else
+   ncfillval(self,varargin{:});
+ end
 end

Modified: trunk/octave-forge/main/octcdf/inst/@ncvar/name.m
===================================================================
--- trunk/octave-forge/main/octcdf/inst/@ncvar/name.m	2012-02-16 07:43:22 UTC (rev 9633)
+++ trunk/octave-forge/main/octcdf/inst/@ncvar/name.m	2012-02-17 12:41:12 UTC (rev 9634)
@@ -1,3 +1,7 @@
-function name(self)
- ncname(self)
+function n = name(self,varargin)
+ if nargin == 1
+   n = ncname(self);
+ else
+   ncname(self,varargin{:});
+ end
 end

Modified: trunk/octave-forge/main/octcdf/inst/nctest.m
===================================================================
--- trunk/octave-forge/main/octcdf/inst/nctest.m	2012-02-16 07:43:22 UTC (rev 9633)
+++ trunk/octave-forge/main/octcdf/inst/nctest.m	2012-02-17 12:41:12 UTC (rev 9634)
@@ -37,6 +37,7 @@
 %!test
 %! nc('time') = 5;
 %! nc('space') = 3;
+%! nc('record') = 0;
 %! assert(length(nc('time')),5);
 %! assert(length(nc('space')),3);
 
@@ -126,25 +127,33 @@
 
 %!# Test ncdim
 %!test
-%! dimlist = ncdim(nc);
-%! assert(length(dimlist),2);
+%! dimlist = dim(nc);
+%! assert(length(dimlist),3);
 %! assert(dimlist{1}(:),5);
 %! assert(dimlist{2}(:),3);
 
+%!# Test isrecord
+%!test
+%! assert(isrecord(nc('record')) == 1);
+
+%!# Test name on file
+%!test
+%! assert(name(nc),fname);
+
 %!# Test ncatt
 %!test
-%! attlist = ncatt(nc);
+%! attlist = att(nc);
 %! assert(length(attlist),7);
-%! assert(ncname(attlist{1}),'byte_att');
-%! assert(ncdatatype(attlist{1}),'byte');
+%! assert(name(attlist{1}),'byte_att');
+%! assert(datatype(attlist{1}),'byte');
 %! assert(attlist{1}(:),123);
 
 %!# Test ncvar
 %!test
-%! varlist = ncvar(nc);
+%! varlist = var(nc);
 %! assert(length(varlist),7);
-%! assert(ncname(varlist{1}),'byte_var');
-%! assert(ncdatatype(varlist{1}),'byte');
+%! assert(name(varlist{1}),'byte_var');
+%! assert(datatype(varlist{1}),'byte');
 
 %!# Test to write a variable by slices
 %!test
@@ -181,19 +190,22 @@
 %!
 %! scaled = nc{'autoscale_var',1}(:);                          
 %! assert(var,scaled,1e-6);
+%!
+%! nf = autoscale(nc{'autoscale_var'},1);
+%! assert(nf(:),scaled,1e-6);
 
 %!# Test autonan
 %!test
 %! nc{'variable_with_gaps'}=ncdouble('time'); 
 %! nv = nc{'variable_with_gaps'}; 
-%! nv = ncautonan(nv,1);
+%! nv = autonan(nv,1);
 %! nv.FillValue_ = 99; 
 %! nv(:) = NaN;
 %! 
-%! nv = ncautonan(nv,0);
+%! nv = autonan(nv,0);
 %! assert(all(nv(:) == 99))
 %! 
-%! nv = ncautonan(nv,1);
+%! nv = autonan(nv,1);
 %! assert(all(isnan(nv(:))))
 
 %!# Test size of vector
@@ -212,7 +224,7 @@
  
 %!# Close file
 %!test
-%! ncclose(nc);
+%! close(nc);
 %! delete(fname);
 
 
@@ -226,25 +238,25 @@
 %! 
 %! nf.old_name = 'example attribute';
 %! 
-%! d = ncdim(nf){1};
-%! ncname(d,'new_name');
-%! assert(ncname(d),'new_name')
+%! d = dim(nf){1};
+%! name(d,'new_name');
+%! assert(name(d),'new_name')
 %! 
-%! a = ncatt(nf){1};
-%! ncname(a,'new_name');
-%! assert(ncname(a),'new_name');
+%! a = att(nf){1};
+%! name(a,'new_name');
+%! assert(name(a),'new_name');
 %! 
 %! nf{'old_name'} = ncdouble('new_name','latitude');
 %! v = nf{'old_name'};
-%! ncname(v,'new_name')
-%! assert(ncname(v),'new_name');
-%! ncclose(nf);
+%! name(v,'new_name')
+%! assert(name(v),'new_name');
+%! close(nf);
 %! delete(filename);
 
 %!# Test 64bit-offset function
 %!test
 %! filename = [tmpnam '-octcdf.nc'];
 %! nf = netcdf(filename,'c','64bit-offset');
-%! ncclose(nf);
+%! close(nf);
 %! delete(filename);
 

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