diff m-toolbox/classes/@ao/ao.m @ 45:a59cdb8aaf31 database-connection-manager

Merge
author Daniele Nicolodi <nicolodi@science.unitn.it>
date Tue, 06 Dec 2011 19:07:22 +0100
parents a71a40911c27 bc767aaa99a8
children
line wrap: on
line diff
--- a/m-toolbox/classes/@ao/ao.m	Mon Dec 05 18:04:34 2011 +0100
+++ b/m-toolbox/classes/@ao/ao.m	Tue Dec 06 19:07:22 2011 +0100
@@ -29,7 +29,7 @@
 %
 % <a href="matlab:utils.helper.displayMethodInfo('ao', 'ao')">Parameters Description</a>
 %
-% VERSION: $Id: ao.m,v 1.361 2011/08/22 05:23:45 hewitson Exp $
+% VERSION: $Id: ao.m,v 1.362 2011/12/01 08:30:52 hewitson Exp $
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -110,7 +110,7 @@
 %                             given in the parameter list
 %
 %
-% VERSION:    $Id: ao.m,v 1.361 2011/08/22 05:23:45 hewitson Exp $
+% VERSION:    $Id: ao.m,v 1.362 2011/12/01 08:30:52 hewitson Exp $
 %
 % Parameter sets for plist constructor (in order of priority):
 %
@@ -775,7 +775,7 @@
     end
     
     function out = VEROUT()
-      out = '$Id: ao.m,v 1.361 2011/08/22 05:23:45 hewitson Exp $';
+      out = '$Id: ao.m,v 1.362 2011/12/01 08:30:52 hewitson Exp $';
     end
     
     function ii = getInfo(varargin)
@@ -1358,6 +1358,7 @@
   methods (Static = true, Access = private)
     % constructor functions
     % Spectral estimate function
+    varargout = wosa(varargin);
     [yy, dyy, info] = welchscale(xx, dxx, win, fs, norm, inunits)
     [x,M,isreal_x,y,Ly,win,winName,winParam,noverlap,k,L,options] = welchparse(x,esttype,varargin)
     [P,f] = computeperiodogram(x,win,nfft,esttype,varargin)