You can subscribe to this list here.
2001 
_{Jan}

_{Feb}

_{Mar}

_{Apr}

_{May}

_{Jun}

_{Jul}
(10) 
_{Aug}
(5) 
_{Sep}
(3) 
_{Oct}
(41) 
_{Nov}
(41) 
_{Dec}
(33) 

2002 
_{Jan}
(75) 
_{Feb}
(10) 
_{Mar}
(170) 
_{Apr}
(174) 
_{May}
(66) 
_{Jun}
(11) 
_{Jul}
(10) 
_{Aug}
(44) 
_{Sep}
(73) 
_{Oct}
(28) 
_{Nov}
(139) 
_{Dec}
(52) 
2003 
_{Jan}
(35) 
_{Feb}
(93) 
_{Mar}
(62) 
_{Apr}
(10) 
_{May}
(55) 
_{Jun}
(70) 
_{Jul}
(37) 
_{Aug}
(16) 
_{Sep}
(56) 
_{Oct}
(31) 
_{Nov}
(57) 
_{Dec}
(83) 
2004 
_{Jan}
(85) 
_{Feb}
(67) 
_{Mar}
(27) 
_{Apr}
(37) 
_{May}
(75) 
_{Jun}
(85) 
_{Jul}
(160) 
_{Aug}
(68) 
_{Sep}
(104) 
_{Oct}
(25) 
_{Nov}
(39) 
_{Dec}
(23) 
2005 
_{Jan}
(10) 
_{Feb}
(45) 
_{Mar}
(43) 
_{Apr}
(19) 
_{May}
(108) 
_{Jun}
(31) 
_{Jul}
(41) 
_{Aug}
(23) 
_{Sep}
(65) 
_{Oct}
(58) 
_{Nov}
(44) 
_{Dec}
(54) 
2006 
_{Jan}
(96) 
_{Feb}
(27) 
_{Mar}
(69) 
_{Apr}
(59) 
_{May}
(67) 
_{Jun}
(35) 
_{Jul}
(13) 
_{Aug}
(461) 
_{Sep}
(160) 
_{Oct}
(399) 
_{Nov}
(32) 
_{Dec}
(72) 
2007 
_{Jan}
(316) 
_{Feb}
(305) 
_{Mar}
(318) 
_{Apr}
(54) 
_{May}
(194) 
_{Jun}
(173) 
_{Jul}
(282) 
_{Aug}
(91) 
_{Sep}
(227) 
_{Oct}
(365) 
_{Nov}
(168) 
_{Dec}
(18) 
2008 
_{Jan}
(71) 
_{Feb}
(111) 
_{Mar}
(155) 
_{Apr}
(173) 
_{May}
(70) 
_{Jun}
(67) 
_{Jul}
(55) 
_{Aug}
(83) 
_{Sep}
(32) 
_{Oct}
(68) 
_{Nov}
(80) 
_{Dec}
(29) 
2009 
_{Jan}
(46) 
_{Feb}
(18) 
_{Mar}
(95) 
_{Apr}
(76) 
_{May}
(140) 
_{Jun}
(98) 
_{Jul}
(84) 
_{Aug}
(123) 
_{Sep}
(94) 
_{Oct}
(131) 
_{Nov}
(142) 
_{Dec}
(125) 
2010 
_{Jan}
(128) 
_{Feb}
(158) 
_{Mar}
(172) 
_{Apr}
(134) 
_{May}
(94) 
_{Jun}
(84) 
_{Jul}
(32) 
_{Aug}
(127) 
_{Sep}
(167) 
_{Oct}
(109) 
_{Nov}
(69) 
_{Dec}
(78) 
2011 
_{Jan}
(39) 
_{Feb}
(58) 
_{Mar}
(52) 
_{Apr}
(47) 
_{May}
(56) 
_{Jun}
(76) 
_{Jul}
(55) 
_{Aug}
(54) 
_{Sep}
(165) 
_{Oct}
(255) 
_{Nov}
(328) 
_{Dec}
(263) 
2012 
_{Jan}
(82) 
_{Feb}
(147) 
_{Mar}
(400) 
_{Apr}
(216) 
_{May}
(209) 
_{Jun}
(160) 
_{Jul}
(86) 
_{Aug}
(141) 
_{Sep}
(156) 
_{Oct}
(6) 
_{Nov}

_{Dec}

2015 
_{Jan}

_{Feb}

_{Mar}

_{Apr}

_{May}

_{Jun}

_{Jul}
(1) 
_{Aug}

_{Sep}
(1) 
_{Oct}

_{Nov}
(1) 
_{Dec}
(2) 
2016 
_{Jan}

_{Feb}
(2) 
_{Mar}
(2) 
_{Apr}
(1) 
_{May}
(1) 
_{Jun}
(2) 
_{Jul}
(1) 
_{Aug}
(1) 
_{Sep}

_{Oct}

_{Nov}
(1) 
_{Dec}

S  M  T  W  T  F  S 

1

2

3
(1) 
4

5
(2) 
6
(8) 
7
(3) 
8

9
(3) 
10
(10) 
11
(2) 
12
(1) 
13
(3) 
14

15

16
(1) 
17
(1) 
18
(11) 
19
(7) 
20
(1) 
21
(7) 
22
(1) 
23
(5) 
24
(3) 
25
(5) 
26
(1) 
27
(2) 
28

29
(1) 
30
(2) 
31
(1) 




From: <paramaniac@us...>  20120118 20:29:17

Revision: 9539 http://octave.svn.sourceforge.net/octave/?rev=9539&view=rev Author: paramaniac Date: 20120118 20:29:08 +0000 (Wed, 18 Jan 2012) Log Message:  controldevel: fix wrappers Modified Paths:  trunk/octaveforge/extra/controldevel/devel/balancmr.m trunk/octaveforge/extra/controldevel/devel/balred.m trunk/octaveforge/extra/controldevel/devel/bstmr.m trunk/octaveforge/extra/controldevel/devel/hankelmr.m trunk/octaveforge/extra/controldevel/devel/madievski.m Modified: trunk/octaveforge/extra/controldevel/devel/balancmr.m ===================================================================  trunk/octaveforge/extra/controldevel/devel/balancmr.m 20120118 19:25:54 UTC (rev 9538) +++ trunk/octaveforge/extra/controldevel/devel/balancmr.m 20120118 20:29:08 UTC (rev 9539) @@ 16,224 +16,12 @@ ## along with LTI Syncope. If not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn{Function File} {[@var{Gr}, @var{info}] =} btamodred (@var{G}, @dots{}) ## @deftypefnx{Function File} {[@var{Gr}, @var{info}] =} btamodred (@var{G}, @var{nr}, @dots{}) ## @deftypefnx{Function File} {[@var{Gr}, @var{info}] =} btamodred (@var{G}, @var{opt}, @dots{}) ## @deftypefnx{Function File} {[@var{Gr}, @var{info}] =} btamodred (@var{G}, @var{nr}, @var{opt}, @dots{}) ## ## Model order reduction by frequency weighted Balanced Truncation Approximation (BTA) method. ## The aim of model reduction is to find an LTI system @var{Gr} of order ## @var{nr} (nr < n) such that the inputoutput behaviour of @var{Gr} ## approximates the one from original system @var{G}. ## ## BTA is an absolute error method which tries to minimize ## @iftex ## @tex ## $$  G  G_r _{\\infty} = min $$ ## $$  V \\ (G  G_r) \\ W _{\\infty} = min $$ ## @end tex ## @end iftex ## @ifnottex ## @example ## GGr = min ## inf ## ## V (GGr) W = min ## inf ## @end example ## @end ifnottex ## where @var{V} and @var{W} denote output and input weightings. ## ## ## @strong{Inputs} ## @table @var ## @item G ## LTI model to be reduced. ## @item nr ## The desired order of the resulting reduced order system @var{Gr}. ## If not specified, @var{nr} is chosen automatically according ## to the description of key @var{'order'}. ## @item @dots{} ## Optional pairs of keys and values. @code{"key1", value1, "key2", value2}. ## @item opt ## Optional struct with keys as field names. ## Struct @var{opt} can be created directly or ## by command @command{options}. @code{opt.key1 = value1, opt.key2 = value2}. ## @end table ## ## @strong{Outputs} ## @table @var ## @item Gr ## Reduced order statespace model. ## @item info ## Struct containing additional information. ## @table @var ## @item info.n ## The order of the original system @var{G}. ## @item info.ns ## The order of the @var{alpha}stable subsystem of the original system @var{G}. ## @item info.hsv ## The Hankel singular values of the @var{alpha}stable part of ## the original system @var{G}, ordered decreasingly. ## @item info.nu ## The order of the @var{alpha}unstable subsystem of both the original ## system @var{G} and the reducedorder system @var{Gr}. ## @item info.nr ## The order of the obtained reduced order system @var{Gr}. ## @end table ## @end table ## ## ## @strong{Option Keys and Values} ## @table @var ## @item 'order', 'nr' ## The desired order of the resulting reduced order system @var{Gr}. ## If not specified, @var{nr} is chosen automatically such that states with ## Hankel singular values @var{info.hsv} > @var{tol1} are retained. ## ## @item 'left', 'output' ## LTI model of the left/output frequency weighting @var{V}. ## Default value is an identity matrix. ## ## @item 'right', 'input' ## LTI model of the right/input frequency weighting @var{W}. ## Default value is an identity matrix. ## ## @item 'method' ## Approximation method for the Linfinity norm to be used as follows: ## @table @var ## @item 'sr', 'b' ## Use the squareroot Balance & Truncate method. ## @item 'bfsr', 'f' ## Use the balancingfree squareroot Balance & Truncate method. Default method. ## @end table ## ## @item 'alpha' ## Specifies the ALPHAstability boundary for the eigenvalues ## of the state dynamics matrix @var{G.A}. For a continuoustime ## system, ALPHA <= 0 is the boundary value for ## the real parts of eigenvalues, while for a discretetime ## system, 0 <= ALPHA <= 1 represents the ## boundary value for the moduli of eigenvalues. ## The ALPHAstability domain does not include the boundary. ## Default value is 0 for continuoustime systems and ## 1 for discretetime systems. ## ## @item 'tol1' ## If @var{'order'} is not specified, @var{tol1} contains the tolerance for ## determining the order of the reduced model. ## For model reduction, the recommended value of @var{tol1} is ## c*info.hsv(1), where c lies in the interval [0.00001, 0.001]. ## Default value is info.ns*eps*info.hsv(1). ## If @var{'order'} is specified, the value of @var{tol1} is ignored. ## ## @item 'tol2' ## The tolerance for determining the order of a minimal ## realization of the ALPHAstable part of the given ## model. TOL2 <= TOL1. ## If not specified, ns*eps*info.hsv(1) is chosen. ## ## @item 'gramctrb' ## Specifies the choice of frequencyweighted controllability ## Grammian as follows: ## @table @var ## @item 'standard' ## Choice corresponding to a combination method [4] ## of the approaches of Enns [1] and LinChiu [2,3]. Default method. ## @item 'enhanced' ## Choice corresponding to the stability enhanced ## modified combination method of [4]. ## @end table ## ## @item 'gramobsv' ## Specifies the choice of frequencyweighted observability ## Grammian as follows: ## @table @var ## @item 'standard' ## Choice corresponding to a combination method [4] ## of the approaches of Enns [1] and LinChiu [2,3]. Default method. ## @item 'enhanced' ## Choice corresponding to the stability enhanced ## modified combination method of [4]. ## @end table ## ## @item 'alphactrb' ## Combination method parameter for defining the ## frequencyweighted controllability Grammian. ## abs(alphac) <= 1. ## If alphac = 0, the choice of ## Grammian corresponds to the method of Enns [1], while if ## alphac = 1, the choice of Grammian corresponds ## to the method of Lin and Chiu [2,3]. ## Default value is 0. ## ## @item 'alphaobsv' ## Combination method parameter for defining the ## frequencyweighted observability Grammian. ## abs(alphao) <= 1. ## If alphao = 0, the choice of ## Grammian corresponds to the method of Enns [1], while if ## alphao = 1, the choice of Grammian corresponds ## to the method of Lin and Chiu [2,3]. ## Default value is 0. ## ## @item 'equil', 'scale' ## Boolean indicating whether equilibration (scaling) should be ## performed on system @var{G} prior to order reduction. ## Default value is true if @code{G.scaled == false} and ## false if @code{G.scaled == true}. ## @end table ## ## ## UNSTABLE (from bstmodred) ## ## MIMO (from bstmodred) ## ## Approximation Properties: ## @itemize @bullet ## @item ## Guaranteed stability of reduced models ## @item ## Lower guaranteed error bound ## @item ## Guaranteed a priori error bound ## @iftex ## @tex ## $$ \\sigma_{r+1} \\leq  (GG_r) _{\\infty} \\leq 2 \\sum_{j=r+1}^{n} \\sigma_j $$ ## @end tex ## @end iftex ## @end itemize ## ## ## @strong{References}@* ## [1] Enns, D. ## Model reduction with balanced realizations: An error bound ## and a frequency weighted generalization. ## Proc. 23th CDC, Las Vegas, pp. 127132, 1984. ## ## [2] Lin, C.A. and Chiu, T.Y. ## Model reduction via frequencyweighted balanced realization. ## Control Theory and Advanced Technology, vol. 8, ## pp. 341351, 1992. ## ## [3] Sreeram, V., Anderson, B.D.O and Madievski, A.G. ## New results on frequency weighted balanced reduction ## technique. ## Proc. ACC, Seattle, Washington, pp. 40044009, 1995. ## ## [4] Varga, A. and Anderson, B.D.O. ## Squareroot balancingfree methods for the frequencyweighted ## balancing related model reduction. ## (report in preparation) ## ## ## @strong{Algorithm}@* ## Uses SLICOT AB09ID by courtesy of ## @uref{http://www.slicot.org, NICONET e.V.} +## @deftypefn{Function File} {[@var{Gr}, @var{info}] =} balancmr (@var{G}, @dots{}) +## Wrapper for @command{btamodred}. ## @end deftypefn ## Author: Lukas Reichlin <lukas.reichlin@...> ## Created: Januar 2012 +## Created: January 2012 ## Version: 0.1 function [Gr, info] = balancmr (varargin) @@ 248,60 +36,3 @@ [Gr, info] = btamodred (varargin{:}); endfunction   %!shared Mo, Me, Info, HSVe %! A = [ 26.4000, 6.4023, 4.3868; %! 32.0000, 0, 0; %! 0, 8.0000, 0 ]; %! %! B = [ 16 %! 0 %! 0 ]; %! %! C = [ 9.2994 1.1624 0.1090 ]; %! %! D = [ 0 ]; %! %! G = ss (A, B, C, D); % "scaled", false %! %! AV = [ 1.0000, 0, 4.0000, 9.2994, 1.1624, 0.1090; %! 0, 2.0000, 0, 9.2994, 1.1624, 0.1090; %! 0, 0, 3.0000, 9.2994, 1.1624, 0.1090; %! 16.0000, 16.0000, 16.0000, 26.4000, 6.4023, 4.3868; %! 0, 0, 0, 32.0000, 0, 0; %! 0, 0, 0, 0, 8.0000, 0 ]; %! %! BV = [ 1 %! 1 %! 1 %! 0 %! 0 %! 0 ]; %! %! CV = [ 1 1 1 0 0 0 ]; %! %! DV = [ 0 ]; %! %! V = ss (AV, BV, CV, DV); %! %! [Gr, Info] = btamodred (G, 2, "left", V); %! [Ao, Bo, Co, Do] = ssdata (Gr); %! %! Ae = [ 9.1900 0.0000 %! 0.0000 34.5297 ]; %! %! Be = [ 11.9593 %! 16.9329 ]; %! %! Ce = [ 2.8955 6.9152 ]; %! %! De = [ 0.0000 ]; %! %! HSVe = [ 3.8253 0.2005 ].'; %! %! Mo = [Ao, Bo; Co, Do]; %! Me = [Ae, Be; Ce, De]; %! %!assert (Mo, Me, 1e4); %!assert (Info.hsv, HSVe, 1e4); Modified: trunk/octaveforge/extra/controldevel/devel/balred.m ===================================================================  trunk/octaveforge/extra/controldevel/devel/balred.m 20120118 19:25:54 UTC (rev 9538) +++ trunk/octaveforge/extra/controldevel/devel/balred.m 20120118 20:29:08 UTC (rev 9539) @@ 16,224 +16,12 @@ ## along with LTI Syncope. If not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn{Function File} {[@var{Gr}, @var{info}] =} btamodred (@var{G}, @dots{}) ## @deftypefnx{Function File} {[@var{Gr}, @var{info}] =} btamodred (@var{G}, @var{nr}, @dots{}) ## @deftypefnx{Function File} {[@var{Gr}, @var{info}] =} btamodred (@var{G}, @var{opt}, @dots{}) ## @deftypefnx{Function File} {[@var{Gr}, @var{info}] =} btamodred (@var{G}, @var{nr}, @var{opt}, @dots{}) ## ## Model order reduction by frequency weighted Balanced Truncation Approximation (BTA) method. ## The aim of model reduction is to find an LTI system @var{Gr} of order ## @var{nr} (nr < n) such that the inputoutput behaviour of @var{Gr} ## approximates the one from original system @var{G}. ## ## BTA is an absolute error method which tries to minimize ## @iftex ## @tex ## $$  G  G_r _{\\infty} = min $$ ## $$  V \\ (G  G_r) \\ W _{\\infty} = min $$ ## @end tex ## @end iftex ## @ifnottex ## @example ## GGr = min ## inf ## ## V (GGr) W = min ## inf ## @end example ## @end ifnottex ## where @var{V} and @var{W} denote output and input weightings. ## ## ## @strong{Inputs} ## @table @var ## @item G ## LTI model to be reduced. ## @item nr ## The desired order of the resulting reduced order system @var{Gr}. ## If not specified, @var{nr} is chosen automatically according ## to the description of key @var{'order'}. ## @item @dots{} ## Optional pairs of keys and values. @code{"key1", value1, "key2", value2}. ## @item opt ## Optional struct with keys as field names. ## Struct @var{opt} can be created directly or ## by command @command{options}. @code{opt.key1 = value1, opt.key2 = value2}. ## @end table ## ## @strong{Outputs} ## @table @var ## @item Gr ## Reduced order statespace model. ## @item info ## Struct containing additional information. ## @table @var ## @item info.n ## The order of the original system @var{G}. ## @item info.ns ## The order of the @var{alpha}stable subsystem of the original system @var{G}. ## @item info.hsv ## The Hankel singular values of the @var{alpha}stable part of ## the original system @var{G}, ordered decreasingly. ## @item info.nu ## The order of the @var{alpha}unstable subsystem of both the original ## system @var{G} and the reducedorder system @var{Gr}. ## @item info.nr ## The order of the obtained reduced order system @var{Gr}. ## @end table ## @end table ## ## ## @strong{Option Keys and Values} ## @table @var ## @item 'order', 'nr' ## The desired order of the resulting reduced order system @var{Gr}. ## If not specified, @var{nr} is chosen automatically such that states with ## Hankel singular values @var{info.hsv} > @var{tol1} are retained. ## ## @item 'left', 'output' ## LTI model of the left/output frequency weighting @var{V}. ## Default value is an identity matrix. ## ## @item 'right', 'input' ## LTI model of the right/input frequency weighting @var{W}. ## Default value is an identity matrix. ## ## @item 'method' ## Approximation method for the Linfinity norm to be used as follows: ## @table @var ## @item 'sr', 'b' ## Use the squareroot Balance & Truncate method. ## @item 'bfsr', 'f' ## Use the balancingfree squareroot Balance & Truncate method. Default method. ## @end table ## ## @item 'alpha' ## Specifies the ALPHAstability boundary for the eigenvalues ## of the state dynamics matrix @var{G.A}. For a continuoustime ## system, ALPHA <= 0 is the boundary value for ## the real parts of eigenvalues, while for a discretetime ## system, 0 <= ALPHA <= 1 represents the ## boundary value for the moduli of eigenvalues. ## The ALPHAstability domain does not include the boundary. ## Default value is 0 for continuoustime systems and ## 1 for discretetime systems. ## ## @item 'tol1' ## If @var{'order'} is not specified, @var{tol1} contains the tolerance for ## determining the order of the reduced model. ## For model reduction, the recommended value of @var{tol1} is ## c*info.hsv(1), where c lies in the interval [0.00001, 0.001]. ## Default value is info.ns*eps*info.hsv(1). ## If @var{'order'} is specified, the value of @var{tol1} is ignored. ## ## @item 'tol2' ## The tolerance for determining the order of a minimal ## realization of the ALPHAstable part of the given ## model. TOL2 <= TOL1. ## If not specified, ns*eps*info.hsv(1) is chosen. ## ## @item 'gramctrb' ## Specifies the choice of frequencyweighted controllability ## Grammian as follows: ## @table @var ## @item 'standard' ## Choice corresponding to a combination method [4] ## of the approaches of Enns [1] and LinChiu [2,3]. Default method. ## @item 'enhanced' ## Choice corresponding to the stability enhanced ## modified combination method of [4]. ## @end table ## ## @item 'gramobsv' ## Specifies the choice of frequencyweighted observability ## Grammian as follows: ## @table @var ## @item 'standard' ## Choice corresponding to a combination method [4] ## of the approaches of Enns [1] and LinChiu [2,3]. Default method. ## @item 'enhanced' ## Choice corresponding to the stability enhanced ## modified combination method of [4]. ## @end table ## ## @item 'alphactrb' ## Combination method parameter for defining the ## frequencyweighted controllability Grammian. ## abs(alphac) <= 1. ## If alphac = 0, the choice of ## Grammian corresponds to the method of Enns [1], while if ## alphac = 1, the choice of Grammian corresponds ## to the method of Lin and Chiu [2,3]. ## Default value is 0. ## ## @item 'alphaobsv' ## Combination method parameter for defining the ## frequencyweighted observability Grammian. ## abs(alphao) <= 1. ## If alphao = 0, the choice of ## Grammian corresponds to the method of Enns [1], while if ## alphao = 1, the choice of Grammian corresponds ## to the method of Lin and Chiu [2,3]. ## Default value is 0. ## ## @item 'equil', 'scale' ## Boolean indicating whether equilibration (scaling) should be ## performed on system @var{G} prior to order reduction. ## Default value is true if @code{G.scaled == false} and ## false if @code{G.scaled == true}. ## @end table ## ## ## UNSTABLE (from bstmodred) ## ## MIMO (from bstmodred) ## ## Approximation Properties: ## @itemize @bullet ## @item ## Guaranteed stability of reduced models ## @item ## Lower guaranteed error bound ## @item ## Guaranteed a priori error bound ## @iftex ## @tex ## $$ \\sigma_{r+1} \\leq  (GG_r) _{\\infty} \\leq 2 \\sum_{j=r+1}^{n} \\sigma_j $$ ## @end tex ## @end iftex ## @end itemize ## ## ## @strong{References}@* ## [1] Enns, D. ## Model reduction with balanced realizations: An error bound ## and a frequency weighted generalization. ## Proc. 23th CDC, Las Vegas, pp. 127132, 1984. ## ## [2] Lin, C.A. and Chiu, T.Y. ## Model reduction via frequencyweighted balanced realization. ## Control Theory and Advanced Technology, vol. 8, ## pp. 341351, 1992. ## ## [3] Sreeram, V., Anderson, B.D.O and Madievski, A.G. ## New results on frequency weighted balanced reduction ## technique. ## Proc. ACC, Seattle, Washington, pp. 40044009, 1995. ## ## [4] Varga, A. and Anderson, B.D.O. ## Squareroot balancingfree methods for the frequencyweighted ## balancing related model reduction. ## (report in preparation) ## ## ## @strong{Algorithm}@* ## Uses SLICOT AB09ID by courtesy of ## @uref{http://www.slicot.org, NICONET e.V.} +## @deftypefn{Function File} {[@var{Gr}, @var{info}] =} balred (@var{G}, @dots{}) +## Wrapper for @command{spamodred}. ## @end deftypefn ## Author: Lukas Reichlin <lukas.reichlin@...> ## Created: Januar 2012 +## Created: January 2012 ## Version: 0.1 function [Gr, info] = balred (varargin) @@ 248,60 +36,3 @@ [Gr, info] = spamodred (varargin{:}); endfunction   %!shared Mo, Me, Info, HSVe %! A = [ 26.4000, 6.4023, 4.3868; %! 32.0000, 0, 0; %! 0, 8.0000, 0 ]; %! %! B = [ 16 %! 0 %! 0 ]; %! %! C = [ 9.2994 1.1624 0.1090 ]; %! %! D = [ 0 ]; %! %! G = ss (A, B, C, D); % "scaled", false %! %! AV = [ 1.0000, 0, 4.0000, 9.2994, 1.1624, 0.1090; %! 0, 2.0000, 0, 9.2994, 1.1624, 0.1090; %! 0, 0, 3.0000, 9.2994, 1.1624, 0.1090; %! 16.0000, 16.0000, 16.0000, 26.4000, 6.4023, 4.3868; %! 0, 0, 0, 32.0000, 0, 0; %! 0, 0, 0, 0, 8.0000, 0 ]; %! %! BV = [ 1 %! 1 %! 1 %! 0 %! 0 %! 0 ]; %! %! CV = [ 1 1 1 0 0 0 ]; %! %! DV = [ 0 ]; %! %! V = ss (AV, BV, CV, DV); %! %! [Gr, Info] = btamodred (G, 2, "left", V); %! [Ao, Bo, Co, Do] = ssdata (Gr); %! %! Ae = [ 9.1900 0.0000 %! 0.0000 34.5297 ]; %! %! Be = [ 11.9593 %! 16.9329 ]; %! %! Ce = [ 2.8955 6.9152 ]; %! %! De = [ 0.0000 ]; %! %! HSVe = [ 3.8253 0.2005 ].'; %! %! Mo = [Ao, Bo; Co, Do]; %! Me = [Ae, Be; Ce, De]; %! %!assert (Mo, Me, 1e4); %!assert (Info.hsv, HSVe, 1e4); Modified: trunk/octaveforge/extra/controldevel/devel/bstmr.m ===================================================================  trunk/octaveforge/extra/controldevel/devel/bstmr.m 20120118 19:25:54 UTC (rev 9538) +++ trunk/octaveforge/extra/controldevel/devel/bstmr.m 20120118 20:29:08 UTC (rev 9539) @@ 16,224 +16,12 @@ ## along with LTI Syncope. If not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn{Function File} {[@var{Gr}, @var{info}] =} btamodred (@var{G}, @dots{}) ## @deftypefnx{Function File} {[@var{Gr}, @var{info}] =} btamodred (@var{G}, @var{nr}, @dots{}) ## @deftypefnx{Function File} {[@var{Gr}, @var{info}] =} btamodred (@var{G}, @var{opt}, @dots{}) ## @deftypefnx{Function File} {[@var{Gr}, @var{info}] =} btamodred (@var{G}, @var{nr}, @var{opt}, @dots{}) ## ## Model order reduction by frequency weighted Balanced Truncation Approximation (BTA) method. ## The aim of model reduction is to find an LTI system @var{Gr} of order ## @var{nr} (nr < n) such that the inputoutput behaviour of @var{Gr} ## approximates the one from original system @var{G}. ## ## BTA is an absolute error method which tries to minimize ## @iftex ## @tex ## $$  G  G_r _{\\infty} = min $$ ## $$  V \\ (G  G_r) \\ W _{\\infty} = min $$ ## @end tex ## @end iftex ## @ifnottex ## @example ## GGr = min ## inf ## ## V (GGr) W = min ## inf ## @end example ## @end ifnottex ## where @var{V} and @var{W} denote output and input weightings. ## ## ## @strong{Inputs} ## @table @var ## @item G ## LTI model to be reduced. ## @item nr ## The desired order of the resulting reduced order system @var{Gr}. ## If not specified, @var{nr} is chosen automatically according ## to the description of key @var{'order'}. ## @item @dots{} ## Optional pairs of keys and values. @code{"key1", value1, "key2", value2}. ## @item opt ## Optional struct with keys as field names. ## Struct @var{opt} can be created directly or ## by command @command{options}. @code{opt.key1 = value1, opt.key2 = value2}. ## @end table ## ## @strong{Outputs} ## @table @var ## @item Gr ## Reduced order statespace model. ## @item info ## Struct containing additional information. ## @table @var ## @item info.n ## The order of the original system @var{G}. ## @item info.ns ## The order of the @var{alpha}stable subsystem of the original system @var{G}. ## @item info.hsv ## The Hankel singular values of the @var{alpha}stable part of ## the original system @var{G}, ordered decreasingly. ## @item info.nu ## The order of the @var{alpha}unstable subsystem of both the original ## system @var{G} and the reducedorder system @var{Gr}. ## @item info.nr ## The order of the obtained reduced order system @var{Gr}. ## @end table ## @end table ## ## ## @strong{Option Keys and Values} ## @table @var ## @item 'order', 'nr' ## The desired order of the resulting reduced order system @var{Gr}. ## If not specified, @var{nr} is chosen automatically such that states with ## Hankel singular values @var{info.hsv} > @var{tol1} are retained. ## ## @item 'left', 'output' ## LTI model of the left/output frequency weighting @var{V}. ## Default value is an identity matrix. ## ## @item 'right', 'input' ## LTI model of the right/input frequency weighting @var{W}. ## Default value is an identity matrix. ## ## @item 'method' ## Approximation method for the Linfinity norm to be used as follows: ## @table @var ## @item 'sr', 'b' ## Use the squareroot Balance & Truncate method. ## @item 'bfsr', 'f' ## Use the balancingfree squareroot Balance & Truncate method. Default method. ## @end table ## ## @item 'alpha' ## Specifies the ALPHAstability boundary for the eigenvalues ## of the state dynamics matrix @var{G.A}. For a continuoustime ## system, ALPHA <= 0 is the boundary value for ## the real parts of eigenvalues, while for a discretetime ## system, 0 <= ALPHA <= 1 represents the ## boundary value for the moduli of eigenvalues. ## The ALPHAstability domain does not include the boundary. ## Default value is 0 for continuoustime systems and ## 1 for discretetime systems. ## ## @item 'tol1' ## If @var{'order'} is not specified, @var{tol1} contains the tolerance for ## determining the order of the reduced model. ## For model reduction, the recommended value of @var{tol1} is ## c*info.hsv(1), where c lies in the interval [0.00001, 0.001]. ## Default value is info.ns*eps*info.hsv(1). ## If @var{'order'} is specified, the value of @var{tol1} is ignored. ## ## @item 'tol2' ## The tolerance for determining the order of a minimal ## realization of the ALPHAstable part of the given ## model. TOL2 <= TOL1. ## If not specified, ns*eps*info.hsv(1) is chosen. ## ## @item 'gramctrb' ## Specifies the choice of frequencyweighted controllability ## Grammian as follows: ## @table @var ## @item 'standard' ## Choice corresponding to a combination method [4] ## of the approaches of Enns [1] and LinChiu [2,3]. Default method. ## @item 'enhanced' ## Choice corresponding to the stability enhanced ## modified combination method of [4]. ## @end table ## ## @item 'gramobsv' ## Specifies the choice of frequencyweighted observability ## Grammian as follows: ## @table @var ## @item 'standard' ## Choice corresponding to a combination method [4] ## of the approaches of Enns [1] and LinChiu [2,3]. Default method. ## @item 'enhanced' ## Choice corresponding to the stability enhanced ## modified combination method of [4]. ## @end table ## ## @item 'alphactrb' ## Combination method parameter for defining the ## frequencyweighted controllability Grammian. ## abs(alphac) <= 1. ## If alphac = 0, the choice of ## Grammian corresponds to the method of Enns [1], while if ## alphac = 1, the choice of Grammian corresponds ## to the method of Lin and Chiu [2,3]. ## Default value is 0. ## ## @item 'alphaobsv' ## Combination method parameter for defining the ## frequencyweighted observability Grammian. ## abs(alphao) <= 1. ## If alphao = 0, the choice of ## Grammian corresponds to the method of Enns [1], while if ## alphao = 1, the choice of Grammian corresponds ## to the method of Lin and Chiu [2,3]. ## Default value is 0. ## ## @item 'equil', 'scale' ## Boolean indicating whether equilibration (scaling) should be ## performed on system @var{G} prior to order reduction. ## Default value is true if @code{G.scaled == false} and ## false if @code{G.scaled == true}. ## @end table ## ## ## UNSTABLE (from bstmodred) ## ## MIMO (from bstmodred) ## ## Approximation Properties: ## @itemize @bullet ## @item ## Guaranteed stability of reduced models ## @item ## Lower guaranteed error bound ## @item ## Guaranteed a priori error bound ## @iftex ## @tex ## $$ \\sigma_{r+1} \\leq  (GG_r) _{\\infty} \\leq 2 \\sum_{j=r+1}^{n} \\sigma_j $$ ## @end tex ## @end iftex ## @end itemize ## ## ## @strong{References}@* ## [1] Enns, D. ## Model reduction with balanced realizations: An error bound ## and a frequency weighted generalization. ## Proc. 23th CDC, Las Vegas, pp. 127132, 1984. ## ## [2] Lin, C.A. and Chiu, T.Y. ## Model reduction via frequencyweighted balanced realization. ## Control Theory and Advanced Technology, vol. 8, ## pp. 341351, 1992. ## ## [3] Sreeram, V., Anderson, B.D.O and Madievski, A.G. ## New results on frequency weighted balanced reduction ## technique. ## Proc. ACC, Seattle, Washington, pp. 40044009, 1995. ## ## [4] Varga, A. and Anderson, B.D.O. ## Squareroot balancingfree methods for the frequencyweighted ## balancing related model reduction. ## (report in preparation) ## ## ## @strong{Algorithm}@* ## Uses SLICOT AB09ID by courtesy of ## @uref{http://www.slicot.org, NICONET e.V.} +## @deftypefn{Function File} {[@var{Gr}, @var{info}] =} bstmr (@var{G}, @dots{}) +## Wrapper for @command{bstmodred}. ## @end deftypefn ## Author: Lukas Reichlin <lukas.reichlin@...> ## Created: Januar 2012 +## Created: January 2012 ## Version: 0.1 function [Gr, info] = bstmr (varargin) @@ 248,60 +36,3 @@ [Gr, info] = bstmodred (varargin{:}); endfunction   %!shared Mo, Me, Info, HSVe %! A = [ 26.4000, 6.4023, 4.3868; %! 32.0000, 0, 0; %! 0, 8.0000, 0 ]; %! %! B = [ 16 %! 0 %! 0 ]; %! %! C = [ 9.2994 1.1624 0.1090 ]; %! %! D = [ 0 ]; %! %! G = ss (A, B, C, D); % "scaled", false %! %! AV = [ 1.0000, 0, 4.0000, 9.2994, 1.1624, 0.1090; %! 0, 2.0000, 0, 9.2994, 1.1624, 0.1090; %! 0, 0, 3.0000, 9.2994, 1.1624, 0.1090; %! 16.0000, 16.0000, 16.0000, 26.4000, 6.4023, 4.3868; %! 0, 0, 0, 32.0000, 0, 0; %! 0, 0, 0, 0, 8.0000, 0 ]; %! %! BV = [ 1 %! 1 %! 1 %! 0 %! 0 %! 0 ]; %! %! CV = [ 1 1 1 0 0 0 ]; %! %! DV = [ 0 ]; %! %! V = ss (AV, BV, CV, DV); %! %! [Gr, Info] = btamodred (G, 2, "left", V); %! [Ao, Bo, Co, Do] = ssdata (Gr); %! %! Ae = [ 9.1900 0.0000 %! 0.0000 34.5297 ]; %! %! Be = [ 11.9593 %! 16.9329 ]; %! %! Ce = [ 2.8955 6.9152 ]; %! %! De = [ 0.0000 ]; %! %! HSVe = [ 3.8253 0.2005 ].'; %! %! Mo = [Ao, Bo; Co, Do]; %! Me = [Ae, Be; Ce, De]; %! %!assert (Mo, Me, 1e4); %!assert (Info.hsv, HSVe, 1e4); Modified: trunk/octaveforge/extra/controldevel/devel/hankelmr.m ===================================================================  trunk/octaveforge/extra/controldevel/devel/hankelmr.m 20120118 19:25:54 UTC (rev 9538) +++ trunk/octaveforge/extra/controldevel/devel/hankelmr.m 20120118 20:29:08 UTC (rev 9539) @@ 16,224 +16,12 @@ ## along with LTI Syncope. If not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn{Function File} {[@var{Gr}, @var{info}] =} btamodred (@var{G}, @dots{}) ## @deftypefnx{Function File} {[@var{Gr}, @var{info}] =} btamodred (@var{G}, @var{nr}, @dots{}) ## @deftypefnx{Function File} {[@var{Gr}, @var{info}] =} btamodred (@var{G}, @var{opt}, @dots{}) ## @deftypefnx{Function File} {[@var{Gr}, @var{info}] =} btamodred (@var{G}, @var{nr}, @var{opt}, @dots{}) ## ## Model order reduction by frequency weighted Balanced Truncation Approximation (BTA) method. ## The aim of model reduction is to find an LTI system @var{Gr} of order ## @var{nr} (nr < n) such that the inputoutput behaviour of @var{Gr} ## approximates the one from original system @var{G}. ## ## BTA is an absolute error method which tries to minimize ## @iftex ## @tex ## $$  G  G_r _{\\infty} = min $$ ## $$  V \\ (G  G_r) \\ W _{\\infty} = min $$ ## @end tex ## @end iftex ## @ifnottex ## @example ## GGr = min ## inf ## ## V (GGr) W = min ## inf ## @end example ## @end ifnottex ## where @var{V} and @var{W} denote output and input weightings. ## ## ## @strong{Inputs} ## @table @var ## @item G ## LTI model to be reduced. ## @item nr ## The desired order of the resulting reduced order system @var{Gr}. ## If not specified, @var{nr} is chosen automatically according ## to the description of key @var{'order'}. ## @item @dots{} ## Optional pairs of keys and values. @code{"key1", value1, "key2", value2}. ## @item opt ## Optional struct with keys as field names. ## Struct @var{opt} can be created directly or ## by command @command{options}. @code{opt.key1 = value1, opt.key2 = value2}. ## @end table ## ## @strong{Outputs} ## @table @var ## @item Gr ## Reduced order statespace model. ## @item info ## Struct containing additional information. ## @table @var ## @item info.n ## The order of the original system @var{G}. ## @item info.ns ## The order of the @var{alpha}stable subsystem of the original system @var{G}. ## @item info.hsv ## The Hankel singular values of the @var{alpha}stable part of ## the original system @var{G}, ordered decreasingly. ## @item info.nu ## The order of the @var{alpha}unstable subsystem of both the original ## system @var{G} and the reducedorder system @var{Gr}. ## @item info.nr ## The order of the obtained reduced order system @var{Gr}. ## @end table ## @end table ## ## ## @strong{Option Keys and Values} ## @table @var ## @item 'order', 'nr' ## The desired order of the resulting reduced order system @var{Gr}. ## If not specified, @var{nr} is chosen automatically such that states with ## Hankel singular values @var{info.hsv} > @var{tol1} are retained. ## ## @item 'left', 'output' ## LTI model of the left/output frequency weighting @var{V}. ## Default value is an identity matrix. ## ## @item 'right', 'input' ## LTI model of the right/input frequency weighting @var{W}. ## Default value is an identity matrix. ## ## @item 'method' ## Approximation method for the Linfinity norm to be used as follows: ## @table @var ## @item 'sr', 'b' ## Use the squareroot Balance & Truncate method. ## @item 'bfsr', 'f' ## Use the balancingfree squareroot Balance & Truncate method. Default method. ## @end table ## ## @item 'alpha' ## Specifies the ALPHAstability boundary for the eigenvalues ## of the state dynamics matrix @var{G.A}. For a continuoustime ## system, ALPHA <= 0 is the boundary value for ## the real parts of eigenvalues, while for a discretetime ## system, 0 <= ALPHA <= 1 represents the ## boundary value for the moduli of eigenvalues. ## The ALPHAstability domain does not include the boundary. ## Default value is 0 for continuoustime systems and ## 1 for discretetime systems. ## ## @item 'tol1' ## If @var{'order'} is not specified, @var{tol1} contains the tolerance for ## determining the order of the reduced model. ## For model reduction, the recommended value of @var{tol1} is ## c*info.hsv(1), where c lies in the interval [0.00001, 0.001]. ## Default value is info.ns*eps*info.hsv(1). ## If @var{'order'} is specified, the value of @var{tol1} is ignored. ## ## @item 'tol2' ## The tolerance for determining the order of a minimal ## realization of the ALPHAstable part of the given ## model. TOL2 <= TOL1. ## If not specified, ns*eps*info.hsv(1) is chosen. ## ## @item 'gramctrb' ## Specifies the choice of frequencyweighted controllability ## Grammian as follows: ## @table @var ## @item 'standard' ## Choice corresponding to a combination method [4] ## of the approaches of Enns [1] and LinChiu [2,3]. Default method. ## @item 'enhanced' ## Choice corresponding to the stability enhanced ## modified combination method of [4]. ## @end table ## ## @item 'gramobsv' ## Specifies the choice of frequencyweighted observability ## Grammian as follows: ## @table @var ## @item 'standard' ## Choice corresponding to a combination method [4] ## of the approaches of Enns [1] and LinChiu [2,3]. Default method. ## @item 'enhanced' ## Choice corresponding to the stability enhanced ## modified combination method of [4]. ## @end table ## ## @item 'alphactrb' ## Combination method parameter for defining the ## frequencyweighted controllability Grammian. ## abs(alphac) <= 1. ## If alphac = 0, the choice of ## Grammian corresponds to the method of Enns [1], while if ## alphac = 1, the choice of Grammian corresponds ## to the method of Lin and Chiu [2,3]. ## Default value is 0. ## ## @item 'alphaobsv' ## Combination method parameter for defining the ## frequencyweighted observability Grammian. ## abs(alphao) <= 1. ## If alphao = 0, the choice of ## Grammian corresponds to the method of Enns [1], while if ## alphao = 1, the choice of Grammian corresponds ## to the method of Lin and Chiu [2,3]. ## Default value is 0. ## ## @item 'equil', 'scale' ## Boolean indicating whether equilibration (scaling) should be ## performed on system @var{G} prior to order reduction. ## Default value is true if @code{G.scaled == false} and ## false if @code{G.scaled == true}. ## @end table ## ## ## UNSTABLE (from bstmodred) ## ## MIMO (from bstmodred) ## ## Approximation Properties: ## @itemize @bullet ## @item ## Guaranteed stability of reduced models ## @item ## Lower guaranteed error bound ## @item ## Guaranteed a priori error bound ## @iftex ## @tex ## $$ \\sigma_{r+1} \\leq  (GG_r) _{\\infty} \\leq 2 \\sum_{j=r+1}^{n} \\sigma_j $$ ## @end tex ## @end iftex ## @end itemize ## ## ## @strong{References}@* ## [1] Enns, D. ## Model reduction with balanced realizations: An error bound ## and a frequency weighted generalization. ## Proc. 23th CDC, Las Vegas, pp. 127132, 1984. ## ## [2] Lin, C.A. and Chiu, T.Y. ## Model reduction via frequencyweighted balanced realization. ## Control Theory and Advanced Technology, vol. 8, ## pp. 341351, 1992. ## ## [3] Sreeram, V., Anderson, B.D.O and Madievski, A.G. ## New results on frequency weighted balanced reduction ## technique. ## Proc. ACC, Seattle, Washington, pp. 40044009, 1995. ## ## [4] Varga, A. and Anderson, B.D.O. ## Squareroot balancingfree methods for the frequencyweighted ## balancing related model reduction. ## (report in preparation) ## ## ## @strong{Algorithm}@* ## Uses SLICOT AB09ID by courtesy of ## @uref{http://www.slicot.org, NICONET e.V.} +## @deftypefn{Function File} {[@var{Gr}, @var{info}] =} hankelmr (@var{G}, @dots{}) +## Wrapper for @command{hnamodred}. ## @end deftypefn ## Author: Lukas Reichlin <lukas.reichlin@...> ## Created: Januar 2012 +## Created: January 2012 ## Version: 0.1 function [Gr, info] = hankelmr (varargin) @@ 248,60 +36,3 @@ [Gr, info] = hnamodred (varargin{:}); endfunction   %!shared Mo, Me, Info, HSVe %! A = [ 26.4000, 6.4023, 4.3868; %! 32.0000, 0, 0; %! 0, 8.0000, 0 ]; %! %! B = [ 16 %! 0 %! 0 ]; %! %! C = [ 9.2994 1.1624 0.1090 ]; %! %! D = [ 0 ]; %! %! G = ss (A, B, C, D); % "scaled", false %! %! AV = [ 1.0000, 0, 4.0000, 9.2994, 1.1624, 0.1090; %! 0, 2.0000, 0, 9.2994, 1.1624, 0.1090; %! 0, 0, 3.0000, 9.2994, 1.1624, 0.1090; %! 16.0000, 16.0000, 16.0000, 26.4000, 6.4023, 4.3868; %! 0, 0, 0, 32.0000, 0, 0; %! 0, 0, 0, 0, 8.0000, 0 ]; %! %! BV = [ 1 %! 1 %! 1 %! 0 %! 0 %! 0 ]; %! %! CV = [ 1 1 1 0 0 0 ]; %! %! DV = [ 0 ]; %! %! V = ss (AV, BV, CV, DV); %! %! [Gr, Info] = btamodred (G, 2, "left", V); %! [Ao, Bo, Co, Do] = ssdata (Gr); %! %! Ae = [ 9.1900 0.0000 %! 0.0000 34.5297 ]; %! %! Be = [ 11.9593 %! 16.9329 ]; %! %! Ce = [ 2.8955 6.9152 ]; %! %! De = [ 0.0000 ]; %! %! HSVe = [ 3.8253 0.2005 ].'; %! %! Mo = [Ao, Bo; Co, Do]; %! Me = [Ae, Be; Ce, De]; %! %!assert (Mo, Me, 1e4); %!assert (Info.hsv, HSVe, 1e4); Modified: trunk/octaveforge/extra/controldevel/devel/madievski.m ===================================================================  trunk/octaveforge/extra/controldevel/devel/madievski.m 20120118 19:25:54 UTC (rev 9538) +++ trunk/octaveforge/extra/controldevel/devel/madievski.m 20120118 20:29:08 UTC (rev 9539) @@ 1,3 +1,5 @@ +%clear all, close all, clc; + Ap1 = [ 0.0 1.0 0.0 0.0 ]; @@ 52,7 +54,7 @@ K = ss (Ac, Bc, Cc, Dc); Kr = btaconred (P, K, 4, 'weight', 'both', 'feedback', '') +Kr = btaconred (P, K, 4, 'feedback', '') tau = 0.1; @@ 63,22 +65,78 @@ F = 5 / (s + 5); L = P * K; Ld = Pd * Kd; +%Ld = Pd * Kd; +Lr = P * Kr; T = feedback (L); Td = feedback (Ld); +%Td = feedback (Ld); +Tr = feedback (Lr); +w = {1e2, 1e1}; + figure (1) step (T, 100) figure (2) bode (L) +%bode (L) +bode (K, w) figure (3) step (Td, 100) +%step (Td, 100) +step (Tr, 100) figure (4) bode (Ld) +%bode (Ld) +bode (Kr, w) figure (5) step (feedback (P*Kr), 100) +%step (feedback (P*Kr), 100) + + + +[mag, pha, w] = bode (K, w); +[magr, phar, wr] = bode (Kr, w); + +mag = 20 * log10 (mag); +magr = 20 * log10 (magr); + + +%figure (6) + + + xl_str = "Frequency [rad/s]"; + + + subplot (2, 1, 1) + semilogx (w, mag, "b", wr, magr, "r") + axis ("tight") + ylim (__axis_margin__ (ylim)) + grid ("on") + title ("Bode Diagrams of K and Kr") + ylabel ("Magnitude [dB]") + + subplot (2, 1, 2) + semilogx (w, pha, "b", wr, phar, "r") + axis ("tight") + ylim (__axis_margin__ (ylim)) + grid ("on") + xlabel (xl_str) + ylabel ("Phase [deg]") + legend ("K (8 states)", "Kr (4 states)", "location", "southwest") + + print depsc2 madievskibode.eps + + +[y, t] = step (T, 100); +[yr, tr] = step (Tr, 100); + +figure (6) +plot (t, y, 'b', tr, yr, 'r') +grid ('on') +title ('Step Response of Closed Loop') +xlabel ('Time [s]') +ylabel ('Output []') +legend ('K (8 states)', 'Kr (4 states)', 'Location', 'SouthEast') + +print depsc2 madievskistep.eps + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <paramaniac@us...>  20120118 19:26:01

Revision: 9538 http://octave.svn.sourceforge.net/octave/?rev=9538&view=rev Author: paramaniac Date: 20120118 19:25:54 +0000 (Wed, 18 Jan 2012) Log Message:  quaternion_oo: add diff to index, fix test Modified Paths:  trunk/octaveforge/extra/quaternion_oo/INDEX trunk/octaveforge/extra/quaternion_oo/inst/test_quaternion.m Modified: trunk/octaveforge/extra/quaternion_oo/INDEX ===================================================================  trunk/octaveforge/extra/quaternion_oo/INDEX 20120118 18:13:20 UTC (rev 9537) +++ trunk/octaveforge/extra/quaternion_oo/INDEX 20120118 19:25:54 UTC (rev 9538) @@ 13,6 +13,7 @@ @quaternion/columns @quaternion/conj @quaternion/diag + @quaternion/diff @quaternion/exp @quaternion/inv @quaternion/ispure Modified: trunk/octaveforge/extra/quaternion_oo/inst/test_quaternion.m ===================================================================  trunk/octaveforge/extra/quaternion_oo/inst/test_quaternion.m 20120118 18:13:20 UTC (rev 9537) +++ trunk/octaveforge/extra/quaternion_oo/inst/test_quaternion.m 20120118 19:25:54 UTC (rev 9538) @@ 1,4 +1,4 @@ test @quaternion/blkdiag test @quaternion/diag test @quaternion/dot +test @quaternion/diff test @quaternion/log \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <rafavzqz@us...>  20120118 18:13:27

Revision: 9537 http://octave.svn.sourceforge.net/octave/?rev=9537&view=rev Author: rafavzqz Date: 20120118 18:13:20 +0000 (Wed, 18 Jan 2012) Log Message:  Error in the help Modified Paths:  trunk/octaveforge/extra/nurbs/inst/vectrans.m Modified: trunk/octaveforge/extra/nurbs/inst/vectrans.m ===================================================================  trunk/octaveforge/extra/nurbs/inst/vectrans.m 20120118 16:43:33 UTC (rev 9536) +++ trunk/octaveforge/extra/nurbs/inst/vectrans.m 20120118 18:13:20 UTC (rev 9537) @@ 22,8 +22,8 @@ % The matrix is: % % [ 1 0 0 tx ] % [ 0 0 0 ty ] % [ 0 0 0 tz ] +% [ 0 1 0 ty ] +% [ 0 0 1 tz ] % [ 0 0 0 1 ] % % Examples: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <carandraug@us...>  20120118 16:43:43

Revision: 9536 http://octave.svn.sourceforge.net/octave/?rev=9536&view=rev Author: carandraug Date: 20120118 16:43:33 +0000 (Wed, 18 Jan 2012) Log Message:  signal: * update license to GPLv3+ * use print_usage * set defaults at function definition line * increase dependency for octave 3.6.0 to parse public domain notice properly * fix indentation problems Modified Paths:  trunk/octaveforge/main/signal/COPYING trunk/octaveforge/main/signal/DESCRIPTION trunk/octaveforge/main/signal/inst/__ellip_ws.m trunk/octaveforge/main/signal/inst/__power.m trunk/octaveforge/main/signal/inst/ar_psd.m trunk/octaveforge/main/signal/inst/arburg.m trunk/octaveforge/main/signal/inst/aryule.m trunk/octaveforge/main/signal/inst/barthannwin.m trunk/octaveforge/main/signal/inst/besselap.m trunk/octaveforge/main/signal/inst/besself.m trunk/octaveforge/main/signal/inst/bilinear.m trunk/octaveforge/main/signal/inst/bitrevorder.m trunk/octaveforge/main/signal/inst/blackmanharris.m trunk/octaveforge/main/signal/inst/blackmannuttall.m trunk/octaveforge/main/signal/inst/bohmanwin.m trunk/octaveforge/main/signal/inst/boxcar.m trunk/octaveforge/main/signal/inst/buffer.m trunk/octaveforge/main/signal/inst/butter.m trunk/octaveforge/main/signal/inst/buttord.m trunk/octaveforge/main/signal/inst/cceps.m trunk/octaveforge/main/signal/inst/cheb.m trunk/octaveforge/main/signal/inst/cheb1ord.m trunk/octaveforge/main/signal/inst/cheb2ord.m trunk/octaveforge/main/signal/inst/chebwin.m trunk/octaveforge/main/signal/inst/cheby1.m trunk/octaveforge/main/signal/inst/cheby2.m trunk/octaveforge/main/signal/inst/chirp.m trunk/octaveforge/main/signal/inst/cmorwavf.m trunk/octaveforge/main/signal/inst/cohere.m trunk/octaveforge/main/signal/inst/convmtx.m trunk/octaveforge/main/signal/inst/cplxreal.m trunk/octaveforge/main/signal/inst/cpsd.m trunk/octaveforge/main/signal/inst/csd.m trunk/octaveforge/main/signal/inst/czt.m trunk/octaveforge/main/signal/inst/data2fun.m trunk/octaveforge/main/signal/inst/dct.m trunk/octaveforge/main/signal/inst/dct2.m trunk/octaveforge/main/signal/inst/dctmtx.m trunk/octaveforge/main/signal/inst/decimate.m trunk/octaveforge/main/signal/inst/dftmtx.m trunk/octaveforge/main/signal/inst/diric.m trunk/octaveforge/main/signal/inst/downsample.m trunk/octaveforge/main/signal/inst/dst.m trunk/octaveforge/main/signal/inst/dwt.m trunk/octaveforge/main/signal/inst/ellip.m trunk/octaveforge/main/signal/inst/ellipord.m trunk/octaveforge/main/signal/inst/fht.m trunk/octaveforge/main/signal/inst/filtic.m trunk/octaveforge/main/signal/inst/fir1.m trunk/octaveforge/main/signal/inst/firls.m trunk/octaveforge/main/signal/inst/flattopwin.m trunk/octaveforge/main/signal/inst/fracshift.m trunk/octaveforge/main/signal/inst/freqs.m trunk/octaveforge/main/signal/inst/freqs_plot.m trunk/octaveforge/main/signal/inst/fwhm.m trunk/octaveforge/main/signal/inst/gauspuls.m trunk/octaveforge/main/signal/inst/gaussian.m trunk/octaveforge/main/signal/inst/gausswin.m trunk/octaveforge/main/signal/inst/gmonopuls.m trunk/octaveforge/main/signal/inst/grpdelay.m trunk/octaveforge/main/signal/inst/hilbert.m trunk/octaveforge/main/signal/inst/idct.m trunk/octaveforge/main/signal/inst/idct2.m trunk/octaveforge/main/signal/inst/idst.m trunk/octaveforge/main/signal/inst/ifht.m trunk/octaveforge/main/signal/inst/iirlp2mb.m trunk/octaveforge/main/signal/inst/impinvar.m trunk/octaveforge/main/signal/inst/impz.m trunk/octaveforge/main/signal/inst/interp.m trunk/octaveforge/main/signal/inst/invfreq.m trunk/octaveforge/main/signal/inst/invfreqs.m trunk/octaveforge/main/signal/inst/invfreqz.m trunk/octaveforge/main/signal/inst/invimpinvar.m trunk/octaveforge/main/signal/inst/kaiser.m trunk/octaveforge/main/signal/inst/kaiserord.m trunk/octaveforge/main/signal/inst/levinson.m trunk/octaveforge/main/signal/inst/mexihat.m trunk/octaveforge/main/signal/inst/meyeraux.m trunk/octaveforge/main/signal/inst/morlet.m trunk/octaveforge/main/signal/inst/mscohere.m trunk/octaveforge/main/signal/inst/ncauer.m trunk/octaveforge/main/signal/inst/nuttallwin.m trunk/octaveforge/main/signal/inst/parzenwin.m trunk/octaveforge/main/signal/inst/pburg.m trunk/octaveforge/main/signal/inst/pei_tseng_notch.m trunk/octaveforge/main/signal/inst/polystab.m trunk/octaveforge/main/signal/inst/pulstran.m trunk/octaveforge/main/signal/inst/pwelch.m trunk/octaveforge/main/signal/inst/pyulear.m trunk/octaveforge/main/signal/inst/qp_kaiser.m trunk/octaveforge/main/signal/inst/rceps.m trunk/octaveforge/main/signal/inst/rectpuls.m trunk/octaveforge/main/signal/inst/rectwin.m trunk/octaveforge/main/signal/inst/resample.m trunk/octaveforge/main/signal/inst/residued.m trunk/octaveforge/main/signal/inst/residuez.m trunk/octaveforge/main/signal/inst/sampled2continuous.m trunk/octaveforge/main/signal/inst/sawtooth.m trunk/octaveforge/main/signal/inst/sftrans.m trunk/octaveforge/main/signal/inst/sgolay.m trunk/octaveforge/main/signal/inst/sgolayfilt.m trunk/octaveforge/main/signal/inst/shanwavf.m trunk/octaveforge/main/signal/inst/sigmoid_train.m trunk/octaveforge/main/signal/inst/sos2tf.m trunk/octaveforge/main/signal/inst/sos2zp.m trunk/octaveforge/main/signal/inst/specgram.m trunk/octaveforge/main/signal/inst/square.m trunk/octaveforge/main/signal/inst/ss2tf.m trunk/octaveforge/main/signal/inst/ss2zp.m trunk/octaveforge/main/signal/inst/tf2sos.m trunk/octaveforge/main/signal/inst/tf2ss.m trunk/octaveforge/main/signal/inst/tf2zp.m trunk/octaveforge/main/signal/inst/tfe.m trunk/octaveforge/main/signal/inst/tfestimate.m trunk/octaveforge/main/signal/inst/triang.m trunk/octaveforge/main/signal/inst/tripuls.m trunk/octaveforge/main/signal/inst/tukeywin.m trunk/octaveforge/main/signal/inst/upsample.m trunk/octaveforge/main/signal/inst/welchwin.m trunk/octaveforge/main/signal/inst/window.m trunk/octaveforge/main/signal/inst/wkeep.m trunk/octaveforge/main/signal/inst/wrev.m trunk/octaveforge/main/signal/inst/xcorr.m trunk/octaveforge/main/signal/inst/xcorr2.m trunk/octaveforge/main/signal/inst/xcov.m trunk/octaveforge/main/signal/inst/zerocrossing.m trunk/octaveforge/main/signal/inst/zp2sos.m trunk/octaveforge/main/signal/inst/zp2ss.m trunk/octaveforge/main/signal/inst/zp2tf.m trunk/octaveforge/main/signal/inst/zplane.m trunk/octaveforge/main/signal/src/cl2bp.cc trunk/octaveforge/main/signal/src/cl2bp_lib.cc trunk/octaveforge/main/signal/src/cl2bp_lib.h trunk/octaveforge/main/signal/src/remez.cc trunk/octaveforge/main/signal/src/sosfilt.cc trunk/octaveforge/main/signal/src/upfirdn.cc Modified: trunk/octaveforge/main/signal/COPYING ===================================================================  trunk/octaveforge/main/signal/COPYING 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/COPYING 20120118 16:43:33 UTC (rev 9536) @@ 1,283 +1,625 @@ GNU GENERAL PUBLIC LICENSE  Version 2, June 1991 + Version 3, 29 June 2007  Copyright (C) 1989, 1991 Free Software Foundation, Inc. <http://fsf.org/>; + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>; Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble  The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free softwareto make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a programto make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things.  To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights.  We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it.  Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions.  Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on generalpurpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program nonfree. + The precise terms and conditions for copying, distribution and modification follow.   GNU GENERAL PUBLIC LICENSE  TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION  0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". + TERMS AND CONDITIONS Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. + 0. Definitions.  1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. + "This License" refers to version 3 of the GNU General Public License. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. + "Copyright" also means copyrightlike laws that apply to other kinds of +works, such as semiconductor masks.  2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations.  a) You must cause the modified files to carry prominent notices  stating that you changed the files and the date of any change. + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work.  b) You must cause any work that you distribute or publish, that in  whole or in part contains or is derived from the Program or any  part thereof, to be licensed as a whole at no charge to all third  parties under the terms of this License. + A "covered work" means either the unmodified Program or a work based +on the Program.  c) If the modified program normally reads commands interactively  when run, you must cause it, when started running for such  interactive use in the most ordinary way, to print or display an  announcement including an appropriate copyright notice and a  notice that there is no warranty (or else, saying that you provide  a warranty) and that users may redistribute the program under  these conditions, and telling the user how to view a copy of this  License. (Exception: if the Program itself is interactive but  does not normally print such an announcement, your work based on  the Program is not required to print an announcement.)  These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion.  3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: + 1. Source Code.  a) Accompany it with the complete corresponding machinereadable  source code, which must be distributed under the terms of Sections  1 and 2 above on a medium customarily used for software interchange; or, + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any nonsource +form of a work.  b) Accompany it with a written offer, valid for at least three  years, to give any third party, for a charge no more than your  cost of physically performing source distribution, a complete  machinereadable copy of the corresponding source code, to be  distributed under the terms of Sections 1 and 2 above on a medium  customarily used for software interchange; or, + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language.  c) Accompany it with the information you received as to the offer  to distribute corresponding source code. (This alternative is  allowed only for noncommercial distribution and only if you  received the program in object code or executable form with such  an offer, in accord with Subsection b above.) + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or generalpurpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.   4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source.  5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. + The Corresponding Source for a work in source code form is that +same work.  6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From AntiCircumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +nonpermissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying NonSource Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machinereadable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peertopeer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or nonconsumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other nonpermissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or nonpermissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peertopeer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a crossclaim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of this License.  7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or + Each contributor grants you a nonexclusive, worldwide, royaltyfree +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the nonexercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royaltyfree redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. + 13. Use with the GNU Affero General Public License. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.   8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + 14. Revised Versions of this License.  9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation.  10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program.  NO WARRANTY + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version.  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + 15. Disclaimer of Warranty.  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + END OF TERMS AND CONDITIONS  + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest @@ 286,15 +628,15 @@ To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least +state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) <year> <name of author>  This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by  the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ 303,35 +645,30 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License  along with this program; if not, see <http://www.gnu.org/licenses/>;. + along with this program. If not, see <http://www.gnu.org/licenses/>;. Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode:  Gnomovision version 69, Copyright (C) year name of author  Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouseclicks or menu itemswhatever suits your program. +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>;.  Yoyodyne, Inc., hereby disclaims all copyright interest in the program  `Gnomovision' (which makes passes at compilers) written by James Hacker.   <signature of Ty Coon>, 1 April 1989  Ty Coon, President of Vice  This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/whynotlgpl.html>;. Modified: trunk/octaveforge/main/signal/DESCRIPTION ===================================================================  trunk/octaveforge/main/signal/DESCRIPTION 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/DESCRIPTION 20120118 16:43:33 UTC (rev 9536) @@ 5,7 +5,7 @@ Maintainer: The Octave Community Title: Signal Processing. Description: Signal processing tools, including filtering, windowing and display functions. Depends: octave (>= 3.4.0), optim (>= 1.0.0), specfun, control (>= 2.2.3) +Depends: octave (>= 3.6.0), optim (>= 1.0.0), specfun, control (>= 2.2.3) Autoload: yes License: GPL version 2 or later +License: GPL version 3 or later Url: http://octave.sf.net Modified: trunk/octaveforge/main/signal/inst/__ellip_ws.m ===================================================================  trunk/octaveforge/main/signal/inst/__ellip_ws.m 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/inst/__ellip_ws.m 20120118 16:43:33 UTC (rev 9536) @@ 1,17 +1,17 @@ ## Copyright (C) 2001 Paulo Neis <p_neis@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. +## This program is free software; you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free Software +## Foundation; either version 3 of the License, or (at your option) any later +## version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. +## This program is distributed in the hope that it will be useful, but WITHOUT +## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +## details. ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## usage: ws = __ellip_ws(n, rp, rs) ## Modified: trunk/octaveforge/main/signal/inst/__power.m ===================================================================  trunk/octaveforge/main/signal/inst/__power.m 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/inst/__power.m 20120118 16:43:33 UTC (rev 9536) @@ 1,17 +1,17 @@ ## Copyright (C) 1999 Paul Kienzle <pkienzle@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or ## (at your option) any later version. +## This program is free software; you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free Software +## Foundation; either version 3 of the License, or (at your option) any later +## version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. +## This program is distributed in the hope that it will be useful, but WITHOUT +## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +## details. ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## usage: [P, w] = __power (b, a, [, nfft [, Fs]] [, range] [, units]) ## @@ 33,8 +33,7 @@ ## TODO: distinguish between 'linear', 'log', 'logsquared' and 'squared' function [varargout] = __power (b, a, varargin)  usagestr = "[P w] = __power(b, a [,nfft [,Fs]] [,range] [, units])";  if (nargin < 2  nargin > 6) usage(usagestr); endif + if (nargin < 2  nargin > 6) print_usage; endif nfft = []; Fs = []; Modified: trunk/octaveforge/main/signal/inst/ar_psd.m ===================================================================  trunk/octaveforge/main/signal/inst/ar_psd.m 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/inst/ar_psd.m 20120118 16:43:33 UTC (rev 9536) @@ 1,17 +1,17 @@ %% Copyright (C) 2006 Peter V. Lanspeary <pvl@...> %% %% This program is free software; you can redistribute it and/or %% modify it under the terms of the GNU General Public License %% as published by the Free Software Foundation; either version 2, %% or (at your option) any later version. +%% This program is free software; you can redistribute it and/or modify it under +%% the terms of the GNU General Public License as published by the Free Software +%% Foundation; either version 3 of the License, or (at your option) any later +%% version. %% %% This program is distributed in the hope that it will be useful, %% but WITHOUT ANY WARRANTY; without even the implied warranty of %% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the %% GNU General Public License for more details. +%% This program is distributed in the hope that it will be useful, but WITHOUT +%% ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +%% FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +%% details. %% %% You should have received a copy of the GNU General Public License %% along with this program; If not, see <http://www.gnu.org/licenses/>;. +%% You should have received a copy of the GNU General Public License along with +%% this program; if not, see <http://www.gnu.org/licenses/>;. %% Usage: %% [psd,f_out] = ar_psd(a,v,freq,Fs,range,method,plot_type) Modified: trunk/octaveforge/main/signal/inst/arburg.m ===================================================================  trunk/octaveforge/main/signal/inst/arburg.m 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/inst/arburg.m 20120118 16:43:33 UTC (rev 9536) @@ 1,17 +1,17 @@ %% Copyright (C) 2006 Peter V. Lanspeary <pvl@...> %% %% This program is free software; you can redistribute it and/or %% modify it under the terms of the GNU General Public License %% as published by the Free Software Foundation; either version 3, %% or (at your option) any later version. +%% This program is free software; you can redistribute it and/or modify it under +%% the terms of the GNU General Public License as published by the Free Software +%% Foundation; either version 3 of the License, or (at your option) any later +%% version. %% %% This program is distributed in the hope that it will be useful, %% but WITHOUT ANY WARRANTY; without even the implied warranty of %% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the %% GNU General Public License for more details. +%% This program is distributed in the hope that it will be useful, but WITHOUT +%% ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +%% FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +%% details. %% %% You should have received a copy of the GNU General Public License %% along with this program; If not, see <http://www.gnu.org/licenses/>;. +%% You should have received a copy of the GNU General Public License along with +%% this program; if not, see <http://www.gnu.org/licenses/>;. %% [a,v,k] = arburg(x,poles,criterion) %% Modified: trunk/octaveforge/main/signal/inst/aryule.m ===================================================================  trunk/octaveforge/main/signal/inst/aryule.m 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/inst/aryule.m 20120118 16:43:33 UTC (rev 9536) @@ 1,19 +1,19 @@ ## Copyright (C) 1999 Paul Kienzle <pkienzle@...> +## Copyright (C) 2006 Peter Lanspeary ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or ## (at your option) any later version. +## This program is free software; you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free Software +## Foundation; either version 3 of the License, or (at your option) any later +## version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. +## This program is distributed in the hope that it will be useful, but WITHOUT +## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +## details. ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;.  ## usage: [a, v, k] = aryule (x, p) ## ## fits an AR (p)model with YuleWalker estimates. @@ 36,20 +36,15 @@ ## lacking a lattice filter processor, I haven't tested that the lattice ## filter coefficients are reasonable. ## Changes (Peter Lanspeary, 6 Nov 2006): ## Add input checking; ## 'biased' arg for xcorr fixes scaling problem; ## force real zerolag autocorrelation  prevents warning from toeplitz; ## returns 'a' only if nargout==0 (rather than returning a, v, k).  function [a, v, k] = aryule (x, p) if ( nargin~=2 )  error( 'usage: [a,v,k] = aryule(x,p)' ); elseif ( ~isvector(x)  length(x)<3 )  error( 'aryule: arg 1 (x) must be vector of length >2' ); elseif ( ~isscalar(p)  fix(p)~=p  p > length(x)2 )  error( 'aryule: arg 2 (p) must be an integer >0 and <length(x)1' ); else + if ( nargin~=2 ) + print_usage; + elseif ( ~isvector(x)  length(x)<3 ) + error( 'aryule: arg 1 (x) must be vector of length >2' ); + elseif ( ~isscalar(p)  fix(p)~=p  p > length(x)2 ) + error( 'aryule: arg 2 (p) must be an integer >0 and <length(x)1' ); + endif + c = xcorr(x, p+1, 'biased'); c(1:p+1) = []; # remove negative autocorrelation lags c(1) = real(c(1)); # levinson/toeplitz requires exactly c(1)==conj(c(1)) @@ 60,7 +55,6 @@ else [a, v, k] = levinson(c, p); endif endif endfunction %!demo Modified: trunk/octaveforge/main/signal/inst/barthannwin.m ===================================================================  trunk/octaveforge/main/signal/inst/barthannwin.m 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/inst/barthannwin.m 20120118 16:43:33 UTC (rev 9536) @@ 1,35 +1,34 @@ ## Copyright (C) 2007 Sylvain Pelissier <sylvain.pelissier@...> +## Copyright (C) 2007 Sylvain Pelissier <sylvain.pelissier@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or ## (at your option) any later version. +## This program is free software; you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free Software +## Foundation; either version 3 of the License, or (at your option) any later +## version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. +## This program is distributed in the hope that it will be useful, but WITHOUT +## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +## details. ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Function File} {[@var{w}] =} barthannwin(@var{L}) ## Compute the modified BartlettHann window of lenght L. +## Compute the modified BartlettHann window of lenght L. ## @seealso{rectwin, bartlett} ## @end deftypefn function [w] = barthannwin(L)  if (nargin < 1); usage('barthannwin(x)'); end   if(! isscalar(L)  L < 0)  error("L must be a positive integer");  endif  L = round(L);  N = L1;  n = 0:N;   w = 0.62 0.48.*abs(n./(L1)  0.5)+0.38*cos(2.*pi*(n./(L1)0.5));  w = w'; endfunction;  + if (nargin < 1) + print_usage; + elseif (! isscalar(L)  L < 0) + error("L must be a positive integer"); + endif + L = round(L); + N = L1; + n = 0:N; + + w = 0.62 0.48.*abs(n./(L1)  0.5)+0.38*cos(2.*pi*(n./(L1)0.5)); + w = w'; +endfunction Modified: trunk/octaveforge/main/signal/inst/besselap.m ===================================================================  trunk/octaveforge/main/signal/inst/besselap.m 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/inst/besselap.m 20120118 16:43:33 UTC (rev 9536) @@ 1,17 +1,17 @@ ## Copyright (C) 2009 Thomas Sailer ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or ## (at your option) any later version. +## This program is free software; you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free Software +## Foundation; either version 3 of the License, or (at your option) any later +## version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. +## This program is distributed in the hope that it will be useful, but WITHOUT +## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +## details. ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## Return bessel analog filter prototype. ## @@ 22,7 +22,7 @@ function [zero, pole, gain] = besselap (n) if (nargin>1  nargin<1)  usage ("[z, p, g] = besselap (n)"); + print_usage; end ## interpret the input parameters Modified: trunk/octaveforge/main/signal/inst/besself.m ===================================================================  trunk/octaveforge/main/signal/inst/besself.m 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/inst/besself.m 20120118 16:43:33 UTC (rev 9536) @@ 2,18 +2,18 @@ ## Copyright (C) 2003 Doug Stewart <dastew@...> ## Copyright (C) 2009 Thomas Sailer <t.sailer@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or ## (at your option) any later version. +## This program is free software; you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free Software +## Foundation; either version 3 of the License, or (at your option) any later +## version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. +## This program is distributed in the hope that it will be useful, but WITHOUT +## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +## details. ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## Generate a bessel filter. ## Default is a Laplace space (s) filter. @@ 48,7 +48,7 @@ function [a, b, c, d] = besself (n, W, varargin) if (nargin>4  nargin<2)  (nargout>4  nargout<2)  usage ("[b, a] or [z, p, g] or [a,b,c,d] = besself (n, W [, 'ftype'][,'z'])"); + print_usage; end ## interpret the input parameters Modified: trunk/octaveforge/main/signal/inst/bilinear.m ===================================================================  trunk/octaveforge/main/signal/inst/bilinear.m 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/inst/bilinear.m 20120118 16:43:33 UTC (rev 9536) @@ 1,17 +1,17 @@ ## Copyright (C) 1999 Paul Kienzle <pkienzle@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or ## (at your option) any later version. +## This program is free software; you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free Software +## Foundation; either version 3 of the License, or (at your option) any later +## version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. +## This program is distributed in the hope that it will be useful, but WITHOUT +## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +## details. ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## usage: [Zz, Zp, Zg] = bilinear(Sz, Sp, Sg, T) ## [Zb, Za] = bilinear(Sb, Sa, T) @@ 76,8 +76,8 @@ T = Sg; [Sz, Sp, Sg] = tf2zp(Sz, Sp); elseif nargin!=4  usage("[Zz, Zp, Zg]=bilinear(Sz,Sp,Sg,T) or [Zb, Za]=blinear(Sb,Sa,T)");  end; + print_usage; + end p = length(Sp); z = length(Sz); Modified: trunk/octaveforge/main/signal/inst/bitrevorder.m ===================================================================  trunk/octaveforge/main/signal/inst/bitrevorder.m 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/inst/bitrevorder.m 20120118 16:43:33 UTC (rev 9536) @@ 1,17 +1,17 @@ ## Copyright (C) 2007 Sylvain Pelissier <sylvain.pelissier@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or ## (at your option) any later version. +## This program is free software; you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free Software +## Foundation; either version 3 of the License, or (at your option) any later +## version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. +## This program is distributed in the hope that it will be useful, but WITHOUT +## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +## details. ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Function File} {[@var{y} @var{i}] =} bitrevorder(@var{x}) @@ 20,17 +20,17 @@ ## @end deftypefn function [y i] = bitrevorder(x)   if(nargin < 1  nargin >1)  error('usage : [y i] = bitrevorder(x)');  end   if(log2(length(x)) ~= floor(log2(length(x))))  error('x must have a length equal to a power of 2');  end   old_ind = 0:length(x)1;  new_ind = bi2de(fliplr(de2bi(old_ind)));  i = new_ind + 1;  y(old_ind+1) = x(i); + if(nargin < 1  nargin >1) + print_usage; + elseif(log2(length(x)) ~= floor(log2(length(x)))) + error('x must have a length equal to a power of 2'); + end + + old_ind = 0:length(x)1; + new_ind = bi2de(fliplr(de2bi(old_ind))); + i = new_ind + 1; + + y(old_ind+1) = x(i); + +endfunction Modified: trunk/octaveforge/main/signal/inst/blackmanharris.m ===================================================================  trunk/octaveforge/main/signal/inst/blackmanharris.m 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/inst/blackmanharris.m 20120118 16:43:33 UTC (rev 9536) @@ 1,17 +1,17 @@ ## Copyright (C) 2007 Sylvain Pelissier <sylvain.pelissier@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or ## (at your option) any later version. +## This program is free software; you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free Software +## Foundation; either version 3 of the License, or (at your option) any later +## version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. +## This program is distributed in the hope that it will be useful, but WITHOUT +## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +## details. ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Function File} {[@var{w}] =} blackmanharris(@var{L}) Modified: trunk/octaveforge/main/signal/inst/blackmannuttall.m ===================================================================  trunk/octaveforge/main/signal/inst/blackmannuttall.m 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/inst/blackmannuttall.m 20120118 16:43:33 UTC (rev 9536) @@ 1,17 +1,17 @@ ## Copyright (C) 2007 Muthiah Annamalai <muthiah.annamalai@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or ## (at your option) any later version. +## This program is free software; you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free Software +## Foundation; either version 3 of the License, or (at your option) any later +## version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. +## This program is distributed in the hope that it will be useful, but WITHOUT +## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +## details. ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Function File} {[@var{w}] =} blackmannuttall(@var{L}) Modified: trunk/octaveforge/main/signal/inst/bohmanwin.m ===================================================================  trunk/octaveforge/main/signal/inst/bohmanwin.m 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/inst/bohmanwin.m 20120118 16:43:33 UTC (rev 9536) @@ 1,17 +1,17 @@ ## Copyright (C) 2007 Sylvain Pelissier <sylvain.pelissier@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or ## (at your option) any later version. +## This program is free software; you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free Software +## Foundation; either version 3 of the License, or (at your option) any later +## version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. +## This program is distributed in the hope that it will be useful, but WITHOUT +## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +## details. ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Function File} {[@var{w}] =} bohmanwin(@var{L}) Modified: trunk/octaveforge/main/signal/inst/boxcar.m ===================================================================  trunk/octaveforge/main/signal/inst/boxcar.m 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/inst/boxcar.m 20120118 16:43:33 UTC (rev 9536) @@ 1,17 +1,17 @@ ## Copyright (C) 2000 Paul Kienzle <pkienzle@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or ## (at your option) any later version. +## This program is free software; you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free Software +## Foundation; either version 3 of the License, or (at your option) any later +## version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. +## This program is distributed in the hope that it will be useful, but WITHOUT +## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +## details. ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## usage: w = boxcar (n) ## Modified: trunk/octaveforge/main/signal/inst/buffer.m ===================================================================  trunk/octaveforge/main/signal/inst/buffer.m 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/inst/buffer.m 20120118 16:43:33 UTC (rev 9536) @@ 1,17 +1,17 @@ ## Copyright (C) 2008 David Bateman <adb014@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. +## This program is free software; you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free Software +## Foundation; either version 3 of the License, or (at your option) any later +## version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. +## This program is distributed in the hope that it will be useful, but WITHOUT +## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +## details. ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## * texinfo * ## @deftypefn {Function File} {@var{y} = } buffer (@var{x}, @var{n}, @var{p}, @var{opt}) @@ 102,27 +102,27 @@ if (ischar (opt)) if (strcmp (opt, "nodelay")) y = [y ; zeros(p, m)];  if (p > n / 2)  is = n  p + 1;  in = n  p;  ie = is + in  1;  off = 1;  while (in > 0)  y (is : ie, 1 : end  off) = y (1 : in, 1 + off : end); + if (p > n / 2) + is = n  p + 1; + in = n  p; + ie = is + in  1; + off = 1; + while (in > 0) + y (is : ie, 1 : end  off) = y (1 : in, 1 + off : end); off++;  is = ie + 1;  ie = ie + in;  if (ie > n)  ie = n;  endif  in = ie  is + 1; + is = ie + 1; + ie = ie + in; + if (ie > n) + ie = n; + endif + in = ie  is + 1; endwhile  [i, j] = ind2sub([np, m], l); + [i, j] = ind2sub([np, m], l); if (all ([i, j] == [np, m])) off ;  endif  y (:, end  off + 2 : end) = [];  else + endif + y (:, end  off + 2 : end) = []; + else y (end  p + 1 : end, 1 : end  1) = y (1 : p, 2 : end); if (sub2ind([np, m], p, m) >= l) y (:, end) = []; @@ 135,30 +135,30 @@ if (length (opt) == p) lopt = p; y = [zeros(p, m); y];  in = p; + in = p; off = 1;  while (in > 0)  y (1 : in, off) = opt(off:end);  off++;  in = in  n + p;  endwhile  if (p > n / 2)  in = n  p;  ie = p;  is = p  in + 1;  off = 1;  while (ie > 0) + while (in > 0) + y (1 : in, off) = opt(off:end); + off++; + in = in  n + p; + endwhile + if (p > n / 2) + in = n  p; + ie = p; + is = p  in + 1; + off = 1; + while (ie > 0) y (is : ie, 1 + off : end) = ...  y (end  in + 1 : end, 1 : end  off); + y (end  in + 1 : end, 1 : end  off); off++;  ie = is  1;  is = is  in;  if (is < 1)  is = 1;  endif  in = ie  is + 1; + ie = is  1; + is = is  in; + if (is < 1) + is = 1; + endif + in = ie  is + 1; endwhile  else + else y (1 : p, 2 : end) = y (end  p + 1 : end, 1 : end  1); endif else @@ 172,7 +172,7 @@ if (p >= 0) [i, j] = ind2sub (size(y), l + lopt + p * (size (y, 2)  1)); if (any ([i, j] != size (y)))  z = y (1 + p : i, end); + z = y (1 + p : i, end); y (:, end) = []; else z = zeros (0, 1); @@ 180,7 +180,7 @@ else [i, j] = ind2sub (size (y) + [p, 0], l  lopt); if (i < size (y, 1))  z = y (1: i, end); + z = y (1: i, end); y (:, end) = []; else z = zeros (0, 1); Modified: trunk/octaveforge/main/signal/inst/butter.m ===================================================================  trunk/octaveforge/main/signal/inst/butter.m 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/inst/butter.m 20120118 16:43:33 UTC (rev 9536) @@ 2,18 +2,18 @@ ## Copyright (C) 2003 Doug Stewart <dastew@...> ## Copyright (C) 2011 Alexander Klein <alexander.klein@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. +## This program is free software; you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free Software +## Foundation; either version 3 of the License, or (at your option) any later +## version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. +## This program is distributed in the hope that it will be useful, but WITHOUT +## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +## details. ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## Generate a butterworth filter. ## Default is a discrete space (Z) filter. Modified: trunk/octaveforge/main/signal/inst/buttord.m ===================================================================  trunk/octaveforge/main/signal/inst/buttord.m 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/inst/buttord.m 20120118 16:43:33 UTC (rev 9536) @@ 1,17 +1,17 @@ ## Copyright (C) 1999 Paul Kienzle <pkienzle@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. +## This program is free software; you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free Software +## Foundation; either version 3 of the License, or (at your option) any later +## version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. +## This program is distributed in the hope that it will be useful, but WITHOUT +## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +## details. ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## Compute butterworth filter order and cutoff for the desired response ## characteristics. Rp is the allowable decibels of ripple in the pass Modified: trunk/octaveforge/main/signal/inst/cceps.m ===================================================================  trunk/octaveforge/main/signal/inst/cceps.m 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/inst/cceps.m 20120118 16:43:33 UTC (rev 9536) @@ 1,17 +1,17 @@ ## Copyright (C) 1994 Dept of Probability Theory and Statistics TU Wien <Andreas.Weingessel@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. +## This program is free software; you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free Software +## Foundation; either version 3 of the License, or (at your option) any later +## version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. +## This program is distributed in the hope that it will be useful, but WITHOUT +## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +## details. ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## usage: cceps (x [, correct]) ## Modified: trunk/octaveforge/main/signal/inst/cheb.m ===================================================================  trunk/octaveforge/main/signal/inst/cheb.m 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/inst/cheb.m 20120118 16:43:33 UTC (rev 9536) @@ 1,17 +1,17 @@ ## Copyright (C) 2002 André Carezia <acarezia@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 3 of the License, or (at ## your option) any later version. +## This program is free software; you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free Software +## Foundation; either version 3 of the License, or (at your option) any later +## version. ## ## This program is distributed in the hope that it will be useful, but ## WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ## General Public License for more details. +## This program is distributed in the hope that it will be useful, but WITHOUT +## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +## details. ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## Usage: cheb (n, x) ## Modified: trunk/octaveforge/main/signal/inst/cheb1ord.m ===================================================================  trunk/octaveforge/main/signal/inst/cheb1ord.m 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/inst/cheb1ord.m 20120118 16:43:33 UTC (rev 9536) @@ 1,18 +1,18 @@ ## Copyright (C) 2000 Paul Kienzle <pkienzle@...> ## Copyright (C) 2000 Laurent S. Mazet ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. +## This program is free software; you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free Software +## Foundation; either version 3 of the License, or (at your option) any later +## version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. +## This program is distributed in the hope that it will be useful, but WITHOUT +## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +## details. ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## Compute chebyshev type I filter order and cutoff for the desired response ## characteristics. Rp is the allowable decibels of ripple in the pass Modified: trunk/octaveforge/main/signal/inst/cheb2ord.m ===================================================================  trunk/octaveforge/main/signal/inst/cheb2ord.m 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/inst/cheb2ord.m 20120118 16:43:33 UTC (rev 9536) @@ 1,17 +1,17 @@ ## Copyright (C) 2000 Paul Kienzle <pkienzle@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. +## This program is free software; you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free Software +## Foundation; either version 3 of the License, or (at your option) any later +## version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. +## This program is distributed in the hope that it will be useful, but WITHOUT +## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +## details. ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## Compute chebyshev type II filter order and cutoff for the desired response ## characteristics. Rp is the allowable decibels of ripple in the pass @@ 34,13 +34,13 @@ function [n, Wc] = cheb2ord(Wp, Ws, Rp, Rs) if nargin != 4  usage("[n, Wn] = cheb2ord(Wp, Ws, Rp, Rs)"); + print_usage; elseif length(Wp) != length(Ws) error("cheb2ord: Wp and Ws must have the same length"); elseif length(Wp) != 1 && length(Wp) != 2 error("cheb2ord: Wp,Ws must have length 1 or 2"); elseif length(Wp) == 2 && ...  (all(Wp>Ws)  all(Ws>Wp)  diff(Wp)<=0  diff(Ws)<=0) + (all(Wp>Ws)  all(Ws>Wp)  diff(Wp)<=0  diff(Ws)<=0) error("cheb2ord: Wp(1)<Ws(1)<Ws(2)<Wp(2) or Ws(1)<Wp(1)<Wp(2)<Ws(2)"); end Modified: trunk/octaveforge/main/signal/inst/chebwin.m ===================================================================  trunk/octaveforge/main/signal/inst/chebwin.m 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/inst/chebwin.m 20120118 16:43:33 UTC (rev 9536) @@ 1,17 +1,17 @@ ## Copyright (C) 2002 André Carezia <acarezia@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 3 of the License, or (at ## your option) any later version. +## This program is free software; you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free Software +## Foundation; either version 3 of the License, or (at your option) any later +## version. ## ## This program is distributed in the hope that it will be useful, but ## WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ## General Public License for more details. +## This program is distributed in the hope that it will be useful, but WITHOUT +## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +## details. ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## Usage: chebwin (n, at) ## Modified: trunk/octaveforge/main/signal/inst/cheby1.m ===================================================================  trunk/octaveforge/main/signal/inst/cheby1.m 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/inst/cheby1.m 20120118 16:43:33 UTC (rev 9536) @@ 1,18 +1,18 @@ ## Copyright (C) 1999 Paul Kienzle <pkienzle@...> ## Copyright (C) 2003 Doug Stewart <dastew@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. +## This program is free software; you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free Software +## Foundation; either version 3 of the License, or (at your option) any later +## version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. +## This program is distributed in the hope that it will be useful, but WITHOUT +## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +## details. ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## Generate an Chebyshev type I filter with Rp dB of pass band ripple. ## Modified: trunk/octaveforge/main/signal/inst/cheby2.m ===================================================================  trunk/octaveforge/main/signal/inst/cheby2.m 20120118 15:27:05 UTC (rev 9535) +++ trunk/octaveforge/main/signal/inst/cheby2.m 20120118 16:43:33 UTC (rev 9536) @@ 1,18 +1,18 @@ ## Copyright (C) 1999 Paul Kienzle <pkienzle@...> ## Copyright (C) 2003 Doug Stewart <dastew@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. +## This program is free software; you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free Software +## Foundation; either version 3 of the License, or (at your option) any later +## version. ## ## This program is distributed in the hope that it will be useful, @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <jpicarbajal@us...>  20120118 15:27:16

Revision: 9535 http://octave.svn.sourceforge.net/octave/?rev=9535&view=rev Author: jpicarbajal Date: 20120118 15:27:05 +0000 (Wed, 18 Jan 2012) Log Message:  robotics: RTB/@Quaternion/dot wrapping quaternions_oo/@quaternion/diff Modified Paths:  trunk/octaveforge/extra/robotics/inst/@Quaternion/subsref.m Modified: trunk/octaveforge/extra/robotics/inst/@Quaternion/subsref.m ===================================================================  trunk/octaveforge/extra/robotics/inst/@Quaternion/subsref.m 20120118 15:24:44 UTC (rev 9534) +++ trunk/octaveforge/extra/robotics/inst/@Quaternion/subsref.m 20120118 15:27:05 UTC (rev 9535) @@ 37,7 +37,7 @@ __method__.scale = @(o,a) error(typeNotImplemented,'scale',o);  __method__.dot = @(o,a) Quaternion (dot (wrapperfield(o),a)); + __method__.dot = @(o,a) Quaternion (diff (wrapperfield(o),a)); __properties__ = struct(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <jpicarbajal@us...>  20120118 15:24:54

Revision: 9534 http://octave.svn.sourceforge.net/octave/?rev=9534&view=rev Author: jpicarbajal Date: 20120118 15:24:44 +0000 (Wed, 18 Jan 2012) Log Message:  quaternions_oo: renaming dot to diff Added Paths:  trunk/octaveforge/extra/quaternion_oo/inst/@quaternion/diff.m Removed Paths:  trunk/octaveforge/extra/quaternion_oo/inst/@quaternion/dot.m Copied: trunk/octaveforge/extra/quaternion_oo/inst/@quaternion/diff.m (from rev 9528, trunk/octaveforge/extra/quaternion_oo/inst/@quaternion/dot.m) ===================================================================  trunk/octaveforge/extra/quaternion_oo/inst/@quaternion/diff.m (rev 0) +++ trunk/octaveforge/extra/quaternion_oo/inst/@quaternion/diff.m 20120118 15:24:44 UTC (rev 9534) @@ 0,0 +1,64 @@ +## Copyright (c) 1998, 2000, 2005, 2007 Auburn University. +## Copyright (c) 2011 Juan Pablo Carbajal <carbajal@...> +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see <http://www.gnu.org/licenses/>;. + +## * texinfo * +## @deftypefn {Function File} {@var{qdot} =} diff (@var{q}, @var{omega}) +## Derivative of a quaternion. +## +## Let Q be a quaternion to transform a vector from a fixed frame to +## a rotating frame. If the rotating frame is rotating about the +## [x, y, z] axes at angular rates [wx, wy, wz], then the derivative +## of Q is given by +## +## @example +## Q' = diff(Q, omega) +## @end example +## +## If the passive convention is used (rotate the frame, not the vector), +## then +## +## @example +## Q' = diff(Q,omega) +## @end example +## @end deftypefn + +## Adapted from: qderiv by A. S. Hodel <a.s.hodel@...> + +function qd = diff (q, Omega) + + if (nargin != 2) + print_usage (); + endif + + if (! isa (q, "quaternion")  ! isscalar (q.w)) + error ("quaternion: first argument '%s' must be a scalar quaternion", inputname(1)); + endif + + Omega = vec (Omega); + + if (length (Omega) != 3) + error ("quaternion: second argument '%s' must be a length 3 vector", inputname(2)); + endif + + qd = 0.5 * quaternion (Omega(1), Omega(2), Omega(3)) * q; + +endfunction + +%!shared q +%! q = quaternion(3,1,0,0); + +%!assert(quaternion(0,0,0.5,1.5) == diff(q,[0 0 1])) +%!assert(quaternion(0,0,2,1) == diff(q,[0 1 1])) Deleted: trunk/octaveforge/extra/quaternion_oo/inst/@quaternion/dot.m ===================================================================  trunk/octaveforge/extra/quaternion_oo/inst/@quaternion/dot.m 20120118 15:02:32 UTC (rev 9533) +++ trunk/octaveforge/extra/quaternion_oo/inst/@quaternion/dot.m 20120118 15:24:44 UTC (rev 9534) @@ 1,71 +0,0 @@ ## Copyright (c) 1998, 2000, 2005, 2007 Auburn University. ## Copyright (c) 2011 Juan Pablo Carbajal <carbajal@...> ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License ## along with this program. If not, see <http://www.gnu.org/licenses/>;.  ## * texinfo * ## @deftypefn {Function File} {@var{qdot} =} dot (@var{q}, @var{omega}) ## Derivative of a quaternion. ## ## Let Q be a quaternion to transform a vector from a fixed frame to ## a rotating frame. If the rotating frame is rotating about the ## [x, y, z] axes at angular rates [wx, wy, wz], then the derivative ## of Q is given by ## ## @example ## Q' = dot(Q, omega) ## @end example ## ## If the passive convention is used (rotate the frame, not the vector), ## then ## ## @example ## Q' = dot(Q,omega) ## @end example ## @end deftypefn  ## Adapted from: qderiv by A. S. Hodel <a.s.hodel@...>  function qd = dot (q, Omega)   ## FIXME: Use another name for this function. There is already  ## a "dot" command with different meaning:  ## Loadable Function: dot (X, Y, DIM) ...  ## Compute the dot product of two vectors.  ## This is equivalent to `sum (conj (X) .* Y, DIM)   if (nargin != 2)  print_usage ();  endif   if (! isa (q, "quaternion")  ! isscalar (q.w))  error ("quaternion: first argument '%s' must be a scalar quaternion", inputname(1));  endif   Omega = vec (Omega);   if (length (Omega) != 3)  error ("quaternion: second argument '%s' must be a length 3 vector", inputname(2));  endif   qd = 0.5 * quaternion (Omega(1), Omega(2), Omega(3)) * q;  endfunction  %!shared q %! q = quaternion(3,1,0,0);  %!assert(quaternion(0,0,0.5,1.5) == dot(q,[0 0 1])) %!assert(quaternion(0,0,2,1) == dot(q,[0 1 1]))  This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <jpicarbajal@us...>  20120118 15:02:38

Revision: 9533 http://octave.svn.sourceforge.net/octave/?rev=9533&view=rev Author: jpicarbajal Date: 20120118 15:02:32 +0000 (Wed, 18 Jan 2012) Log Message:  signal: Removing audio from DESCRIPTION Modified Paths:  trunk/octaveforge/main/signal/DESCRIPTION Modified: trunk/octaveforge/main/signal/DESCRIPTION ===================================================================  trunk/octaveforge/main/signal/DESCRIPTION 20120118 14:41:16 UTC (rev 9532) +++ trunk/octaveforge/main/signal/DESCRIPTION 20120118 15:02:32 UTC (rev 9533) @@ 1,11 +1,11 @@ Name: Signal Version: 1.1.2 Date: 20120106 +Date: 20120117 Author: Various Authors Maintainer: The Octave Community Title: Signal Processing. Description: Signal processing tools, including filtering, windowing and display functions. Depends: octave (>= 3.4.0), optim (>= 1.0.0), specfun, control (>= 2.2.3), audio +Depends: octave (>= 3.4.0), optim (>= 1.0.0), specfun, control (>= 2.2.3) Autoload: yes License: GPL version 2 or later Url: http://octave.sf.net This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <paramaniac@us...>  20120118 14:41:27

Revision: 9532 http://octave.svn.sourceforge.net/octave/?rev=9532&view=rev Author: paramaniac Date: 20120118 14:41:16 +0000 (Wed, 18 Jan 2012) Log Message:  control: support frequency response in the range {wmin, wmax}, e.g. bode (sys, {wmin, wmax}) Modified Paths:  trunk/octaveforge/main/control/inst/__frequency_response__.m trunk/octaveforge/main/control/inst/__frequency_vector__.m Modified: trunk/octaveforge/main/control/inst/__frequency_response__.m ===================================================================  trunk/octaveforge/main/control/inst/__frequency_response__.m 20120118 14:02:54 UTC (rev 9531) +++ trunk/octaveforge/main/control/inst/__frequency_response__.m 20120118 14:41:16 UTC (rev 9532) @@ 1,4 +1,4 @@ ## Copyright (C) 2009, 2010 Lukas F. Reichlin +## Copyright (C) 2009, 2010, 2012 Lukas F. Reichlin ## ## This file is part of LTI Syncope. ## @@ 21,7 +21,7 @@ ## Author: Lukas Reichlin <lukas.reichlin@...> ## Created: November 2009 ## Version: 0.2 +## Version: 0.3 function [H, w] = __frequency_response__ (sys, w = [], mimoflag = 0, resptype = 0, wbounds = "std", cellflag = false) @@ 42,6 +42,8 @@ endif elseif (isempty (w)) # find interesting frequency range w if not specified w = __frequency_vector__ (sys, wbounds); + elseif (iscell (w) && numel (w) == 2 && issample (w{1}) && issample (w{2})) + w = __frequency_vector__ (sys, wbounds, w{1}, w{2}); elseif (! is_real_vector (w)) error ("frequency_response: second argument w must be a vector of frequencies"); endif Modified: trunk/octaveforge/main/control/inst/__frequency_vector__.m ===================================================================  trunk/octaveforge/main/control/inst/__frequency_vector__.m 20120118 14:02:54 UTC (rev 9531) +++ trunk/octaveforge/main/control/inst/__frequency_vector__.m 20120118 14:41:16 UTC (rev 9532) @@ 35,9 +35,9 @@ ## AdaptedBy: Lukas Reichlin <lukas.reichlin@...> ## Date: October 2009 ## Version: 0.2 +## Version: 0.3 function w = __frequency_vector__ (sys, wbounds = "std") +function w = __frequency_vector__ (sys, wbounds = "std", wmin, wmax) zer = zero (sys); pol = pole (sys); @@ 119,6 +119,11 @@ dec_max = log10 (pi/tsam); endif + if (nargin == 4) # w = {wmin, wmax} + dec_min = log10 (wmin); + dec_max = log10 (wmax); + endif + ## create frequency vector zp = [abs(zer), abs(pol)]; idx = find (zp > 10^dec_min & zp < 10^dec_max); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <carandraug@us...>  20120118 14:03:07

Revision: 9531 http://octave.svn.sourceforge.net/octave/?rev=9531&view=rev Author: carandraug Date: 20120118 14:02:54 +0000 (Wed, 18 Jan 2012) Log Message:  signal: * update GPL to v3 (or later) * fix copyright notices * use print_usage * fix indentation Modified Paths:  trunk/octaveforge/main/signal/inst/__ellip_ws.m trunk/octaveforge/main/signal/inst/__ellip_ws_min.m trunk/octaveforge/main/signal/inst/arburg.m trunk/octaveforge/main/signal/inst/besself.m trunk/octaveforge/main/signal/inst/bilinear.m trunk/octaveforge/main/signal/inst/bitrevorder.m trunk/octaveforge/main/signal/inst/blackmanharris.m trunk/octaveforge/main/signal/inst/blackmannuttall.m trunk/octaveforge/main/signal/inst/bohmanwin.m trunk/octaveforge/main/signal/inst/boxcar.m trunk/octaveforge/main/signal/inst/buffer.m trunk/octaveforge/main/signal/inst/butter.m trunk/octaveforge/main/signal/inst/buttord.m trunk/octaveforge/main/signal/inst/cceps.m trunk/octaveforge/main/signal/inst/cheb.m trunk/octaveforge/main/signal/inst/cheb1ord.m trunk/octaveforge/main/signal/inst/cheb2ord.m trunk/octaveforge/main/signal/inst/chebwin.m trunk/octaveforge/main/signal/inst/cheby1.m trunk/octaveforge/main/signal/inst/cheby2.m trunk/octaveforge/main/signal/inst/chirp.m trunk/octaveforge/main/signal/inst/cmorwavf.m trunk/octaveforge/main/signal/inst/cohere.m trunk/octaveforge/main/signal/inst/convmtx.m trunk/octaveforge/main/signal/inst/cplxreal.m trunk/octaveforge/main/signal/inst/cpsd.m trunk/octaveforge/main/signal/inst/csd.m trunk/octaveforge/main/signal/inst/czt.m trunk/octaveforge/main/signal/inst/dct.m trunk/octaveforge/main/signal/inst/dct2.m trunk/octaveforge/main/signal/inst/dctmtx.m trunk/octaveforge/main/signal/inst/decimate.m trunk/octaveforge/main/signal/inst/dftmtx.m trunk/octaveforge/main/signal/inst/diric.m trunk/octaveforge/main/signal/inst/downsample.m trunk/octaveforge/main/signal/inst/dst.m trunk/octaveforge/main/signal/inst/dwt.m trunk/octaveforge/main/signal/inst/ellip.m trunk/octaveforge/main/signal/inst/ellipord.m trunk/octaveforge/main/signal/inst/fht.m trunk/octaveforge/main/signal/inst/filtfilt.m trunk/octaveforge/main/signal/inst/filtic.m trunk/octaveforge/main/signal/inst/fir1.m trunk/octaveforge/main/signal/inst/fir2.m Modified: trunk/octaveforge/main/signal/inst/__ellip_ws.m ===================================================================  trunk/octaveforge/main/signal/inst/__ellip_ws.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/__ellip_ws.m 20120118 14:02:54 UTC (rev 9531) @@ 2,7 +2,7 @@ ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, Modified: trunk/octaveforge/main/signal/inst/__ellip_ws_min.m ===================================================================  trunk/octaveforge/main/signal/inst/__ellip_ws_min.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/__ellip_ws_min.m 20120118 14:02:54 UTC (rev 9531) @@ 2,7 +2,7 @@ ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ 22,14 +22,12 @@ ## ##  Serra, Celso Penteado, Teoria e Projeto de Filtros, Campinas: CARTGRAF, ## 1983. ## Author: Paulo Neis <p_neis@...> function err=__ellip_ws_min(kl, x) # int=ellipke([kl; 1kl]); ql=int(1); q=int(2); err=abs((ql/q)x); + int=ellipke([kl; 1kl]); + ql=int(1); + q=int(2); + err=abs((ql/q)x); endfunction Modified: trunk/octaveforge/main/signal/inst/arburg.m ===================================================================  trunk/octaveforge/main/signal/inst/arburg.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/arburg.m 20120118 14:02:54 UTC (rev 9531) @@ 2,7 +2,7 @@ %% %% This program is free software; you can redistribute it and/or %% modify it under the terms of the GNU General Public License %% as published by the Free Software Foundation; either version 2, +%% as published by the Free Software Foundation; either version 3, %% or (at your option) any later version. %% %% This program is distributed in the hope that it will be useful, Modified: trunk/octaveforge/main/signal/inst/besself.m ===================================================================  trunk/octaveforge/main/signal/inst/besself.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/besself.m 20120118 14:02:54 UTC (rev 9531) @@ 1,5 +1,6 @@ ## Copyright (C) 2009 Thomas Sailer ## Copyright (C) 1999 Paul Kienzle <pkienzle@...> +## Copyright (C) 2003 Doug Stewart <dastew@...> +## Copyright (C) 2009 Thomas Sailer <t.sailer@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ 44,9 +45,6 @@ ## Proakis & Manolakis (1992). Digital Signal Processing. New York: ## Macmillan Publishing Company. ## Author: Paul Kienzle <pkienzle@...> ## Modified by: Doug Stewart <dastew@...> Feb, 2003  function [a, b, c, d] = besself (n, W, varargin) if (nargin>4  nargin<2)  (nargout>4  nargout<2) Modified: trunk/octaveforge/main/signal/inst/bilinear.m ===================================================================  trunk/octaveforge/main/signal/inst/bilinear.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/bilinear.m 20120118 14:02:54 UTC (rev 9531) @@ 70,8 +70,6 @@ ## Proakis & Manolakis (1992). Digital Signal Processing. New York: ## Macmillan Publishing Company. ## Author: Paul Kienzle <pkienzle@...>  function [Zz, Zp, Zg] = bilinear(Sz, Sp, Sg, T) if nargin==3 Modified: trunk/octaveforge/main/signal/inst/bitrevorder.m ===================================================================  trunk/octaveforge/main/signal/inst/bitrevorder.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/bitrevorder.m 20120118 14:02:54 UTC (rev 9531) @@ 1,4 +1,4 @@ ## Copyright (C) 2007 Sylvain Pelissier <sylvain.pelissier@...> +## Copyright (C) 2007 Sylvain Pelissier <sylvain.pelissier@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ 15,7 +15,7 @@ ## * texinfo * ## @deftypefn {Function File} {[@var{y} @var{i}] =} bitrevorder(@var{x}) ## Reorder x in the bit reversed order +## Reorder x in the bit reversed order ## @seealso{fft,ifft} ## @end deftypefn @@ 33,4 +33,4 @@ new_ind = bi2de(fliplr(de2bi(old_ind))); i = new_ind + 1;  y(old_ind+1) = x(i); \ No newline at end of file + y(old_ind+1) = x(i); Modified: trunk/octaveforge/main/signal/inst/blackmanharris.m ===================================================================  trunk/octaveforge/main/signal/inst/blackmanharris.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/blackmanharris.m 20120118 14:02:54 UTC (rev 9531) @@ 1,4 +1,4 @@ ## Copyright (C) 2007 Sylvain Pelissier <sylvain.pelissier@...> +## Copyright (C) 2007 Sylvain Pelissier <sylvain.pelissier@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ 15,22 +15,22 @@ ## * texinfo * ## @deftypefn {Function File} {[@var{w}] =} blackmanharris(@var{L}) ## Compute the BlackmanHarris window. +## Compute the BlackmanHarris window. ## @seealso{rectwin, bartlett} ## @end deftypefn function [w] = blackmanharris(L)  if (nargin < 1); usage('blackmanharris(x)'); end  if(! isscalar(L))  error("L must be a number");  endif   N = L1;  a0 = 0.35875;  a1 = 0.48829;  a2 = 0.14128;  a3 = 0.01168;  n = ceil(N/2):N/2;  w = a0 + a1.*cos(2.*pi.*n./N) + a2.*cos(4.*pi.*n./N) + a3.*cos(6.*pi.*n./N); endfunction;  \ No newline at end of file +function [w] = blackmanharris (L) + if (nargin < 1) + print_usage; + elseif(! isscalar(L)) + error("L must be a number"); + endif + + N = L1; + a0 = 0.35875; + a1 = 0.48829; + a2 = 0.14128; + a3 = 0.01168; + n = ceil(N/2):N/2; + w = a0 + a1.*cos(2.*pi.*n./N) + a2.*cos(4.*pi.*n./N) + a3.*cos(6.*pi.*n./N); +endfunction Modified: trunk/octaveforge/main/signal/inst/blackmannuttall.m ===================================================================  trunk/octaveforge/main/signal/inst/blackmannuttall.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/blackmannuttall.m 20120118 14:02:54 UTC (rev 9531) @@ 1,4 +1,4 @@ ## Copyright (C) 2007 Muthiah Annamalai <muthiah.annamalai@...> +## Copyright (C) 2007 Muthiah Annamalai <muthiah.annamalai@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ 15,22 +15,23 @@ ## * texinfo * ## @deftypefn {Function File} {[@var{w}] =} blackmannuttall(@var{L}) ## Compute the BlackmanNuttall window. +## Compute the BlackmanNuttall window. ## @seealso{nuttallwin, kaiser} ## @end deftypefn function [w] = blackmannuttall(L)  if (nargin < 1); usage('blackmannuttall(L)'); end  if(! isscalar(L))  error("L must be a number");  endif   N = L1;  a0 = 0.3635819;  a1 = 0.4891775;  a2 = 0.1365995;  a3 = 0.0106411;  n = 0:N;  w = a0  a1.*cos(2.*pi.*n./N) + a2.*cos(4.*pi.*n./N)  a3.*cos(6.*pi.*n./N);  w = w.'; endfunction; + if (nargin < 1) + print_usage; + elseif (! isscalar(L)) + error("L must be a number"); + endif + + N = L1; + a0 = 0.3635819; + a1 = 0.4891775; + a2 = 0.1365995; + a3 = 0.0106411; + n = 0:N; + w = a0  a1.*cos(2.*pi.*n./N) + a2.*cos(4.*pi.*n./N)  a3.*cos(6.*pi.*n./N); + w = w.'; +endfunction Modified: trunk/octaveforge/main/signal/inst/bohmanwin.m ===================================================================  trunk/octaveforge/main/signal/inst/bohmanwin.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/bohmanwin.m 20120118 14:02:54 UTC (rev 9531) @@ 1,4 +1,4 @@ ## Copyright (C) 2007 Sylvain Pelissier <sylvain.pelissier@...> +## Copyright (C) 2007 Sylvain Pelissier <sylvain.pelissier@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ 15,38 +15,37 @@ ## * texinfo * ## @deftypefn {Function File} {[@var{w}] =} bohmanwin(@var{L}) ## Compute the Bohman window of lenght L. +## Compute the Bohman window of lenght L. ## @seealso{rectwin, bartlett} ## @end deftypefn function [w] = bohmanwin(L)  if (nargin < 1); usage('bohmanwin(x)'); end  if(! isscalar(L))  error("L must be a number");  endif   if(L < 0)  error('L must be positive');  end   if(L ~= floor(L))  L = round(L);  warning('L rounded to the nearest integer.');  end   if(L == 0)  w = [];   elseif(L == 1)  w = 1;   else  N = L1;  n = N/2:N/2;   w = (12.*abs(n)./N).*cos(2.*pi.*abs(n)./N) + (1./pi).*sin(2.*pi.*abs(n)./N);  w(1) = 0;  w(length(w))=0;  w = w';  end endfunction; \ No newline at end of file + if (nargin < 1) + print_usage + elseif(! isscalar(L)) + error("L must be a number"); + elseif(L < 0) + error('L must be positive'); + end + + if(L ~= floor(L)) + L = round(L); + warning('L rounded to the nearest integer.'); + end + + if(L == 0) + w = []; + + elseif(L == 1) + w = 1; + + else + N = L1; + n = N/2:N/2; + + w = (12.*abs(n)./N).*cos(2.*pi.*abs(n)./N) + (1./pi).*sin(2.*pi.*abs(n)./N); + w(1) = 0; + w(length(w))=0; + w = w'; + end +endfunction Modified: trunk/octaveforge/main/signal/inst/boxcar.m ===================================================================  trunk/octaveforge/main/signal/inst/boxcar.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/boxcar.m 20120118 14:02:54 UTC (rev 9531) @@ 18,15 +18,13 @@ ## Returns the filter coefficients of a rectangular window of length n. function w = boxcar (n)  + if (nargin != 1)  usage ("w = boxcar(n)");  endif   if !isscalar(n)  n != floor(n)  n <= 0 + print_usage; + elseif !isscalar(n)  n != floor(n)  n <= 0 error ("boxcar: n must be an integer > 0"); endif w = ones(n, 1);  + endfunction Modified: trunk/octaveforge/main/signal/inst/buffer.m ===================================================================  trunk/octaveforge/main/signal/inst/buffer.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/buffer.m 20120118 14:02:54 UTC (rev 9531) @@ 2,7 +2,7 @@ ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, Modified: trunk/octaveforge/main/signal/inst/butter.m ===================================================================  trunk/octaveforge/main/signal/inst/butter.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/butter.m 20120118 14:02:54 UTC (rev 9531) @@ 1,8 +1,10 @@ ## Copyright (C) 1999 Paul Kienzle <pkienzle@...> +## Copyright (C) 2003 Doug Stewart <dastew@...> +## Copyright (C) 2011 Alexander Klein <alexander.klein@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ 43,14 +45,10 @@ ## Proakis & Manolakis (1992). Digital Signal Processing. New York: ## Macmillan Publishing Company. ## Author: Paul Kienzle <pkienzle@...> ## Modified by: Doug Stewart <dastew@...> Feb, 2003 ## Tests and demos added: Alexander Klein <alexander.klein@...>, Sep 2011  function [a, b, c, d] = butter (n, W, varargin) if (nargin>4  nargin<2)  (nargout>4  nargout<2)  usage ("[b, a] or [z, p, g] or [a,b,c,d] = butter (n, W [, 'ftype'][,'s'])"); + print_usage; end ## interpret the input parameters @@ 59,7 +57,7 @@ end stop = 0;  digital = 1; + digital = 1; for i=1:length(varargin) switch varargin{i} case 's', digital = 0; Modified: trunk/octaveforge/main/signal/inst/buttord.m ===================================================================  trunk/octaveforge/main/signal/inst/buttord.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/buttord.m 20120118 14:02:54 UTC (rev 9531) @@ 2,7 +2,7 @@ ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ 39,15 +39,12 @@ function [n, Wc] = buttord(Wp, Ws, Rp, Rs) if nargin != 4  usage("[n, Wn] = buttord(Wp, Ws, Rp, Rs)");  end  if length(Wp) != length(Ws) + print_usage; + elseif length(Wp) != length(Ws) error("buttord: Wp and Ws must have the same length");  end  if length(Wp) != 1 && length(Wp) != 2 + elseif length(Wp) != 1 && length(Wp) != 2 error("buttord: Wp,Ws must have length 1 or 2");  end  if length(Wp) == 2 && (all(Wp>Ws)  all(Ws>Wp)  diff(Wp)<=0  diff(Ws)<=0) + elseif length(Wp) == 2 && (all(Wp>Ws)  all(Ws>Wp)  diff(Wp)<=0  diff(Ws)<=0) error("buttord: Wp(1)<Ws(1)<Ws(2)<Wp(2) or Ws(1)<Wp(1)<Wp(2)<Ws(2)"); end @@ 83,4 +80,3 @@ Wc(stop) = 1Wc(stop); endfunction  Modified: trunk/octaveforge/main/signal/inst/cceps.m ===================================================================  trunk/octaveforge/main/signal/inst/cceps.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/cceps.m 20120118 14:02:54 UTC (rev 9531) @@ 2,7 +2,7 @@ ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ 22,13 +22,13 @@ ## Author: Andreas Weingessel <Andreas.Weingessel@...> ## Apr 1, 1994 ## Last modifified by AW on Nov 8, 1994  + function cep = cceps (x, c) if (nargin == 1) c = 0; elseif (nargin != 2)  error ("usage: cceps (x [, correct])"); + print_usage; endif [nr, nc] = size (x); @@ 57,7 +57,7 @@ if (cor) F = fft (x(1:nr1)) if (min (abs (F)) == 0)  error (bad_signal_message); + error (bad_signal_message); endif endif endif Modified: trunk/octaveforge/main/signal/inst/cheb.m ===================================================================  trunk/octaveforge/main/signal/inst/cheb.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/cheb.m 20120118 14:02:54 UTC (rev 9531) @@ 2,7 +2,7 @@ ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or (at +## the Free Software Foundation; either version 3 of the License, or (at ## your option) any later version. ## ## This program is distributed in the hope that it will be useful, but @@ 25,22 +25,17 @@ ## If x is a vector, the output is a vector of the same size, where each ## element is calculated as y(i) = Tn(x(i)). ## Author: André Carezia <acarezia@...> ## Description: Value of the Chebyshev polynomials  function T = cheb (n, x) if (nargin != 2)  usage ("cheb (n, x)");  endif   if !(isscalar (n) && (n == round(n)) && (n >= 0)) + print_usage; + elseif !(isscalar (n) && (n == round(n)) && (n >= 0)) error ("cheb: n has to be a positive integer"); endif if (max(size(x)) == 0) T = []; endif  # avoid resizing latencies + # avoid resizing latencies T = zeros(size(x)); ind = abs (x) <= 1; if (max(size(ind))) @@ 53,5 +48,4 @@ endif T = real(T); end  +endfunction Modified: trunk/octaveforge/main/signal/inst/cheb1ord.m ===================================================================  trunk/octaveforge/main/signal/inst/cheb1ord.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/cheb1ord.m 20120118 14:02:54 UTC (rev 9531) @@ 1,8 +1,9 @@ ## Copyright (C) 2000 Paul Kienzle <pkienzle@...> +## Copyright (C) 2000 Laurent S. Mazet ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ 12,8 +13,6 @@ ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. ## ## Completed by: Laurent S. Mazet ## Compute chebyshev type I filter order and cutoff for the desired response ## characteristics. Rp is the allowable decibels of ripple in the pass @@ 34,13 +33,13 @@ function [n, Wc] = cheb1ord(Wp, Ws, Rp, Rs) if nargin != 4  usage("[n, Wn] = cheb1ord(Wp, Ws, Rp, Rs)"); + print_usage; elseif length(Wp) != length(Ws) error("cheb1ord: Wp and Ws must have the same length"); elseif length(Wp) != 1 && length(Wp) != 2 error("cheb1ord: Wp,Ws must have length 1 or 2"); elseif length(Wp) == 2 && ...  (all(Wp>Ws)  all(Ws>Wp)  diff(Wp)<=0  diff(Ws)<=0) + (all(Wp>Ws)  all(Ws>Wp)  diff(Wp)<=0  diff(Ws)<=0) error("cheb1ord: Wp(1)<Ws(1)<Ws(2)<Wp(2) or Ws(1)<Wp(1)<Wp(2)<Ws(2)"); end Modified: trunk/octaveforge/main/signal/inst/cheb2ord.m ===================================================================  trunk/octaveforge/main/signal/inst/cheb2ord.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/cheb2ord.m 20120118 14:02:54 UTC (rev 9531) @@ 2,7 +2,7 @@ ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, Modified: trunk/octaveforge/main/signal/inst/chebwin.m ===================================================================  trunk/octaveforge/main/signal/inst/chebwin.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/chebwin.m 20120118 14:02:54 UTC (rev 9531) @@ 2,7 +2,7 @@ ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or (at +## the Free Software Foundation; either version 3 of the License, or (at ## your option) any later version. ## ## This program is distributed in the hope that it will be useful, but @@ 48,21 +48,13 @@ ## ## See also: kaiser ## $Id$ ## ## Author: André Carezia <acarezia@...> ## Description: Coefficients of the DolphChebyshev window  function w = chebwin (n, at) if (nargin != 2)  usage ("chebwin (n, at)");  endif   if !(isscalar (n) && (n == round(n)) && (n > 0)) + print_usage; + elseif !(isscalar (n) && (n == round(n)) && (n > 0)) error ("chebwin: n has to be a positive integer");  endif  if !(isscalar (at) && (at == real (at))) + elseif !(isscalar (at) && (at == real (at))) error ("chebwin: at has to be a real scalar"); endif @@ 94,5 +86,4 @@ endif w = w ./ max (w (:)); end  +endfunction Modified: trunk/octaveforge/main/signal/inst/cheby1.m ===================================================================  trunk/octaveforge/main/signal/inst/cheby1.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/cheby1.m 20120118 14:02:54 UTC (rev 9531) @@ 1,8 +1,9 @@ ## Copyright (C) 1999 Paul Kienzle <pkienzle@...> +## Copyright (C) 2003 Doug Stewart <dastew@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ 42,13 +43,10 @@ ## Parks & Burrus (1987). Digital Filter Design. New York: ## John Wiley & Sons, Inc. ## Author: Paul Kienzle <pkienzle@...> ## Modified: Doug Stewart Feb. 2003  function [a,b,c,d] = cheby1(n, Rp, W, varargin) if (nargin>5  nargin<3)  (nargout>4  nargout<2)  usage ("[b, a] or [z, p, g] or [a,b,c,d]= cheby1 (n, Rp, W, [, 'ftype'][,'s'])"); + print_usage; endif ## interpret the input parameters Modified: trunk/octaveforge/main/signal/inst/cheby2.m ===================================================================  trunk/octaveforge/main/signal/inst/cheby2.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/cheby2.m 20120118 14:02:54 UTC (rev 9531) @@ 1,8 +1,9 @@ ## Copyright (C) 1999 Paul Kienzle <pkienzle@...> +## Copyright (C) 2003 Doug Stewart <dastew@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ 42,13 +43,10 @@ ## Parks & Burrus (1987). Digital Filter Design. New York: ## John Wiley & Sons, Inc. ## Author: Paul Kienzle <pkienzle@...> ## Modified: Doug Stewart Feb. 2003  function [a,b,c,d] = cheby2(n, Rs, W, varargin) if (nargin>5  nargin<3)  (nargout>4  nargout<2)  usage ("[b, a] or [z, p, g] or [a,b,c,d]= cheby2 (n, Rs, W, [, 'ftype'][,'s'])"); + print_usage; end ## interpret the input parameters Modified: trunk/octaveforge/main/signal/inst/chirp.m ===================================================================  trunk/octaveforge/main/signal/inst/chirp.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/chirp.m 20120118 14:02:54 UTC (rev 9531) @@ 2,7 +2,7 @@ ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ 36,13 +36,10 @@ ## If you want a different sweep shape f(t), use the following: ## y = cos(2*pi*integral(f(t)) + 2*pi*f0*t + phase); ## 20010831 Paul Kienzle <pkienzle@...> ## * Fix documentation for quadratic case  function y = chirp(t, f0, t1, f1, form, phase) if nargin < 1  nargin > 6  usage("y = chirp(t [, f0 [, t1 [, f1 [, form [, phase]]]]])"); + print_usage; endif if nargin < 2, f0 = []; endif if nargin < 3, t1 = []; endif Modified: trunk/octaveforge/main/signal/inst/cmorwavf.m ===================================================================  trunk/octaveforge/main/signal/inst/cmorwavf.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/cmorwavf.m 20120118 14:02:54 UTC (rev 9531) @@ 1,8 +1,8 @@ ## Copyright (C) 2007 Sylvain Pelissier <sylvain.pelissier@...> +## Copyright (C) 2007 Sylvain Pelissier <sylvain.pelissier@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ 16,16 +16,15 @@ ## * texinfo * ## @deftypefn {Function File} {[@var{psi,x}] =} cmorwavf (@var{lb,ub,n,fb,fc}) ## Compute the Complex Morlet wavelet. +## Compute the Complex Morlet wavelet. ## @end deftypefn function [psi,x] = cmorwavf (lb,ub,n,fb,fc)  if (nargin ~= 5); usage('[psi,x] = cmorwavf(lb,ub,n,fb,fc)'); end   if (n <= 0  floor(n) ~= n)  error("n must be an integer strictly positive");  endif  x = linspace(lb,ub,n);  psi =((pi*fb)^(0.5))*exp(2*i*pi*fc.*x).*exp(x.^2/fb); + if (nargin ~= 5) + print_usage; + elseif (n <= 0  floor(n) ~= n) + error("n must be an integer strictly positive"); + endif + x = linspace(lb,ub,n); + psi =((pi*fb)^(0.5))*exp(2*i*pi*fc.*x).*exp(x.^2/fb); endfunction  Modified: trunk/octaveforge/main/signal/inst/cohere.m ===================================================================  trunk/octaveforge/main/signal/inst/cohere.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/cohere.m 20120118 14:02:54 UTC (rev 9531) @@ 2,7 +2,7 @@ %% %% This program is free software; you can redistribute it and/or %% modify it under the terms of the GNU General Public License %% as published by the Free Software Foundation; either version 2, +%% as published by the Free Software Foundation; either version 3, %% or (at your option) any later version. %% %% This program is distributed in the hope that it will be useful, @@ 22,9 +22,7 @@ %% See "help pwelch" for description of arguments, hints and references %%  especially hint (7) for Matlab R11 defaults. %% %%  function [varargout] = cohere(varargin) %% if ( nargin<2 ) Modified: trunk/octaveforge/main/signal/inst/convmtx.m ===================================================================  trunk/octaveforge/main/signal/inst/convmtx.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/convmtx.m 20120118 14:02:54 UTC (rev 9531) @@ 2,7 +2,7 @@ ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ 37,7 +37,7 @@ function b = convmtx (a, n) if (nargin != 2)  usage ("convmtx (a, n)"); + print_usage; endif [r, c] = size(a); Modified: trunk/octaveforge/main/signal/inst/cplxreal.m ===================================================================  trunk/octaveforge/main/signal/inst/cplxreal.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/cplxreal.m 20120118 14:02:54 UTC (rev 9531) @@ 2,7 +2,7 @@ %% %% This program is free software; you can redistribute it and/or modify %% it under the terms of the GNU General Public License as published by %% the Free Software Foundation; either version 2 of the License, or +%% the Free Software Foundation; either version 3 of the License, or %% (at your option) any later version. %% %% This program is distributed in the hope that it will be useful, Modified: trunk/octaveforge/main/signal/inst/cpsd.m ===================================================================  trunk/octaveforge/main/signal/inst/cpsd.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/cpsd.m 20120118 14:02:54 UTC (rev 9531) @@ 2,7 +2,7 @@ %% %% This program is free software; you can redistribute it and/or %% modify it under the terms of the GNU General Public License %% as published by the Free Software Foundation; either version 2, +%% as published by the Free Software Foundation; either version 3, %% or (at your option) any later version. %% %% This program is distributed in the hope that it will be useful, @@ 19,9 +19,7 @@ %% Estimate cross power spectrum of data "x" and "y" by the Welch (1967) %% periodogram/FFT method. %% See "help pwelch" for description of arguments, hints and references %%  function [varargout] = cpsd(varargin) %% %% Check fixed argument Modified: trunk/octaveforge/main/signal/inst/csd.m ===================================================================  trunk/octaveforge/main/signal/inst/csd.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/csd.m 20120118 14:02:54 UTC (rev 9531) @@ 2,7 +2,7 @@ %% %% This program is free software; you can redistribute it and/or %% modify it under the terms of the GNU General Public License %% as published by the Free Software Foundation; either version 2, +%% as published by the Free Software Foundation; either version 3, %% or (at your option) any later version. %% %% This program is distributed in the hope that it will be useful, @@ 21,9 +21,7 @@ %% See "help pwelch" for description of arguments, hints and references %%  especially hint (7) for Matlab R11 defaults. %% %%  function [varargout] = csd(varargin) %% %% Check fixed argument Modified: trunk/octaveforge/main/signal/inst/czt.m ===================================================================  trunk/octaveforge/main/signal/inst/czt.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/czt.m 20120118 14:02:54 UTC (rev 9531) @@ 2,7 +2,7 @@ ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ 44,7 +44,7 @@ ## multiply gg by Melements of chirp and call it done function y = czt(x, m, w, a)  if nargin < 1  nargin > 4, usage("y=czt(x, m, w, a)"); endif + if nargin < 1  nargin > 4, print_usage; endif [row, col] = size(x); if row == 1, x = x(:); col = 1; endif Modified: trunk/octaveforge/main/signal/inst/dct.m ===================================================================  trunk/octaveforge/main/signal/inst/dct.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/dct.m 20120118 14:02:54 UTC (rev 9531) @@ 2,7 +2,7 @@ ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ 54,13 +54,11 @@ ## ## Scaling the result by w(k)/2 will give us the desired output. ## Author: Paul Kienzle ## 20010208 ## * initial release + function y = dct (x, n) if (nargin < 1  nargin > 2)  usage ("y = dct(x [, n])"); + print_usage; endif realx = isreal(x); Modified: trunk/octaveforge/main/signal/inst/dct2.m ===================================================================  trunk/octaveforge/main/signal/inst/dct2.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/dct2.m 20120118 14:02:54 UTC (rev 9531) @@ 2,7 +2,7 @@ ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ 20,14 +20,10 @@ ## Computes the 2D DCT of x after padding or trimming rows to m and ## columns to n. ## Author: Paul Kienzle ## 20010208 ## * initial revision  function y = dct2 (x, m, n) if (nargin < 1  nargin > 3)  usage("dct (x) or dct (x, m, n) or dct (x, [m n])"); + print_usage; endif if nargin == 1 Modified: trunk/octaveforge/main/signal/inst/dctmtx.m ===================================================================  trunk/octaveforge/main/signal/inst/dctmtx.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/dctmtx.m 20120118 14:02:54 UTC (rev 9531) @@ 2,7 +2,7 @@ ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ 14,7 +14,7 @@ ## along with this program; If not, see <http://www.gnu.org/licenses/>;. ## T = dctmtx (n) ## Return the DCT transformation matrix of size n x n. +## Return the DCT transformation matrix of size n x n. ## ## If A is an n x n matrix, then the following are true: ## T*A == dct(A), T'*A == idct(A) @@ 29,13 +29,9 @@ ## ## See also: dct, idct, dct2, idct2 ## Author: Paul Kienzle <pkienzle@...> ## 20010208 ## * initial release  function T = dctmtx(n) if nargin != 1  usage("T = dctmtx(n)") + print_usage; endif if n > 1 Modified: trunk/octaveforge/main/signal/inst/decimate.m ===================================================================  trunk/octaveforge/main/signal/inst/decimate.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/decimate.m 20120118 14:02:54 UTC (rev 9531) @@ 2,7 +2,7 @@ ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ 35,10 +35,11 @@ function y = decimate(x, q, n, ftype)  if nargin < 1  nargin > 4,  usage("y=decimate(x, q [, n] [, ftype])"); + if nargin < 1  nargin > 4 + print_usage; + elseif q != fix(q) + error("decimate only works with integer q."); endif  if q != fix(q), error("decimate only works with integer q."); endif if nargin<3 ftype='iir'; Modified: trunk/octaveforge/main/signal/inst/dftmtx.m ===================================================================  trunk/octaveforge/main/signal/inst/dftmtx.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/dftmtx.m 20120118 14:02:54 UTC (rev 9531) @@ 2,7 +2,7 @@ ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ 26,13 +26,11 @@ function d = dftmtx(n) if (nargin != 1)  error ("usage: d = dftmtx (n)");  endif   if (!isscalar(n)) + print_usage; + elseif (!isscalar(n)) error ("dftmtx: argument must be scalar"); endif  + d = fft(eye(n)); endfunction Modified: trunk/octaveforge/main/signal/inst/diric.m ===================================================================  trunk/octaveforge/main/signal/inst/diric.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/diric.m 20120118 14:02:54 UTC (rev 9531) @@ 1,8 +1,8 @@ ## Copyright (C) 2007 Sylvain Pelissier <sylvain.pelissier@...> +## Copyright (C) 2007 Sylvain Pelissier <sylvain.pelissier@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ 15,18 +15,18 @@ ## * texinfo * ## @deftypefn {Function File} {[@var{y}] =} diric(@var{x},@var{n}) ## Compute the dirichlet function. +## Compute the dirichlet function. ## @seealso{sinc, gauspuls, sawtooth} ## @end deftypefn function [y] = diric(x,n)  if (nargin < 2); usage('diric(x,n)'); end   if (n <= 0  floor(n) ~= n)  error("n must be an integer strictly positive");  endif   y = sin(n.*x./2)./(n.*sin(x./2));  y(mod(x,2*pi)==0) = (1).^((n1).*x(mod(x,2*pi)==0)./(2.*pi)); + if (nargin < 2) + print_usage; + elseif (n <= 0  floor(n) ~= n) + error("n must be an integer strictly positive"); + endif endfunction; \ No newline at end of file + y = sin(n.*x./2)./(n.*sin(x./2)); + y(mod(x,2*pi)==0) = (1).^((n1).*x(mod(x,2*pi)==0)./(2.*pi)); + +endfunction Modified: trunk/octaveforge/main/signal/inst/downsample.m ===================================================================  trunk/octaveforge/main/signal/inst/downsample.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/downsample.m 20120118 14:02:54 UTC (rev 9531) @@ 1,4 +1,4 @@ ## Copyright (C) 2007 Paul Kienzle <pkienzle@...> +## Author: Paul Kienzle <pkienzle@...> 2007 ## This function is public domain ## * texinfo * Modified: trunk/octaveforge/main/signal/inst/dst.m ===================================================================  trunk/octaveforge/main/signal/inst/dst.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/dst.m 20120118 14:02:54 UTC (rev 9531) @@ 1,4 +1,4 @@ ## Copyright (C) 2006 Paul Kienzle <pkienzle@...> +## Author: Paul Kienzle <pkienzle@...> 2006 ## This function is public domain ## * texinfo * Modified: trunk/octaveforge/main/signal/inst/dwt.m ===================================================================  trunk/octaveforge/main/signal/inst/dwt.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/dwt.m 20120118 14:02:54 UTC (rev 9531) @@ 1,4 +1,4 @@ ## Copyright (C) 2008 Sylvain Pelissier <sylvain.pelissier@...> +## Copyright (C) 2008 Sylvain Pelissier <sylvain.pelissier@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ 15,19 +15,19 @@ ## * texinfo * ## @deftypefn {Function File} {[@var{ca} @var{cd}] =} dwt(@var{x,lo_d,hi_d}) ## Comupte de discrete wavelet transform of x with one level. +## Comupte de discrete wavelet transform of x with one level. ## @end deftypefn +function [ca cd] = dwt(x,lo_d,hi_d) + if (nargin < 3 nargin > 3) + print_usage; + elseif(~isvector(x)  ~isvector(lo_d)  ~isvector(hi_d)) + error('x, hi_d and lo_d must be vectors'); + end function [ca cd] = dwt(x,lo_d,hi_d)  if (nargin < 3 nargin > 3); usage("[ca cd] = dwt(x,lo_d,hi_d)"); end   if(~isvector(x)  ~isvector(lo_d)  ~isvector(hi_d))  error('x, hi_d and lo_d must be vectors');  end   h = filter(hi_d,1,x);  g = filter(lo_d,1,x);   cd = downsample(h,2);  ca = downsample(g,2); \ No newline at end of file + h = filter(hi_d,1,x); + g = filter(lo_d,1,x); + + cd = downsample(h,2); + ca = downsample(g,2); +endfunction Modified: trunk/octaveforge/main/signal/inst/ellip.m ===================================================================  trunk/octaveforge/main/signal/inst/ellip.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/ellip.m 20120118 14:02:54 UTC (rev 9531) @@ 1,8 +1,9 @@ ## Copyright (C) 2001 Paulo Neis <p_neis@...> +## Copyright (C) 2003 Doug Stewart <dastew@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ 12,7 +13,6 @@ ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. ## ## Nellip 0.2.1 ##usage: [Zz, Zp, Zg] = ellip(n, Rp, Rs, Wp, stype,'s') @@ 47,15 +47,12 @@ ##  Parente Ribeiro, E., Notas de aula da disciplina TE498  Processamento ## Digital de Sinais, UFPR, 2001/2002. ##  Kienzle, Paul, functions from OctaveForge, 1999 (http://octave.sf.net). ## ## Author: Paulo Neis <p_neis@...> ## Modified: Doug Stewart Feb. 2003 function [a,b,c,d] = ellip(n, Rp, Rs, W, varargin) if (nargin>6  nargin<4)  (nargout>4  nargout<2)  usage ("[b, a] or [z, p, g] or [a,b,c,d] = ellip (n, Rp, Rs, Wp, [, 'ftype'][,'s'])"); + print_usage; endif ## interpret the input parameters Modified: trunk/octaveforge/main/signal/inst/ellipord.m ===================================================================  trunk/octaveforge/main/signal/inst/ellipord.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/ellipord.m 20120118 14:02:54 UTC (rev 9531) @@ 2,7 +2,7 @@ ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ 12,7 +12,6 @@ ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. ## ## usage: [n,wp] = ellipord(wp,ws, rp,rs) ## @@ 27,70 +26,65 @@ ##  Lamar, Marcus Vinicius, Notas de aula da disciplina TE 456  Circuitos ## Analogicos II, UFPR, 2001/2002.   function [n, Wp] = ellipord(Wp, Ws, Rp, Rs) ## [rp, cp]=size(Wp); [rs, cs]=size(Ws); if ( !(length(Wp)<=2 && (rp==1  cp==1) && length(Ws)<=2 && (rs==1  cs==1)) )  error ("ellipord: frequency must be given as w0 or [w0, w1]"); elseif (!all(Wp >= 0 & Wp <= 1 & Ws >= 0 & Ws <= 1)) #####  error ("ellipord: critical frequencies must be in (0 1)"); elseif (!(length(Wp)==1  length(Wp) == 2 & length(Ws)==1  length(Ws) == 2))  error ("ellipord: only one filter band allowed"); elseif (length(Wp)==2 && !(Wp(1) < Wp(2)))  error ("ellipord: first band edge must be smaller than second"); elseif (length(Ws)==2 && !(length(Wp)==2))  error ("ellipord: you must specify band pass borders."); elseif (length(Wp)==2 && length(Ws)==2 && !(Ws(1) < Wp(1) && Ws(2) > Wp(2)) )  error ("ellipord: ( Wp(1), Wp(2) ) must be inside of interval ( Ws(1), Ws(2) )"); elseif (length(Wp)==2 && length(Ws)==1 && !(Ws < Wp(1)  Ws > Wp(2)) )  error ("ellipord: Ws must be out of interval ( Wp(1), Wp(2) )"); endif + [rp, cp]=size(Wp); + [rs, cs]=size(Ws); + if ( !(length(Wp)<=2 && (rp==1  cp==1) && length(Ws)<=2 && (rs==1  cs==1)) ) + error ("ellipord: frequency must be given as w0 or [w0, w1]"); + elseif (!all(Wp >= 0 & Wp <= 1 & Ws >= 0 & Ws <= 1)) ##### + error ("ellipord: critical frequencies must be in (0 1)"); + elseif (!(length(Wp)==1  length(Wp) == 2 & length(Ws)==1  length(Ws) == 2)) + error ("ellipord: only one filter band allowed"); + elseif (length(Wp)==2 && !(Wp(1) < Wp(2))) + error ("ellipord: first band edge must be smaller than second"); + elseif (length(Ws)==2 && !(length(Wp)==2)) + error ("ellipord: you must specify band pass borders."); + elseif (length(Wp)==2 && length(Ws)==2 && !(Ws(1) < Wp(1) && Ws(2) > Wp(2)) ) + error ("ellipord: ( Wp(1), Wp(2) ) must be inside of interval ( Ws(1), Ws(2) )"); + elseif (length(Wp)==2 && length(Ws)==1 && !(Ws < Wp(1)  Ws > Wp(2)) ) + error ("ellipord: Ws must be out of interval ( Wp(1), Wp(2) )"); + endif + # sampling frequency of 2 Hz + T = 2; + Wpw = tan(pi.*Wp./T); # prewarp + Wsw = tan(pi.*Ws./T); # prewarp + ##pass/stop band to low pass filter transform: + if (length(Wpw)==2 && length(Wsw)==2) + wp=1; + w02 = Wpw(1) * Wpw(2); # Central frequency of stop/pass band (square) + w3 = w02/Wsw(2); + w4 = w02/Wsw(1); + if (w3 > Wsw(1)) + ws = (Wsw(2)w3)/(Wpw(2)Wpw(1)); + elseif (w4 < Wsw(2)) + ws = (w4Wsw(1))/(Wpw(2)Wpw(1)); + else + ws = (Wsw(2)Wsw(1))/(Wpw(2)Wpw(1)); + endif + elseif (length(Wpw)==2 && length(Wsw)==1) + wp=1; + w02 = Wpw(1) * Wpw(2); + if (Wsw > Wpw(2)) + w3 = w02/Wsw; + ws = (Wsw  w3)/(Wpw(2)  Wpw(1)); + else + w4 = w02/Wsw; + ws = (w4  Wsw)/(Wpw(2)  Wpw(1)); + endif + else + wp = Wpw; + ws = Wsw; + endif # sampling frequency of 2 Hz T = 2; + k=wp/ws; + k1=sqrt(1k^2); + q0=(1/2)*((1sqrt(k1))/(1+sqrt(k1))); + q= q0 + 2*q0^5 + 15*q0^9 + 150*q0^13; %(....) + D=(10^(0.1*Rs)1)/(10^(0.1*Rp)1); Wpw = tan(pi.*Wp./T); # prewarp Wsw = tan(pi.*Ws./T); # prewarp  ##pass/stop band to low pass filter transform: if (length(Wpw)==2 && length(Wsw)==2)  wp=1;  w02 = Wpw(1) * Wpw(2); # Central frequency of stop/pass band (square)  w3 = w02/Wsw(2);  w4 = w02/Wsw(1);  if (w3 > Wsw(1))  ws = (Wsw(2)w3)/(Wpw(2)Wpw(1));  elseif (w4 < Wsw(2))  ws = (w4Wsw(1))/(Wpw(2)Wpw(1));  else  ws = (Wsw(2)Wsw(1))/(Wpw(2)Wpw(1));  endif elseif (length(Wpw)==2 && length(Wsw)==1)  wp=1;  w02 = Wpw(1) * Wpw(2);  if (Wsw > Wpw(2))  w3 = w02/Wsw;  ws = (Wsw  w3)/(Wpw(2)  Wpw(1));  else  w4 = w02/Wsw;  ws = (w4  Wsw)/(Wpw(2)  Wpw(1));  endif else  wp = Wpw;  ws = Wsw; endif  k=wp/ws; k1=sqrt(1k^2); q0=(1/2)*((1sqrt(k1))/(1+sqrt(k1))); q= q0 + 2*q0^5 + 15*q0^9 + 150*q0^13; %(....) D=(10^(0.1*Rs)1)/(10^(0.1*Rp)1);  n=ceil(log10(16*D)/log10(1/q)); + n=ceil(log10(16*D)/log10(1/q)); +endfunction Modified: trunk/octaveforge/main/signal/inst/fht.m ===================================================================  trunk/octaveforge/main/signal/inst/fht.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/fht.m 20120118 14:02:54 UTC (rev 9531) @@ 2,7 +2,7 @@ ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ 12,7 +12,6 @@ ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. ## ## * texinfo * ## @deftypefn{Function File} {m = } fht ( d, n, dim ) Modified: trunk/octaveforge/main/signal/inst/filtfilt.m ===================================================================  trunk/octaveforge/main/signal/inst/filtfilt.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/filtfilt.m 20120118 14:02:54 UTC (rev 9531) @@ 4,7 +4,7 @@ ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ 30,18 +30,6 @@ ## y = filtfilt(b,a,x); z = filter(b,a,x); % apply filter ## plot(t,x,';data;',t,y,';filtfilt;',t,z,';filter;') ## Changelog: ## 2000 02 pkienzle@... ##  pad with zeros to load up the state vector on filter reverse. ##  add example ## 2007 12 pot@... ##  use filtic to compute initial and final states ##  work for multiple columns as well ## 2008 12 lciti@... ##  fixed instability issues with IIR filters and noisy inputs ##  initial states computed according to Likhterov & Kopeika, 2003 ##  use of a "reflection method" to reduce end effects ##  added some basic tests ## TODO: (pkienzle) My version seems to have similar quality to matlab, ## but both are pretty bad. They do remove gross lag errors, though. @@ 49,7 +37,7 @@ function y = filtfilt(b, a, x) if (nargin != 3)  usage("y=filtfilt(b,a,x)"); + print_usage; end rotate = (size(x,1)==1); if rotate, # a row vector @@ 134,4 +122,3 @@ %! assert (y, [yr.' ys.']); %! y2 = filtfilt(b.', a.', [r.' s.']); %! assert (y, y2);  Modified: trunk/octaveforge/main/signal/inst/filtic.m ===================================================================  trunk/octaveforge/main/signal/inst/filtic.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/filtic.m 20120118 14:02:54 UTC (rev 9531) @@ 2,7 +2,7 @@ ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ 35,12 +35,10 @@ ## input vector x and output vector y ## ## Author: David Billinghurst  function zf = filtic(b,a,y,x) if (nargin>4  nargin<3)  (nargout>1)  usage ("zf = filtic (b, a, y [,x])"); + print_usage; endif if nargin < 4, x = []; endif Modified: trunk/octaveforge/main/signal/inst/fir1.m ===================================================================  trunk/octaveforge/main/signal/inst/fir1.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/fir1.m 20120118 14:02:54 UTC (rev 9531) @@ 2,7 +2,7 @@ ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, Modified: trunk/octaveforge/main/signal/inst/fir2.m ===================================================================  trunk/octaveforge/main/signal/inst/fir2.m 20120118 08:20:01 UTC (rev 9530) +++ trunk/octaveforge/main/signal/inst/fir2.m 20120118 14:02:54 UTC (rev 9531) @@ 1,17 +1,17 @@ ## Copyright (C) 2000 Paul Kienzle <pkienzle@...> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or ## (at your option) any later version. +## This program is free software; you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free Software +## Foundation; either version 3 of the License, or (at your option) any later +## version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. +## This program is distributed in the hope that it will be useful, but WITHOUT +## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +## details. ## ## You should have received a copy of the GNU General Public License ## along with this program; If not, see <http://www.gnu.org/licenses/>;. +## You should have received a copy of the GNU General Public License along with +## this program; if not, see <http://www.gnu.org/licenses/>;. ## usage: b = fir2(n, f, m [, grid_n [, ramp_n]] [, window]) ## @@ 43,19 +43,10 @@ ## [h, w] = freqz(fir2(100,f,m)); ## plot(f,m,';target response;',w/pi,abs(h),';filter response;'); ## Feb 27, 2000 PAK ## use ramping on any transition less than ramp_n units ## use 2^nextpow2(n+1) for expanded grid size if grid is too small ## 20010130 PAK ## set default ramp length to grid_n/20 (i.e., pi/20 radians) ## use interp1 to interpolate the grid points ## better(?) handling of 0 and pi frequency points. ## added some demos  function b = fir2(n, f, m, grid_n, ramp_n, window) if nargin < 3  nargin > 6  usage("b = fir2(n, f, m [, grid_n [, ramp_n]] [, window])"); + print_usage; endif ## verify frequency and magnitude vectors are reasonable This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <paramaniac@us...>  20120118 08:20:11

Revision: 9530 http://octave.svn.sourceforge.net/octave/?rev=9530&view=rev Author: paramaniac Date: 20120118 08:20:01 +0000 (Wed, 18 Jan 2012) Log Message:  quaternion_oo: fix copypaste error Modified Paths:  trunk/octaveforge/extra/quaternion_oo/NEWS Modified: trunk/octaveforge/extra/quaternion_oo/NEWS ===================================================================  trunk/octaveforge/extra/quaternion_oo/NEWS 20120118 08:16:26 UTC (rev 9529) +++ trunk/octaveforge/extra/quaternion_oo/NEWS 20120118 08:20:01 UTC (rev 9530) @@ 1,4 +1,4 @@ Summary of important uservisible changes for releases of the control package +Summary of important uservisible changes for releases of the quaternion package =============================================================================== quaternion2.0.0 Release Date: 2012xxyy Release Manager: Lukas Reichlin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <paramaniac@us...>  20120118 08:16:38

Revision: 9529 http://octave.svn.sourceforge.net/octave/?rev=9529&view=rev Author: paramaniac Date: 20120118 08:16:26 +0000 (Wed, 18 Jan 2012) Log Message:  quaternion_oo: add a news file Modified Paths:  trunk/octaveforge/extra/quaternion_oo/DESCRIPTION trunk/octaveforge/extra/quaternion_oo/Makefile Added Paths:  trunk/octaveforge/extra/quaternion_oo/NEWS Modified: trunk/octaveforge/extra/quaternion_oo/DESCRIPTION ===================================================================  trunk/octaveforge/extra/quaternion_oo/DESCRIPTION 20120117 15:57:23 UTC (rev 9528) +++ trunk/octaveforge/extra/quaternion_oo/DESCRIPTION 20120118 08:16:26 UTC (rev 9529) @@ 1,11 +1,11 @@ Name: quaternion Version: 1.9.51 Date: 20111230 +Version: 1.9.52 +Date: 20120118 Author: Lukas Reichlin <lukas.reichlin@...> Maintainer: Lukas Reichlin <lukas.reichlin@...> Title: Quaternion Description: Overloaded operators for quaternions Depends: octave (>= 3.5.90) +Depends: octave (>= 3.6.0) Autoload: yes License: GPL version 3 or later Url: http://octave.sf.net Modified: trunk/octaveforge/extra/quaternion_oo/Makefile ===================================================================  trunk/octaveforge/extra/quaternion_oo/Makefile 20120117 15:57:23 UTC (rev 9528) +++ trunk/octaveforge/extra/quaternion_oo/Makefile 20120118 08:16:26 UTC (rev 9529) @@ 1,6 +1,6 @@ sinclude ../../Makeconf PKG_FILES = COPYING DESCRIPTION INDEX $(wildcard inst/*) +PKG_FILES = COPYING DESCRIPTION INDEX NEWS $(wildcard inst/*) SUBDIRS = doc/ .PHONY: $(SUBDIRS) Added: trunk/octaveforge/extra/quaternion_oo/NEWS ===================================================================  trunk/octaveforge/extra/quaternion_oo/NEWS (rev 0) +++ trunk/octaveforge/extra/quaternion_oo/NEWS 20120118 08:16:26 UTC (rev 9529) @@ 0,0 +1,14 @@ +Summary of important uservisible changes for releases of the control package + +=============================================================================== +quaternion2.0.0 Release Date: 2012xxyy Release Manager: Lukas Reichlin +=============================================================================== + +** First official release. Its main features are: +  Matrices and ndimensional arrays of quaternions. +  Overloaded operators due to the use of classes. +  Operator semantics similar to Octave’s builtin complex numbers. +  Vectorized code for crunching large quaternion arrays in a speedy manner. + + +=============================================================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 