Mercurial > octave
changeset 3426:f8dde1807dee
[project @ 2000-01-13 08:40:00 by jwe]
line wrap: on
line diff
--- a/scripts/audio/loadaudio.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/audio/loadaudio.m Thu Jan 13 08:40:53 2000 +0000 @@ -20,13 +20,13 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} loadaudio (@var{name}, @var{ext}, @var{bps}) ## Loads audio data from the file @file{@var{name}.@var{ext}} into the -## vector @var{x}. +## vector @var{x}. ## ## The extension @var{ext} determines how the data in the audio file is ## interpreted; the extensions @file{lin} (default) and @file{raw} ## correspond to linear, the extensions @file{au}, @file{mu}, or @file{snd} ## to mu-law encoding. -## +## ## The argument @var{bps} can be either 8 (default) or 16, and specifies ## the number of bits per sample used in the audio file. ## @end deftypefn
--- a/scripts/audio/playaudio.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/audio/playaudio.m Thu Jan 13 08:40:53 2000 +0000 @@ -38,10 +38,10 @@ [nr, nc] = size (name); if (nc != 1) if (nr == 1) - name = name'; - nr = nc; + name = name'; + nr = nc; else - error ("playaudio: X must be a vector"); + error ("playaudio: X must be a vector"); endif endif X = name + 127;
--- a/scripts/audio/saveaudio.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/audio/saveaudio.m Thu Jan 13 08:40:53 2000 +0000 @@ -17,7 +17,7 @@ ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -## -*- texinfo -*- +## -*- texinfo -*- ## @deftypefn {Function File} {} saveaudio (@var{name}, @var{x}, @var{ext}, @var{bps}) ## Saves a vector @var{x} of audio data to the file ## @file{@var{name}.@var{ext}}. The optional parameters @var{ext} and @@ -63,12 +63,12 @@ if (bit == 8) ld = max (abs (X)); if (ld > 127) # convert 16 to 8 bit - if (ld < 16384) - sc = 64 / ld; - else - sc = 1 / 256; - endif - X = fix (X * sc); + if (ld < 16384) + sc = 64 / ld; + else + sc = 1 / 256; + endif + X = fix (X * sc); endif X = X + 127; c = fwrite (num, X, "uchar");
--- a/scripts/control/obsolete/dlqg.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/control/obsolete/dlqg.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,20 +1,20 @@ ## Copyright (C) 1996 Auburn University. All rights reserved. ## -## This file is part of Octave. +## This file is part of Octave. +## +## Octave 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. ## -## Octave 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. -## -## Octave 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 +## Octave 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 Octave; see the file COPYING. If not, write to the Free -## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. +## +## You should have received a copy of the GNU General Public License +## along with Octave; see the file COPYING. If not, write to the Free +## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. ## O B S O L E T E * * * D O N O T U S E! ## @@ -22,7 +22,7 @@ ## ## function [K,Q,P,Ee,Er] = dlqg(A,B,C,G,Sigw,Sigv,Q,R) ## function [K,Q,P,Ee,Er] = dlqg(Sys,Sigw,Sigv,Q,R) -## +## ## design a discrete-time linear quadratic gaussian optimal controller ## for the system ## @@ -36,10 +36,10 @@ ## Ee: estimator poles ## Es: controller poles ## inputs: -## A,B,C,G, or Sys: state space representation of system. -## Sigw, Sigv: covariance matrices of independent Gaussian noise processes +## A,B,C,G, or Sys: state space representation of system. +## Sigw, Sigv: covariance matrices of independent Gaussian noise processes ## (as above) -## Q, R: state, control weighting matrices for dlqr call respectively. +## Q, R: state, control weighting matrices for dlqr call respectively. ## ## See also: lqg, dlqe, dlqr @@ -70,10 +70,10 @@ error("dlqg: system has no discrete time states") elseif(nin <= columns(Sigw)) error(["dlqg: ",num2str(nin)," inputs provided, noise dimension is ", ... - num2str(columns(Sigw))]) + num2str(columns(Sigw))]) elseif(nout != columns(Sigv)) error(["dlqg: number of outputs (",num2str(nout),") incompatible with ", ... - "dimension of Sigv (",num2str(columns(Sigv)),")"]) + "dimension of Sigv (",num2str(columns(Sigv)),")"]) endif ## put parameters into correct variables
--- a/scripts/control/obsolete/minfo.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/control/obsolete/minfo.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,20 +1,20 @@ ## Copyright (C) 1996 Auburn University. All rights reserved. ## -## This file is part of Octave. +## This file is part of Octave. +## +## Octave 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. ## -## Octave 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. -## -## Octave 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 +## Octave 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 Octave; see the file COPYING. If not, write to the Free -## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. +## +## You should have received a copy of the GNU General Public License +## along with Octave; see the file COPYING. If not, write to the Free +## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. ## function [systype, nout, nin, ncstates, ndstates] = minfo(inmat) ## @@ -27,7 +27,7 @@ ## nout is the number of outputs of the system ## nin is the number of inputs of the system ## ncstates is the number of continuous states of the system -## ndstates is the number of discrete states of the system +## ndstates is the number of discrete states of the system ## Author: R. Bruce Tenison <btenison@eng.auburn.edu> ## Created: July 29, 1994 @@ -37,27 +37,27 @@ function [systype, nout, nin, ncstates, ndstates] = minfo (inmat) warning("minfo: obsolete. Use sys2ss, sys2tf, or sys2zp."); - + if (nargin ~= 1 ) disp ("MINFO: Wrong number of arguments") systype = nout = nin = ncstates = ndstates = []; endif - + [rr,cc] = size(inmat); - + ## Check for empty matrix first! if (isempty(inmat)) systype = "empty"; nout = nin = ncstates = ndstates = 0; return - + ## Check for Constant matrix elseif (rr == 1 || cc == 1) systype = "constant"; nout = nin = ncstates = ndstates = 1; return - + ## Check for system type matrix elseif (inmat(rr,cc) == -Inf) systype = "system"; @@ -66,7 +66,7 @@ nstates = ncstates + ndstates; nout = rr - nstates - 1; nin = cc - nstates - 1; - + ## Check for Varying type matrix elseif (inmat(rr,cc) == Inf) systype = "varying";
--- a/scripts/control/obsolete/packsys.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/control/obsolete/packsys.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,30 +1,30 @@ ## Copyright (C) 1996 Auburn University. All rights reserved. ## -## This file is part of Octave. +## This file is part of Octave. +## +## Octave 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. ## -## Octave 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. -## -## Octave 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 +## Octave 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 Octave; see the file COPYING. If not, write to the Free -## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. +## +## You should have received a copy of the GNU General Public License +## along with Octave; see the file COPYING. If not, write to the Free +## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. ## O B S O L E T E: use ss2sys instead. ## function Asys = packsys(a,b,c[,d,dflg]) -## +## ## dflg: 0 for continuous time system, 1 for discrete-time system. -## +## ## defaults: ## D: 0 matrix of appropriate dimension. ## dflg: 0 (continuous time) -## +## ## Note: discrete-state sampling time is not included! ## Author: R. Bruce Tenison <btenison@eng.auburn.edu> @@ -35,7 +35,7 @@ function Asys = packsys (a, b, c, d, dflg) warning("packsys is obsolete! Use ss2sys instead."); - + if (nargin < 3 || nargin > 5) disp("packsys: Invalid number of arguments") endif @@ -45,7 +45,7 @@ if( !is_scalar(dflg)) [m,n] = size(dflg); error(["packsys: dflg (",num2str(m),",",num2str(n), ... - ") must be a scalar."]); + ") must be a scalar."]); elseif( (dflg != 0) && (dflg != 1)) error(["packsys: dflg=",num2str(dflg),"must be 0 or 1"]); endif @@ -65,7 +65,7 @@ if (n == -1 || m == -1 || p == -1) error("packsys: incompatible dimensions") endif - + Asys = ss2sys(a,b,c,d,dflg); endfunction
--- a/scripts/control/obsolete/qzval.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/control/obsolete/qzval.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,24 +1,24 @@ ## Copyright (C) 1998 Auburn University. All rights reserved. ## -## This file is part of Octave. +## This file is part of Octave. +## +## Octave 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. ## -## Octave 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. -## -## Octave 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 +## Octave 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 Octave; see the file COPYING. If not, write to the Free -## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. +## +## You should have received a copy of the GNU General Public License +## along with Octave; see the file COPYING. If not, write to the Free +## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. ## -*- texinfo -*- ## @deftypefn {Function File } { @var{x} =} qzval (@var{A}, @var{B}) -## Compute generalized eigenvalues of the matrix pencil +## Compute generalized eigenvalues of the matrix pencil ## @ifinfo ## @example ## (A - lambda B). @@ -29,12 +29,12 @@ ## $(A - \lambda B)$. ## @end tex ## @end iftex -## +## ## @var{A} and @var{B} must be real matrices. -## +## ## @strong{Note} @code{qzval} is obsolete; use @code{qz} instead. ## @end deftypefn - + ## Author: A. S. Hodel <a.s.hodel@eng.auburn.edu> ## Created: July 1998
--- a/scripts/control/obsolete/series.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/control/obsolete/series.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,20 +1,20 @@ ## Copyright (C) 1996 Auburn University. All rights reserved. ## -## This file is part of Octave. +## This file is part of Octave. +## +## Octave 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. ## -## Octave 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. -## -## Octave 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 +## Octave 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 Octave; see the file COPYING. If not, write to the Free -## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. +## +## You should have received a copy of the GNU General Public License +## along with Octave; see the file COPYING. If not, write to the Free +## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. ## Forms the series connection of two systems. ## @@ -28,7 +28,7 @@ ## Type of input: State space systems ## Command: [a,b,c,d]=series(a1,b1,c1,d1,a2,b2,c2,d2) ## Forms the series representation of the two state space system arguments. -## The series connected system will have the inputs of system 1 and the +## The series connected system will have the inputs of system 1 and the ## outputs of system 2. ## ## Type of input: system data structure @@ -55,8 +55,8 @@ ## If four arguments input, put two transfer functions in series if(nargin == 4) - a = conv(a1,c1); % was conv1 - b = conv(b1,d1); % was conv1 + a = conv(a1,c1); % was conv1 + b = conv(b1,d1); % was conv1 c = 0; d = 0; @@ -65,7 +65,7 @@ elseif((nargin == 8)||(muflag == 1)) ## check matrix dimensions - + [n1,m1,p1] = abcddim(a1,b1,c1,d1); [n2,m2,p2] = abcddim(a2,b2,c2,d2); @@ -92,7 +92,7 @@ if(muflag == 1) a=ss2sys(a,b,c,d); b=c=d=0; - endif + endif endif endfunction
--- a/scripts/control/obsolete/swapcols.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/control/obsolete/swapcols.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,23 +1,23 @@ ## Copyright (C) 1996 Auburn University. All rights reserved. ## -## This file is part of Octave. +## This file is part of Octave. +## +## Octave 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. ## -## Octave 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. -## -## Octave 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 +## Octave 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 Octave; see the file COPYING. If not, write to the Free -## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. +## +## You should have received a copy of the GNU General Public License +## along with Octave; see the file COPYING. If not, write to the Free +## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. ## -*- texinfo -*- -## @deftypefn {Function File } { outputs =} swapcols ( inputs ) +## @deftypefn {Function File } { outputs =} swapcols ( inputs ) ## @format ## function B = swapcols(A) ## permute columns of A into reverse order @@ -29,7 +29,7 @@ ## Conversion to Octave R. Bruce Tenison July 4, 1994 function B = swapcols (A) - + m = length(A(1,:)); idx = m:-1:1; B = A(:,idx);
--- a/scripts/control/obsolete/swaprows.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/control/obsolete/swaprows.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,23 +1,23 @@ ## Copyright (C) 1996 Auburn University. All rights reserved. ## -## This file is part of Octave. +## This file is part of Octave. +## +## Octave 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. ## -## Octave 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. -## -## Octave 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 +## Octave 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 Octave; see the file COPYING. If not, write to the Free -## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. +## +## You should have received a copy of the GNU General Public License +## along with Octave; see the file COPYING. If not, write to the Free +## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. ## -*- texinfo -*- -## @deftypefn {Function File } { outputs =} swaprows ( inputs ) +## @deftypefn {Function File } { outputs =} swaprows ( inputs ) ## @format ## function B = swaprows(A) ## permute rows of A into reverse order @@ -27,7 +27,7 @@ ## Author: A. S. Hodel <a.s.hodel@eng.auburn.edu> ## Created: July 23, 1992 ## Conversion to Octave R. Bruce Tenison July 4, 1994 - + function B = swaprows (A) m = rows(A);
--- a/scripts/control/obsolete/syschnames.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/control/obsolete/syschnames.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,22 +1,22 @@ ## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## -## This file is part of Octave. +## This file is part of Octave. +## +## Octave 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. ## -## Octave 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. -## -## Octave 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 +## Octave 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 Octave; see the file COPYING. If not, write to the Free -## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. +## +## You should have received a copy of the GNU General Public License +## along with Octave; see the file COPYING. If not, write to the Free +## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. -## -*- texinfo -*- +## -*- texinfo -*- ## @deftypefn {Function File } {@var{retsys} =} syschnames (@var{sys}, @var{opt}, @var{list}, @var{names}) ## Superseded by @code{syssetsignals} ## @end deftypefn
--- a/scripts/control/obsolete/unpacksys.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/control/obsolete/unpacksys.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,20 +1,20 @@ ## Copyright (C) 1996 Auburn University. All rights reserved. ## -## This file is part of Octave. +## This file is part of Octave. +## +## Octave 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. ## -## Octave 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. -## -## Octave 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 +## Octave 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 Octave; see the file COPYING. If not, write to the Free -## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. +## +## You should have received a copy of the GNU General Public License +## along with Octave; see the file COPYING. If not, write to the Free +## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. ## [a,b,c,d] = unpacksys(sys) ## Obsolete. Use sys2ss instead.
--- a/scripts/elfun/gcd.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/elfun/gcd.m Thu Jan 13 08:40:53 2000 +0000 @@ -20,22 +20,22 @@ ## -*- texinfo -*- ## @deftypefn {Mapping Function} {} gcd (@var{x}, @code{...}) ## Compute the greatest common divisor of the elements of @var{x}, or the -## list of all the arguments. For example, -## +## list of all the arguments. For example, +## ## @example ## gcd (a1, ..., ak) ## @end example -## +## ## @noindent ## is the same as -## +## ## @example ## gcd ([a1, ..., ak]) ## @end example -## +## ## An optional second return value, @var{v} ## contains an integer vector such that -## +## ## @example ## g = v(1) * a(k) + ... + v(k) * a(k) ## @end example
--- a/scripts/elfun/lcm.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/elfun/lcm.m Thu Jan 13 08:40:53 2000 +0000 @@ -20,20 +20,20 @@ ## -*- texinfo -*- ## @deftypefn {Mapping Function} {} lcm (@var{x}, @code{...}) ## Compute the least common multiple of the elements elements of @var{x}, or -## the list of all the arguments. For example, -## +## the list of all the arguments. For example, +## ## @example ## lcm (a1, ..., ak) ## @end example -## +## ## @noindent ## is the same as -## +## ## @example ## lcm ([a1, ..., ak]). ## @end example ## @end deftypefn -## @seealso{gcd, min, max, ceil, and floor} +## @seealso{gcd, min, max, ceil, and floor} ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Created: 16 September 1994
--- a/scripts/finance/fv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/finance/fv.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -27,16 +27,16 @@ ## ## Note that the rate r is not specified in percent, i.e., one has to ## write 0.05 rather than 5 %. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Future value of an investment function v = fv (r, n, p, l, m) - + if ((nargin < 3) || (nargin > 5)) usage ("fv (r, n, p [, l] [, method])"); endif - + if !(is_scalar (r) && (r > -1)) error ("fv: r must be a scalar > -1"); elseif !(is_scalar (n) && (n > 0)) @@ -44,13 +44,13 @@ elseif !is_scalar (p) error ("fv: p must be a scalar."); endif - + if (r != 0) v = p * ((1 + r)^n - 1) / r; else v = p * n; endif - + if (nargin > 3) if (nargin == 5) if !isstr (m) @@ -71,6 +71,6 @@ error ("fv: l must be a scalar"); endif endif - + endfunction - +
--- a/scripts/finance/fvl.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/finance/fvl.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -21,13 +21,13 @@ ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Future value of an initial lump sum investment - + function v = fvl (r, n, l) - + if (nargin != 3) usage ("fvl (r, n, l)"); endif - + if !(is_scalar (r) && (r > -1)) error ("fvl: r has to be a scalar > -1"); elseif !(is_scalar (n) && (n > 0)) @@ -35,7 +35,7 @@ elseif !is_scalar (l) error ("fvl: l has to be a scalar"); endif - + v = l * (1 + r)^n; - + endfunction \ No newline at end of file
--- a/scripts/finance/irr.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/finance/irr.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -21,18 +21,18 @@ ## second argument is omitted, i = 0 is used. ## ## See also: npv; pv, rate. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Internal rate of return of an investment function r = irr (p, i) - + if (nargin == 1) i = 0; elseif !(nargin == 2) usage ("irr (p [, i])"); endif - + tmp = output_precision; output_precision = 15; if !(is_vector (p)) @@ -44,13 +44,13 @@ if !is_scalar (i) error ("irr: i must be a scalar"); endif - + string = ["function delta = f (r) ", ... "delta = npv (r, %s) - %g; end"]; eval (sprintf (string, p_string, i)); r = fsolve ("f", 0.01); - + output_precision = tmp; - + endfunction
--- a/scripts/finance/nper.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/finance/nper.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -30,16 +30,16 @@ ## write 0.05 rather than 5 %. ## @end deftypefn ## @seealso{pv, pmt, rate, and npv} - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Number of payments needed for amortizing a loan function n = nper (r, p, a, l, m) - + if ((nargin < 3) || (nargin > 5)) usage ("nper (r, p, a [, l] [, method])"); endif - + if !(is_scalar (r) && (r > -1)) error ("nper: r must be a scalar > -1"); elseif !is_scalar (p) @@ -63,18 +63,18 @@ m = "e"; l = 0; endif - + if strcmp (m, "b") p = p * (1 + r); endif - + q = (p - r * a) / (p - r * l); - + if (q > 0) n = - log (q) / log (1 + r); else n = Inf; endif - + endfunction
--- a/scripts/finance/npv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/finance/npv.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -29,23 +29,23 @@ ## 0.05 rather than 5 %. ## @end deftypefn ## @seealso{irr and pv} - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Net present value of a series of payments function v = npv (r, p, i) - + if ((nargin < 2) || (nargin > 3)) usage ("npv (r, p [, i]"); endif - + if !(is_vector (p)) error ("npv: p has to be a vector"); else n = length (p); p = reshape (p, 1, n); endif - + if any (any (r <= -1)) error ("npv: all interest rates must be > -1"); endif @@ -64,8 +64,8 @@ else i = 0; endif - + p = [i, p]; v = sum (d .* p); - + endfunction
--- a/scripts/finance/pmt.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/finance/pmt.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,20 +1,20 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -## -*- texinfo -*- +## -*- texinfo -*- ## @deftypefn {Function File} {} pmt (@var{r}, @var{n}, @var{a} [, @var{l}] [, @var{method}]) ## Compute the amount of periodic payment necessary to amortize a loan ## of amount a with interest rate @var{r} in @var{n} periods. @@ -25,16 +25,16 @@ ## beginning ("b") of each period. ## @end deftypefn ## @seealso{pv, nper, and rate} - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Amount of periodic payment needed to amortize a loan function p = pmt (r, n, a, l, m) - + if ((nargin < 3) || (nargin > 5)) usage ("pmt (r, n, a [, l] [, method])"); endif - + if !(is_scalar (r) && (r > -1)) error ("pmt: rate must be a scalar > -1"); elseif !(is_scalar (n) && (n > 0)) @@ -42,7 +42,7 @@ elseif !(is_scalar (a) && (a > 0)) error ("pmt: a must be a positive scalar."); endif - + if (nargin == 5) if !isstr (m) error ("pmt: `method' must be a string"); @@ -58,16 +58,16 @@ l = 0; m = "e"; endif - + p = r * (a - l * (1 + r)^(-n)) / (1 - (1 + r)^(-n)); - + if strcmp (m, "b") p = p / (1 + r); endif - - + + endfunction - +
--- a/scripts/finance/pv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/finance/pv.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -30,16 +30,16 @@ ## write 0.05 rather than 5 %. ## @end deftypefn ## @seealso{pmt, nper, rate, and npv} - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Present value of an investment function v = pv (r, n, p, l, m) - + if ((nargin < 3) || (nargin > 5)) usage ("pv (r, n, p [, l] [, method])"); endif - + if !(is_scalar (r) && (r > -1)) error ("pv: r must be a scalar > -1"); elseif !(is_scalar (n) && (n > 0)) @@ -47,17 +47,17 @@ elseif !is_scalar (p) error ("pv: p must be a scalar."); endif - + if (r != 0) v = p * (1 - (1 + r)^(-n)) / r; else v = p * n; endif - + if (nargin > 3) if (nargin == 5) if !isstr (m) - error ("pv: `method' must be a string"); + error ("pv: `method' must be a string"); endif elseif isstr (l) m = l; @@ -74,6 +74,6 @@ error ("pv: l must be a scalar"); endif endif - + endfunction - +
--- a/scripts/finance/pvl.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/finance/pvl.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,11 +23,11 @@ ## Description: Present value of an investment that pays off at the end function v = pvl (r, n, p) - + if (nargin != 3) usage ("pvl (r, n, p)"); endif - + if !(is_scalar (r) && (r > -1)) error ("pvl: r has to be a scalar > -1"); elseif !(is_scalar (n) && (n > 0)) @@ -35,7 +35,7 @@ elseif !is_scalar (p) error ("pvl: p has to be a scalar"); endif - + v = p / (1 + r)^n; - + endfunction
--- a/scripts/finance/rate.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/finance/rate.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,20 +1,20 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -## -*- texinfo -*- +## -*- texinfo -*- ## @deftypefn {Function File} {} rate (@var{n}, @var{p}, @var{v} [, @var{l}] [,@var{method}]) ## Computes the rate of return on an investment of present value @var{v} which ## pays @var{p} in @var{n} consecutive periods. @@ -25,16 +25,16 @@ ## at the end ("e", default) or at the beginning ("b") of each period. ## @end deftypefn ## @seealso{pv, pmt, nper, and npv} - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Rate of return of an investment - + function r = rate (n, p, v, l, m) if ((nargin < 3) || (nargin > 5)) usage ("rate (n, p, v [, l] [, method])"); endif - + if !(is_scalar (n) && (n > 0)) error ("rate: n must be a positive scalar"); elseif !is_scalar (p) @@ -58,15 +58,15 @@ l = 0; m = "e"; endif - + if !is_scalar (l) error ("rate: l must be a scalar"); endif - + string = ["function delta = f (r) ", ... "delta = pv (r, %g, %g, %g, \"%s\") - %g; end"]; eval (sprintf (string, n, p, l, m, v)); - + [r, info] = fsolve ("f", 0); - + endfunction
--- a/scripts/finance/vol.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/finance/vol.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Friedrich Leisch -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -61,7 +61,7 @@ retval(1, :) = sumsq (U((1 : n*m), :)); for i = 2 : (xr - n * m) retval(i, :) = retval(i - 1, :) ... - - U(i - 1, :).^2 + U(i + n * m - 1, :).^2; + - U(i - 1, :).^2 + U(i + n * m - 1, :).^2; endfor retval = sqrt (retval * m / (n * m - 1));
--- a/scripts/general/common_size.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/general/common_size.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -21,7 +21,7 @@ ## common size with all entries equal to @var{xi} if this is a scalar or ## @var{xi} otherwise. If the inputs cannot be brought to a common size, ## errorcode is 1, and @var{yi} is @var{xi}. For example, -## +## ## @example ## @group ## [errorcode, a, b] = common_size ([1 2; 3 4], 5) @@ -30,7 +30,7 @@ ## @result{} b = [ 5, 5; 5, 5 ] ## @end group ## @end example -## +## ## @noindent ## This is useful for implementing functions where arguments can either ## be scalars or of common size. @@ -41,7 +41,7 @@ ## Adapted-By: jwe function [errorcode, ...] = common_size (...) - + if (nargin < 2) error ("common_size: only makes sense if nargin >= 2"); endif @@ -50,7 +50,7 @@ for k = 1 : nargin s(k, :) = size (va_arg ()); endfor - + m = max (s); if (any (any ((s != 1)') & any ((s != ones (nargin, 1) * m)'))) errorcode = 1; @@ -63,9 +63,9 @@ va_start (); for k = 1 : nargin if (prod (s(k, :)) == 1) - vr_val (va_arg () * ones (m)); + vr_val (va_arg () * ones (m)); else - vr_val (va_arg ()); + vr_val (va_arg ()); endif endfor endif
--- a/scripts/general/diff.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/general/diff.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -26,10 +26,10 @@ ## @ifinfo ## @var{x}(2) - @var{x}(1), @dots{}, @var{x}(n) - @var{x}(n-1). ## @end ifinfo -## +## ## If @var{x} is a matrix, @code{diff (@var{x})} is the matrix of column ## differences. -## +## ## The second argument is optional. If supplied, @code{diff (@var{x}, ## @var{k})}, where @var{k} is a nonnegative integer, returns the ## @var{k}-th differences. @@ -40,7 +40,7 @@ ## Adapted-By: jwe function x = diff (x, k) - + if (nargin == 1) k = 1; elseif (nargin == 2) @@ -52,7 +52,7 @@ else usage ("diff (x [, k]"); endif - + if (isstr (x)) error ("diff: symbolic differentiation not (yet) supported"); elseif (is_vector (x)) @@ -61,7 +61,7 @@ x = []; else for i = 1 : k - x = x (2 : (n - i + 1)) - x (1 : (n - i)); + x = x (2 : (n - i + 1)) - x (1 : (n - i)); endfor endif elseif (is_matrix (x)) @@ -70,7 +70,7 @@ x = []; else for i = 1 : k - x = x (2 : (n - i + 1), :) - x (1: (n - i), :); + x = x (2 : (n - i + 1), :) - x (1: (n - i), :); endfor endif else
--- a/scripts/general/fliplr.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/general/fliplr.m Thu Jan 13 08:40:53 2000 +0000 @@ -20,8 +20,8 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} fliplr (@var{x}) ## Return a copy of @var{x} with the order of the columns reversed. For -## example, -## +## example, +## ## @example ## @group ## fliplr ([1, 2; 3, 4])
--- a/scripts/general/flipud.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/general/flipud.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,7 +21,7 @@ ## @deftypefn {Function File} {} flipud (@var{x}) ## Return a copy of @var{x} with the order of the rows reversed. For ## example, -## +## ## @example ## @group ## flipud ([1, 2; 3, 4])
--- a/scripts/general/is_duplicate_entry.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/general/is_duplicate_entry.m Thu Jan 13 08:40:53 2000 +0000 @@ -41,4 +41,4 @@ endif endfunction - +
--- a/scripts/general/is_square.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/general/is_square.m Thu Jan 13 08:40:53 2000 +0000 @@ -36,7 +36,7 @@ if (is_matrix (x)) [nr, nc] = size (x); if (nr == nc && nr > 0) - retval = nr; + retval = nr; endif endif else
--- a/scripts/general/is_symmetric.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/general/is_symmetric.m Thu Jan 13 08:40:53 2000 +0000 @@ -19,7 +19,7 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} is_symmetric (@var{x}, @var{tol}) -## If @var{x} is symmetric within the tolerance specified by @var{tol}, +## If @var{x} is symmetric within the tolerance specified by @var{tol}, ## then return the dimension of @var{x}. Otherwise, return 0. If ## @var{tol} is omitted, use a tolerance equal to the machine precision. ## @end deftypefn @@ -36,7 +36,7 @@ retval = is_square (x); if (retval != 0) if (nargin == 1) - tol = eps; + tol = eps; endif if (norm (x - x') / norm(x) > tol) retval = 0;
--- a/scripts/general/logspace.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/general/logspace.m Thu Jan 13 08:40:53 2000 +0000 @@ -29,7 +29,7 @@ ## @ifinfo ## 10^base to 10^limit. ## @end ifinfo -## +## ## If @var{limit} is equal to ## @iftex ## @tex
--- a/scripts/general/nargchk.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/general/nargchk.m Thu Jan 13 08:40:53 2000 +0000 @@ -22,7 +22,7 @@ ## If @var{n} is in the range @var{nargin_min} through @var{nargin_max} ## inclusive, return the empty matrix. Otherwise, return a message ## indicating whether @var{n} is too large or too small. -## +## ## This is useful for checking to see that the number of arguments supplied ## to a function is within an acceptable range. ## @end deftypefn
--- a/scripts/general/nextpow2.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/general/nextpow2.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -25,7 +25,7 @@ ## @ifinfo ## 2^n >= abs (x). ## @end ifinfo -## +## ## If @var{x} is a vector, return @code{nextpow2 (length (@var{x}))}. ## @end deftypefn ## @seealso{pow2} @@ -35,7 +35,7 @@ ## Adapted-By: jwe function n = nextpow2 (x) - + if (nargin != 1) usage ("nextpow2 (x)"); endif @@ -48,10 +48,10 @@ if (t > 1) x = t; endif - + [f, n] = log2 (abs (x)); if (f == 0.5) n = n - 1; endif - + endfunction
--- a/scripts/general/rem.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/general/rem.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,11 +21,11 @@ ## @deftypefn {Mapping Function} {} rem (@var{x}, @var{y}) ## Return the remainder of @code{@var{x} / @var{y}}, computed using the ## expression -## +## ## @example ## x - y .* fix (x ./ y) ## @end example -## +## ## An error message is printed if the dimensions of the arguments do not ## agree, or if either of the arguments is complex. ## @end deftypefn
--- a/scripts/general/reshape.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/general/reshape.m Thu Jan 13 08:40:53 2000 +0000 @@ -23,9 +23,9 @@ ## taken from the matrix @var{a}. To decide how to order the elements, ## Octave pretends that the elements of a matrix are stored in column-major ## order (like Fortran arrays are stored). -## +## ## For example, -## +## ## @example ## @group ## reshape ([1, 2, 3, 4], 2, 2) @@ -33,17 +33,17 @@ ## 2 4 ## @end group ## @end example -## +## ## If the variable @code{do_fortran_indexing} is nonzero, the ## @code{reshape} function is equivalent to -## +## ## @example ## @group ## retval = zeros (m, n); ## retval (:) = a; ## @end group ## @end example -## +## ## @noindent ## but it is somewhat less cryptic to use @code{reshape} instead of the ## colon operator. Note that the total number of elements in the original @@ -68,15 +68,15 @@ istno = implicit_str_to_num_ok; unwind_protect do_fortran_indexing = 1; - implicit_str_to_num_ok = 1; + implicit_str_to_num_ok = 1; retval = zeros (m, n); retval (:) = a; - if (isstr (a)) - retval = setstr (retval); - endif + if (isstr (a)) + retval = setstr (retval); + endif unwind_protect_cleanup do_fortran_indexing = dfi; - implicit_str_to_num_ok = istno; + implicit_str_to_num_ok = istno; end_unwind_protect else error ("reshape: sizes must match");
--- a/scripts/general/rot90.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/general/rot90.m Thu Jan 13 08:40:53 2000 +0000 @@ -24,7 +24,7 @@ ## how many 90-degree rotations are to be applied (the default value is 1). ## Negative values of @var{n} rotate the matrix in a clockwise direction. ## For example, -## +## ## @example ## @group ## rot90 ([1, 2; 3, 4], -1) @@ -32,11 +32,11 @@ ## 4 2 ## @end group ## @end example -## +## ## @noindent ## rotates the given matrix clockwise by 90 degrees. The following are all ## equivalent statements: -## +## ## @example ## @group ## rot90 ([1, 2; 3, 4], -1)
--- a/scripts/general/shift.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/general/shift.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -18,7 +18,7 @@ ## @deftypefn {Function File} {} shift (@var{x}, @var{b}) ## If @var{x} is a vector, perform a circular shift of length @var{b} of ## the elements of @var{x}. -## +## ## If @var{x} is a matrix, do the same for each column of @var{x}. ## @end deftypefn @@ -27,13 +27,13 @@ ## Adapted-By: jwe function y = shift (x, b) - + if (nargin != 2) error ("usage: shift (X, b)"); endif [nr, nc] = size (x); - + if (nr == 0 || nc == 0) error ("shift: x must not be empty"); elseif (nr == 1)
--- a/scripts/general/tril.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/general/tril.m Thu Jan 13 08:40:53 2000 +0000 @@ -25,20 +25,20 @@ ## setting all other elements to zero. The second argument is optional, ## and specifies how many diagonals above or below the main diagonal should ## also be set to zero. -## +## ## The default value of @var{k} is zero, so that @code{triu} and ## @code{tril} normally include the main diagonal as part of the result ## matrix. -## +## ## If the value of @var{k} is negative, additional elements above (for ## @code{tril}) or below (for @code{triu}) the main diagonal are also ## selected. -## +## ## The absolute value of @var{k} must not be greater than the number of ## sub- or super-diagonals. -## +## ## For example, -## +## ## @example ## @group ## tril (ones (3), -1) @@ -47,10 +47,10 @@ ## 1 1 0 ## @end group ## @end example -## +## ## @noindent ## and -## +## ## @example ## @group ## tril (ones (3), 1)
--- a/scripts/image/colormap.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/image/colormap.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,15 +21,15 @@ ## @deftypefn {Function File} {} colormap (@var{map}) ## @deftypefnx {Function File} {} colormap ("default") ## Set the current colormap. -## +## ## @code{colormap (@var{map})} sets the current colormap to @var{map}. The ## color map should be an @var{n} row by 3 column matrix. The columns ## contain red, green, and blue intensities respectively. All entries ## should be between 0 and 1 inclusive. The new colormap is returned. -## +## ## @code{colormap ("default")} restores the default colormap (a gray scale ## colormap with 64 entries). The default colormap is returned. -## +## ## With no arguments, @code{colormap} returns the current color map. ## @end deftypefn @@ -51,19 +51,19 @@ if (strcmp (map, "default")) map = gray (); else - unwind_protect - save_default_eval_print_flag = default_eval_print_flag; - default_eval_print_flag = 0; - map = eval (map); - unwind_protect_cleanup - default_eval_print_flag = save_default_eval_print_flag; - end_unwind_protect + unwind_protect + save_default_eval_print_flag = default_eval_print_flag; + default_eval_print_flag = 0; + map = eval (map); + unwind_protect_cleanup + default_eval_print_flag = save_default_eval_print_flag; + end_unwind_protect endif endif if (! isempty (map)) if (columns (map) != 3) - error( "colormap: map must have 3 columns: [R,G,B]." ); + error( "colormap: map must have 3 columns: [R,G,B]." ); endif if (min (min (map)) < 0 || max (max (map)) > 1) error( "colormap: map must have values in [0,1]." );
--- a/scripts/image/image.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/image/image.m Thu Jan 13 08:40:53 2000 +0000 @@ -22,7 +22,7 @@ ## Display a matrix as a color image. The elements of @var{x} are indices ## into the current colormap and should have values between 1 and the ## length of the colormap. If @var{zoom} is omitted, a value of 4 is -## assumed. +## assumed. ## @end deftypefn ## SEE ALSO: imshow, imagesc, colormap. @@ -59,7 +59,7 @@ ## the viewer in the background. command = sprintf ("( %s || %s && %s ) > /dev/null 2>&1 &", - xv, xloadimage, rm); + xv, xloadimage, rm); system (command);
--- a/scripts/image/imshow.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/image/imshow.m Thu Jan 13 08:40:53 2000 +0000 @@ -23,15 +23,15 @@ ## @deftypefnx {Function File} {} imshow (@var{i}, @var{n}) ## @deftypefnx {Function File} {} imshow (@var{r}, @var{g}, @var{b}) ## Display images. -## +## ## @code{imshow (@var{x})} displays an indexed image using the current ## colormap. -## +## ## @code{imshow (@var{x}, @var{map})} displays an indexed image using the ## specified colormap. -## +## ## @code{imshow (@var{i}, @var{n})} displays a gray scale intensity image. -## +## ## @code{imshow (@var{r}, @var{g}, @var{b})} displays an RGB image. ## @end deftypefn
--- a/scripts/image/saveimage.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/image/saveimage.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,22 +21,22 @@ ## @deftypefn {Function File} {} saveimage (@var{file}, @var{x}, @var{fmt}, @var{map}) ## Save the matrix @var{x} to @var{file} in image format @var{fmt}. Valid ## values for @var{fmt} are -## +## ## @table @code ## @item "img" ## Octave's image format. The current colormap is also saved in the file. -## +## ## @item "ppm" ## Portable pixmap format. -## +## ## @item "ps" ## PostScript format. Note that images saved in PostScript format can not ## be read back into Octave with loadimage. ## @end table -## +## ## If the fourth argument is supplied, the specified colormap will also be ## saved along with the image. -## +## ## Note: if the colormap contains only two entries and these entries are ## black and white, the bitmap ppm and PostScript formats are used. If the ## image is a gray scale image (the entries within each row of the colormap @@ -97,7 +97,7 @@ error ("image format specification must be a string"); elseif (! (strcmp (img_form, "img") || strcmp (img_form, "ppm") - || strcmp (img_form, "ps"))) + || strcmp (img_form, "ps"))) error ("unsupported image format specification"); endif @@ -154,32 +154,32 @@ if (grey && map_nr == 2 && bw) if (map(1) != 0) - map = [1; 0]; + map = [1; 0]; else - map = [0; 1]; + map = [0; 1]; endif n_long = rem (img_nc, 8); tmp = zeros (ceil (img_nc/8), img_nr); for i = 1:img_nr - idx = (i-1)*img_nc+1:i*img_nc; - if (n_long > 0) - img_row = [map(img(idx)); (zeros (8-n_long, 1))]; - else - img_row = map(img(idx)); - endif - img_row - tmp - if (img_nc < 8) - for j = 1:8 - tmp(:,i) = tmp(:,i) + img_row (j) * 2^(8-j); - endfor - else - for j = 1:8 - tmp(:,i) = tmp(:,i) + img_row (j:8:img_nc) * 2^(8-j); - endfor - endif + idx = (i-1)*img_nc+1:i*img_nc; + if (n_long > 0) + img_row = [map(img(idx)); (zeros (8-n_long, 1))]; + else + img_row = map(img(idx)); + endif + img_row + tmp + if (img_nc < 8) + for j = 1:8 + tmp(:,i) = tmp(:,i) + img_row (j) * 2^(8-j); + endfor + else + for j = 1:8 + tmp(:,i) = tmp(:,i) + img_row (j:8:img_nc) * 2^(8-j); + endfor + endif endfor fid = fopen (filename, "w"); @@ -245,14 +245,14 @@ if (scols > pagewid * MARGIN || srows > pagehgt * MARGIN) if (scols > pagewid * MARGIN) - scale = scale * (pagewid / scols * MARGIN); - scols = scale * img_nr * pixfac; - srows = scale * img_nc * pixfac; + scale = scale * (pagewid / scols * MARGIN); + scols = scale * img_nr * pixfac; + srows = scale * img_nc * pixfac; endif if (srows > pagehgt * MARGIN) - scale = scale * (pagehgt / srows * MARGIN); - scols = scale * img_nr * pixfac; - srows = scale * img_nc * pixfac; + scale = scale * (pagehgt / srows * MARGIN); + scols = scale * img_nr * pixfac; + srows = scale * img_nc * pixfac; endif warning ("image too large for page, rescaling to %g", scale); endif
--- a/scripts/linear-algebra/commutation_matrix.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/linear-algebra/commutation_matrix.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -61,7 +61,7 @@ ## @ifinfo ## @var{A}. ## @end ifinfo -## +## ## If only one argument @var{m} is given, ## @iftex ## @tex @@ -72,7 +72,7 @@ ## K(m,m) ## @end ifinfo ## is returned. -## +## ## See Magnus and Neudecker (1988), Matrix differential calculus with ## applications in statistics and econometrics. ## @end deftypefn @@ -82,7 +82,7 @@ ## Adapted-By: jwe function k = commutation_matrix (m, n) - + if (nargin < 1 || nargin > 2) usage ("commutation_matrix (m [, n])"); else @@ -95,7 +95,7 @@ error ("commutation_matrix: n must be a positive integer"); endif endif - + ## It is clearly possible to make this a LOT faster! k = zeros (m * n, m * n); for i = 1 : m
--- a/scripts/linear-algebra/cond.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/linear-algebra/cond.m Thu Jan 13 08:40:53 2000 +0000 @@ -47,9 +47,9 @@ sigma_1 = sigma(1); sigma_n = sigma(length (sigma)); if (sigma_1 == 0 || sigma_n == 0) - retval = Inf; + retval = Inf; else - retval = sigma_1 / sigma_n; + retval = sigma_1 / sigma_n; endif endif else
--- a/scripts/linear-algebra/cross.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/linear-algebra/cross.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -21,7 +21,7 @@ ## ## A row vector is returned if @var{x} and @var{y} are both row vectors; ## otherwise, a column vector is returned. -## +## ## @example ## @group ## cross ([1,1,0], [0,1,1]) @@ -35,7 +35,7 @@ ## Adapted-By: jwe function z = cross (x, y) - + if (nargin != 2) usage ("cross (x, y)"); endif
--- a/scripts/linear-algebra/dmult.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/linear-algebra/dmult.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -18,21 +18,21 @@ ## ## If a is a vector of length rows (B), return diag (a) * B (but ## computed much more efficiently). - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Rescale the rows of a matrix - + function M = dmult (a, B) - + if (nargin != 2) usage ("dmult (a, B)"); endif - + s = size (a); if ((min (s) > 1) || (max (s) != rows (B))) error ("dmult: a must be a vector of length rows (B)"); endif - + M = (reshape (a, max (s), 1) * ones (1, columns (B))) .* B; - + endfunction
--- a/scripts/linear-algebra/dot.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/linear-algebra/dot.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1998 John W. Eaton -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -21,7 +21,7 @@ ## Author: jwe function z = dot (x, y) - + if (nargin != 2) usage ("dot (x, y)"); endif @@ -31,15 +31,15 @@ [y_nr, y_nc] = size (y); if (x_nr == 1) if (y_nr == 1) - z = x * y.'; + z = x * y.'; else - z = x * y; + z = x * y; endif else if (y_nr == 1) - z = y * x; + z = y * x; else - z = y.' * x; + z = y.' * x; endif endif else
--- a/scripts/linear-algebra/duplication_matrix.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/linear-algebra/duplication_matrix.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,20 +1,20 @@ ## Copyright (C) 1995, 1996 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -## -*- texinfo -*- +## -*- texinfo -*- ## @deftypefn {Function File} {} duplication_matrix (@var{n}) ## Return the duplication matrix ## @iftex @@ -61,7 +61,7 @@ ## @ifinfo ## @var{A}. ## @end ifinfo -## +## ## See Magnus and Neudecker (1988), Matrix differential calculus with ## applications in statistics and econometrics. ## @end deftypefn
--- a/scripts/linear-algebra/housh.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/linear-algebra/housh.m Thu Jan 13 08:40:53 2000 +0000 @@ -28,7 +28,7 @@ # beta: If beta = 0, then no reflection need be applied (zer set to 0) # housv: householder vector # mar 6,1987 : rev dec 17,1988 - # rev sep 19,1991 (blas) + # rev sep 19,1991 (blas) # translated from FORTRAN Aug 1995 # A. S. Hodel @@ -43,10 +43,10 @@ else housv = x; m = max(abs(housv)); - if (m ~= 0.0) + if (m ~= 0.0) housv = housv/m; alpha = norm(housv); - if (alpha > z) + if (alpha > z) beta = 1.0/(alpha*(alpha+abs(housv(j)))); sg = sign(housv(j)); if( sg == 0)
--- a/scripts/linear-algebra/kron.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/linear-algebra/kron.m Thu Jan 13 08:40:53 2000 +0000 @@ -20,13 +20,13 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} kron (@var{a}, @var{b}) ## Form the kronecker product of two matrices, defined block by block as -## +## ## @example ## x = [a(i, j) b] ## @end example -## +## ## For example, -## +## ## @example ## @group ## kron (1:4, ones (3, 1)) @@ -48,17 +48,17 @@ [m, n] = size (b); [ma, na] = size (a); - x = zeros (ma*m, na*n); + x = zeros (ma*m, na*n); i_vec = 1:m; j_vec = 1:n; for jj = 1:na for ii = 1:ma - x(i_vec+(ii-1)*m,j_vec) = a(ii,jj) * b; + x(i_vec+(ii-1)*m,j_vec) = a(ii,jj) * b; endfor j_vec = j_vec + n; endfor - + else usage ("kron (a, b)"); endif
--- a/scripts/linear-algebra/krylov.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/linear-algebra/krylov.m Thu Jan 13 08:40:53 2000 +0000 @@ -109,7 +109,7 @@ if(pflg) # locate max magnitude element in short_q asq = abs(short_q); - maxv = max(asq); + maxv = max(asq); maxidx = find(asq == maxv); pivot_idx = short_pv(maxidx(1));
--- a/scripts/linear-algebra/krylovb.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/linear-algebra/krylovb.m Thu Jan 13 08:40:53 2000 +0000 @@ -19,7 +19,7 @@ function [Uret,Ucols] = krylovb(A,V,k,eps1,pflg); # function [U,Ucols] = krylovb(A,V,k{,eps1,pflg}); # construct orthogonal basis U of block Krylov subspace; - # [V AV A^2*V ... A^(k+1)*V]; + # [V AV A^2*V ... A^(k+1)*V]; # method used: householder reflections to guard against loss of # orthogonality # eps1: threshhold for 0 (default: 1e-12)
--- a/scripts/linear-algebra/norm.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/linear-algebra/norm.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,34 +21,34 @@ ## @deftypefn {Function File} {} norm (@var{a}, @var{p}) ## Compute the p-norm of the matrix @var{a}. If the second argument is ## missing, @code{p = 2} is assumed. -## +## ## If @var{a} is a matrix: -## +## ## @table @asis ## @item @var{p} = @code{1} ## 1-norm, the largest column sum of @var{a}. -## +## ## @item @var{p} = @code{2} ## Largest singular value of @var{a}. -## +## ## @item @var{p} = @code{Inf} ## @cindex infinity norm ## Infinity norm, the largest row sum of @var{a}. -## +## ## @item @var{p} = @code{"fro"} ## @cindex Frobenius norm ## Frobenius norm of @var{a}, @code{sqrt (sum (diag (@var{a}' * @var{a})))}. ## @end table -## +## ## If @var{a} is a vector or a scalar: -## +## ## @table @asis ## @item @var{p} = @code{Inf} ## @code{max (abs (@var{a}))}. -## +## ## @item @var{p} = @code{-Inf} ## @code{min (abs (@var{a}))}. -## +## ## @item other ## p-norm of @var{a}, @code{(sum (abs (@var{a}) .^ @var{p})) ^ (1/@var{p})}. ## @end table @@ -82,13 +82,13 @@ error ("norm: unrecognized norm"); endif else - if (p == Inf) - retval = max (abs (x)); - elseif (p == -Inf) - retval = min (abs (x)); - else - retval = sum (abs (x) .^ p) ^ (1/p); - endif + if (p == Inf) + retval = max (abs (x)); + elseif (p == -Inf) + retval = min (abs (x)); + else + retval = sum (abs (x) .^ p) ^ (1/p); + endif endif elseif (nargin == 1) retval = sum (abs (x) .^ 2) ^ 0.5;
--- a/scripts/linear-algebra/null.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/linear-algebra/null.m Thu Jan 13 08:40:53 2000 +0000 @@ -20,11 +20,11 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} null (@var{a}, @var{tol}) ## Return an orthonormal basis of the null space of @var{a}. -## +## ## The dimension of the null space is taken as the number of singular ## values of @var{a} not greater than @var{tol}. If the argument @var{tol} ## is missing, it is computed as -## +## ## @example ## max (size (@var{a})) * max (svd (@var{a})) * eps ## @end example
--- a/scripts/linear-algebra/orth.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/linear-algebra/orth.m Thu Jan 13 08:40:53 2000 +0000 @@ -20,11 +20,11 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} orth (@var{a}, @var{tol}) ## Return an orthonormal basis of the range space of @var{a}. -## +## ## The dimension of the range space is taken as the number of singular ## values of @var{a} greater than @var{tol}. If the argument @var{tol} is ## missing, it is computed as -## +## ## @example ## max (size (@var{a})) * max (svd (@var{a})) * eps ## @end example
--- a/scripts/linear-algebra/qzhess.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/linear-algebra/qzhess.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,10 +21,10 @@ ## @deftypefn {Function File} {[@var{aa}, @var{bb}, @var{q}, @var{z}] =} qzhess (@var{a}, @var{b}) ## Compute the Hessenberg-triangular decomposition of the matrix pencil ## @code{(@var{a}, @var{b})}, returning -## @code{@var{aa} = @var{q} * @var{a} * @var{z}}, +## @code{@var{aa} = @var{q} * @var{a} * @var{z}}, ## @code{@var{bb} = @var{q} * @var{b} * @var{z}}, with @var{q} and @var{z} ## orthogonal. For example, -## +## ## @example ## @group ## [aa, bb, q, z] = qzhess ([1, 2; 3, 4], [5, 6; 7, 8]) @@ -34,10 +34,10 @@ ## @result{} z = [ 1, 0; 0, 1 ] ## @end group ## @end example -## +## ## The Hessenberg-triangular decomposition is the first step in ## Moler and Stewart's QZ decomposition algorithm. -## +## ## Algorithm taken from Golub and Van Loan, @cite{Matrix Computations, 2nd ## edition}. ## @end deftypefn
--- a/scripts/linear-algebra/rank.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/linear-algebra/rank.m Thu Jan 13 08:40:53 2000 +0000 @@ -23,11 +23,11 @@ ## The rank is taken to be the number of singular values of @var{a} that ## are greater than the specified tolerance @var{tol}. If the second ## argument is omitted, it is taken to be -## +## ## @example ## tol = max (size (@var{a})) * sigma (1) * eps; ## @end example -## +## ## @noindent ## where @code{eps} is machine precision and @code{sigma} is the largest ## singular value of @var{a}.
--- a/scripts/linear-algebra/vec.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/linear-algebra/vec.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -28,11 +28,11 @@ ## Adapted-By: jwe function v = vec (x) - + if (nargin != 1) - usage ("vec (x)"); - endif - + usage ("vec (x)"); + endif + v = reshape (x, prod (size (x)), 1); endfunction
--- a/scripts/linear-algebra/vech.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/linear-algebra/vech.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -29,22 +29,22 @@ ## Adapted-By: jwe function v = vech (x) - + if (nargin != 1) usage ("vech (x)"); endif - + if (! is_square (x)) error ("vech: x must be square"); endif - + ## This should be quicker than having an inner `for' loop as well. ## Ideally, vech should be written in C++. n = rows (x); v = zeros ((n+1)*n/2, 1); count = 0; for j = 1 : n - i = j : n; + i = j : n; v (count + i) = x (i, j); count = count + n - j; endfor
--- a/scripts/miscellaneous/bincoeff.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/miscellaneous/bincoeff.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -25,7 +25,7 @@ ## @end tex ## @end iftex ## @ifinfo -## +## ## @example ## @group ## / \ @@ -36,9 +36,9 @@ ## @end group ## @end example ## @end ifinfo -## +## ## For example, -## +## ## @example ## @group ## bincoeff (5, 2) @@ -52,27 +52,27 @@ ## Adapted-By: jwe function b = bincoeff (n, k) - + if (nargin != 2) usage ("bincoeff (n, k)"); endif - + [retval, n, k] = common_size (n, k); if (retval > 0) error ("bincoeff: n and k must be of common size or scalars"); endif - + [r, c] = size (n); s = r * c; n = reshape (n, s, 1); k = reshape (k, s, 1); b = zeros (s, 1); - + ind = find (! (k >= 0) | (k != real (round (k))) | isnan (n)); if (any (ind)) b(ind) = NaN * ones (length (ind), 1); endif - + ind = find (k == 0); if (any (ind)) b(ind) = ones (length (ind), 1); @@ -81,22 +81,22 @@ ind = find ((k > 0) & ((n == real (round (n))) & (n < 0))); if any (ind) b(ind) = (-1) .^ k(ind) .* exp (lgamma (abs (n(ind)) + k(ind)) ... - - lgamma (k(ind) + 1) - lgamma (abs (n(ind)))); + - lgamma (k(ind) + 1) - lgamma (abs (n(ind)))); endif - + ind = find ((k > 0) & ((n != real (round (n))) | (n >= k))); if (length (ind) > 0) b(ind) = exp (lgamma (n(ind) + 1) - lgamma (k(ind) + 1) ... - - lgamma (n(ind) - k(ind) + 1)); + - lgamma (n(ind) - k(ind) + 1)); endif - + ## clean up rounding errors ind = find (n == round (n)); if (any (ind)) b(ind) = round (b(ind)); endif - + b = reshape (b, r, c); - + endfunction
--- a/scripts/miscellaneous/comma.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/miscellaneous/comma.m Thu Jan 13 08:40:53 2000 +0000 @@ -17,7 +17,7 @@ ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -## @deftypefn {Operator} {} , +## @deftypefn {Operator} {} , ## Array index, function argument, or command separator. ## @end deftypefn ## @seealso{semicolon}
--- a/scripts/miscellaneous/dump_prefs.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/miscellaneous/dump_prefs.m Thu Jan 13 08:40:53 2000 +0000 @@ -37,71 +37,71 @@ ## changes var_list = ["EDITOR"; - "EXEC_PATH"; - "IMAGEPATH"; - "INFO_FILE"; - "INFO_PROGRAM"; - "LOADPATH"; - "PAGER"; - "PS1"; - "PS2"; - "PS4"; - "automatic_replot"; - "beep_on_error"; - "completion_append_char"; - "default_eval_print_flag"; - "default_global_variable_value"; - "default_return_value"; - "default_save_format"; - "define_all_return_values"; - "do_fortran_indexing"; - "echo_executing_commands"; - "empty_list_elements_ok"; - "fixed_point_format"; - "gnuplot_binary"; - "gnuplot_command_end"; - "gnuplot_command_plot"; - "gnuplot_command_replot"; - "gnuplot_command_splot"; - "gnuplot_command_title"; - "gnuplot_command_using"; - "gnuplot_command_with"; - "gnuplot_has_frames"; - "gnuplot_has_multiplot"; - "history_file"; - "history_size"; - "ignore_function_time_stamp"; - "implicit_num_to_str_ok"; - "implicit_str_to_num_ok"; - "initialize_global_variables"; - "max_recursion_depth"; - "ok_to_lose_imaginary_part"; - "output_max_field_width"; - "output_precision"; - "page_output_immediately"; - "page_screen_output"; - "prefer_column_vectors"; - "print_answer_id_name"; - "print_empty_dimensions"; - "print_rhs_assign_val"; - "propagate_empty_matrices"; - "resize_on_range_error"; - "return_last_computed_value"; - "save_precision"; - "saving_history"; - "silent_functions"; - "split_long_rows"; - "string_fill_char"; - "struct_levels_to_print"; - "suppress_verbose_help_message"; - "treat_neg_dim_as_zero"; - "warn_assign_as_truth_value"; - "warn_divide_by_zero"; - "warn_function_name_clash"; - "warn_future_time_stamp"; - "warn_missing_semicolon"; - "warn_variable_switch_label"; - "whitespace_in_literal_matrix"]; + "EXEC_PATH"; + "IMAGEPATH"; + "INFO_FILE"; + "INFO_PROGRAM"; + "LOADPATH"; + "PAGER"; + "PS1"; + "PS2"; + "PS4"; + "automatic_replot"; + "beep_on_error"; + "completion_append_char"; + "default_eval_print_flag"; + "default_global_variable_value"; + "default_return_value"; + "default_save_format"; + "define_all_return_values"; + "do_fortran_indexing"; + "echo_executing_commands"; + "empty_list_elements_ok"; + "fixed_point_format"; + "gnuplot_binary"; + "gnuplot_command_end"; + "gnuplot_command_plot"; + "gnuplot_command_replot"; + "gnuplot_command_splot"; + "gnuplot_command_title"; + "gnuplot_command_using"; + "gnuplot_command_with"; + "gnuplot_has_frames"; + "gnuplot_has_multiplot"; + "history_file"; + "history_size"; + "ignore_function_time_stamp"; + "implicit_num_to_str_ok"; + "implicit_str_to_num_ok"; + "initialize_global_variables"; + "max_recursion_depth"; + "ok_to_lose_imaginary_part"; + "output_max_field_width"; + "output_precision"; + "page_output_immediately"; + "page_screen_output"; + "prefer_column_vectors"; + "print_answer_id_name"; + "print_empty_dimensions"; + "print_rhs_assign_val"; + "propagate_empty_matrices"; + "resize_on_range_error"; + "return_last_computed_value"; + "save_precision"; + "saving_history"; + "silent_functions"; + "split_long_rows"; + "string_fill_char"; + "struct_levels_to_print"; + "suppress_verbose_help_message"; + "treat_neg_dim_as_zero"; + "warn_assign_as_truth_value"; + "warn_divide_by_zero"; + "warn_function_name_clash"; + "warn_future_time_stamp"; + "warn_missing_semicolon"; + "warn_variable_switch_label"; + "whitespace_in_literal_matrix"]; for i = 1:rows(var_list) var = deblank (var_list(i,:));
--- a/scripts/miscellaneous/etime.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/miscellaneous/etime.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,13 +21,13 @@ ## @deftypefn {Function File} {} etime (@var{t1}, @var{t2}) ## Return the difference (in seconds) between two time values returned from ## @code{clock}. For example: -## +## ## @example ## t0 = clock (); ## # many computations later... ## elapsed_time = etime (clock (), t0); ## @end example -## +## ## @noindent ## will set the variable @code{elapsed_time} to the number of seconds since ## the variable @code{t0} was set.
--- a/scripts/miscellaneous/is_leap_year.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/miscellaneous/is_leap_year.m Thu Jan 13 08:40:53 2000 +0000 @@ -22,7 +22,7 @@ ## Return 1 if the given year is a leap year and 0 otherwise. If no ## arguments are provided, @code{is_leap_year} will use the current year. ## For example, -## +## ## @example ## @group ## is_leap_year (2000) @@ -45,6 +45,6 @@ endif retval = ((rem (year, 4) == 0 & rem (year, 100) != 0) ... - | rem (year, 400) == 0); + | rem (year, 400) == 0); endfunction
--- a/scripts/miscellaneous/menu.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/miscellaneous/menu.m Thu Jan 13 08:40:53 2000 +0000 @@ -59,16 +59,16 @@ while (1) va_start (); for i = 1:nopt - printf (" [%2d] ", i); - disp (va_arg ()); + printf (" [%2d] ", i); + disp (va_arg ()); endfor printf ("\n"); s = input ("pick a number, any number: ", "s"); eval (sprintf ("num = %s;", s), "num = [];"); if (! is_scalar (num) || num < 1 || num > nopt) - printf ("\nerror: input invalid or out of range\n\n"); + printf ("\nerror: input invalid or out of range\n\n"); else - break; + break; endif endwhile
--- a/scripts/miscellaneous/path.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/miscellaneous/path.m Thu Jan 13 08:40:53 2000 +0000 @@ -40,7 +40,7 @@ if (nargout == 0) stdout << "\nLOADPATH contains the following directories:\n\n "; stdout << strrep (LOADPATH, ":", "\n ") << "\n\n"; - else + else p = LOADPATH; endif else
--- a/scripts/miscellaneous/popen2.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/miscellaneous/popen2.m Thu Jan 13 08:40:53 2000 +0000 @@ -26,9 +26,9 @@ ## @var{out}. If execution of the command is successful, @var{pid} ## contains the process ID of the subprocess. Otherwise, @var{pid} is ## @minus{}1. -## +## ## For example, -## +## ## @example ## @group ## [in, out, pid] = popen2 ("sort", "-nr"); @@ -67,41 +67,41 @@ if (stdin_status == 0 && stdout_status == 0) - pid = fork (); + pid = fork (); - if (pid == 0) + if (pid == 0) - fclose (stdin_pipe (2)); - fclose (stdout_pipe (1)); + fclose (stdin_pipe (2)); + fclose (stdout_pipe (1)); - dup2 (stdin_pipe (1), stdin); - fclose (stdin_pipe (1)); + dup2 (stdin_pipe (1), stdin); + fclose (stdin_pipe (1)); - dup2 (stdout_pipe (2), stdout); - fclose (stdout_pipe (2)); + dup2 (stdout_pipe (2), stdout); + fclose (stdout_pipe (2)); - if (exec (command, args) < 0) - error ("popen2: unable to start process `%s'", command); - exit (0); - endif + if (exec (command, args) < 0) + error ("popen2: unable to start process `%s'", command); + exit (0); + endif - elseif (pid) + elseif (pid) - fclose (stdin_pipe (1)); - fclose (stdout_pipe (2)); + fclose (stdin_pipe (1)); + fclose (stdout_pipe (2)); - if (fcntl (stdout_pipe (1), __F_SETFL__, __O_NONBLOCK__) < 0) - error ("popen2: error setting file mode"); - else - in = stdin_pipe (2); - out = stdout_pipe (1); - endif + if (fcntl (stdout_pipe (1), __F_SETFL__, __O_NONBLOCK__) < 0) + error ("popen2: error setting file mode"); + else + in = stdin_pipe (2); + out = stdout_pipe (1); + endif - elseif (pid < 0) - error ("popen2: fork failed -- unable to create child process"); - endif + elseif (pid < 0) + error ("popen2: fork failed -- unable to create child process"); + endif else - error ("popen2: pipe creation failed"); + error ("popen2: pipe creation failed"); endif else error ("popen2: file name must be a string");
--- a/scripts/miscellaneous/texas_lotto.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/miscellaneous/texas_lotto.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,7 +21,7 @@ ## ## Pick 6 unique numbers between 1 and 50 that are guaranteed to win ## the Texas Lotto. -## @end deftypefn +## @end deftypefn ## @seealso{rand} ## Author: jwe
--- a/scripts/miscellaneous/tic.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/miscellaneous/tic.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,23 +21,23 @@ ## @deftypefn {Function File} {} tic () ## @deftypefnx {Function File} {} toc () ## These functions set and check a wall-clock timer. For example, -## +## ## @example ## tic (); ## # many computations later... ## elapsed_time = toc (); ## @end example -## +## ## @noindent ## will set the variable @code{elapsed_time} to the number of seconds since ## the most recent call to the function @code{tic}. -## +## ## If you are more interested in the CPU time that your process used, you ## should use the @code{cputime} function instead. The @code{tic} and ## @code{toc} functions report the actual wall clock time that elapsed ## between the calls. This may include time spent processing other jobs or ## doing nothing at all. For example, -## +## ## @example ## @group ## tic (); sleep (5); toc () @@ -46,7 +46,7 @@ ## @result{} 0 ## @end group ## @end example -## +## ## @noindent ## (This example also illustrates that the CPU timer may have a fairly ## coarse resolution.)
--- a/scripts/miscellaneous/xor.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/miscellaneous/xor.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -29,7 +29,7 @@ function z = xor (x, y) if (nargin == 2) - if (is_scalar (x) || is_scalar (y) || size (x) == size (y)) + if (is_scalar (x) || is_scalar (y) || size (x) == size (y)) z = logical ((x | y) - (x & y)); else error ("xor: x and y must be of common size or scalars");
--- a/scripts/plot/__plr2__.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/plot/__plr2__.m Thu Jan 13 08:40:53 2000 +0000 @@ -44,13 +44,13 @@ elseif (is_vector (theta)) if (is_vector (rho)) if (length (theta) != length (rho)) - error ("polar: vector lengths must match"); + error ("polar: vector lengths must match"); endif if (rows (rho) == 1) - rho = rho'; + rho = rho'; endif if (rows (theta) == 1) - theta = theta'; + theta = theta'; endif x = rho .* cos (theta); y = rho .* sin (theta); @@ -58,20 +58,20 @@ elseif (is_matrix (rho)) [t_nr, t_nc] = size (theta); if (t_nr == 1) - theta = theta'; - tmp = t_nr; - t_nr = t_nc; - t_nc = tmp; + theta = theta'; + tmp = t_nr; + t_nr = t_nc; + t_nc = tmp; endif [r_nr, r_nc] = size (rho); if (t_nr != r_nr) - rho = rho'; - tmp = r_nr; - r_nr = r_nc; - r_nc = tmp; + rho = rho'; + tmp = r_nr; + r_nr = r_nc; + r_nc = tmp; endif if (t_nr != r_nr) - error ("polar: vector and matrix sizes must match"); + error ("polar: vector and matrix sizes must match"); endif x = diag (cos (theta)) * rho; y = diag (sin (theta)) * rho; @@ -81,20 +81,20 @@ if (is_vector (rho)) [r_nr, r_nc] = size (rho); if (r_nr == 1) - rho = rho'; - tmp = r_nr; - r_nr = r_nc; - r_nc = tmp; + rho = rho'; + tmp = r_nr; + r_nr = r_nc; + r_nc = tmp; endif [t_nr, t_nc] = size (theta); if (r_nr != t_nr) - theta = theta'; - tmp = t_nr; - t_nr = t_nc; - t_nc = tmp; + theta = theta'; + tmp = t_nr; + t_nr = t_nc; + t_nc = tmp; endif if (r_nr != t_nr) - error ("polar: vector and matrix sizes must match"); + error ("polar: vector and matrix sizes must match"); endif diag_r = diag (rho); x = diag_r * cos (theta); @@ -102,7 +102,7 @@ __plt2mv__ (x, y, fmt); elseif (is_matrix (rho)) if (size (rho) != size (theta)) - error ("polar: matrix dimensions must match"); + error ("polar: matrix dimensions must match"); endif x = rho .* cos (theta); y = rho .* sin (theta);
--- a/scripts/plot/__plt2mm__.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/plot/__plt2mm__.m Thu Jan 13 08:40:53 2000 +0000 @@ -40,16 +40,16 @@ if (x_nc > 0) tmp = [x, y]; cmd = sprintf ("gplot tmp(:,%d:%d:%d) %s", 1, x_nc, x_nc+1, - deblank (fmt (k, :))); + deblank (fmt (k, :))); if (k < fmt_nr) - k++; + k++; endif for i = 2:x_nc cmd = sprintf ("%s, tmp(:,%d:%d:%d) %s", cmd, i, x_nc, x_nc+i, - deblank (fmt (k, :))); - if (k < fmt_nr) - k++; - endif + deblank (fmt (k, :))); + if (k < fmt_nr) + k++; + endif endfor eval (cmd); else
--- a/scripts/plot/__plt2mv__.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/plot/__plt2mv__.m Thu Jan 13 08:40:53 2000 +0000 @@ -57,15 +57,15 @@ if (x_nc > 0) tmp = [x, y]; cmd = sprintf ("gplot tmp(:,%d:%d:%d) %s", 1, x_nc, x_nc+1, - deblank (fmt (k, :))); + deblank (fmt (k, :))); if (k < fmt_nr) k++; endif for i = 2:x_nc cmd = sprintf ("%s, tmp(:,%d:%d:%d) %s", cmd, i, x_nc-i+1, x_nc+1, - deblank (fmt (k, :))); + deblank (fmt (k, :))); if (k < fmt_nr) - k++; + k++; endif endfor eval (cmd);
--- a/scripts/plot/__plt2vm__.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/plot/__plt2vm__.m Thu Jan 13 08:40:53 2000 +0000 @@ -57,15 +57,15 @@ if (y_nc > 0) tmp = [x, y]; cmd = sprintf ("gplot tmp(:,%d:%d:%d) %s", 1, x_nc, x_nc+1, - deblank (fmt (k, :))); + deblank (fmt (k, :))); if (k < fmt_nr) k++; endif for i = 2:y_nc cmd = sprintf ("%s, tmp(:,%d:%d:%d) %s", cmd, 1, i, i+1, - deblank (fmt (k, :))); + deblank (fmt (k, :))); if (k < fmt_nr) - k++; + k++; endif endfor eval (cmd);
--- a/scripts/plot/__plt__.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/plot/__plt__.m Thu Jan 13 08:40:53 2000 +0000 @@ -43,47 +43,47 @@ while (nargin-- > 0) - fmt = ""; - new = va_arg (); + fmt = ""; + new = va_arg (); - if (isstr (new)) - if (! x_set) - error ("plot: no data to plot"); - endif - fmt = __pltopt__ (caller, new); - if (! y_set) - __plt1__ (x, fmt); - else - __plt2__ (x, y, fmt); - endif - hold on; - x_set = 0; - y_set = 0; - elseif (x_set) - if (y_set) - __plt2__ (x, y, fmt); - hold on; - x = new; - y_set = 0; - else - y = new; - y_set = 1; - endif - else - x = new; - x_set = 1; - endif + if (isstr (new)) + if (! x_set) + error ("plot: no data to plot"); + endif + fmt = __pltopt__ (caller, new); + if (! y_set) + __plt1__ (x, fmt); + else + __plt2__ (x, y, fmt); + endif + hold on; + x_set = 0; + y_set = 0; + elseif (x_set) + if (y_set) + __plt2__ (x, y, fmt); + hold on; + x = new; + y_set = 0; + else + y = new; + y_set = 1; + endif + else + x = new; + x_set = 1; + endif endwhile ## Handle last plot. if (x_set) - if (y_set) - __plt2__ (x, y, fmt); - else - __plt1__ (x, fmt); - endif + if (y_set) + __plt2__ (x, y, fmt); + else + __plt1__ (x, fmt); + endif endif unwind_protect_cleanup
--- a/scripts/plot/__pltopt1__.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/plot/__pltopt1__.m Thu Jan 13 08:40:53 2000 +0000 @@ -97,12 +97,12 @@ || strcmp (char, "6") || strcmp (char, "7") ... || strcmp (char, "8") || strcmp (char, "9")) if (set_color) - set_points = 1; - symbol = char; - set_symbol = 1; + set_points = 1; + symbol = char; + set_symbol = 1; else - color = char; - set_color = 1; + color = char; + set_color = 1; endif elseif (strcmp (char, "r")) set_color = 1; @@ -141,14 +141,14 @@ elseif (strcmp (char, ";")) # title mode. set_key = 1; working = 1; - key_title = ""; + key_title = ""; while (working) if (max (size (opt)) > 1) - char = opt(1); - opt = opt(2:length(opt)); + char = opt(1); + opt = opt(2:length(opt)); else - char = opt; - if (! strcmp (char, ";")) + char = opt; + if (! strcmp (char, ";")) error ("%s: unfinished key label", caller); end more_opts = 0; @@ -157,14 +157,14 @@ if strcmp (char, ";") working = 0; else - if (isempty (key_title)) # needs this to avoid empty matrix warning. + if (isempty (key_title)) # needs this to avoid empty matrix warning. key_title = char; - else + else key_title = strcat (key_title, char); - endif + endif endif endwhile - elseif (strcmp (char, " ")) + elseif (strcmp (char, " ")) ## whitespace -- do nothing. else error ("%s: unrecognized format character: '%s'", caller, char);
--- a/scripts/plot/__pltopt__.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/plot/__pltopt__.m Thu Jan 13 08:40:53 2000 +0000 @@ -51,15 +51,15 @@ ## The colors, line styles, and point styles have the following ## meanings for X11 and Postscript terminals under Gnuplot 3.6. ## -## Number ------ Color ------- Line Style ---- Points Style ---- -## x11 postscript postscript x11 postscript +## Number ------ Color ------- Line Style ---- Points Style ---- +## x11 postscript postscript x11 postscript ## ===================================================================== -## 1 red green solid "o" "+" -## 2 green blue long dash "+" "x" -## 3 blue red short dash square "*" -## 4 magenta magenta dotted "x" open square +## 1 red green solid "o" "+" +## 2 green blue long dash "+" "x" +## 3 blue red short dash square "*" +## 4 magenta magenta dotted "x" open square ## 5 cyan cyan dot long dash triangle filled square -## 6 brown yellow dot short dash "*" "o" +## 6 brown yellow dot short dash "*" "o" ## ## @seealso{__pltopt1__}
--- a/scripts/plot/axis.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/plot/axis.m Thu Jan 13 08:40:53 2000 +0000 @@ -20,14 +20,14 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} axis (@var{limits}) ## Sets the axis limits for plots. -## +## ## The argument @var{limits} should be a 2, 4, or 6 element vector. The ## first and second elements specify the lower and upper limits for the x ## axis. The third and fourth specify the limits for the y axis, and the ## fifth and sixth specify the limits for the z axis. -## +## ## With no arguments, @code{axis} turns autoscaling on. -## +## ## If your plot is already drawn, then you need to use @code{replot} before ## the new axis limits will take effect. You can get this to happen ## automatically by setting the built-in variable @code{automatic_replot}
--- a/scripts/plot/bar.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/plot/bar.m Thu Jan 13 08:40:53 2000 +0000 @@ -20,25 +20,25 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} bar (@var{x}, @var{y}) ## Given two vectors of x-y data, @code{bar} produces a bar graph. -## +## ## If only one argument is given, it is taken as a vector of y-values ## and the x coordinates are taken to be the indices of the elements. -## +## ## If two output arguments are specified, the data are generated but ## not plotted. For example, -## +## ## @example ## bar (x, y); ## @end example -## +## ## @noindent ## and -## +## ## @example ## [xb, yb] = bar (x, y); ## plot (xb, yb); ## @end example -## +## ## @noindent ## are equivalent. ## @end deftypefn @@ -83,27 +83,27 @@ delta_m = delta_p; tmp_xb(1) = x(1) - delta_m; tmp_yb(1) = 0.0; - k = 1; + k = 1; for i = 2:3:len tmp_xb(i) = tmp_xb(i-1); tmp_xb(i+1) = x(k) + delta_p; tmp_xb(i+2) = tmp_xb(i+1); - tmp_yb(i) = y(k); - tmp_yb(i+1) = y(k); - tmp_yb(i+2) = 0.0; + tmp_yb(i) = y(k); + tmp_yb(i+1) = y(k); + tmp_yb(i+2) = 0.0; if (k < xlen) if (x(k+1) < x(k)) error ("bar: x vector values must be in ascending order"); endif - delta_m = x(k+1) - cutoff(k); + delta_m = x(k+1) - cutoff(k); k++; if (k < xlen) delta_p = cutoff(k) - x(k); - else - delta_p = delta_m; + else + delta_p = delta_m; endif - endif - endfor + endif + endfor else error ("bar: arguments must be the same length"); endif
--- a/scripts/plot/contour.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/plot/contour.m Thu Jan 13 08:40:53 2000 +0000 @@ -44,13 +44,13 @@ gset contour; gset cntrparam bspline; if (is_scalar (n)) - command = sprintf ("gset cntrparam levels %d", n); + command = sprintf ("gset cntrparam levels %d", n); elseif (is_vector (n)) - tmp = sprintf ("%f", n(1)); - for i = 2:length (n) - tmp = sprintf ("%s, %f", tmp, n(i)); - endfor - command = sprintf ("gset cntrparam levels discrete %s", tmp); + tmp = sprintf ("%f", n(1)); + for i = 2:length (n) + tmp = sprintf ("%s, %f", tmp, n(i)); + endfor + command = sprintf ("gset cntrparam levels discrete %s", tmp); endif eval (command); gset noparametric; @@ -79,19 +79,19 @@ gset nosurface; gset contour; gset cntrparam bspline; - if (is_scalar (n)) + if (is_scalar (n)) command = sprintf ("gset cntrparam levels %d", n); - elseif (is_vector (n)) - tmp = sprintf ("%f", n(1)); - for i = 2:length (n) - tmp = sprintf ("%s, %f", tmp, n(i)); - endfor - command = sprintf ("gset cntrparam levels discrete %s", tmp); - endif + elseif (is_vector (n)) + tmp = sprintf ("%f", n(1)); + for i = 2:length (n) + tmp = sprintf ("%s, %f", tmp, n(i)); + endfor + command = sprintf ("gset cntrparam levels discrete %s", tmp); + endif eval (command); - gset parametric; + gset parametric; gset view 0, 0, 1, 1; - gsplot zz w l 1; + gsplot zz w l 1; else msg = "contour: rows (z) must be the same as length (x) and"; msg = sprintf ("%s\ncolumns (z) must be the same as length (y)", msg);
--- a/scripts/plot/figure.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/plot/figure.m Thu Jan 13 08:40:53 2000 +0000 @@ -40,11 +40,11 @@ if (nargin < 2) if (gnuplot_has_frames) if (! isempty (getenv ("DISPLAY"))) - oneplot (); - figure_list = union (figure_list, f); - eval (sprintf ("gset term x11 %d\n", f)); + oneplot (); + figure_list = union (figure_list, f); + eval (sprintf ("gset term x11 %d\n", f)); else - error ("figure: requires X11 and valid DISPLAY"); + error ("figure: requires X11 and valid DISPLAY"); endif else error ("figure: gnuplot doesn't appear to support this feature");
--- a/scripts/plot/hist.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/plot/hist.m Thu Jan 13 08:40:53 2000 +0000 @@ -20,19 +20,19 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} hist (@var{y}, @var{x}) ## Produce histogram counts or plots. -## +## ## With one vector input argument, plot a histogram of the values with ## 10 bins. The range of the histogram bins is determined by the range ## of the data. -## +## ## Given a second scalar argument, use that as the number of bins. -## +## ## Given a second vector argument, use that as the centers of the bins, ## with the width of the bins determined from the adjacent values in ## the vector. -## +## ## Extreme values are lumped in the first and last bins. -## +## ## With two output arguments, produce the values @var{nn} and @var{xx} such ## that @code{bar (@var{xx}, @var{nn})} will plot the histogram. ## @end deftypefn
--- a/scripts/plot/mesh.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/plot/mesh.m Thu Jan 13 08:40:53 2000 +0000 @@ -67,14 +67,14 @@ zz(:,i+2) = z(:,k); k++; endfor - gset hidden3d; - gset data style lines; + gset hidden3d; + gset data style lines; gset surface; gset nocontour; - gset parametric; + gset parametric; gset view 60, 30, 1, 1 - gsplot (zz); - gset noparametric; + gsplot (zz); + gset noparametric; else msg = "mesh: rows (z) must be the same as length (x) and"; msg = sprintf ("%s\ncolumns (z) must be the same as length (y)", msg); @@ -84,7 +84,7 @@ xlen = columns (z); ylen = rows (z); if (xlen == columns (x) && xlen == columns (y) && - ylen == rows (x) && ylen == rows(y)) + ylen == rows (x) && ylen == rows(y)) len = 3 * xlen; zz = zeros (ylen, len); k = 1; @@ -94,14 +94,14 @@ zz(:,i+2) = z(:,k); k++; endfor - gset hidden3d; - gset data style lines; + gset hidden3d; + gset data style lines; gset surface; gset nocontour; - gset parametric; + gset parametric; gset view 60, 30, 1, 1 - gsplot (zz); - gset noparametric; + gsplot (zz); + gset noparametric; else error ("mesh: x, y, and z must have same dimensions"); endif
--- a/scripts/plot/meshdom.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/plot/meshdom.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,7 +21,7 @@ ## @deftypefn {Function File} {} meshdom (@var{x}, @var{y}) ## Given vectors of @var{x} and @var{y} coordinates, return two matrices ## corresponding to the @var{x} and @var{y} coordinates of the mesh. -## +## ## See the file @file{sombrero.m} for an example of using @code{mesh} and ## @code{meshdom}. ##
--- a/scripts/plot/mplot.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/plot/mplot.m Thu Jan 13 08:40:53 2000 +0000 @@ -22,10 +22,10 @@ ## @deftypefnx {Function File} {} mplot (@var{x}, @var{y}, @var{fmt}) ## @deftypefnx {Function File} {} mplot (@var{x1}, @var{y1}, @var{x2}, @var{y2}) ## This is a modified version of the @code{plot} function that works with -## the multiplot version of @code{gnuplot} to plot multiple plots per page. +## the multiplot version of @code{gnuplot} to plot multiple plots per page. ## This plot version automatically advances to the next subplot position ## after each set of arguments are processed. -## +## ## See the description of the @var{plot} function for the various options. ## @end deftypefn @@ -62,9 +62,9 @@ else __multiplot_xi__ = 1; if (__multiplot_yi__ < __multiplot_yn__) - __multiplot_yi__++; + __multiplot_yi__++; else - __multiplot_yi__ = 1; + __multiplot_yi__ = 1; endif endif
--- a/scripts/plot/multiplot.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/plot/multiplot.m Thu Jan 13 08:40:53 2000 +0000 @@ -20,7 +20,7 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} multiplot (@var{xn}, @var{yn}) ## Sets and resets multiplot mode. -## +## ## If the arguments are non-zero, @code{multiplot} will set up multiplot ## mode with @var{xn}, @var{yn} subplots along the @var{x} and @var{y} ## axes. If both arguments are zero, @code{multiplot} closes multiplot
--- a/scripts/plot/plot.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/plot/plot.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,102 +21,102 @@ ## @deftypefn {Function File} {} plot (@var{args}) ## This function produces two-dimensional plots. Many different ## combinations of arguments are possible. The simplest form is -## +## ## @example ## plot (@var{y}) ## @end example -## +## ## @noindent ## where the argument is taken as the set of @var{y} coordinates and the ## @var{x} coordinates are taken to be the indices of the elements, ## starting with 1. -## +## ## If more than one argument is given, they are interpreted as -## +## ## @example ## plot (@var{x}, @var{y}, @var{fmt} ...) ## @end example -## +## ## @noindent ## where @var{y} and @var{fmt} are optional, and any number of argument ## sets may appear. The @var{x} and @var{y} values are ## interpreted as follows: -## +## ## @itemize @bullet ## @item ## If a single data argument is supplied, it is taken as the set of @var{y} ## coordinates and the @var{x} coordinates are taken to be the indices of ## the elements, starting with 1. -## +## ## @item ## If the first argument is a vector and the second is a matrix, the ## the vector is plotted versus the columns (or rows) of the matrix. ## (using whichever combination matches, with columns tried first.) -## +## ## @item ## If the first argument is a matrix and the second is a vector, the ## the columns (or rows) of the matrix are plotted versus the vector. ## (using whichever combination matches, with columns tried first.) -## +## ## @item ## If both arguments are vectors, the elements of @var{y} are plotted versus ## the elements of @var{x}. -## +## ## @item ## If both arguments are matrices, the columns of @var{y} are plotted ## versus the columns of @var{x}. In this case, both matrices must have ## the same number of rows and columns and no attempt is made to transpose ## the arguments to make the number of rows match. -## +## ## If both arguments are scalars, a single point is plotted. ## @end itemize -## +## ## If the @var{fmt} argument is supplied, it is interpreted as ## follows. If @var{fmt} is missing, the default gnuplot line style ## is assumed. -## +## ## @table @samp ## @item - ## Set lines plot style (default). -## +## ## @item . ## Set dots plot style. -## +## ## @item @@ ## Set points plot style. -## +## ## @item -@@ ## Set linespoints plot style. -## +## ## @item ^ ## Set impulses plot style. -## +## ## @item L ## Set steps plot style. -## +## ## @item # ## Set boxes plot style. -## +## ## @item ~ ## Set errorbars plot style. -## +## ## @item #~ ## Set boxerrorbars plot style. -## +## ## @item @var{n} ## Interpreted as the plot color if @var{n} is an integer in the range 1 to ## 6. -## +## ## @item @var{nm} ## If @var{nm} is a two digit integer and @var{m} is an integer in the ## range 1 to 6, @var{m} is interpreted as the point style. This is only ## valid in combination with the @code{@@} or @code{-@@} specifiers. -## +## ## @item @var{c} ## If @var{c} is one of @code{"r"}, @code{"g"}, @code{"b"}, @code{"m"}, ## @code{"c"}, or @code{"w"}, it is interpreted as the plot color (red, ## green, blue, magenta, cyan, or white). -## +## ## @item + ## @itemx * ## @itemx o @@ -124,10 +124,10 @@ ## Used in combination with the points or linespoints styles, set the point ## style. ## @end table -## +## ## The color line styles have the following meanings on terminals that ## support color. -## +## ## @example ## Number Gnuplot colors (lines)points style ## 1 red * @@ -137,21 +137,21 @@ ## 5 cyan house ## 6 brown there exists ## @end example -## +## ## Here are some plot examples: -## +## ## @example ## plot (x, y, "@@12", x, y2, x, y3, "4", x, y4, "+") ## @end example -## +## ## This command will plot @code{y} with points of type 2 (displayed as ## @samp{+}) and color 1 (red), @code{y2} with lines, @code{y3} with lines of ## color 4 (magenta) and @code{y4} with points displayed as @samp{+}. -## +## ## @example ## plot (b, "*") ## @end example -## +## ## This command will plot the data in the variable @code{b} will be plotted ## with points displayed as @samp{*}. ## @end deftypefn
--- a/scripts/plot/plot_border.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/plot/plot_border.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,27 +21,27 @@ ## @deftypefn {Function File} {} plot_border (...) ## Multiple arguments allowed to specify the sides on which the border ## is shown. Allowed arguments include: -## +## ## @table @code ## @item "blank" ## No borders displayed. -## +## ## @item "all" ## All borders displayed -## +## ## @item "north" ## North Border -## +## ## @item "south" ## South Border -## +## ## @item "east" ## East Border -## +## ## @item "west" ## West Border ## @end table -## +## ## @noindent ## The arguments may be abbreviated to single characters. Without any ## arguments, @code{plot_border} turns borders off. @@ -83,20 +83,20 @@ else none = 0; if (strcmp (arg, "south") || strcmp (arg, "SOUTH") - || strcmp (arg, "s") || strcmp (arg, "S")) - south = 1; + || strcmp (arg, "s") || strcmp (arg, "S")) + south = 1; elseif (strcmp (arg, "west") || strcmp (arg, "WEST") - || strcmp (arg, "w") || strcmp (arg, "W")) - west = 2; + || strcmp (arg, "w") || strcmp (arg, "W")) + west = 2; elseif (strcmp (arg, "north") || strcmp (arg, "NORTH") - || strcmp (arg, "n") || strcmp (arg, "N")) - north = 4; + || strcmp (arg, "n") || strcmp (arg, "N")) + north = 4; elseif (strcmp (arg, "east") || strcmp (arg, "EAST") - || strcmp (arg, "e") || strcmp (arg, "E")) - east = 8; + || strcmp (arg, "e") || strcmp (arg, "E")) + east = 8; elseif (strcmp (arg, "all") || strcmp (arg, "ALL") - || strcmp (arg, "a") || strcmp (arg, "A")) - all = 1; + || strcmp (arg, "a") || strcmp (arg, "A")) + all = 1; endif endif endwhile
--- a/scripts/plot/shg.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/plot/shg.m Thu Jan 13 08:40:53 2000 +0000 @@ -17,13 +17,13 @@ ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -## -*- texinfo -*- +## -*- texinfo -*- ## @deftypefn {Function File} {} shg ## ## Show the graph window. Currently, this is the same as executing ## replot without any arguments. -## -## @end deftypefn +## +## @end deftypefn ## @seealso{plot, semilogx, semilogy, loglog, polar, mesh, contour, ## bar, stairs, gplot, gsplot, replot, xlabel, and ylabel}
--- a/scripts/plot/stairs.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/plot/stairs.m Thu Jan 13 08:40:53 2000 +0000 @@ -20,25 +20,25 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} stairs (@var{x}, @var{y}) ## Given two vectors of x-y data, bar produces a `stairstep' plot. -## +## ## If only one argument is given, it is taken as a vector of y-values ## and the x coordinates are taken to be the indices of the elements. -## +## ## If two output arguments are specified, the data are generated but ## not plotted. For example, -## +## ## @example ## stairs (x, y); ## @end example -## +## ## @noindent ## and -## +## ## @example ## [xs, ys] = stairs (x, y); ## plot (xs, ys); ## @end example -## +## ## @noindent ## are equivalent. ## @end deftypefn @@ -71,18 +71,18 @@ if (xlen == ylen) len = 2 * xlen; tmp_xs = tmp_ys = zeros (len, 1); - k = 1; + k = 1; len_m2 = len - 2; - for i = 1:2:len_m2 - tmp_xs(i) = x(k); - tmp_ys(i) = y(k); - tmp_ys(i+1) = y(k); + for i = 1:2:len_m2 + tmp_xs(i) = x(k); + tmp_ys(i) = y(k); + tmp_ys(i+1) = y(k); k++; - tmp_xs(i+1) = x(k); + tmp_xs(i+1) = x(k); if (x(k) < x(k-1)) error ("stairs: x vector values must be in ascending order"); endif - endfor + endfor tmp_xs(len-1) = x(xlen); delta = x(xlen) - x(xlen-1); tmp_xs(len) = x(xlen) + delta;
--- a/scripts/plot/subplot.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/plot/subplot.m Thu Jan 13 08:40:53 2000 +0000 @@ -22,27 +22,27 @@ ## @deftypefnx {Function File} {} subplot (@var{rcn}) ## Sets @code{gnuplot} in multiplot mode and plots in location ## given by index (there are @var{cols} by @var{rows} subwindows). -## +## ## Input: -## +## ## @table @var ## @item rows ## Number of rows in subplot grid. -## +## ## @item columns ## Number of columns in subplot grid. -## +## ## @item index ## Index of subplot where to make the next plot. ## @end table -## +## ## If only one argument is supplied, then it must be a three digit value ## specifying the location in digits 1 (rows) and 2 (columns) and the plot ## index in digit 3. -## +## ## The plot index runs row-wise. First all the columns in a row are filled ## and then the next row is filled. -## +## ## For example, a plot with 4 by 2 grid will have plot indices running as ## follows: ## @iftex @@ -137,8 +137,8 @@ ## doing multiplot plots if (! __multiplot_mode__ - || __multiplot_xn__ != columns - || __multiplot_yn__ != rows) + || __multiplot_xn__ != columns + || __multiplot_yn__ != rows) __multiplot_mode__ = 1; __multiplot_xn__ = columns; @@ -151,7 +151,7 @@ gset multiplot; eval (sprintf ("gset size %g, %g", __multiplot_xsize__, - __multiplot_ysize__)); + __multiplot_ysize__)); endif ## get the sub plot location
--- a/scripts/polynomial/compan.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/polynomial/compan.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,7 +21,7 @@ ## @deftypefn {Function File} {} compan (@var{c}) ## Compute the companion matrix corresponding to polynomial coefficient ## vector @var{c}. -## +## ## The companion matrix is ## @iftex ## @tex @@ -36,7 +36,7 @@ ## @end tex ## @end iftex ## @ifinfo -## +## ## @smallexample ## _ _ ## | -c(2)/c(1) -c(3)/c(1) ... -c(N)/c(1) -c(N+1)/c(1) | @@ -48,7 +48,7 @@ ## |_ 0 0 ... 1 0 _| ## @end smallexample ## @end ifinfo -## +## ## The eigenvalues of the companion matrix are equal to the roots of the ## polynomial. ## @end deftypefn
--- a/scripts/polynomial/conv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/polynomial/conv.m Thu Jan 13 08:40:53 2000 +0000 @@ -20,7 +20,7 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} conv (@var{a}, @var{b}) ## Convolve two vectors. -## +## ## @code{y = conv (a, b)} returns a vector of length equal to ## @code{length (a) + length (b) - 1}. ## If @var{a} and @var{b} are polynomial coefficient vectors, @code{conv}
--- a/scripts/polynomial/deconv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/polynomial/deconv.m Thu Jan 13 08:40:53 2000 +0000 @@ -20,10 +20,10 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} deconv (@var{y}, @var{a}) ## Deconvolve two vectors. -## +## ## @code{[b, r] = deconv (y, a)} solves for @var{b} and @var{r} such that ## @code{y = conv (a, b) + r}. -## +## ## If @var{y} and @var{a} are polynomial coefficient vectors, @var{b} will ## contain the coefficients of the polynomial quotient and @var{r} will be ## a remander polynomial of lowest order.
--- a/scripts/polynomial/polyfit.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/polynomial/polyfit.m Thu Jan 13 08:40:53 2000 +0000 @@ -20,7 +20,7 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {[@var{p}, @var{yf}] =} polyfit (@var{x}, @var{y}, @var{n}) ## Return the coefficients of a polynomial @var{p}(@var{x}) of degree -## @var{n} that minimizes +## @var{n} that minimizes ## @iftex ## @tex ## $$ @@ -36,7 +36,7 @@ ## The polynomial coefficients are returned in a row vector if @var{x} ## and @var{y} are both row vectors; otherwise, they are returned in a ## column vector. -## +## ## If two output arguments are requested, the second contains the values of ## the polynomial for each value of @var{x}. ## @end deftypefn
--- a/scripts/polynomial/polyinteg.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/polynomial/polyinteg.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,7 +21,7 @@ ## @deftypefn {Function File} {} polyinteg (@var{c}) ## Return the coefficients of the integral of the polynomial whose ## coefficients are represented by the vector @var{c}. -## +## ## The constant of integration is set to zero. ## @end deftypefn
--- a/scripts/polynomial/polyout.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/polynomial/polyout.m Thu Jan 13 08:40:53 2000 +0000 @@ -18,20 +18,20 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {@var{y} =} polyout (@var{c}@{, @var{x}@}) -## write formatted polynomial +## write formatted polynomial ## @example ## c(x) = c(1) * x^n + ... + c(n) x + c(n+1) ## @end example ## to string @var{y} or to the screen (if @var{y} is omitted) ## @var{x} defaults to the string @code{"s"} ## @end deftypefn -## @seealso{polyval, polyvalm, poly, roots, conv, deconv, residue, +## @seealso{polyval, polyvalm, poly, roots, conv, deconv, residue, ## filter, polyderiv, and polyinteg} ## Author: A. S. Hodel <a.s.hodel@eng.auburn.edu> ## Created: May 1995 ## Nov 1998: Correctly handles complex coefficients - + function y = polyout (c, x) if (nargin < 1 ) || (nargin > 2) || (nargout < 0 ) || (nargout > 1) @@ -41,7 +41,7 @@ if (!is_vector(c)) error("polyout: first argument must be a vector"); endif - + if (nargin == 1) x = "s"; elseif( ! isstr(x) ) @@ -63,7 +63,7 @@ else nstr = num2str(c(ii)); endif tmp = sprintf("%s*%s^%d%s%s",tmp,x,n1-ii,ns,nstr); - + endfor else tmp = " ";
--- a/scripts/polynomial/polyreduce.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/polynomial/polyreduce.m Thu Jan 13 08:40:53 2000 +0000 @@ -50,13 +50,13 @@ if (length (index) != 0) - if (length (p) > 1) - p = p (index (length (index))+1:length (p)); - endif + if (length (p) > 1) + p = p (index (length (index))+1:length (p)); + endif - if (length (p) == 0) - p = 0; - endif + if (length (p) == 0) + p = 0; + endif endif
--- a/scripts/polynomial/polyval.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/polynomial/polyval.m Thu Jan 13 08:40:53 2000 +0000 @@ -20,10 +20,10 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} polyval (@var{c}, @var{x}) ## Evaluate a polynomial. -## +## ## @code{polyval (@var{c}, @var{x})} will evaluate the polynomial at the ## specified value of @var{x}. -## +## ## If @var{x} is a vector or matrix, the polynomial is evaluated at each of ## the elements of @var{x}. ## @end deftypefn
--- a/scripts/polynomial/polyvalm.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/polynomial/polyvalm.m Thu Jan 13 08:40:53 2000 +0000 @@ -20,11 +20,11 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} polyvalm (@var{c}, @var{x}) ## Evaluate a polynomial in the matrix sense. -## +## ## @code{polyvalm (@var{c}, @var{x})} will evaluate the polynomial in the ## matrix sense, i.e. matrix multiplication is used instead of element by ## element multiplication as is used in polyval. -## +## ## The argument @var{x} must be a square matrix. ## @end deftypefn
--- a/scripts/polynomial/residue.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/polynomial/residue.m Thu Jan 13 08:40:53 2000 +0000 @@ -23,13 +23,13 @@ ## residue calculates the partial fraction expansion corresponding to the ## ratio of the two polynomials. ## @cindex partial fraction expansion -## +## ## The function @code{residue} returns @var{r}, @var{p}, @var{k}, and ## @var{e}, where the vector @var{r} contains the residue terms, @var{p} ## contains the pole values, @var{k} contains the coefficients of a direct ## polynomial term (if it exists) and @var{e} is a vector containing the ## powers of the denominators in the partial fraction terms. -## +## ## Assuming @var{b} and @var{a} represent polynomials ## @iftex ## @tex @@ -49,19 +49,19 @@ ## @end tex ## @end iftex ## @ifinfo -## +## ## @example ## P(s) M r(m) N ## ---- = SUM ------------- + SUM k(i)*s^(N-i) ## Q(s) m=1 (s-p(m))^e(m) i=1 ## @end example ## @end ifinfo -## +## ## @noindent ## where @var{M} is the number of poles (the length of the @var{r}, ## @var{p}, and @var{e} vectors) and @var{N} is the length of the @var{k} ## vector. -## +## ## The argument @var{tol} is optional, and if not specified, a default ## value of 0.001 is assumed. The tolerance value is used to determine ## whether poles with small imaginary components are declared real. It is @@ -69,7 +69,7 @@ ## imaginary part of a pole to the real part is less than @var{tol}, the ## imaginary part is discarded. If two poles are farther apart than ## @var{tol} they are distinct. For example, -## +## ## @example ## @group ## b = [1, 1, 1]; @@ -81,7 +81,7 @@ ## @result{} e = [1, 2, 1] ## @end group ## @end example -## +## ## @noindent ## which implies the following partial fraction expansion ## @iftex @@ -92,7 +92,7 @@ ## @end tex ## @end iftex ## @ifinfo -## +## ## @example ## s^2 + s + 1 -2 7 3 ## ------------------- = ----- + ------- + -----
--- a/scripts/polynomial/roots.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/polynomial/roots.m Thu Jan 13 08:40:53 2000 +0000 @@ -19,7 +19,7 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} roots (@var{v}) -## +## ## For a vector @var{v} with @var{N} components, return ## the roots of the polynomial ## @iftex @@ -30,7 +30,7 @@ ## @end tex ## @end iftex ## @ifinfo -## +## ## @example ## v(1) * z^(N-1) + ... + v(N-1) * z + v(N). ## @end example @@ -65,7 +65,7 @@ r = eig (A); if (f(m) < n) tmp = zeros (n - f(m), 1); - r = [r; tmp]; + r = [r; tmp]; endif else r = zeros (n - f(m), 1);
--- a/scripts/quaternion/quaternion.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/quaternion/quaternion.m Thu Jan 13 08:40:53 2000 +0000 @@ -3,13 +3,13 @@ # w = a*i + b*j + c*k + d from given data. # # calling formats: -# [a,b,c,d] = quaternion(w) -or- +# [a,b,c,d] = quaternion(w) -or- # [vv,theta] = quaternion(w) # w = quaternion(a,b,c,d) # w = quaternion(vv,theta) switch(nargin) -case(1), # extract information +case(1), # extract information if(!(is_vector(w) & length(w) == 4) ) error("input vector must be of length 4)") endif @@ -55,7 +55,7 @@ elseif(!is_scalar(theta)) error("theta must be a scalar"); elseif(norm(vv) == 0) - error("quaternion: vv is zero.") + error("quaternion: vv is zero.") elseif(abs(norm(vv)-1) > 1e-12) warning("quaternion: ||vv|| != 1, normalizing") vv = vv/norm(vv); @@ -67,7 +67,7 @@ endif vv = vv*sin(theta/2); d = cos(theta/2); - a = quaternion(vv(1), vv(2), vv(3), d); + a = quaternion(vv(1), vv(2), vv(3), d); case(4), if(nargout != 1)
--- a/scripts/set/complement.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/set/complement.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,7 +21,7 @@ ## @deftypefn {Function File} {} complement (@var{x}, @var{y}) ## Return the elements of set @var{y} that are not in set @var{x}. For ## example, -## +## ## @example ## @group ## complement ([ 1, 2, 3 ], [ 2, 3, 5 ])
--- a/scripts/set/create_set.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/set/create_set.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,7 +21,7 @@ ## @deftypefn {Function File} {} create_set (@var{x}) ## Return a row vector containing the unique values in @var{x}, sorted in ## ascending order. For example, -## +## ## @example ## @group ## create_set ([ 1, 2; 3, 4; 4, 2 ])
--- a/scripts/set/intersection.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/set/intersection.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,7 +21,7 @@ ## @deftypefn {Function File} {} intersection (@var{x}, @var{y}) ## Return the set of elements that are in both sets @var{x} and @var{y}. ## For example, -## +## ## @example ## @group ## intersection ([ 1, 2, 3 ], [ 2, 3, 5 ])
--- a/scripts/set/union.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/set/union.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,7 +21,7 @@ ## @deftypefn {Function File} {} union (@var{x}, @var{y}) ## Return the set of elements that are in either of the sets @var{x} and ## @var{y}. For example, -## +## ## @example ## @group ## union ([ 1, 2, 4 ], [ 2, 3, 5 ])
--- a/scripts/signal/arch_fit.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/arch_fit.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,20 +1,20 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -## usage: [a, b] = arch_fit (y, X, p [, ITER [, gamma [, a0, b0]]]) +## usage: [a, b] = arch_fit (y, X, p [, ITER [, gamma [, a0, b0]]]) ## ## Fits an ARCH regression model to the time series y using the scoring ## algorithm in Engle's original ARCH paper. The model is @@ -33,7 +33,7 @@ ## The input parameters are: ## y ... time series (vector) ## X ... matrix of (ordinary) regressors or order of -## autoregression +## autoregression ## p ... order of the regression of the residual variance ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> @@ -44,7 +44,7 @@ if ((nargin < 3) || (nargin == 6) || (nargin > 7)) usage ("arch_fit (y, X, p [, ITER [, gamma [, a0, b0]]])"); endif - + if !(is_vector (y)) error ("arch_test: y must be a vector"); endif @@ -56,11 +56,11 @@ X = autoreg_matrix (y, X); elseif !(rx == T) error (["arch_test: ", ... - "either rows (X) == length (y), or X is a scalar"]); + "either rows (X) == length (y), or X is a scalar"]); endif [T, k] = size (X); - + if (nargin == 7) a = a0; b = b0; @@ -71,11 +71,11 @@ if (nargin < 5) gamma = 0.1; if (nargin < 4) - ITER = 50; + ITER = 50; endif endif endif - + esq = e.^2; Z = autoreg_matrix (esq, p); @@ -104,5 +104,5 @@ delta_a = inv (Z_tilde' * Z_tilde) * Z_tilde' * f; a = a + gamma * delta_a; endfor - + endfunction
--- a/scripts/signal/arch_rnd.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/arch_rnd.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,20 +1,20 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -## usage: y = arch_rnd (a, b, T) +## usage: y = arch_rnd (a, b, T) ## ## Simulates an ARCH sequence y of length T with AR coefficients b and ## CH coefficients a. @@ -27,23 +27,23 @@ ## Description: Simulate an ARCH process function y = arch_rnd (a, b, T) - + if (nargin != 3) usage ("arch_rnd (a, b, T)"); endif - + if !( (min (size (a)) == 1) && (min (size (b)) == 1) ) error ("arch_rnd: a and b must both be scalars or vectors"); endif if !( is_scalar (T) && (T > 0) && (rem (T, 1) == 0) ) error ("arch_rnd: T must be a positive integer"); endif - + if !(a(1) > 0) error ("arch_rnd: a(1) must be positive"); endif ## perhaps add a test for the roots of a(z) here ... - + la = length (a); a = reshape (a, 1, la); if (la == 1) @@ -57,15 +57,15 @@ lb = lb + 1; endif M = max([la, lb]); - + e = zeros (T, 1); h = zeros (T, 1); y = zeros (T, 1); - + h(1) = a(1); e(1) = sqrt (h(1)) * randn; y(1) = b(1) + e(1); - + for t= 2 : M; ta = min ([t, la]); h(t) = a(1) + a(2:ta) * e(t-1:t-ta+1).^2; @@ -80,8 +80,7 @@ y(t) = b(1) + b(2:lb) * y(t-1:t-tb+1) + e(t); endfor endif - + y = y(1:T); - + endfunction - \ No newline at end of file
--- a/scripts/signal/arch_test.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/arch_test.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -19,7 +19,7 @@ ## ## arch_test (y, X, p) performs a Lagrange Multiplier (LM) test of the ## null hypothesis of no conditional heteroscedascity in the linear -## regression model y = X * b + e against the alternative of CH(p). +## regression model y = X * b + e against the alternative of CH(p). ## I.e., the model is ## y(t) = b(1) * x(t,1) + ... + b(k) * x(t,k) + e(t), ## where given y up to t-1 and x up to t, e(t) is N(0, h(t)) with @@ -27,17 +27,17 @@ ## and the null is a(1) == ... == a(p) == 0. ## ## arch_test (y, k, p) does the same in a linear autoregression model of -## order k, i.e., with [1, y(t-1), ..., y(t-k)] as the t-th row of X. +## order k, i.e., with [1, y(t-1), ..., y(t-k)] as the t-th row of X. ## ## Under the null, lm approximately has a chisquare distribution with p ## degrees of freedom. pval is the p-value (1 minus the CDF of this ## distribution at lm) of the test. ## ## If no output argument is given, the p-value is displayed. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Test for conditional heteroscedascity - + function [pval, lm] = arch_test (y, X, p) if (nargin != 3) @@ -54,17 +54,17 @@ X = autoreg_matrix (y, X); elseif !(rx == T) error (["arch_test: ", ... - "either rows(X) == length(y), or X is a scalar"]); + "either rows(X) == length(y), or X is a scalar"]); endif if !(is_scalar(p) && (rem(p, 1) == 0) && (p > 0)) error ("arch_test: p must be a positive integer."); endif - + [b, v_b, e] = ols (y, X); Z = autoreg_matrix (e.^2, p); f = e.^2 / v_b - ones (T, 1); f = Z' * f; lm = f' * inv (Z'*Z) * f / 2; pval = 1 - chisquare_cdf (lm, p); - + endfunction \ No newline at end of file
--- a/scripts/signal/arma_rnd.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/arma_rnd.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Friedrich Leisch -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -25,8 +25,8 @@ ## ## The optional parameter n gives the number of dummy x(i) used for ## initialization, i.e., a sequence of length t+n is generated and -## x(n+1:t+n) is returned. If n is omitted, n=100 is used. - +## x(n+1:t+n) is returned. If n is omitted, n=100 is used. + ## Author: FL <Friedrich.Leisch@ci.tuwien.ac.at> ## Description: Simulate an ARMA process @@ -35,12 +35,12 @@ unwind_protect orig_listelemok = empty_list_elements_ok; empty_list_elements_ok = "true"; - + if (nargin == 4) n = 100; elseif (nargin == 5) if (!is_scalar (t)) - error ("arma_rnd: n must be a scalar"); + error ("arma_rnd: n must be a scalar"); endif else usage ("arma_rnd (a, b, v, t [, n])"); @@ -49,31 +49,31 @@ if ( (min (size (a)) > 1) || (min (size (b)) > 1) ) error ("arma_rnd: a and b must not be matrices"); endif - + if (!is_scalar (t)) error ("arma_rnd: t must be a scalar"); endif - + ar = length (a); br = length (b); a = reshape (a, ar, 1); b = reshape (b, br, 1); - - a = [1; -a]; # apply our notational convention + + a = [1; -a]; # apply our notational convention b = [1; b]; - + n = min (n, ar + br); - + e = sqrt (v) * randn (t + n, 1); - + x = filter (b, a, e); x = x(n + 1 : t + n); unwind_protect_cleanup - + empty_list_elements_ok = orig_listelemok; - + end_unwind_protect endfunction
--- a/scripts/signal/autocor.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/autocor.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,44 +1,44 @@ ## Copyright (C) 1995, 1996, 1997 Friedrich Leisch -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## usage: autocor (X [, h]) -## +## ## returns the autocorrelations from lag 0 to h of vector X. ## If h is omitted, all autocorrelations are computed. ## If X is a matrix, the autocorrelations of every single column are -## computed. - +## computed. + ## Author: FL <Friedrich.Leisch@ci.tuwien.ac.at> ## Description: Compute autocorrelations - + function retval = autocor (X, h) - + if (nargin == 1) retval = autocov (X); elseif (nargin == 2) retval = autocov (X, h); else - usage ("autocor (X [, h])"); + usage ("autocor (X [, h])"); endif - + if (min (retval (1,:)) != 0) retval = retval ./ ( ones (rows (retval), 1) * retval(1, :) ); endif - + endfunction - + - +
--- a/scripts/signal/autocov.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/autocov.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,49 +1,49 @@ ## Copyright (C) 1995, 1996, 1997 Friedrich Leisch -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## usage: autocov (X [, h]) -## +## ## returns the autocovariances from lag 0 to h of vector X. ## If h is omitted, all autocovariances are computed. ## If X is a matrix, the autocovariances of every single column are -## computed. +## computed. ## Author: FL <Friedrich.Leisch@ci.tuwien.ac.at> ## Description: Compute autocovariances - + function retval = autocov (X, h) - + [n, c] = size (X); - + if (is_vector (X)) n = length (X); c = 1; X = reshape (X, n, 1); endif - + X = center (X); - + if (nargin == 1) h = n - 1; endif - + retval = zeros (h + 1, c); - + for i = 0 : h retval(i+1, :) = diag (X(i+1:n, :).' * conj (X(1:n-i, :))) / n; endfor - + endfunction
--- a/scripts/signal/autoreg_matrix.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/autoreg_matrix.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -20,7 +20,7 @@ ## first column and the first k lagged values of y in the other columns. ## I.e., for t > k, [1, y(t-1), ..., y(t-k)] is the t-th row of X. X can ## be used as regressor matrix in autoregressions. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Design matrix for autoregressions @@ -29,16 +29,16 @@ if (nargin != 2) usage ("autoreg_matrix (y, k)"); endif - + if !(is_vector (y)) error ("autoreg_matrix: y must be a vector"); endif - + T = length (y); y = reshape (y, T, 1); X = ones (T, k+1); for j = 1 : k; X(:, j+1) = [(zeros (j, 1)); y(1:T-j)]; endfor - + endfunction
--- a/scripts/signal/bartlett.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/bartlett.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 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 2, 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -26,15 +26,15 @@ ## Description: Coefficients of the Bartlett (triangular) window function c = bartlett (m) - + if (nargin != 1) usage ("bartlett (m)"); endif - + if !(is_scalar (m) && (m == round (m)) && (m > 0)) error ("bartlett: m has to be an integer > 0"); endif - + if (m == 1) c = 1; else
--- a/scripts/signal/blackman.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/blackman.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 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 2, 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,17 +23,17 @@ ## Author: AW <Andreas.Weingessel@ci.tuwien.ac.at> ## Description: Coefficients of the Blackman window - + function c = blackman (m) - + if (nargin != 1) usage ("blackman (m)"); endif - + if !(is_scalar (m) && (m == round (m)) && (m > 0)) error ("blackman: m has to be an integer > 0"); endif - + if (m == 1) c = 1; else @@ -41,5 +41,5 @@ k = (0 : m)' / m; c = 0.42 - 0.5 * cos (2 * pi * k) + 0.08 * cos (4 * pi * k); endif - + endfunction
--- a/scripts/signal/detrend.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/detrend.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -18,10 +18,10 @@ ## @deftypefn {Function File} {} detrend (@var{x}, @var{p}) ## If @var{x} is a vector, @code{detrend (@var{x}, @var{p})} removes the ## best fit of a polynomial of order @var{p} from the data @var{x}. -## +## ## If @var{x} is a matrix, @code{detrend (@var{x}, @var{p})} does the same ## for each column in @var{x}. -## +## ## The second argument is optional. If it is not specified, a value of 1 ## is assumed. This corresponds to removing a linear trend. ## @end deftypefn @@ -29,9 +29,9 @@ ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Created: 11 October 1994 ## Adapted-By: jwe - + function y = detrend (x, p) - + if (nargin == 1) p = 1; elseif (nargin == 2) @@ -41,18 +41,18 @@ else usage ("detrend (x [, p])"); endif - + [m, n] = size (x); if (m == 1) x = x'; endif - + r = rows (x); b = ((1 : r)' * ones (1, p + 1)) .^ (ones (r, 1) * (0 : p)); y = x - b * (b \ x); - + if (m == 1) y = y'; endif - + endfunction
--- a/scripts/signal/diffpara.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/diffpara.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Friedrich Leisch -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -30,12 +30,12 @@ ## ## Reference: Brockwell, Peter J. & Davis, Richard A. Time Series: ## Theory and Methods Springer 1987 - + ## Author: FL <Friedrich.Leisch@ci.tuwien.ac.at> ## Description: Estimate the fractional differencing parameter function [d, D] = diffpara (X, a, b) - + if ((nargin < 1) || (nargin > 3)) usage ("[d [, D]] = diffpara (X [, a [, b]])"); else @@ -54,30 +54,30 @@ a = 1; endif endif - + if !(is_scalar (a) && is_scalar (b)) error ("diffpara: a and b must be scalars"); endif - + D = zeros (b - a + 1, k); - + for l = 1:k - + w = 2 * pi * (1 : n-1) / n; - + x = 2 * log (abs( 1 - exp (-i*w))); y = log (periodogram (X(2:n,l))); - + x = center (x); y = center (y); - + for m = a:b D(m-a+1) = - x(1:m) * y(1:m) / sumsq (x(1:m)); endfor - + endfor - + d = mean (D); - + endfunction
--- a/scripts/signal/durbinlevinson.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/durbinlevinson.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995 Friedrich Leisch -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -24,66 +24,66 @@ ## ## If oldphi is omitted, all steps from 1 to t of the algorithm are ## performed. - + ## Author: FL <Friedrich.Leisch@ci.tuwien.ac.at> ## Description: Perform one step of the Durbin-Levinson algorithm - + function [newphi, newv] = durbinlevinson (c, oldphi, oldv) - + if( !((nargin == 1) || (nargin == 3)) ) usage ("durbinlevinson (c, [oldphi, oldv])"); endif - + if( columns (c) > 1 ) c=c'; endif newphi = 0; newv = 0; - + if (nargin == 3) - + t = length (oldphi) + 1; - + if (length (c) < t+1) error ("durbilevinson: c too small"); endif - + if (oldv == 0) error ("durbinlevinson: oldv = 0"); endif - + if (rows (oldphi) > 1 ) oldphi = oldphi'; endif - + newphi = zeros (1, t); newphi(1) = ( c(t+1) - oldphi * c(2:t) ) / oldv; for i = 2 : t newphi(i) = oldphi(i-1) - newphi(1) * oldphi(t-i+1); endfor newv = ( 1 - newphi(1)^2 ) * oldv; - + elseif(nargin == 1) - + tt = length (c)-1; oldphi = c(2) / c(1); oldv = ( 1 - oldphi^2 ) * c(1); - + for t = 2 : tt - + newphi = zeros (1, t); newphi(1) = ( c(t+1) - oldphi * c(2:t) ) / oldv; for i = 2 : t - newphi(i) = oldphi(i-1) - newphi(1) * oldphi(t-i+1); + newphi(i) = oldphi(i-1) - newphi(1) * oldphi(t-i+1); endfor newv = ( 1 - newphi(1)^2 ) * oldv; - + oldv = newv; oldphi = newphi; - + endfor - + endif endfunction
--- a/scripts/signal/fftconv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/fftconv.m Thu Jan 13 08:40:53 2000 +0000 @@ -23,7 +23,7 @@ ## with length equal to the @code{length (a) + length (b) - 1}. If @var{a} ## and @var{b} are the coefficient vectors of two polynomials, the returned ## value is the coefficient vector of the product polynomial. -## +## ## The computation uses the FFT by calling the function @code{fftfilt}. If ## the optional argument @var{n} is specified, an N-point FFT is used. ## @end deftypefn @@ -53,7 +53,7 @@ c = fftfilt (a, b); else if !(is_scalar (N)) - error ("fftconv: N has to be a scalar"); + error ("fftconv: N has to be a scalar"); endif c = fftfilt (a, b, N); endif
--- a/scripts/signal/fftfilt.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/fftfilt.m Thu Jan 13 08:40:53 2000 +0000 @@ -19,10 +19,10 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} fftfilt (@var{b}, @var{x}, @var{n}) -## +## ## With two arguments, @code{fftfilt} filters @var{x} with the FIR filter ## @var{b} using the FFT. -## +## ## Given the optional third argument, @var{n}, @code{fftfilt} uses the ## overlap-add method to filter @var{x} with @var{b} using an N-point FFT. ## @end deftypefn
--- a/scripts/signal/fftshift.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/fftshift.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1997 by Vincent Cautaerts -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
--- a/scripts/signal/fractdiff.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/fractdiff.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Friedrich Leisch -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -18,33 +18,33 @@ ## ## Computes the fractional differences (1-L)^d x where L denotes the ## lag-operator and d > -1. - + ## Author: FL <Friedrich.Leisch@ci.tuwien.ac.at> ## Description: Compute fractional differences - + function retval = fractdiff (x, d) - + N = 100; - + if !is_vector (x) error ("fractdiff: x must be a vector") endif - + if !is_scalar (d) error ("fractdiff: d must be a scalar") endif - - + + if (d >= 1) for k = 1 : d x = x(2 : length (x)) - x(1 : length (x) - 1); endfor endif - + if (d > -1) - + d = rem (d, 1); - + if (d != 0) n = (0 : N)'; w = real (gamma (-d+n) ./ gamma (-d) ./ gamma (n+1)); @@ -53,10 +53,10 @@ else retval = x; endif - + else error ("fractdiff: d must be > -1"); - + endif - + endfunction
--- a/scripts/signal/freqz.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/freqz.m Thu Jan 13 08:40:53 2000 +0000 @@ -31,10 +31,10 @@ ## $2\pi$. ## @end tex ## @end iftex -## +## ## @noindent ## The output value @var{w} is a vector of the frequencies. -## +## ## If the fourth argument is omitted, the response is evaluated at ## frequencies between 0 and ## @ifinfo @@ -45,12 +45,12 @@ ## $\pi$. ## @end tex ## @end iftex -## +## ## If @var{n} is omitted, a value of 512 is assumed. -## +## ## If @var{a} is omitted, the denominator is assumed to be 1 (this ## corresponds to a simple FIR filter). -## +## ## For fastest computation, @var{n} should factor into a small number of ## small primes. ## @end deftypefn
--- a/scripts/signal/hamming.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/hamming.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 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 2, 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -25,20 +25,20 @@ ## Description: Coefficients of the Hamming window function c = hamming (m) - + if (nargin != 1) usage ("hamming (m)"); endif - + if !(is_scalar (m) && (m == round (m)) && (m > 0)) error ("hamming: m has to be an integer > 0"); endif - + if (m == 1) c = 1; else m = m - 1; c = 0.54 - 0.46 * cos (2 * pi * (0:m)' / m); endif - + endfunction
--- a/scripts/signal/hanning.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/hanning.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 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 2, 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -20,25 +20,25 @@ ## ## For a definition of this window type, see e.g. A. V. Oppenheim & ## R. W. Schafer, "Discrete-Time Signal Processing". - + ## Author: AW <Andreas.Weingessel@ci.tuwien.ac.at> ## Description: Coefficients of the Hanning window function c = hanning (m) - + if (nargin != 1) usage ("hanning (m)"); endif - + if !(is_scalar (m) && (m == round (m)) && (m > 0)) error ("hanning: m has to be an integer > 0"); endif - + if (m == 1) c = 1; else m = m - 1; c = 0.5 - 0.5 * cos (2 * pi * (0 : m)' / m); endif - + endfunction
--- a/scripts/signal/hurst.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/hurst.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Friedrich Leisch -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -22,7 +22,7 @@ ## Author: FL <Friedrich.Leisch@ci.tuwien.ac.at> ## Description: Estimate the Hurst parameter - + function H = hurst (x) if (nargin != 1) @@ -34,12 +34,12 @@ elseif is_vector (x) x = reshape (x, length (x), 1); end - + [xr, xc] = size (x); s = std (x); w = cumsum (x - mean (x)); RS = (max(w) - min(w)) ./ s; H = log (RS) / log (xr); - + endfunction
--- a/scripts/signal/periodogram.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/periodogram.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Friedrich Leisch -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -17,7 +17,7 @@ ## usage: periodogram (x) ## ## For a data matrix x from a sample of size n, return the periodogram. - + ## Author: FL <Friedrich.Leisch@ci.tuwien.ac.at> ## Description: Compute the periodogram @@ -28,14 +28,14 @@ if (r == 1) r = c; endif - + retval = (abs (fft (x - mean (x)))) .^ 2 / r; - + endfunction - - + +
--- a/scripts/signal/rectangle_lw.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/rectangle_lw.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Friedrich Leisch -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -18,15 +18,15 @@ ## ## Rectangular lag window. Subfunction used for spectral density ## estimation. - + ## Author: FL <Friedrich.Leisch@ci.tuwien.ac.at> ## Description: Rectangular lag window function retval = rectangle_lw (n, b) - + retval = zeros (n, 1); t = floor (1 / b); - + retval (1:t, 1) = ones (t, 1); endfunction
--- a/scripts/signal/rectangle_sw.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/rectangle_sw.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Friedrich Leisch -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -18,12 +18,12 @@ ## ## Rectangular spectral window. Subfunction used for spectral density ## estimation. - + ## Author: FL <Friedrich.Leisch@ci.tuwien.ac.at> ## Description: Rectangular spectral window function retval = rectangle_sw (n, b) - + retval = zeros (n, 1); retval(1) = 2 / b + 1; @@ -31,7 +31,7 @@ l = 2 * pi * l / n; retval(2:n) = sin( (2/b + 1) * l / 2 ) ./ sin (l / 2); - + endfunction
--- a/scripts/signal/sinetone.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/sinetone.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Friedrich Leisch -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -21,12 +21,12 @@ ## vectors of common size. ## ## Defaults are rate = 8000, sec = 1 and ampl = 64. - + ## Author: FL <Friedrich.Leisch@ci.tuwien.ac.at> ## Description: Compute a sine tone - + function retval = sinetone (f, r, s, a) - + if (nargin == 1) r = 8000; s = 1; @@ -39,12 +39,12 @@ elseif ((nargin < 1) || (nargin > 4)) usage ("sinetone (freq [, rate [, sec [, ampl]]])"); endif - + [err, f, a] = common_size (f, a); if (err || ! is_vector (f)) error ("sinetone: freq and ampl must be vectors of common size"); endif - + if !(is_scalar (r) && is_scalar (s)) error ("sinetone: rate and sec must be scalars"); endif @@ -55,6 +55,6 @@ for k = 1:n retval (:, k) = a(k) * sin (2 * pi * (1:r*s) / r * f(k))'; endfor - + endfunction
--- a/scripts/signal/sinewave.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/sinewave.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 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 2, 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -25,7 +25,7 @@ ## Description: Compute a sine wave function x = sinewave (m, n, d) - + if (nargin == 2) d = 0; elseif (nargin != 3)
--- a/scripts/signal/spectral_adf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/spectral_adf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,37 +1,37 @@ ## Copyright (C) 1995, 1996, 1997 Friedrich Leisch -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## usage: retval = spectral_adf (c, [win, [b]]) -## +## ## Returns the spectral density estimator. ## c ....... vector of autocovariances (starting at lag 0) ## win ..... window name, eg. "triangle" or "rectangle" ## spectral_adf searches for a function called win_lw () ## b ....... bandwidth -## +## ## If win is omitted, the triangle window is used as default. ## If b is omitted, 1 / sqrt( length (c)) is used as default. - + ## Author: FL <Friedrich.Leisch@ci.tuwien.ac.at> ## Description: Spectral density estimation - + function retval = spectral_adf (c, win, b) - + cr = length (c); - + if (columns (c) > 1) c=c'; endif @@ -46,16 +46,16 @@ win = [win, "_lw"]; w = feval (win, cr, b); endif - + c = c .* w; - + retval = 2 * real (fft (c)) - c(1); retval = [(zeros (cr, 1)), retval]; retval(:, 1) = (0 : cr-1)' / cr; - + endfunction - - - + + +
--- a/scripts/signal/spectral_xdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/spectral_xdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,66 +1,66 @@ ## Copyright (C) 1995, 1996, 1997 Friedrich Leisch -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## usage: retval = spectral_xdf (X, [win, [b]]) -## +## ## Returns the spectral density estimator. ## X ....... data vector ## win ..... window name, eg. "triangle" or "rectangle" ## spectral_adf searches for a function called win_sw () ## b ....... bandwidth -## +## ## If win is omitted, the triangle window is used as default. ## If b is omitted, 1 / sqrt (length (X)) is used as default. - + ## Author: FL <Friedrich.Leisch@ci.tuwien.ac.at> ## Description: Spectral density estimation - + function retval = spectral_xdf (X, win, b) - + xr = length (X); - + if (columns (X) > 1) X = X'; endif - + if (nargin < 3) b = 1 / ceil (sqrt (xr)); endif - + if (nargin == 1) w = triangle_sw (xr, b); else win = [win, "_sw"]; w = feval (win, xr, b); endif - + X = X - sum (X) / xr; retval = (abs (fft (X)) / xr).^2; retval = real (ifft (fft(retval) .* fft(w))); - + retval = [(zeros (xr, 1)), retval]; retval(:, 1) = (0 : xr-1)' / xr; - + endfunction - - - + + +
--- a/scripts/signal/spencer.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/spencer.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Friedrich Leisch -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -17,34 +17,34 @@ ## usage: spencer (X) ## ## returns Spencer's 15 point moving average of every single column of X - + ## Author: FL <Friedrich.Leisch@ci.tuwien.ac.at> ## Description: Apply Spencer's 15-point MA filter function retval = spencer (X) - + if (nargin != 1) usage ("spencer (X)"); endif [xr, xc] = size(X); - + n = xr; c = xc; - + if (is_vector(X)) n = length(X); c = 1; X = reshape(X, n, 1); endif - + W = [-3, -6, -5, 3, 21, 46, 67, 74, 67, 46, 21, 3, -5, -6, -3] / 320; retval = fftfilt (W, X); retval = [zeros(7,c); retval(15:n,:); zeros(7,c);]; - + retval = reshape(retval, xr, xc); - + endfunction
--- a/scripts/signal/stft.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/stft.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 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 2, 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -38,41 +38,41 @@ ## Description: Short-term Fourier transform function [Y, c] = stft(X, win, inc, coef, w_type) - + ## default values of unspecified arguments if (nargin < 5) w_type = 1; if (nargin < 4) coef = 64; if (nargin < 3) - inc = 24; - if (nargin < 2) - win = 80; - endif + inc = 24; + if (nargin < 2) + win = 80; + endif endif endif - elseif (nargin == 5) + elseif (nargin == 5) if (isstr (w_type)) if (strcmp (w_type, "hanning")) - w_type = 1; + w_type = 1; elseif (strcmp (w_type, "hamming")) - w_type = 2; + w_type = 2; elseif (strcmp (w_type, "rectangle")) - w_type = 3; + w_type = 3; else - error (["stft: unknown window type `", w_type, "'"]) + error (["stft: unknown window type `", w_type, "'"]) endif endif else usage ("[Y [, c]] = ", ... - "stft(X [, win_size [, inc [, num_coef [, w_type]]]])"); + "stft(X [, win_size [, inc [, num_coef [, w_type]]]])"); endif ## check whether X is a vector [nr, nc] = size (X); if (nc != 1) if (nr == 1) - X = X'; + X = X'; nr = nc; else error ("stft: X must be a vector"); @@ -87,14 +87,14 @@ num_win = fix ((nr - win) / inc); ## compute the window coefficients - if (w_type == 3) # rectangular window + if (w_type == 3) # rectangular window WIN_COEF = ones (win, 1); - elseif (w_type == 2) # Hamming window + elseif (w_type == 2) # Hamming window WIN_COEF = hamming (win); - else # Hanning window + else # Hanning window WIN_COEF = hanning (win); endif - + ## create a matrix Z whose columns contain the windowed time-slices Z = zeros (num_coef, num_win + 1); start = 1;
--- a/scripts/signal/synthesis.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/synthesis.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 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 2, 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -20,26 +20,26 @@ ## [win_size, increment, window_type]. ## ## Y and c can be derived by [Y, c] = stft (X [, ...]). - + ## Author: AW <Andreas.Weingessel@ci.tuwien.ac.at> ## Description: Recover a signal from its short-term Fourier transform function X = synthesis (Y, c) - + if (nargin != 2) usage ("X = synthesis (Y, c)"); endif - + [nr, nc] = size (c); if (nr * nc != 3) error ("synthesis: c must contain exactly 3 elements"); endif - + ## not necessary, enables better reading - win = c(1); + win = c(1); inc = c(2); w_type = c(3); - + if (w_type == 1) H = hanning (win); elseif (w_type == 2) @@ -49,7 +49,7 @@ else error ("synthesis: window_type must be 1, 2, or 3"); endif - + Z = real (ifft (Y)); st = fix ((win-inc) / 2); Z = Z(st:st+inc-1, :); @@ -59,7 +59,7 @@ for i = 1:nc Z(:, i) = Z(:, i) ./ H; endfor - + X = reshape(Z, inc * nc, 1); - + endfunction
--- a/scripts/signal/triangle_lw.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/triangle_lw.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Friedrich Leisch -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -18,12 +18,12 @@ ## ## Triangular lag window. Subfunction used for spectral density ## estimation. - + ## Author: FL <Friedrich.Leisch@ci.tuwien.ac.at> ## Description: Triangular lag window - + function retval = triangle_lw (n, b) - + retval = 1 - (0 : n-1)' * b; retval = max ([retval'; (zeros (1, n))])';
--- a/scripts/signal/triangle_sw.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/triangle_sw.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Friedrich Leisch -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -18,18 +18,18 @@ ## ## Triangular spectral window. Subfunction used for spectral density ## estimation. - + ## Author: FL <Friedrich.Leisch@ci.tuwien.ac.at> ## Description: Triangular spectral window function retval = triangle_sw (n, b) - + retval = zeros(n,1); retval(1) = 1 / b; l = (2:n)' - 1; l = 2 * pi * l / n; - + retval(2:n) = b * (sin (l / (2*b)) ./ sin (l / 2) ).^2; endfunction
--- a/scripts/signal/yulewalker.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/signal/yulewalker.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,52 +1,52 @@ ## Copyright (C) 1995, 1996, 1997 Friedrich Leisch -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## usage: [a, v] = yulewalker (c) -## +## ## fits an AR (p)-model with Yule-Walker estimates. ## c = [gamma_0, ..., gamma_p] autocovariances ## a .... AR coefficients ## v .... variance of white noise - + ## Author: FL <Friedrich.Leisch@ci.tuwien.ac.at> ## Description: Fit AR model by Yule-Walker method - + function [a, v] = yulewalker (c) - + p = length (c) - 1; - + if (columns (c) > 1) c = c'; endif - + cp = c(2 : p+1); CP = zeros(p, p); - + for i = 1:p for j = 1:p CP (i, j) = c (abs (i-j) + 1); endfor endfor - + a = inv (CP) * cp; v = c(1) - a' * cp; - + endfunction - - - + + +
--- a/scripts/specfun/bessel.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/specfun/bessel.m Thu Jan 13 08:40:53 2000 +0000 @@ -23,28 +23,28 @@ ## @deftypefnx {Mapping Function} {} besselk (@var{alpha}, @var{x}) ## @deftypefnx {Mapping Function} {} bessely (@var{alpha}, @var{x}) ## Compute Bessel functions of the following types: -## +## ## @table @code ## @item besselj ## Bessel functions of the first kind. -## +## ## @item bessely ## Bessel functions of the second kind. -## +## ## @item besseli ## Modified Bessel functions of the first kind. -## +## ## @item besselk ## Modified Bessel functions of the second kind. ## @end table -## +## ## The second argument, @var{x}, must be a real matrix, vector, or scalar. -## +## ## The first argument, @var{alpha}, must be greater than or equal to zero. ## If @var{alpha} is a range, it must have an increment equal to one. -## +## ## If @var{alpha} is a scalar, the result is the same size as @var{x}. -## +## ## If @var{alpha} is a range, @var{x} must be a vector or scalar, and the ## result is a matrix with @code{length(@var{x})} rows and ## @code{length(@var{alpha})} columns.
--- a/scripts/specfun/beta.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/specfun/beta.m Thu Jan 13 08:40:53 2000 +0000 @@ -28,7 +28,7 @@ ## @end tex ## @end iftex ## @ifinfo -## +## ## @example ## beta (a, b) = gamma (a) * gamma (b) / gamma (a + b). ## @end example
--- a/scripts/specfun/betai.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/specfun/betai.m Thu Jan 13 08:40:53 2000 +0000 @@ -28,7 +28,7 @@ ## @end tex ## @end iftex ## @ifinfo -## +## ## @smallexample ## x ## / @@ -37,7 +37,7 @@ ## t=0 ## @end smallexample ## @end ifinfo -## +## ## If x has more than one component, both @var{a} and @var{b} must be ## scalars. If @var{x} is a scalar, @var{a} and @var{b} must be of ## compatible dimensions.
--- a/scripts/specfun/erfinv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/specfun/erfinv.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -25,7 +25,7 @@ ## Adapted-By: jwe function [y, iterations] = erfinv (x) - + if (nargin != 1) usage ("erfinv (x)"); endif @@ -35,7 +35,7 @@ iterations = 0; - [m, n] = size (x); + [m, n] = size (x); x = reshape (x, m * n, 1); y = zeros (m * n, 1); @@ -59,13 +59,13 @@ z_old = z_new; z_new = z_old - (erf (z_old) - x(i)) .* exp (z_old.^2) * s; if (++iterations > maxit) - warning ("erfinv: iteration limit exceeded"); - break; + warning ("erfinv: iteration limit exceeded"); + break; endif endwhile y(i) = z_new; endif - + y = reshape (y, m, n); - + endfunction
--- a/scripts/specfun/gammai.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/specfun/gammai.m Thu Jan 13 08:40:53 2000 +0000 @@ -28,7 +28,7 @@ ## @end tex ## @end iftex ## @ifinfo -## +## ## @smallexample ## x ## 1 / @@ -37,10 +37,10 @@ ## t=0 ## @end smallexample ## @end ifinfo -## +## ## If @var{a} is scalar, then @code{gammai (@var{a}, @var{x})} is returned ## for each element of @var{x} and vice versa. -## +## ## If neither @var{a} nor @var{x} is scalar, the sizes of @var{a} and ## @var{x} must agree, and @var{gammai} is applied element-by-element. ## @end deftypefn
--- a/scripts/specfun/log2.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/specfun/log2.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -45,7 +45,7 @@ elseif (nargout == 2) ## Only deal with the real parts ... x = real (x); - ## Since log (0) gives problems, 0 entries are replaced by 1. + ## Since log (0) gives problems, 0 entries are replaced by 1. ## This is corrected later by multiplication with the sign. f = abs (x) + (x == 0); e = (floor (log (f) / log (2)) + 1) .* (x != 0);
--- a/scripts/specfun/pow2.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/specfun/pow2.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -43,7 +43,7 @@ ## Adapted-By: jwe function y = pow2 (f, e) - + if (nargin == 1) y = 2 .^ f; elseif (nargin == 2)
--- a/scripts/special-matrix/hankel.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/special-matrix/hankel.m Thu Jan 13 08:40:53 2000 +0000 @@ -24,7 +24,7 @@ ## not the same as the first element of @var{r}, the last element of ## @var{c} is used. If the second argument is omitted, the last row is ## taken to be the same as the first column. -## +## ## A Hankel matrix formed from an m-vector @var{c}, and an n-vector ## @var{r}, has the elements ## @iftex @@ -35,7 +35,7 @@ ## @end tex ## @end iftex ## @ifinfo -## +## ## @example ## @group ## H (i, j) = c (i+j-1), i+j-1 <= m;
--- a/scripts/special-matrix/hilb.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/special-matrix/hilb.m Thu Jan 13 08:40:53 2000 +0000 @@ -37,7 +37,7 @@ ## @end tex ## @end iftex ## @ifinfo -## +## ## @example ## H (i, j) = 1 / (i + j - 1) ## @end example
--- a/scripts/special-matrix/toeplitz.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/special-matrix/toeplitz.m Thu Jan 13 08:40:53 2000 +0000 @@ -24,7 +24,7 @@ ## is not the same as the first element of @var{r}, the first element of ## @var{c} is used. If the second argument is omitted, the first row is ## taken to be the same as the first column. -## +## ## A square Toeplitz matrix has the form ## @iftex ## @tex @@ -38,7 +38,7 @@ ## @end tex ## @end iftex ## @ifinfo -## +## ## @example ## @group ## c(0) r(1) r(2) ... r(n) @@ -47,7 +47,7 @@ ## . . ## . . ## . . -## +## ## c(n) c(n-1) c(n-2) ... c(0) ## @end group ## @end example
--- a/scripts/special-matrix/vander.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/special-matrix/vander.m Thu Jan 13 08:40:53 2000 +0000 @@ -20,7 +20,7 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} vander (@var{c}) ## Return the Vandermonde matrix whose next to last column is @var{c}. -## +## ## A Vandermonde matrix has the form ## @iftex ## @tex @@ -33,7 +33,7 @@ ## @end tex ## @end iftex ## @ifinfo -## +## ## @example ## @group ## c(0)^n ... c(0)^2 c(0) 1 @@ -41,7 +41,7 @@ ## . . . . ## . . . . ## . . . . -## +## ## c(n)^n ... c(n)^2 c(n) 1 ## @end group ## @end example
--- a/scripts/statistics/base/center.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/center.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -21,9 +21,9 @@ ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Center by subtracting means - + function retval = center (x) - + if (nargin != 1) usage ("center (x)"); endif
--- a/scripts/statistics/base/cloglog.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/cloglog.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,31 +1,31 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## Returns cloglog (x) = - log (- log (x)), the complementary log-log ## function. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Complementary log-log function - + function y = cloglog (x) - + if (nargin != 1) usage ("cloglog (x)"); endif - + y = - log (- log (x)); - + endfunction \ No newline at end of file
--- a/scripts/statistics/base/cor.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/cor.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
--- a/scripts/statistics/base/cov.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/cov.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -42,7 +42,7 @@ y = y'; endif if (rows (y) != n) - error ("cov: x and y must have the same number of observations."); + error ("cov: x and y must have the same number of observations."); endif x = x - ones (n, 1) * sum (x) / n; y = y - ones (n, 1) * sum (y) / n;
--- a/scripts/statistics/base/cut.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/cut.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -31,7 +31,7 @@ ## Description: Cut data into intervals function group = cut (X, BREAKS) - + if (nargin != 2) usage ("cut (X, BREAKS)"); endif @@ -53,7 +53,7 @@ if any (k = find ((X >= min (BREAKS)) & (X <= max (BREAKS)))) n = length (k); group(k) = sum ((ones (m, 1) * reshape (X(k), 1, n)) - > (reshape (BREAKS, m, 1) * ones (1, n))); + > (reshape (BREAKS, m, 1) * ones (1, n))); endif endfunction
--- a/scripts/statistics/base/gls.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/gls.m Thu Jan 13 08:40:53 2000 +0000 @@ -32,7 +32,7 @@ ## @end ifinfo ## where ## @iftex -## @tex +## @tex ## $y$ is a $t \times p$ matrix, $x$ is a $t \times k$ matrix, $b$ is a $k ## \times p$ matrix, $e$ is a $t \times p$ matrix, and $o$ is a $tp \times ## tp$ matrix. @@ -44,20 +44,20 @@ ## @var{p} matrix, and @var{O} is a @var{T}@var{p} by @var{T}@var{p} ## matrix. ## @end ifinfo -## +## ## @noindent ## Each row of Y and X is an observation and each column a variable. -## +## ## The return values @var{beta}, @var{v}, and @var{r} are defined as ## follows. -## +## ## @table @var ## @item beta ## The GLS estimator for @var{b}. -## +## ## @item v ## The GLS estimator for @code{@var{s}^2}. -## +## ## @item r ## The matrix of GLS residuals, @code{@var{r} = @var{y} - @var{x} * ## @var{beta}}.
--- a/scripts/statistics/base/iqr.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/iqr.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -20,16 +20,16 @@ ## difference between the upper and lower quartile, of the input data. ## ## If x is a matrix, do the above for each column of x. - + ## Author KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Interquartile range function y = iqr (x) - + if (nargin != 1) usage ("iqr (x)"); endif y = empirical_inv (3/4, x) - empirical_inv (1/4, x); - + endfunction
--- a/scripts/statistics/base/kendall.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/kendall.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -38,7 +38,7 @@ ## Description: Kendall's rank correlation tau function tau = kendall (x, y) - + if ((nargin < 1) || (nargin > 2)) usage ("kendall (x [, y])"); endif @@ -54,18 +54,18 @@ endif if (rows (y) != n) error (["kendall: ", ... - "x and y must have the same number of observations"]); + "x and y must have the same number of observations"]); else x = [x, y]; endif endif - + r = ranks (x); m = sign (kron (r, ones (n, 1)) - kron (ones (n, 1), r)); tau = cor (m); - + if (nargin == 2) tau = tau (1 : c, (c + 1) : columns (x)); endif - + endfunction \ No newline at end of file
--- a/scripts/statistics/base/kurtosis.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/kurtosis.m Thu Jan 13 08:40:53 2000 +0000 @@ -28,12 +28,12 @@ ## @end tex ## @end iftex ## @ifinfo -## +## ## @example ## kurtosis (x) = N^(-1) std(x)^(-4) sum ((x - mean(x)).^4) - 3 ## @end example ## @end ifinfo -## +## ## @noindent ## of @var{x}. If @var{x} is a matrix, return the row vector containing ## the kurtosis of each column.
--- a/scripts/statistics/base/logit.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/logit.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,26 +1,26 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## For each component of p, return the logit log (p / (1-p)) of p. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Logit transformation function y = logit (p) - + if (nargin == 1) y = logistic_inv (p); else
--- a/scripts/statistics/base/mean.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/mean.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,7 +23,7 @@ ## @end tex ## @end iftex ## @ifinfo -## +## ## @example ## mean (x) = SUM_i x(i) / N ## @end example @@ -45,7 +45,7 @@ ## Compute the harmonic mean. ## @end table ## @end deftypefn - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Compute arithmetic, geometric, and harmonic mean @@ -58,17 +58,17 @@ if isempty (x) error ("mean: x must not be empty"); endif - + if (rows (x) == 1) x = x.'; endif - + if (nargin == 1) opt = "a"; endif [r, c] = size (x); - + if (strcmp (opt, "a")) y = sum (x) / r; elseif (strcmp (opt, "g")) @@ -86,5 +86,5 @@ else error (sprintf ("mean: option `%s' not recognized", opt)); endif - + endfunction
--- a/scripts/statistics/base/meansq.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/meansq.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -19,16 +19,16 @@ ## For vector arguments, return the mean square of the values. ## For matrix arguments, return a row vector contaning the mean square ## of each column. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Compute mean square function y = meansq (x) - + if (nargin != 1) usage ("meansq (x)"); endif - + y = mean (x.^2); - + endfunction
--- a/scripts/statistics/base/median.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/median.m Thu Jan 13 08:40:53 2000 +0000 @@ -31,11 +31,11 @@ ## @end tex ## @end iftex ## @ifinfo -## +## ## @example ## @group ## x(ceil(N/2)), N odd -## median(x) = +## median(x) = ## (x(N/2) + x((N/2)+1))/2, N even ## @end group ## @end example
--- a/scripts/statistics/base/moment.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/moment.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -26,16 +26,16 @@ ## Can easily be made to work for continuous distributions (using quad) ## as well, but how does the general case work? - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Compute moments - + function m = moment (x, p, opt) - + if ((nargin < 2) || (nargin > 3)) usage ("moment (x, p [, type]") endif - + [nr, nc] = size (x); if (nr == 0 || nc == 0) error ("moment: x must not be empty"); @@ -43,7 +43,7 @@ x = reshape (x, nc, 1); nr = nc; endif - + if (nargin == 3) tmp = implicit_str_to_num_ok; implicit_str_to_num_ok = "true"; @@ -55,7 +55,7 @@ endif implicit_str_to_num_ok = tmp; endif - + m = sum(x .^ p) / nr; - + endfunction
--- a/scripts/statistics/base/ols.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/ols.m Thu Jan 13 08:40:53 2000 +0000 @@ -35,7 +35,7 @@ ## where ## @iftex ## @tex -## $y$ is a $t \times p$ matrix, $x$ is a $t \times k$ matrix, +## $y$ is a $t \times p$ matrix, $x$ is a $t \times k$ matrix, ## $b$ is a $k \times p$ matrix, and $e$ is a $t \times p$ matrix. ## @end tex ## @end iftex @@ -44,22 +44,22 @@ ## matrix, @var{B} is a @var{k} by @var{p} matrix, and @var{e} is a @var{t} ## by @var{p} matrix. ## @end ifinfo -## +## ## Each row of @var{y} and @var{x} is an observation and each column a ## variable. -## +## ## The return values @var{beta}, @var{sigma}, and @var{r} are defined as ## follows. -## +## ## @table @var ## @item beta ## The OLS estimator for @var{b}, @code{@var{beta} = pinv (@var{x}) * ## @var{y}}, where @code{pinv (@var{x})} denotes the pseudoinverse of ## @var{x}. -## +## ## @item sigma ## The OLS estimator for the matrix @var{s}, -## +## ## @example ## @group ## @var{sigma} = (@var{y}-@var{x}*@var{beta})' @@ -67,7 +67,7 @@ ## / (@var{t}-rank(@var{x})) ## @end group ## @end example -## +## ## @item r ## The matrix of OLS residuals, @code{@var{r} = @var{y} - @var{x} * ## @var{beta}}.
--- a/scripts/statistics/base/ppplot.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/ppplot.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -35,11 +35,11 @@ ## Description: Perform a PP-plot (probability plot) function [p, y] = ppplot (x, dist, ...) - + if (nargin < 1) usage ("ppplot (x [, dist [, params]])"); endif - + if !is_vector (x) error ("ppplot: x must be a vector."); endif @@ -57,7 +57,7 @@ else y = feval (F, s, all_va_args); endif - + if (nargout == 0) axis ([0, 1, 0, 1]); set nokey;
--- a/scripts/statistics/base/probit.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/probit.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,27 +1,27 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## For each component of p, return the probit (the quantile of the ## standard normal distribution) of p. - + ## Written by KH <Kurt.Hornik@ci.tuwien.ac.at> on 1995/02/04 ## Description: Probit transformation function y = probit (p) - + if (nargin == 1) y = stdnormal_inv (p); else @@ -29,4 +29,3 @@ endif endfunction - \ No newline at end of file
--- a/scripts/statistics/base/qqplot.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/qqplot.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -37,11 +37,11 @@ ## Description: Perform a QQ-plot (quantile plot) function [q, s] = qqplot (x, dist, ...) - + if (nargin < 1) usage ("qqplot (x [,dist [,params]])"); endif - + if !(is_vector(x)) error ("qqplot: x must be a vector."); endif @@ -65,7 +65,7 @@ q = eval (sprintf ("%s (t, %s);", f, param_string)); q_label = sprintf ("%s with parameter(s) %s", f, param_string); endif - + if (nargout == 0) xlabel (q_label); ylabel ("sample points");
--- a/scripts/statistics/base/range.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/range.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -17,18 +17,18 @@ ## usage: range (x) ## ## If x is a vector, return the range, i.e., the difference between the -## maximum and the minimum, of the input data. +## maximum and the minimum, of the input data. ## If x is a matrix, do the above for each column of x. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Compute range function y = range (x) - + if (nargin != 1) usage ("range (x)"); endif y = max (x) - min (x); - + endfunction
--- a/scripts/statistics/base/ranks.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/ranks.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -17,21 +17,21 @@ ## usage: ranks (x) ## ## If x is a vector, return the (column) vector of ranks of x adjusted -## for ties. +## for ties. ## If x is a matrix, do the above for each column of x. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Compute ranks ## This code is rather ugly, but is there an easy way to get the ranks ## adjusted for ties from sort? - + function y = ranks (x) if (nargin != 1) usage ("ranks (x)"); endif - + y = []; [r, c] = size (x); @@ -45,5 +45,5 @@ y = [y, ( sum (p < p') + (sum (p == p') + 1) / 2 )']; endfor endif - + endfunction
--- a/scripts/statistics/base/run_count.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/run_count.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Friedrich Leisch -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,12 +23,12 @@ ## Description: Count upward runs function retval = run_count (x, n) - + [xr, xc] = size(x); - + tmp = zeros (xr,xc); retval = zeros (n, xc); - + for j = 1 : xc run = 1; count = 1; @@ -36,22 +36,22 @@ for k = 2 : xr if x(k, j) < x(k-1, j) - tmp(run, j) = count; - run = run + 1; - count = 0; + tmp(run, j) = count; + run = run + 1; + count = 0; endif - + count = count + 1; endfor tmp(run, j) = count; - + endfor - + for k=1 : (n-1) retval(k, :) = sum (tmp == k); endfor retval(n, :) = sum (tmp >= n); - + endfunction
--- a/scripts/statistics/base/skewness.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/skewness.m Thu Jan 13 08:40:53 2000 +0000 @@ -28,12 +28,12 @@ ## @end tex ## @end iftex ## @ifinfo -## +## ## @example ## skewness (x) = N^(-1) std(x)^(-3) sum ((x - mean(x)).^3) ## @end example ## @end ifinfo -## +## ## @noindent ## of @var{x}. If @var{x} is a matrix, return the row vector containing ## the skewness of each column.
--- a/scripts/statistics/base/spearman.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/spearman.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -35,7 +35,7 @@ ## Description: Spearman's rank correlation rho function rho = spearman (x, y) - + if ((nargin < 1) || (nargin > 2)) usage ("spearman (x [, y])"); endif @@ -44,7 +44,7 @@ x = x'; endif n = rows (x); - + if (nargin == 1) rho = cor (ranks (x)); else @@ -53,9 +53,9 @@ endif if (rows (y) != n) error (["spearman: ", ... - "x and y must have the same number of observations"]); + "x and y must have the same number of observations"]); endif rho = cor (ranks (x), ranks (y)); endif - + endfunction
--- a/scripts/statistics/base/statistics.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/statistics.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -21,12 +21,12 @@ ## columns of X as its rows. ## ## If X is a vector, treat it as a column vector. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Compute basic statistics function S = statistics (X) - + if (nargin != 1) usage ("S = statistics (X)"); endif @@ -37,15 +37,15 @@ endif for k=1:columns(X) S(:,k) = [(min (X(:,k))); - (empirical_inv ([0.25;0.5;0.75], X(:,k))); - (max (X(:,k))); - (mean (X(:,k))); - (std (X(:,k))); - (skewness (X(:,k))); - (kurtosis (X(:,k)))]; - endfor + (empirical_inv ([0.25;0.5;0.75], X(:,k))); + (max (X(:,k))); + (mean (X(:,k))); + (std (X(:,k))); + (skewness (X(:,k))); + (kurtosis (X(:,k)))]; + endfor else error ("statistics: invalid argument"); endif - + endfunction
--- a/scripts/statistics/base/std.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/std.m Thu Jan 13 08:40:53 2000 +0000 @@ -29,7 +29,7 @@ ## @end tex ## @end iftex ## @ifinfo -## +## ## @example ## @group ## std (x) = sqrt (sumsq (x - mean (x)) / (n - 1))
--- a/scripts/statistics/base/studentize.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/studentize.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -25,7 +25,7 @@ ## Description: Subtract mean and divide by standard deviation function t = studentize (x) - + if (nargin != 1) usage ("studentize (x)"); endif
--- a/scripts/statistics/base/table.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/table.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -21,12 +21,12 @@ ## the corresponding levels. ## ## Currently, only 1- and 2-dimensional tables are supported. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Cross tabulation - + function [t, v, w] = table (x, y) - + if (nargin == 1) if !(is_vector (x)) error ("table: x must be a vector"); @@ -43,12 +43,12 @@ w = values (y); for i = 1 : length (v) for j = 1 : length (w) - t(i,j) = sum ((x == v(i) | isnan (v(i)) * isnan (x)) & - (y == w(j) | isnan (w(j)) * isnan (y))); + t(i,j) = sum ((x == v(i) | isnan (v(i)) * isnan (x)) & + (y == w(j) | isnan (w(j)) * isnan (y))); endfor endfor else usage ("[t, l_x, ...] = table (x, ...)"); endif - + endfunction \ No newline at end of file
--- a/scripts/statistics/base/values.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/values.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -18,22 +18,22 @@ ## ## Return the different values in a column vector, arranged in ascending ## order. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Extract unique elements function v = values (x) - + if (nargin != 1) usage ("values (x)"); endif - + if !(is_vector (x)) error ("values: x must be a vector"); endif i = any (isnan (x)); - x = x(find(!isnan (x))); # HACK! + x = x(find(!isnan (x))); # HACK! n = length (x); x = reshape (x, n, 1); s = sort (x);
--- a/scripts/statistics/base/var.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/base/var.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -19,16 +19,16 @@ ## For vector arguments, return the (real) variance of the values. ## For matrix arguments, return a row vector contaning the variance for ## each column. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Compute variance function y = var(x) - + if (nargin != 1) usage ("var (x)"); endif - + [nr, nc] = size (x); if (nr == 0 || nc == 0) error ("var: x must not be empty"); @@ -40,5 +40,5 @@ else y = (sumsq (x) - sum(x).^2 / nr) / (nr - 1); endif - + endfunction
--- a/scripts/statistics/distributions/beta_cdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/beta_cdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,7 +23,7 @@ ## Description: CDF of the Beta distribution function cdf = beta_cdf (x, a, b) - + if (nargin != 3) usage ("beta_cdf (a, b, x)"); endif @@ -32,29 +32,29 @@ if (retval > 0) error ("beta_cdf: x, a and b must be of common size or scalar"); endif - + [r, c] = size (x); s = r * c; x = reshape (x, s, 1); a = reshape (a, s, 1); b = reshape (b, s, 1); cdf = zeros (s, 1); - + k = find (!(a > 0) | !(b > 0) | isnan (x)); if any (k) cdf (k) = NaN * ones (length (k), 1); endif - + k = find ((x >= 1) & (a > 0) & (b > 0)); if any (k) cdf (k) = ones (length (k), 1); endif - + k = find ((x > 0) & (x < 1) & (a > 0) & (b > 0)); if any (k) cdf (k) = betai (a(k), b(k), x(k)); endif - + cdf = reshape (cdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/beta_inv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/beta_inv.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -18,16 +18,16 @@ ## ## For each component of x, compute the quantile (the inverse of the ## CDF) at x of the Beta distribution with parameters a and b. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Quantile function of the Beta distribution function inv = beta_inv (x, a, b) - + if (nargin != 3) usage ("beta_inv (x, a, b)"); endif - + [retval, x, a, b] = common_size (x, a, b); if (retval > 0) error ("beta_inv: x, a and b must be of common size or scalars"); @@ -39,17 +39,17 @@ a = reshape (a, s, 1); b = reshape (b, s, 1); inv = zeros (s, 1); - + k = find ((x < 0) | (x > 1) | !(a > 0) | !(b > 0) | isnan (x)); if any (k) inv (k) = NaN * ones (length (k), 1); endif - + k = find ((x == 1) & (a > 0) & (b > 0)); if any (k) inv (k) = ones (length (k), 1); endif - + k = find ((x > 0) & (x < 1) & (a > 0) & (b > 0)); if any (k) a = a (k); @@ -71,22 +71,22 @@ y_new = y_old - h; ind = find (y_new <= eps); if (any (ind)) - y_new (ind) = y_old (ind) / 10; + y_new (ind) = y_old (ind) / 10; endif ind = find (y_new >= 1 - eps); if any (ind) - y_new (ind) = 1 - (1 - y_old (ind)) / 10; + y_new (ind) = 1 - (1 - y_old (ind)) / 10; endif h = y_old - y_new; if (max (abs (h)) < sqrt (eps)) - break; + break; endif y_old = y_new; endfor - + inv (k) = y_new; endif inv = reshape (inv, r, c); - + endfunction
--- a/scripts/statistics/distributions/beta_pdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/beta_pdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,7 +23,7 @@ ## Description: PDF of the Beta distribution function pdf = beta_pdf (x, a, b) - + if (nargin != 3) usage ("beta_pdf (a, b, x)"); endif @@ -39,7 +39,7 @@ a = reshape (a, s, 1); b = reshape (b, s, 1); pdf = zeros (s, 1); - + k = find (!(a > 0) | !(b > 0) | isnan (x)); if any (k) pdf (k) = NaN * ones (length (k), 1); @@ -48,9 +48,9 @@ k = find ((x > 0) & (x < 1) & (a > 0) & (b > 0)); if any (k) pdf(k) = exp ((a(k) - 1) .* log (x(k)) ... - + (b(k) - 1) .* log (1 - x(k))) ./ beta (a(k), b(k)); + + (b(k) - 1) .* log (1 - x(k))) ./ beta (a(k), b(k)); endif pdf = reshape (pdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/beta_rnd.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/beta_rnd.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,7 +23,7 @@ ## beta_rnd (a, b, r, c) returns an r by c matrix of random samples from ## the Beta distribution with parameters a and b. Both a and b must be ## scalar or of size r by c. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Random deviates from the Beta distribution @@ -39,8 +39,8 @@ [retval, a, b] = common_size (a, b, zeros (r, c)); if (retval > 0) error (strcat("beta_rnd: ", - "a and b must be scalar or of size ", - sprintf ("%d by %d", r, c))); + "a and b must be scalar or of size ", + sprintf ("%d by %d", r, c))); endif elseif (nargin == 2) [retval, a, b] = common_size (a, b); @@ -56,17 +56,17 @@ a = reshape (a, 1, s); b = reshape (b, 1, s); rnd = zeros (1, s); - + k = find (!(a > 0) | !(a < Inf) | !(b > 0) | !(b < Inf)); if (any (k)) rnd(k) = NaN * ones (1, length (k)); endif - + k = find ((a > 0) & (a < Inf) & (b > 0) & (b < Inf)); if (any (k)) rnd(k) = beta_inv (rand (1, length (k)), a(k), b(k)); endif - + rnd = reshape (rnd, r, c); - + endfunction \ No newline at end of file
--- a/scripts/statistics/distributions/binomial_cdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/binomial_cdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,17 +23,17 @@ ## Description: CDF of the binomial distribution function cdf = binomial_cdf (x, n, p) - + if (nargin != 3) usage ("binomial_cdf (x, n, p)"); endif - + [retval, x, n, p] = common_size (x, n, p); if (retval > 0) error (["binomial_cdf: ", ... - "x, n and p must be of common size or scalar"]); + "x, n and p must be of common size or scalar"]); endif - + [r, c] = size (x); s = r * c; x = reshape (x, 1, s); @@ -46,20 +46,20 @@ if any (k) cdf(k) = NaN * ones (1, length (k)); endif - + k = find ((x >= n) & (n >= 0) & (n == round (n)) ... - & (p >= 0) & (p <= 1)); + & (p >= 0) & (p <= 1)); if any (k) cdf(k) = ones (1, length (k)); endif - + k = find ((x >= 0) & (x < n) & (n == round (n)) ... & (p >= 0) & (p <= 1)); if any (k) tmp = floor (x(k)); cdf(k) = 1 - betai (tmp + 1, n(k) - tmp, p(k)); endif - + cdf = reshape (cdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/binomial_inv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/binomial_inv.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,15 +23,15 @@ ## Description: Quantile function of the binomial distribution function inv = binomial_inv (x, n, p) - + if (nargin != 3) usage ("binomial_inv (x, n, p)"); endif - + [retval, x, n, p] = common_size (x, n, p); if (retval > 0) error (["binomial_inv: ", ... - "x, n and p must be of common size or scalars"]); + "x, n and p must be of common size or scalars"]); endif [r, c] = size (x); @@ -40,13 +40,13 @@ n = reshape (n, 1, s); p = reshape (p, 1, s); inv = zeros (1, s); - + k = find (!(x >= 0) | !(x <= 1) | !(n >= 0) | (n != round (n)) ... | !(p >= 0) | !(p <= 1)); if any (k) inv(k) = NaN * ones (1, length (k)); endif - + k = find ((x >= 0) & (x <= 1) & (n >= 0) & (n == round (n)) ... & (p >= 0) & (p <= 1)); if any (k) @@ -54,14 +54,14 @@ while (any (inv(k) < n(k))) m = find (cdf < x(k)); if any (m) - inv(k(m)) = inv(k(m)) + 1; - cdf(m) = cdf(m) + binomial_pdf (inv(k(m)), n(k(m)), p(k(m))); + inv(k(m)) = inv(k(m)) + 1; + cdf(m) = cdf(m) + binomial_pdf (inv(k(m)), n(k(m)), p(k(m))); else - break; + break; endif endwhile endif inv = reshape (inv, r, c); - + endfunction
--- a/scripts/statistics/distributions/binomial_pdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/binomial_pdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,7 +23,7 @@ ## Description: PDF of the binomial distribution function pdf = binomial_pdf (x, n, p) - + if (nargin != 3) usage ("binomial_pdf (x, n, p)"); endif @@ -31,9 +31,9 @@ [retval, x, n, p] = common_size (x, n, p); if (retval > 0) error (["binomial_pdf: ", ... - "x, n and p must be of common size or scalar"]); + "x, n and p must be of common size or scalar"]); endif - + [r, c] = size (x); s = r * c; x = reshape (x, 1, s); @@ -46,14 +46,14 @@ if any (k) pdf(k) = NaN * ones (1, length (k)); endif - + k = find ((x >= 0) & (x <= n) & (x == round (x)) ... & (n == round (n)) & (p >= 0) & (p <= 1)); if any (k) pdf(k) = bincoeff (n(k), x(k)) .* (p(k) .^ x(k)) ... - .* ((1 - p(k)) .^ (n(k) - x(k))); + .* ((1 - p(k)) .^ (n(k) - x(k))); endif - + pdf = reshape (pdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/binomial_rnd.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/binomial_rnd.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,7 +23,7 @@ ## binomial_rnd (n, p, r, c) returns an r by c matrix of random samples ## from the binomial distribution with parameters n and p. Both n and p ## must be scalar or of size r by c. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Random deviates from the binomial distribution @@ -39,8 +39,8 @@ [retval, n, p] = common_size (n, p, zeros (r, c)); if (retval > 0) error (strcat("binomial_rnd: ", - "n and p must be scalar or of size ", - sprintf ("%d by %d", r, c))); + "n and p must be scalar or of size ", + sprintf ("%d by %d", r, c))); endif elseif (nargin == 2) [retval, n, p] = common_size (n, p); @@ -56,13 +56,13 @@ n = reshape (n, 1, s); p = reshape (p, 1, s); rnd = zeros (1, s); - + k = find (!(n > 0) | !(n < Inf) | !(n == round (n)) | - !(p <= 0) | !(p >= 1)); + !(p <= 0) | !(p >= 1)); if any (k) rnd(k) = NaN * ones (1, length (k)); endif - + k = find ((n > 0) & (n < Inf) & (n == round (n)) & (p >= 0) & (p <= 1)); if any (k) N = max (n(k)); @@ -70,9 +70,9 @@ tmp = rand (N, L); ind = (1 : N)' * ones (1, L); rnd(k) = sum ((tmp < ones (N, 1) * p(k)) & - (ind <= ones (N, 1) * n(k))); + (ind <= ones (N, 1) * n(k))); endif - + rnd = reshape (rnd, r, c); - + endfunction \ No newline at end of file
--- a/scripts/statistics/distributions/cauchy_cdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/cauchy_cdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -24,16 +24,16 @@ ## Description: CDF of the Cauchy distribution function cdf = cauchy_cdf (x, location, scale) - + if !(nargin == 1 || nargin == 3) usage ("cauchy_cdf (x [, lambda, sigma])"); endif - + if (nargin == 1) location = 0; scale = 1; endif - + [retval, x, location, scale] = common_size (x, location, scale); if (retval > 0) error (["cauchy_cdf: ", ... @@ -47,12 +47,12 @@ scale = reshape (scale, 1, s); cdf = NaN * ones (1, s); - k = find ((x > -Inf) & (x < Inf) & (location > -Inf) & - (location < Inf) & (scale > 0) & (scale < Inf)); + k = find ((x > -Inf) & (x < Inf) & (location > -Inf) & + (location < Inf) & (scale > 0) & (scale < Inf)); if any (k) cdf(k) = 0.5 + atan ((x(k) - location(k)) ./ scale(k)) / pi; endif - + cdf = reshape (cdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/cauchy_inv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/cauchy_inv.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -24,48 +24,48 @@ ## Description: Quantile function of the Cauchy distribution function inv = cauchy_inv (x, location, scale) - + if !(nargin == 1 || nargin == 3) usage ("cauchy_inv (x [, lambda, sigma])"); endif - + if (nargin == 1) location = 0; scale = 1; endif - + [retval, x, location, scale] = common_size (x, location, scale); if (retval > 0) error (["cauchy_inv: ", ... - "x, lambda and sigma must be of common size or scalar"]); + "x, lambda and sigma must be of common size or scalar"]); endif - + [r, c] = size (x); s = r * c; x = reshape (x, 1, s); location = reshape (location, 1, s); scale = reshape (scale, 1, s); - + inv = NaN * ones (1, s); - + ok = ((location > -Inf) & (location < Inf) & (scale > 0) & (scale < Inf)); - + k = find ((x == 0) & ok); if any (k) inv(k) = -Inf * ones (1, length (k)); endif - + k = find ((x > 0) & (x < 1) & ok); if any (k) inv(k) = location(k) - scale(k) .* cot (pi * x(k)); endif - + k = find ((x == 1) & ok); if any (k) inv(k) = Inf * ones (1, length (k)); endif - + inv = reshape (inv, r, c); - + endfunction
--- a/scripts/statistics/distributions/cauchy_pdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/cauchy_pdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -24,37 +24,37 @@ ## Description: PDF of the Cauchy distribution function pdf = cauchy_pdf (x, location, scale) - + if !(nargin == 1 || nargin == 3) usage ("cauchy_pdf (x [, lambda, sigma])"); endif - + if (nargin == 1) location = 0; scale = 1; endif - + [retval, x, location, scale] = common_size (x, location, scale); if (retval > 0) error (["cauchy_pdf: ", ... "x, lambda and sigma must be of common size or scalar"]); endif - + [r, c] = size (x); s = r * c; x = reshape (x, 1, s); location = reshape (location, 1, s); scale = reshape (scale, 1, s); - + pdf = NaN * ones (1, s); - - k = find ((x > -Inf) & (x < Inf) & (location > -Inf) & - (location < Inf) & (scale > 0) & (scale < Inf)); + + k = find ((x > -Inf) & (x < Inf) & (location > -Inf) & + (location < Inf) & (scale > 0) & (scale < Inf)); if any (k) pdf(k) = (1 ./ (1 + ((x(k) - location(k)) ./ scale(k)) .^ 2)) ... / pi ./ scale(k); endif - + pdf = reshape (pdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/cauchy_rnd.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/cauchy_rnd.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,12 +23,12 @@ ## cauchy_rnd (lambda, sigma, r, c) returns an r by c matrix of random ## samples from the Cauchy distribution with parameters lambda and sigma ## which must both be scalar or of size r by c. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Random deviates from the Cauchy distribution function rnd = cauchy_rnd (l, scale, r, c) - + if (nargin == 4) if ( !(is_scalar (r) && (r > 0) && (r == round (r))) ) error ("cauchy_rnd: r must be a positive integer"); @@ -39,31 +39,31 @@ [retval, l, scale] = common_size (l, scale, zeros (r, c)); if (retval > 0) error (strcat("cauchy_rnd: ", - "lambda and sigma must be scalar or of size", - sprintf ("%d by %d.", r, c))); + "lambda and sigma must be scalar or of size", + sprintf ("%d by %d.", r, c))); endif elseif (nargin == 2) [retval, l, scale] = common_size (l, scale); if (retval > 0) error (["cauchy_rnd: ", ... - "lambda and sigma must be of common size or scalar"]); + "lambda and sigma must be of common size or scalar"]); endif [r, c] = size (l); else usage ("cauchy_rnd (lambda, sigma [, r, c])"); endif - + s = r * c; l = reshape (l, 1, s); scale = reshape (scale, 1, s); - + rnd = NaN * ones (1, s); - + k = find ((l > -Inf) & (l < Inf) & (scale > 0) & (scale < Inf)); if (any (k)) rnd(k) = l(k) - cot (pi * rand (1, length (k))) .* scale(k); endif rnd = reshape (rnd, r, c); - + endfunction
--- a/scripts/statistics/distributions/chisquare_cdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/chisquare_cdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -18,12 +18,12 @@ ## ## For each element of x, compute the cumulative distribution function ## (CDF) at x of the chisquare distribution with n degrees of freedom. - + ## Author: TT <Teresa.Twaroch@ci.tuwien.ac.at> ## Description: CDF of the chi-square distribution function cdf = chisquare_cdf (x, n) - + if (nargin != 2) usage ("chisquare_cdf (x, n)"); endif @@ -31,20 +31,20 @@ [retval, x, n] = common_size (x, n); if (retval > 0) error (["chisquare_cdf: ", ... - "x and n must be of common size or scalar"]); + "x and n must be of common size or scalar"]); endif - + cdf = gamma_cdf (x, n / 2, 1 / 2); - + ## should we really only allow for positive integer n? k = find (n != round (n)); if any (k) fprintf (stderr, ... - "WARNING: n should be positive integer\n"); + "WARNING: n should be positive integer\n"); [r, c] = size (x); cdf = reshape (cdf, 1, r * c); cdf(k) = NaN * ones (1, length (k)); - cdf = reshape (cdf, r, c); + cdf = reshape (cdf, r, c); endif endfunction
--- a/scripts/statistics/distributions/chisquare_inv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/chisquare_inv.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -18,12 +18,12 @@ ## ## For each element of x, compute the quantile (the inverse of the CDF) ## at x of the chisquare distribution with n degrees of freedom. - + ## Author: TT <Teresa.Twaroch@ci.tuwien.ac.at> ## Description: Quantile function of the chi-square distribution - + function inv = chisquare_inv (x, n) - + if (nargin != 2) usage ("chisquare_inv (x, n)"); endif @@ -34,16 +34,16 @@ endif inv = gamma_inv (x, n / 2, 1 / 2); - + ## Allow only for (positive) integer n. k = find (n != round (n)); if any (k) fprintf (stderr, ... - "WARNING: n should be positive integer\n"); + "WARNING: n should be positive integer\n"); [r, c] = size (x); inv = reshape (inv, 1, r * c); inv(k) = NaN * ones (1, length (k)); inv = reshape (inv, r, c); endif - + endfunction
--- a/scripts/statistics/distributions/chisquare_pdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/chisquare_pdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,7 +23,7 @@ ## Description: PDF of the chi-sqaure distribution function pdf = chisquare_pdf (x, n) - + if (nargin != 2) usage ("chisquare_pdf (x, n)"); endif @@ -31,20 +31,20 @@ [retval, x, n] = common_size (x, n); if (retval > 0) error (["chisquare_pdf: ", ... - "x and n must be of common size or scalar"]); + "x and n must be of common size or scalar"]); endif - + pdf = gamma_pdf (x, n / 2, 1 / 2); - + ## should we really only allow for positive integer n? k = find (n != round (n)); if any (k) fprintf (stderr, ... - "WARNING: n should be positive integer\n"); + "WARNING: n should be positive integer\n"); [r, c] = size (x); pdf = reshape (pdf, 1, r * c); pdf(k) = NaN * ones (1, length (k)); pdf = reshape (pdf, r, c); endif - + endfunction
--- a/scripts/statistics/distributions/chisquare_rnd.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/chisquare_rnd.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,7 +23,7 @@ ## chisquare_rnd (n, r, c) returns an r by c matrix of random samples ## from the chisquare distribution with n degrees of freedom. n must be ## a scalar or of size r by c. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Random deviates from the chi-square distribution @@ -39,28 +39,28 @@ [retval, n] = common_size (n, zeros (r, c)); if (retval > 0) error (strcat("chisquare_rnd: ", - "n must be scalar or of size ", - sprintf ("%d by %d", r, c))); + "n must be scalar or of size ", + sprintf ("%d by %d", r, c))); endif elseif (nargin != 1) usage ("chisquare_rnd (n [, r, c])"); endif - + [r, c] = size (n); s = r * c; n = reshape (n, 1, s); rnd = zeros (1, s); - + k = find (!(n > 0) | !(n < Inf) | !(n == round (n))); if (any (k)) rnd(k) = NaN * ones (1, length (k)); endif - + k = find ((n > 0) & (n < Inf) & (n == round (n))); if (any (k)) rnd(k) = chisquare_inv (rand (1, length (k)), n(k)); endif - + rnd = reshape (rnd, r, c); - + endfunction
--- a/scripts/statistics/distributions/discrete_cdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/discrete_cdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -24,7 +24,7 @@ ## Description: CDF of a discrete distribution function cdf = discrete_cdf (X, V, P) - + if (nargin != 3) usage ("discrete_cdf (X, V, P)"); endif
--- a/scripts/statistics/distributions/discrete_inv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/discrete_inv.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -24,7 +24,7 @@ ## Description: Quantile function of a discrete distribution function inv = discrete_inv (X, V, P) - + if (nargin != 3) usage ("discrete_inv (X, V, P)"); endif
--- a/scripts/statistics/distributions/discrete_pdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/discrete_pdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -24,7 +24,7 @@ ## Description: PDF of a discrete distribution function pdf = discrete_pdf (X, V, P) - + if (nargin != 3) usage ("discrete_pdf (X, V, P)"); endif
--- a/scripts/statistics/distributions/discrete_rnd.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/discrete_rnd.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -26,7 +26,7 @@ ## Description: Random deviates from a discrete distribution function rnd = discrete_rnd (N, V, P) - + if (nargin != 3) usage ("discrete_rnd (N, V, P)"); endif @@ -48,5 +48,5 @@ s = reshape (cumsum (P / sum (P)), m, 1); rnd = V (1 + sum ((s * ones (1, N)) <= ((ones (m, 1) * u)))); - + endfunction
--- a/scripts/statistics/distributions/empirical_cdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/empirical_cdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -22,9 +22,9 @@ ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: CDF of the empirical distribution - + function cdf = empirical_cdf (X, DATA) - + if (! is_vector (DATA)) error ("empirical_cdf: DATA must be a vector"); endif
--- a/scripts/statistics/distributions/empirical_inv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/empirical_inv.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -22,9 +22,9 @@ ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Quantile function of the empirical distribution - + function inv = empirical_inv (X, DATA) - + if (! is_vector (DATA)) error ("empirical_inv: DATA must be a vector"); endif
--- a/scripts/statistics/distributions/empirical_pdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/empirical_pdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -22,9 +22,9 @@ ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: PDF of the empirical distribution - + function pdf = empirical_pdf (X, DATA) - + if (! is_vector (DATA)) error ("empirical_pdf: DATA must be a vector"); endif
--- a/scripts/statistics/distributions/empirical_rnd.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/empirical_rnd.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -21,9 +21,9 @@ ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Bootstrap samples from the empirical distribution - + function rnd = empirical_rnd (N, DATA) - + if (! is_vector (DATA)) error ("empirical_rnd: DATA must be a vector"); endif
--- a/scripts/statistics/distributions/exponential_cdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/exponential_cdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -20,42 +20,42 @@ ## (CDF) at x of the exponential distribution with parameter lambda. ## ## The arguments can be of common size or scalar. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: CDF of the exponential distribution function cdf = exponential_cdf (x, l) - + if (nargin != 2) usage ("exponential_cdf (x, lambda)"); endif - + [retval, x, l] = common_size (x, l); if (retval > 0) error ("exponential_cdf: x and lambda must be of common size or scalar"); endif - + [r, c] = size (x); s = r * c; x = reshape (x, 1, s); l = reshape (l, 1, s); cdf = zeros (1, s); - + k = find (isnan (x) | !(l > 0)); if any (k) cdf(k) = NaN * ones (1, length (k)); endif - + k = find ((x == Inf) & (l > 0)); if any (k) cdf(k) = ones (1, length (k)); endif - + k = find ((x > 0) & (x < Inf) & (l > 0)); if any (k) cdf (k) = 1 - exp (- l(k) .* x(k)); endif cdf = reshape (cdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/exponential_inv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/exponential_inv.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -18,20 +18,20 @@ ## ## For each element of x, compute the quantile (the inverse of the CDF) ## at x of the exponential distribution with parameter lambda. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Quantile function of the exponential distribution function inv = exponential_inv (x, l) - + if (nargin != 2) usage ("exponential_inv (x, lambda)"); endif - + [retval, x, l] = common_size (x, l); if (retval > 0) error (["exponential_inv: ", ... - "x and lambda must be of common size or scalar"]); + "x and lambda must be of common size or scalar"]); endif [r, c] = size (x); @@ -39,22 +39,22 @@ x = reshape (x, 1, s); l = reshape (l, 1, s); inv = zeros (1, s); - + k = find (!(l > 0) | (x < 0) | (x > 1) | isnan (x)); if any (k) inv(k) = NaN * ones (1, length (k)); endif - + k = find ((x == 1) & (l > 0)); if any (k) inv(k) = Inf * ones (1, length (k)); endif - + k = find ((x > 0) & (x < 1) & (l > 0)); if any (k) inv(k) = - log (1 - x(k)) ./ l(k); endif inv = reshape (inv, r, c); - + endfunction
--- a/scripts/statistics/distributions/exponential_pdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/exponential_pdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,15 +23,15 @@ ## Description: PDF of the exponential distribution function pdf = exponential_pdf (x, l) - + if (nargin != 2) usage ("exponential_pdf (x, lambda)"); endif - + [retval, x, l] = common_size (x, l); if (retval > 0) error (["exponential_pdf: ", ... - "x and lambda must be of common size or scalar"]); + "x and lambda must be of common size or scalar"]); endif [r, c] = size (x); @@ -44,12 +44,12 @@ if any (k) pdf(k) = NaN * ones (1, length (k)); endif - + k = find ((x > 0) & (x < Inf) & (l > 0)); if any (k) pdf(k) = l(k) .* exp (- l(k) .* x(k)); endif pdf = reshape (pdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/exponential_rnd.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/exponential_rnd.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,10 +23,10 @@ ## exponential_rnd (lambda, r, c) returns an r by c matrix of random ## samples from the exponential distribution with parameter lambda, ## which must be a scalar or of size r by c. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Random deviates from the exponential distribution - + function rnd = exponential_rnd (l, r, c) if (nargin == 3) @@ -39,18 +39,18 @@ [retval, l] = common_size (l, zeros (r, c)); if (retval > 0) error (strcat("exponential_rnd: ", - "lambda must be scalar or of size ", - sprintf ("%d by %d", r, c))); + "lambda must be scalar or of size ", + sprintf ("%d by %d", r, c))); endif elseif (nargin != 1) usage ("exponential_rnd (lambda [, r, c])"); endif - + [r, c] = size (l); s = r * c; l = reshape (l, 1, s); rnd = zeros (1, s); - + k = find (!(l > 0) | !(l < Inf)); if (any (k)) rnd(k) = NaN * ones (1, length (k)); @@ -59,7 +59,7 @@ if (any (k)) rnd(k) = - log (1 - rand (1, length (k))) ./ l(k); endif - + rnd = reshape (rnd, r, c); - + endfunction
--- a/scripts/statistics/distributions/f_cdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/f_cdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,16 +23,16 @@ ## Description: CDF of the F distribution function cdf = f_cdf (x, m, n) - + if (nargin != 3) usage ("f_cdf (x, m, n)"); endif - + [retval, x, m, n] = common_size (x, m, n); if (retval > 0) error ("f_cdf: x, m and n must be of common size or scalar"); endif - + [r, c] = size (x); s = r * c; x = reshape (x, 1, s); @@ -44,26 +44,26 @@ if any (k) cdf(k) = NaN * ones (1, length (k)); endif - + k = find ((x == Inf) & (m > 0) & (n > 0)); if any (k) cdf(k) = ones (1, length (k)); endif - + k = find ((x > 0) & (x < Inf) & (m > 0) & (n > 0)); if any (k) cdf(k) = 1 - betai (n(k) / 2, m(k) / 2, ... - 1 ./ (1 + m(k) .* x(k) ./ n(k))); + 1 ./ (1 + m(k) .* x(k) ./ n(k))); endif - + ## should we really only allow for positive integer m, n? k = find ((m != round (m)) | (n != round (n))); if any (k) fprintf (stderr, ... - "WARNING: m and n should be positive integers\n"); + "WARNING: m and n should be positive integers\n"); cdf(k) = NaN * ones (1, length (k)); endif - + cdf = reshape (cdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/f_inv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/f_inv.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -32,7 +32,7 @@ if (retval > 0) error ("f_inv: x, m and n must be of common size or scalar"); endif - + [r, c] = size (x); s = r * c; x = reshape (x, 1, s); @@ -44,26 +44,26 @@ if any (k) inv(k) = NaN * ones (1, length (k)); endif - + k = find ((x == 1) & (m > 0) & (n > 0)); if any (k) inv(k) = Inf * ones (1, length (k)); endif - + k = find ((x > 0) & (x < 1) & (m > 0) & (n > 0)); if any (k) inv(k) = (1 ./ beta_inv (1 - x(k), n(k) / 2, m(k) / 2) - 1) ... - .* n(k) ./ m(k); + .* n(k) ./ m(k); endif ## should we really only allow for positive integer m, n? k = find ((m != round (m)) | (n != round (n))); if any (k) fprintf (stderr, ... - "WARNING: m and n should be positive integers\n"); + "WARNING: m and n should be positive integers\n"); inv(k) = NaN * ones (1, length (k)); endif - + inv = reshape (inv, r, c); - + endfunction \ No newline at end of file
--- a/scripts/statistics/distributions/f_pdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/f_pdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,44 +23,44 @@ ## Description: PDF of the F distribution function pdf = f_pdf (x, m, n) - + if (nargin != 3) usage ("f_pdf (x, m, n)."); endif - + [retval, x, m, n] = common_size (x, m, n); if (retval > 0) error ("f_pdf: x, m and n must be of common size or scalar"); endif - + [r, c] = size (x); s = r * c; x = reshape (x, 1, s); m = reshape (m, 1, s); n = reshape (n, 1, s); pdf = zeros (1, s); - + k = find (isnan (x) | !(m > 0) | !(n > 0)); if any (k) pdf(k) = NaN * ones (1, length (k)); endif - + k = find ((x > 0) & (x < Inf) & (m > 0) & (n > 0)); if any (k) tmp = m(k) .* x(k) ./ n(k); pdf(k) = exp ((m(k) / 2 - 1) .* log (tmp) ... - - ((m(k) + n(k)) / 2) .* log (1 + tmp)) ... - .* (m(k) ./ n(k)) ./ beta (m(k) / 2, n(k) / 2); + - ((m(k) + n(k)) / 2) .* log (1 + tmp)) ... + .* (m(k) ./ n(k)) ./ beta (m(k) / 2, n(k) / 2); endif ## should we really only allow for positive integer m, n? k = find ((m != round (m)) | (n != round (n))); if any (k) fprintf (stderr, ... - "WARNING: m and n should be positive integers\n"); + "WARNING: m and n should be positive integers\n"); pdf(k) = NaN * ones (1, length (k)); endif pdf = reshape (pdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/f_rnd.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/f_rnd.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,10 +23,10 @@ ## f_rnd (m, n, r, c) returns an r by c matrix of random samples from ## the F distribution with m and n degrees of freedom. Both m and n ## must be scalar or of size r by c. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Random deviates from the F distribution - + function rnd = f_rnd (m, n, r, c) if (nargin == 4) @@ -39,8 +39,8 @@ [retval, m, n] = common_size (m, n, zeros (r, c)); if (retval > 0) error (strcat("f_rnd: ", - "m and n must be scalar or of size ", - sprintf ("%d by %d", r, c))); + "m and n must be scalar or of size ", + sprintf ("%d by %d", r, c))); endif elseif (nargin == 2) [retval, m, n] = common_size (m, n); @@ -56,19 +56,19 @@ m = reshape (m, 1, s); n = reshape (n, 1, s); rnd = zeros (1, s); - + k = find (!(m > 0) | !(m < Inf) | !(m == round (m)) | - !(n > 0) | !(n < Inf) | !(n == round (n))); + !(n > 0) | !(n < Inf) | !(n == round (n))); if (any (k)) rnd(k) = NaN * ones (1, length (k)); endif - + k = find ((m > 0) & (m < Inf) & (m == round (m)) & - (n > 0) & (n < Inf) & (n == round (n))); + (n > 0) & (n < Inf) & (n == round (n))); if (any (k)) rnd(k) = f_inv (rand (1, length (k)), m(k), n(k)); endif - + rnd = reshape (rnd, r, c); - + endfunction \ No newline at end of file
--- a/scripts/statistics/distributions/gamma_cdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/gamma_cdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -21,35 +21,35 @@ ## Author: TT <Teresa.Twaroch@ci.tuwien.ac.at> ## Description: CDF of the Gamma distribution - + function cdf = gamma_cdf (x, a, b) - + if (nargin != 3) usage ("gamma_cdf (x, a, b)"); endif - + [retval, x, a, b] = common_size (x, a, b); if (retval > 0) error ("gamma_cdf: x, a and b must be of common size or scalars"); endif - + [r, c] = size (x); s = r * c; x = reshape (x, s, 1); a = reshape (a, s, 1); b = reshape (b, s, 1); cdf = zeros (s, 1); - + k = find (!(a > 0) | !(b > 0) | isnan (x)); if any (k) cdf (k) = NaN * ones (length (k), 1); endif - + k = find ((x > 0) & (a > 0) & (b > 0)); if any (k) cdf (k) = gammai (a(k), b(k) .* x(k)); endif - + cdf = reshape (cdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/gamma_inv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/gamma_inv.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -18,16 +18,16 @@ ## ## For each component of x, compute the quantile (the inverse of the ## CDF) at x of the Gamma distribution with parameters a and b. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Quantile function of the Gamma distribution function inv = gamma_inv (x, a, b) - + if (nargin != 3) usage ("gamma_inv (x, a, b)"); endif - + [retval, x, a, b] = common_size (x, a, b); if (retval > 0) error ("gamma_inv: x, a and b must be of common size or scalars"); @@ -39,17 +39,17 @@ a = reshape (a, s, 1); b = reshape (b, s, 1); inv = zeros (s, 1); - + k = find ((x < 0) | (x > 1) | isnan (x) | !(a > 0) | !(b > 0)); if any (k) inv (k) = NaN * ones (length (k), 1); endif - + k = find ((x == 1) & (a > 0) & (b > 0)); if any (k) inv (k) = Inf * ones (length (k), 1); endif - + k = find ((x > 0) & (x < 1) & (a > 0) & (b > 0)); if any (k) a = a (k); @@ -67,18 +67,18 @@ y_new = y_old - h; ind = find (y_new <= eps); if (any (ind)) - y_new (ind) = y_old (ind) / 10; - h = y_old - y_new; + y_new (ind) = y_old (ind) / 10; + h = y_old - y_new; endif if (max (abs (h)) < sqrt (eps)) - break; + break; endif y_old = y_new; endfor - + inv (k) = y_new; endif inv = reshape (inv, r, c); - + endfunction
--- a/scripts/statistics/distributions/gamma_pdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/gamma_pdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -18,12 +18,12 @@ ## ## For each element of x, return the probability density function (PDF) ## at x of the Gamma distribution with parameters a and b. - + ## Author: TT <Teresa.Twaroch@ci.tuwien.ac.at> ## Description: PDF of the Gamma distribution function pdf = gamma_pdf (x, a, b) - + if (nargin != 3) usage ("gamma_pdf (x, a, b)"); endif @@ -39,7 +39,7 @@ a = reshape (a, s, 1); b = reshape (b, s, 1); pdf = zeros (s, 1); - + k = find (!(a > 0) | !(b > 0) | isnan (x)); if any (k) pdf (k) = NaN * ones (length (k), 1); @@ -48,9 +48,9 @@ k = find ((x > 0) & (a > 0) & (b > 0)); if any (k) pdf (k) = (b(k) .^ a(k)) .* (x(k) .^ (a(k) - 1)) ... - .* exp(-b(k) .* x(k)) ./ gamma (a(k)); + .* exp(-b(k) .* x(k)) ./ gamma (a(k)); endif pdf = reshape (pdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/gamma_rnd.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/gamma_rnd.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,10 +23,10 @@ ## gamma_rnd (a, b, r, c) returns an r by c matrix of random samples ## from the Gamma distribution with parameters a and b. Both a and b ## must be scalar or of size r by c. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Random deviates from the Gamma distribution - + function rnd = gamma_rnd (a, b, r, c) if (nargin == 4) @@ -39,14 +39,14 @@ [retval, a, b] = common_size (a, b, zeros (r, c)); if (retval > 0) error (strcat("gamma_rnd: ", - "a and b must be scalar or of size ", - sprintf ("%d by %d", r, c))); + "a and b must be scalar or of size ", + sprintf ("%d by %d", r, c))); endif elseif (nargin == 2) [retval, a, b] = common_size (a, b); if (retval > 0) error (["gamma_rnd: ", ... - "a and b must be of common size or scalar"]); + "a and b must be of common size or scalar"]); endif else usage ("gamma_rnd (a, b [, r, c])"); @@ -57,7 +57,7 @@ a = reshape (a, 1, s); b = reshape (b, 1, s); rnd = zeros (1, s); - + k = find (!(a > 0) | !(a < Inf) | !(b > 0) | !(b < Inf)); if (any (k)) rnd(k) = NaN * ones (1, length (k)); @@ -66,7 +66,7 @@ if (any (k)) rnd(k) = gamma_inv (rand (1, length (k)), a(k), b(k)); endif - + rnd = reshape (rnd, r, c); - + endfunction \ No newline at end of file
--- a/scripts/statistics/distributions/geometric_cdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/geometric_cdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,7 +23,7 @@ ## Description: CDF of the geometric distribution function cdf = geometric_cdf (x, p) - + if (nargin != 2) usage ("geometric_cdf (x, p)"); endif @@ -31,9 +31,9 @@ [retval, x, p] = common_size (x, p); if (retval > 0) error (["geometric_cdf: ", ... - "x and p must be of common size or scalar"]); + "x and p must be of common size or scalar"]); endif - + [r, c] = size (x); s = r * c; x = reshape (x, 1, s); @@ -44,18 +44,18 @@ if any (k) cdf(k) = NaN * ones (1, length (k)); endif - + k = find ((x == Inf) & (p >= 0) & (p <= 1)); if any (k) cdf(k) = ones (1, length (k)); endif - + k = find ((x >= 0) & (x < Inf) & (x == round (x)) ... & (p > 0) & (p <= 1)); if any (k) cdf(k) = 1 - ((1 - p(k)) .^ (x(k) + 1)); endif - + cdf = reshape (cdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/geometric_inv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/geometric_inv.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,7 +23,7 @@ ## Description: Quantile function of the geometric distribution function inv = geometric_inv (x, p) - + if (nargin != 2) usage ("geometric_inv (x, p)"); endif @@ -31,9 +31,9 @@ [retval, x, p] = common_size (x, p); if (retval > 0) error (["geometric_inv: ", ... - "x and p must be of common size or scalar"]); + "x and p must be of common size or scalar"]); endif - + [r, c] = size (x); s = r * c; x = reshape (x, 1, s); @@ -44,18 +44,18 @@ if any (k) inv(k) = NaN * ones (1, length (k)); endif - + k = find ((x == 1) & (p >= 0) & (p <= 1)); if any (k) inv(k) = Inf * ones (1, length (k)); endif - + k = find ((x > 0) & (x < 1) & (p > 0) & (p <= 1)); if any (k) inv(k) = max (ceil (log (1 - x(k)) ./ log (1 - p(k))) - 1, ... - zeros (1, length (k))); + zeros (1, length (k))); endif - + inv = reshape (inv, r, c); - + endfunction
--- a/scripts/statistics/distributions/geometric_pdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/geometric_pdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,7 +23,7 @@ ## Description: PDF of the geometric distribution function pdf = geometric_pdf (x, p) - + if (nargin != 2) usage ("geometric_pdf (x, p)"); endif @@ -31,9 +31,9 @@ [retval, x, p] = common_size (x, p); if (retval > 0) error (["geometric_pdf: ", ... - "x and p must be of common size or scalar"]); + "x and p must be of common size or scalar"]); endif - + [r, c] = size (x); s = r * c; x = reshape (x, 1, s); @@ -44,19 +44,19 @@ if any (k) pdf(k) = NaN * ones (1, length (k)); endif - + ## Just for the fun of it ... k = find ((x == Inf) & (p == 0)); if any (k) pdf(k) = ones (1, length (k)); endif - + k = find ((x >= 0) & (x < Inf) & (x == round (x)) ... & (p > 0) & (p <= 1)); if any (k) pdf(k) = p(k) .* ((1 - p(k)) .^ x(k)); endif - + pdf = reshape (pdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/geometric_rnd.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/geometric_rnd.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,10 +23,10 @@ ## geometric_rnd (p, r, c) returns an r by c matrix of random samples ## from the geometric distribution with parameter p, which must be a ## scalar or of size r by c. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Random deviates from the geometric distribution - + function rnd = geometric_rnd (p, r, c) if (nargin == 3) @@ -39,33 +39,33 @@ [retval, p] = common_size (p, zeros (r, c)); if (retval > 0) error (strcat("geometric_rnd: ", - "p must be scalar or of size ", - sprintf ("%d by %d", r, c))); + "p must be scalar or of size ", + sprintf ("%d by %d", r, c))); endif elseif (nargin != 1) usage ("geometric_rnd (p [, r, c])"); endif - + [r, c] = size (p); s = r * c; p = reshape (p, 1, s); rnd = zeros (1, s); - + k = find (!(p >= 0) | !(p <= 1)); if (any (k)) rnd(k) = NaN * ones (1, length (k)); endif - + k = find (p == 0); if (any (k)) rnd(k) = Inf * ones (1, length (k)); endif - + k = find ((p > 0) & (p < 1)); if (any (k)) rnd(k) = floor (log (rand (1, length (k))) ./ log (1 - p(k))); endif - + rnd = reshape (rnd, r, c); - + endfunction
--- a/scripts/statistics/distributions/hypergeometric_cdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/hypergeometric_cdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -32,7 +32,7 @@ usage ("hypergeometrix_cdf (x, m, t, n)"); endif - if ((m < 0) | (t < 0) | (n <= 0) | (m != round (m)) | + if ((m < 0) | (t < 0) | (n <= 0) | (m != round (m)) | (t != round (t)) | (n != round (n)) | (m > t) | (n > t)) cdf = NaN * ones (size (x)) else @@ -40,6 +40,5 @@ endif endfunction - - \ No newline at end of file +
--- a/scripts/statistics/distributions/hypergeometric_inv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/hypergeometric_inv.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -29,7 +29,7 @@ usage ("hypergeometric_inv (x, m, t, n)"); endif - if ((m < 0) | (t < 0) | (n <= 0) | (m != round (m)) | + if ((m < 0) | (t < 0) | (n <= 0) | (m != round (m)) | (t != round (t)) | (n != round (n)) | (m > t) | (n > t)) inv = NaN * ones (size (x)) else
--- a/scripts/statistics/distributions/hypergeometric_pdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/hypergeometric_pdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -26,19 +26,19 @@ ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: PDF of the hypergeometric distribution - + function pdf = hypergeometric_pdf (x, m, t, n) - + if (nargin != 4) usage ("hypergeometric_pdf (x, m, t, n)"); endif - + [retval, x, m, t, n] = common_size (x, m, t, n); if (retval > 0) error (["hypergeometric_pdf: ", ... - "x, m, t, and n must be of common size or scalar"]); + "x, m, t, and n must be of common size or scalar"]); endif - + [r, c] = size (x); s = r * c; x = reshape (x, 1, s); @@ -47,8 +47,8 @@ n = reshape (n, 1, s); pdf = zeros * ones (1, s); ## everything in i1 gives NaN - i1 = ((m < 0) | (t < 0) | (n <= 0) | (m != round (m)) | - (t != round (t)) | (n != round (n)) | (m > t) | (n > t)); + i1 = ((m < 0) | (t < 0) | (n <= 0) | (m != round (m)) | + (t != round (t)) | (n != round (n)) | (m > t) | (n > t)); ## everything in i2 gives 0 unless in i1 i2 = ((x != round (x)) | (x < 0) | (x > m) | (n < x) | (n-x > t-m)); k = find (i1); @@ -58,7 +58,7 @@ k = find (!i1 & !i2); if any (k) pdf (k) = (bincoeff (m(k), x(k)) .* bincoeff (t(k)-m(k), n(k)-x(k)) - ./ bincoeff (t(k), n(k))); + ./ bincoeff (t(k), n(k))); endif - + endfunction
--- a/scripts/statistics/distributions/hypergeometric_rnd.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/hypergeometric_rnd.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -26,7 +26,7 @@ usage ("hypergeometric_rnd (N, m, t, n)"); endif - if ((m < 0) | (t < 0) | (n <= 0) | (m != round (m)) | + if ((m < 0) | (t < 0) | (n <= 0) | (m != round (m)) | (t != round (t)) | (n != round (n)) | (m > t) | (n > t)) rnd = NaN * ones (1, N) else
--- a/scripts/statistics/distributions/kolmogorov_smirnov_cdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/kolmogorov_smirnov_cdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -21,22 +21,22 @@ ## ## The optional tol specifies the precision up to which the series ## should be evaluated; the default is tol = eps. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: CDF of the Kolmogorov-Smirnov distribution function cdf = kolmogorov_smirnov_cdf (x, tol) - + if (nargin < 1 || nargin > 2) usage ("kolmogorov_smirnov_cdf (x [, tol])"); endif if (nargin == 1) tol = eps; - else + else if (!is_scalar (tol) || !(tol > 0)) error (["kolmogorov_smirnov_cdf: ", ... - "tol has to be a positive scalar."]); + "tol has to be a positive scalar."]); endif endif @@ -60,5 +60,5 @@ endif cdf = reshape (cdf, nr, nc); - + endfunction
--- a/scripts/statistics/distributions/laplace_cdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/laplace_cdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -37,17 +37,17 @@ if any (k) cdf(k) = NaN * ones (1, length (k)); endif - + k = find (x == Inf); if any (k) cdf(k) = ones (1, length (k)); endif - + k = find ((x > -Inf) & (x < Inf)); if any (k) cdf(k) = (1 + sign (x(k)) .* (1 - exp (- abs (x(k))))) / 2; endif cdf = reshape (cdf, r, c); - + endfunction \ No newline at end of file
--- a/scripts/statistics/distributions/laplace_inv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/laplace_inv.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -37,18 +37,18 @@ if any (k) inv(k) = NaN * ones (1, length (k)); endif - + k = find (x == 1); if any (k) inv(k) = Inf * ones (1, length (k)); endif - + k = find ((x > 0) & (x < 1)); if any (k) inv(k) = (x(k) < 1/2) .* log (2 * x(k)) ... - - (x(k) > 1/2) .* log (2 * (1 - x(k))); + - (x(k) > 1/2) .* log (2 * (1 - x(k))); endif inv = reshape (inv, r, c); - + endfunction \ No newline at end of file
--- a/scripts/statistics/distributions/laplace_pdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/laplace_pdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -37,12 +37,12 @@ if any (k) pdf(k) = NaN * ones (1, length (k)); endif - + k = find ((x > -Inf) & (x < Inf)); if any (k) pdf(k) = exp (- abs (x(k))) / 2; endif pdf = reshape (pdf, r, c); - + endfunction \ No newline at end of file
--- a/scripts/statistics/distributions/laplace_rnd.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/laplace_rnd.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -18,12 +18,12 @@ ## ## Return an r by c matrix of random numbers from the Laplace ## distribution. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Random deviates from the Laplace distribution function rnd = laplace_rnd (r, c) - + if (nargin != 2) usage ("laplace_rnd (r, c)"); endif @@ -36,7 +36,7 @@ endif tmp = rand (r, c); - rnd = ((tmp < 1/2) .* log (2 * tmp) - - (tmp > 1/2) .* log (2 * (1 - tmp))); - + rnd = ((tmp < 1/2) .* log (2 * tmp) + - (tmp > 1/2) .* log (2 * (1 - tmp))); + endfunction
--- a/scripts/statistics/distributions/logistic_cdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/logistic_cdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -18,16 +18,16 @@ ## ## For each component of x, compute the CDF at x of the logistic ## distribution. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: CDF of the logistic distribution function cdf = logistic_cdf (x) - + if (nargin != 1) usage ("logistic_cdf (x)"); endif cdf = 1 ./ (1 + exp (- x)); - + endfunction
--- a/scripts/statistics/distributions/logistic_inv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/logistic_inv.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -47,12 +47,12 @@ if any (k) inv(k) = Inf * ones (1, length (k)); endif - + k = find ((x > 0) & (x < 1)); if any (k) inv (k) = - log (1 ./ x(k) - 1); endif - + inv = reshape (inv, r, c); - + endfunction
--- a/scripts/statistics/distributions/logistic_pdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/logistic_pdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,12 +23,12 @@ ## Description: PDF of the logistic distribution function pdf = logistic_pdf (x) - + if (nargin != 1) usage ("logistic_pdf (x)"); endif cdf = logistic_cdf (x); pdf = cdf .* (1 - cdf); - + endfunction
--- a/scripts/statistics/distributions/logistic_rnd.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/logistic_rnd.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -18,12 +18,12 @@ ## ## Return an r by c matrix of random numbers from the logistic ## distribution. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Random deviates from the logistic distribution function rnd = logistic_rnd (r, c) - + if (nargin != 2) usage ("logistic_rnd (r, c)"); endif @@ -36,5 +36,5 @@ endif rnd = - log (1 ./ rand (r, c) - 1); - + endfunction
--- a/scripts/statistics/distributions/lognormal_cdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/lognormal_cdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -54,24 +54,24 @@ a = reshape (a, 1, s); v = reshape (v, 1, s); cdf = zeros (1, s); - + k = find (isnan (x) | !(a > 0) | !(a < Inf) ... | !(v > 0) | !(v < Inf)); if any (k) cdf(k) = NaN * ones (1, length (k)); endif - + k = find ((x == Inf) & (a > 0) & (a < Inf) & (v > 0) & (v < Inf)); if any (k) cdf(k) = ones (1, length (k)); endif - + k = find ((x > 0) & (x < Inf) & (a > 0) & (a < Inf) ... & (v > 0) & (v < Inf)); if any (k) cdf(k) = stdnormal_cdf ((log (x(k)) - log (a(k))) ./ sqrt (v(k))); endif - + cdf = reshape (cdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/lognormal_inv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/lognormal_inv.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -41,11 +41,11 @@ ## not work (because exp (Inf) -> NaN): ## inv = exp (normal_inv (x, log (a), v)); ## Hence ... - + [retval, x, a, v] = common_size (x, a, v); if (retval > 0) error (["lognormal_inv: ", ... - "x, a and v must be of common size or scalars"]); + "x, a and v must be of common size or scalars"]); endif [r, c] = size (x); @@ -56,16 +56,16 @@ inv = zeros (1, s); k = find (!(x >= 0) | !(x <= 1) | !(a > 0) | !(a < Inf) ... - | !(v > 0) | !(v < Inf)); + | !(v > 0) | !(v < Inf)); if any (k) inv(k) = NaN * ones (1, length (k)); endif - + k = find ((x == 1) & (a > 0) & (a < Inf) & (v > 0) & (v < Inf)); if any (k) inv(k) = Inf * ones (1, length (k)); endif - + k = find ((x > 0) & (x < 1) & (a > 0) & (a < Inf) ... & (v > 0) & (v < Inf)); if any (k) @@ -73,5 +73,5 @@ endif inv = reshape (inv, r, c); - + endfunction
--- a/scripts/statistics/distributions/lognormal_pdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/lognormal_pdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -22,7 +22,7 @@ ## distributed with mean log (a) and variance v. ## ## Default values are a = 1, v = 1. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: PDF of the log normal distribution @@ -41,13 +41,13 @@ ## not work for the special cases (Inf, ...) ## pdf = (x > 0) ./ x .* normal_pdf (log (x), log (a), v); ## Hence ... - + [retval, x, a, v] = common_size (x, a, v); if (retval > 0) error (["lognormal_pdf: ", ... - "x, a and v must be of common size or scalars"]); + "x, a and v must be of common size or scalars"]); endif - + [r, c] = size (x); s = r * c; x = reshape (x, 1, s); @@ -56,11 +56,11 @@ pdf = zeros (1, s); k = find (isnan (x) | !(a > 0) | !(a < Inf) ... - | !(v > 0) | !(v < Inf)); + | !(v > 0) | !(v < Inf)); if any (k) pdf(k) = NaN * ones (1, length (k)); endif - + k = find ((x > 0) & (x < Inf) & (a > 0) & (a < Inf) ... & (v > 0) & (v < Inf)); if any (k) @@ -68,5 +68,5 @@ endif pdf = reshape (pdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/lognormal_rnd.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/lognormal_rnd.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,10 +23,10 @@ ## lognormal_rnd (a, v, r, c) returns an r by c matrix of random samples ## from the lognormal distribution with parameters a and v. Both a and v ## must be scalar or of size r by c. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Random deviates from the log normal distribution - + function rnd = lognormal_rnd (a, v, r, c) if (nargin == 4) @@ -39,14 +39,14 @@ [retval, a, v] = common_size (a, v, zeros (r, c)); if (retval > 0) error (strcat("lognormal_rnd: ", - "a and v must be scalar or of size ", - sprintf ("%d by %d", r, c))); + "a and v must be scalar or of size ", + sprintf ("%d by %d", r, c))); endif elseif (nargin == 2) [retval, a, v] = common_size (a, v); if (retval > 0) error (strcat("lognormal_rnd: ", - "a and v must be of common size or scalar")); + "a and v must be of common size or scalar")); endif else usage ("lognormal_rnd (a, v [, r, c])"); @@ -57,17 +57,17 @@ a = reshape (a, 1, s); v = reshape (v, 1, s); rnd = zeros (1, s); - + k = find (!(a > 0) | !(a < Inf) | !(v > 0) | !(v < Inf)); if any (k) rnd(k) = NaN * ones (1, length (k)); endif - + k = find ((a > 0) & (a < Inf) & (v > 0) & (v < Inf)); if any (k) rnd(k) = a(k) .* exp (sqrt (v(k)) .* randn (1, length (k))); endif - + rnd = reshape (rnd, r, c); - + endfunction \ No newline at end of file
--- a/scripts/statistics/distributions/normal_cdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/normal_cdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -20,7 +20,7 @@ ## (CDF) at x of the normal distribution with mean m and variance v. ## ## Default values are m = 0, v = 1. - + ## Author: TT <Teresa.Twaroch@ci.tuwien.ac.at> ## Description: CDF of the normal distribution @@ -38,7 +38,7 @@ [retval, x, m, v] = common_size (x, m, v); if (retval > 0) error (["normal_cdf: ", ... - "x, m and v must be of common size or scalars"]); + "x, m and v must be of common size or scalars"]); endif [r, c] = size (x); @@ -52,12 +52,12 @@ if any (k) cdf(k) = NaN * ones (1, length (k)); endif - + k = find (!isinf (m) & !isnan (m) & (v > 0) & (v < Inf)); if any (k) cdf(k) = stdnormal_cdf ((x(k) - m(k)) ./ sqrt (v(k))); endif cdf = reshape (cdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/normal_inv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/normal_inv.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -20,7 +20,7 @@ ## at x of the normal distribution with mean m and variance v. ## ## Default values are m = 0, v = 1. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Quantile function of the normal distribution @@ -38,7 +38,7 @@ [retval, x, m, v] = common_size (x, m, v); if (retval > 0) error (["normal_inv: ", ... - "x, m and v must be of common size or scalars"]); + "x, m and v must be of common size or scalars"]); endif [r, c] = size (x); @@ -52,12 +52,12 @@ if any (k) inv(k) = NaN * ones (1, length (k)); endif - + k = find (!isinf (m) & !isnan (m) & (v > 0) & (v < Inf)); if any (k) inv(k) = m(k) + sqrt (v(k)) .* stdnormal_inv (x(k)); endif inv = reshape (inv, r, c); - + endfunction
--- a/scripts/statistics/distributions/normal_pdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/normal_pdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -20,7 +20,7 @@ ## at x of the normal distribution with mean m and variance v. ## ## Default values are m = 0, v = 1. - + ## Author: TT <Teresa.Twaroch@ci.tuwien.ac.at> ## Description: PDF of the normal distribution @@ -38,7 +38,7 @@ [retval, x, m, v] = common_size (x, m, v); if (retval > 0) error (["normal_pdf: ", ... - "x, m and v must be of common size or scalars"]); + "x, m and v must be of common size or scalars"]); endif [r, c] = size (x); @@ -52,13 +52,13 @@ if any (k) pdf(k) = NaN * ones (1, length (k)); endif - + k = find (!isinf (m) & !isnan (m) & (v > 0) & (v < Inf)); if any (k) pdf(k) = stdnormal_pdf ((x(k) - m(k)) ./ sqrt (v(k))) ... - ./ sqrt (v(k)); + ./ sqrt (v(k)); endif pdf = reshape (pdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/normal_rnd.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/normal_rnd.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -39,8 +39,8 @@ [retval, m, v] = common_size (m, v, zeros (r, c)); if (retval > 0) error (strcat("normal_rnd: ", - "m and v must be scalar or of size ", - sprintf ("%d by %d", r, c))); + "m and v must be scalar or of size ", + sprintf ("%d by %d", r, c))); endif elseif (nargin == 2) [retval, m, v] = common_size (m, v); @@ -56,17 +56,17 @@ m = reshape (m, 1, s); v = reshape (v, 1, s); rnd = zeros (1, s); - + k = find (isnan (m) | isinf (m) | !(v > 0) | !(v < Inf)); if any (k) rnd(k) = NaN * ones (1, length (k)); endif - + k = find ((m > -Inf) & (m < Inf) & (v > 0) & (v < Inf)); if any (k) rnd(k) = m(k) + sqrt (v(k)) .* randn (1, length (k)); endif - + rnd = reshape (rnd, r, c); - + endfunction \ No newline at end of file
--- a/scripts/statistics/distributions/pascal_cdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/pascal_cdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -26,7 +26,7 @@ ## Description: CDF of the Pascal (negative binomial) distribution function cdf = pascal_cdf (x, n, p) - + if (nargin != 3) usage ("pascal_cdf (x, n, p)"); endif @@ -34,9 +34,9 @@ [retval, x, n, p] = common_size (x, n, p); if (retval > 0) error (["pascal_cdf: ", ... - "x, n and p must be of common size or scalar"]); + "x, n and p must be of common size or scalar"]); endif - + [r, c] = size (x); s = r * c; x = reshape (x, 1, s); @@ -49,13 +49,13 @@ if any (k) cdf(k) = NaN * ones (1, length (k)); endif - + k = find ((x == Inf) & (n > 0) & (n < Inf) & (n == round (n)) ... & (p >= 0) & (p <= 1)); if any (k) cdf(k) = ones (1, length (k)); endif - + k = find ((x >= 0) & (x < Inf) & (x == round (x)) & (n > 0) ... & (n < Inf) & (n == round (n)) & (p > 0) & (p <= 1)); if any (k) @@ -68,15 +68,15 @@ while (1) l = find (m <= x); if any (l) - y(l) = y(l) + pascal_pdf (m(l), n(l), p(l)); - m(l) = m(l) + 1; + y(l) = y(l) + pascal_pdf (m(l), n(l), p(l)); + m(l) = m(l) + 1; else - break; + break; endif endwhile cdf(k) = y; endif - + cdf = reshape (cdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/pascal_inv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/pascal_inv.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -26,7 +26,7 @@ ## Description: Quantile function of the Pascal distribution function inv = pascal_inv (x, n, p) - + if (nargin != 3) usage ("pascal_inv (x, n, p)"); endif @@ -34,9 +34,9 @@ [retval, x, n, p] = common_size (x, n, p); if (retval > 0) error (["pascal_inv: ", ... - "x, n and p must be of common size or scalar"]); + "x, n and p must be of common size or scalar"]); endif - + [r, c] = size (x); s = r * c; x = reshape (x, 1, s); @@ -49,13 +49,13 @@ if any (k) inv(k) = NaN * ones (1, length (k)); endif - + k = find ((x == 1) & (n > 0) & (n < Inf) & (n == round (n)) ... & (p >= 0) & (p <= 1)); if any (k) inv(k) = Inf * ones (1, length (k)); endif - + k = find ((x >= 0) & (x < 1) & (n > 0) & (n < Inf) ... & (n == round (n)) & (p > 0) & (p <= 1)); if any (k) @@ -67,15 +67,15 @@ while (1) l = find (s < x); if any (l) - m(l) = m(l) + 1; - s(l) = s(l) + pascal_pdf (m(l), n(l), p(l)); + m(l) = m(l) + 1; + s(l) = s(l) + pascal_pdf (m(l), n(l), p(l)); else - break; + break; endif endwhile inv(k) = m; endif - + inv = reshape (inv, r, c); - + endfunction
--- a/scripts/statistics/distributions/pascal_pdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/pascal_pdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -27,7 +27,7 @@ ## Description: PDF of the Pascal (negative binomial) distribution function pdf = pascal_pdf (x, n, p) - + if (nargin != 3) usage ("pascal_pdf (x, n, p)"); endif @@ -35,9 +35,9 @@ [retval, x, n, p] = common_size (x, n, p); if (retval > 0) error (["pascal_pdf: ", ... - "x, n and p must be of common size or scalar"]); + "x, n and p must be of common size or scalar"]); endif - + [r, c] = size (x); s = r * c; x = reshape (x, 1, s); @@ -50,21 +50,21 @@ if any (k) pdf(k) = NaN * ones (1, length (k)); endif - + ## Just for the fun of it ... k = find ((x == Inf) & (n > 0) & (n < Inf) & (n == round (n)) ... & (p == 0)); if any (k) pdf(k) = ones (1, length (k)); endif - + k = find ((x >= 0) & (x < Inf) & (x == round (x)) & (n > 0) ... & (n < Inf) & (n == round (n)) & (p > 0) & (p <= 1)); if any (k) pdf(k) = bincoeff (-n(k), x(k)) .* (p(k) .^ n(k)) ... - .* ((p(k) - 1) .^ x(k)); + .* ((p(k) - 1) .^ x(k)); endif - + pdf = reshape (pdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/pascal_rnd.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/pascal_rnd.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,10 +23,10 @@ ## pascal_rnd (n, p, r, c) returns an r by c matrix of random samples ## from the Pascal distribution with parameters n and p. Both n and p ## must be scalar or of size r by c. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Random deviates from the Pascal distribution - + function rnd = pascal_rnd (n, p, r, c) if (nargin == 4) @@ -39,8 +39,8 @@ [retval, n, p] = common_size (n, p, zeros (r, c)); if (retval > 0) error (strcat("pascal_rnd: ", - "n and p must be scalar or of size ", - sprintf ("%d by %d", r, c))); + "n and p must be scalar or of size ", + sprintf ("%d by %d", r, c))); endif elseif (nargin == 2) [retval, n, p] = common_size (n, p); @@ -56,13 +56,13 @@ n = reshape (n, 1, s); p = reshape (p, 1, s); rnd = zeros (1, s); - + k = find (!(n > 0) | !(n < Inf) | !(n == round (n)) ... | !(p <= 0) | !(p >= 1)); if (any (k)) rnd(k) = NaN * ones (1, length (k)); endif - + k = find ((n > 0) & (n < Inf) & (n == round (n)) ... & (p >= 0) & (p <= 1)); if (any (k)) @@ -72,7 +72,7 @@ ind = (1 : N)' * ones (1, L); rnd(k) = sum (tmp .* (ind <= ones (N, 1) * n(k))); endif - + rnd = reshape (rnd, r, c); - + endfunction \ No newline at end of file
--- a/scripts/statistics/distributions/poisson_cdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/poisson_cdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,37 +23,37 @@ ## Description: CDF of the Poisson distribution function cdf = poisson_cdf (x, l) - + if (nargin != 2) usage ("poisson_cdf (x, lambda)"); endif - + [retval, x, l] = common_size (x, l); if (retval > 0) error ("poisson_cdf: x and lambda must be of common size or scalar"); endif - + [r, c] = size (x); s = r * c; x = reshape (x, 1, s); l = reshape (l, 1, s); cdf = zeros (1, s); - + k = find (isnan (x) | !(l > 0)); if any (k) cdf(k) = NaN * ones (1, length (k)); endif - + k = find ((x == Inf) & (l > 0)); if any (k) cdf(k) = ones (1, length (k)); endif - + k = find ((x >= 0) & (x < Inf) & (l > 0)); if any (k) cdf(k) = 1 - gammai (floor (x(k)) + 1, l(k)); endif cdf = reshape (cdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/poisson_inv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/poisson_inv.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,7 +23,7 @@ ## Description: Quantile function of the Poisson distribution function inv = poisson_inv (x, l) - + if (nargin != 2) usage ("poisson_inv (x, lambda)"); endif @@ -31,9 +31,9 @@ [retval, x, l] = common_size (x, l); if (retval > 0) error (["poisson_inv: ", ... - "x and lambda must be of common size or scalar"]); + "x and lambda must be of common size or scalar"]); endif - + [r, c] = size (x); s = r * c; x = reshape (x, 1, s); @@ -49,21 +49,21 @@ if any (k) inv(k) = Inf * ones (1, length (k)); endif - + k = find ((x > 0) & (x < 1) & (l > 0)); if any (k) cdf = exp (-l(k)); while (1) m = find (cdf < x(k)); if any (m) - inv(k(m)) = inv(k(m)) + 1; - cdf(m) = cdf(m) + poisson_pdf (inv(k(m)), l(k(m))); + inv(k(m)) = inv(k(m)) + 1; + cdf(m) = cdf(m) + poisson_pdf (inv(k(m)), l(k(m))); else - break; + break; endif endwhile endif - + inv = reshape (inv, r, c); - + endfunction \ No newline at end of file
--- a/scripts/statistics/distributions/poisson_pdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/poisson_pdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,15 +23,15 @@ ## Description: PDF of the Poisson distribution function pdf = poisson_pdf (x, l) - + if (nargin != 2) usage ("poisson_pdf (x, lambda)"); endif - + [retval, x, l] = common_size (x, l); if (retval > 0) error (["poisson_pdf: ", ... - "x and lambda must be of common size or scalar"]); + "x and lambda must be of common size or scalar"]); endif [r, c] = size (x); @@ -49,7 +49,7 @@ if any (k) pdf(k) = exp (x(k) .* log (l(k)) - l(k) - lgamma (x(k) + 1)); endif - + pdf = reshape (pdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/poisson_rnd.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/poisson_rnd.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,10 +23,10 @@ ## poisson_rnd (lambda, r, c) returns an r by c matrix of random samples ## from the Poisson distribution with parameter lambda, which must be a ## scalar or of size r by c. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Random deviates from the Poisson distribution - + function rnd = poisson_rnd (l, r, c) if (nargin == 3) @@ -39,23 +39,23 @@ [retval, l] = common_size (l, zeros (r, c)); if (retval > 0) error (strcat("poisson_rnd: ", - "lambda must be scalar or of size ", - sprintf ("%d by %d", r, c))); + "lambda must be scalar or of size ", + sprintf ("%d by %d", r, c))); endif elseif (nargin != 1) usage ("poisson_rnd (lambda [, r, c])"); endif - + [r, c] = size (l); s = r * c; l = reshape (l, 1, s); rnd = zeros (1, s); - + k = find (!(l > 0) | !(l < Inf)); if (any (k)) rnd(k) = NaN * ones (1, length (k)); endif - + k = find ((l > 0) & (l < Inf)); if (any (k)) l = l(k); @@ -65,16 +65,16 @@ while (1) ind = find (sum < 1); if (any (ind)) - sum(ind) = (sum(ind) - - log (1 - rand (1, length (ind))) ./ l(ind)); - num(ind) = num(ind) + 1; + sum(ind) = (sum(ind) + - log (1 - rand (1, length (ind))) ./ l(ind)); + num(ind) = num(ind) + 1; else - break; + break; endif endwhile rnd(k) = num; endif - + rnd = reshape (rnd, r, c); - + endfunction
--- a/scripts/statistics/distributions/stdnormal_cdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/stdnormal_cdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,7 +23,7 @@ ## Description: CDF of the standard normal distribution function cdf = stdnormal_cdf (x) - + if (nargin != 1) usage ("stdnormal_cdf (x)"); endif @@ -33,10 +33,10 @@ error ("stdnormal_cdf: x must not be empty."); endif - cdf = ( ones (r_x, c_x) + erf (x / sqrt(2)) ) / 2; - + cdf = ( ones (r_x, c_x) + erf (x / sqrt(2)) ) / 2; + endfunction - +
--- a/scripts/statistics/distributions/stdnormal_inv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/stdnormal_inv.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -18,16 +18,16 @@ ## ## For each component of x, compute compute the quantile (the inverse of ## the CDF) at x of the standard normal distribution. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Quantile function of the standard normal distribution - + function inv = stdnormal_inv (x) - + if (nargin != 1) usage ("stdnormal_inv (x)"); endif - + inv = sqrt (2) * erfinv (2 * x - 1); - + endfunction
--- a/scripts/statistics/distributions/stdnormal_pdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/stdnormal_pdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -18,7 +18,7 @@ ## ## For each element of x, compute the probability density function (PDF) ## of the standard normal distribution at x. - + ## Author: TT <Teresa.Twaroch@ci.tuwien.ac.at> ## Description: PDF of the standard normal distribution @@ -27,22 +27,22 @@ if (nargin != 1) usage ("stdnormal_pdf (x)"); endif - + [r, c] = size (x); s = r * c; x = reshape (x, 1, s); pdf = zeros (1, s); - + k = find (isnan (x)); if any (k) pdf(k) = NaN * ones (1, length (k)); endif - + k = find (!isinf (x)); if any (k) pdf (k) = (2 * pi)^(- 1/2) * exp( - x(k) .^ 2 / 2); endif - + pdf = reshape (pdf, r, c); - + endfunction \ No newline at end of file
--- a/scripts/statistics/distributions/stdnormal_rnd.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/stdnormal_rnd.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -18,12 +18,12 @@ ## ## Return an r by c matrix of random numbers from the standard normal ## distribution. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Random deviates from the standard normal distribution function rnd = stdnormal_rnd (r, c) - + if (nargin != 2) usage ("stdnormal_rnd (r, c)"); endif @@ -36,5 +36,5 @@ endif rnd = randn (r, c); - + endfunction
--- a/scripts/statistics/distributions/t_cdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/t_cdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,7 +23,7 @@ ## Description: CDF of the t distribution function cdf = t_cdf (x, n) - + if (nargin != 2) usage ("t_cdf (x, n)"); endif @@ -32,18 +32,18 @@ if (retval > 0) error ("t_cdf: x and n must be of common size or scalar"); endif - + [r, c] = size (x); s = r * c; x = reshape (x, 1, s); n = reshape (n, 1, s); cdf = zeros (1, s); - + k = find (isnan (x) | !(n > 0)); if any (k) cdf(k) = NaN * ones (1, length (k)); endif - + k = find ((x == Inf) & (n > 0)); if any (k) cdf(k) = ones (1, length (k)); @@ -62,10 +62,10 @@ k = find (n != round (n)); if any (k) fprintf (stderr, ... - "WARNING: n should be positive integer\n"); + "WARNING: n should be positive integer\n"); cdf(k) = NaN * ones (1, length (k)); endif cdf = reshape (cdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/t_inv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/t_inv.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -36,7 +36,7 @@ if (retval > 0) error ("t_inv: x and n must be of common size or scalar"); endif - + [r, c] = size (x); s = r * c; x = reshape (x, 1, s); @@ -57,27 +57,27 @@ if any (k) inv(k) = Inf * ones (1, length (k)); endif - + k = find ((x > 0) & (x < 1) & (n > 0) & (n < 10000)); if any (k) inv(k) = sign (x(k) - 1/2) .* sqrt (n(k) .* (1 ... - ./ beta_inv (2 * min (x(k), 1 - x(k)), n(k) / 2, 1 / 2) - 1)); + ./ beta_inv (2 * min (x(k), 1 - x(k)), n(k) / 2, 1 / 2) - 1)); endif - + ## For large n, use the quantiles of the standard normal k = find ((x > 0) & (x < 1) & (n >= 10000)); if any (k) inv(k) = stdnormal_inv (x(k)); endif - + ## should we really only allow for positive integer n? k = find (n != round (n)); if any (k) fprintf (stderr, ... - "WARNING: n should be positive integer\n"); + "WARNING: n should be positive integer\n"); inv(k) = NaN * ones (1, length (k)); endif - + inv = reshape (inv, r, c); - + endfunction \ No newline at end of file
--- a/scripts/statistics/distributions/t_pdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/t_pdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,7 +23,7 @@ ## Description: PDF of the t distribution function pdf = t_pdf (x, n) - + if (nargin != 2) usage ("t_pdf (x, n)"); endif @@ -32,7 +32,7 @@ if (retval > 0) error ("t_pdf: x and n must be of common size or scalar"); endif - + [r, c] = size (x); s = r * c; x = reshape (x, 1, s); @@ -43,7 +43,7 @@ if any (k) pdf(k) = NaN * ones (1, length (k)); endif - + k = find (!isinf (x) & !isnan (x) & (n > 0) & (n < Inf)); if any (k) pdf(k) = exp (- (n(k) + 1) .* log (1 + x(k) .^ 2 ./ n(k)) / 2) ... @@ -54,7 +54,7 @@ k = find (n != round (n)); if any (k) fprintf (stderr, ... - "WARNING: n should be positive integer\n"); + "WARNING: n should be positive integer\n"); pdf(k) = NaN * ones (1, length (k)); endif
--- a/scripts/statistics/distributions/t_rnd.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/t_rnd.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,7 +23,7 @@ ## t_rnd (n, r, c) returns an r by c matrix of random samples from the t ## distribution with n degrees of freedom. n must be a scalar or of ## size r by c. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Random deviates from the t distribution @@ -39,28 +39,28 @@ [retval, n] = common_size (n, zeros (r, c)); if (retval > 0) error (strcat("t_rnd: ", - "n must be scalar or of size ", - sprintf ("%d by %d", r, c))); + "n must be scalar or of size ", + sprintf ("%d by %d", r, c))); endif elseif (nargin != 1) usage ("t_rnd (n [, r, c])"); endif - + [r, c] = size (n); s = r * c; n = reshape (n, 1, s); rnd = zeros (1, s); - + k = find (!(n > 0) | !(n < Inf) | !(n == round (n))); if any (k) rnd(k) = NaN * ones (1, length (k)); endif - + k = find ((n > 0) & (n < Inf) & (n == round (n))); if any (k) rnd(k) = t_inv (rand (1, length (k)), n(k)); endif - + rnd = reshape (rnd, r, c); - + endfunction
--- a/scripts/statistics/distributions/uniform_cdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/uniform_cdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -20,12 +20,12 @@ ## PROB( uniform(a,b) <= x ). ## ## Default values are a = 0, b = 1. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: CDF of the uniform distribution function cdf = uniform_cdf (x, a, b) - + if !(nargin == 1 || nargin == 3) usage ("uniform_cdf (x [, a, b])"); endif @@ -38,7 +38,7 @@ [retval, x, a, b] = common_size (x, a, b); if (retval > 0) error (["uniform_cdf: ", ... - "x, a and b must be of common size or scalar"]); + "x, a and b must be of common size or scalar"]); endif [r, c] = size (x); @@ -47,7 +47,7 @@ a = reshape (a, 1, s); b = reshape (b, 1, s); cdf = zeros (1, s); - + k = find (isnan (x) | !(a < b)); if any (k) cdf(k) = NaN * ones (1, length (k)); @@ -57,12 +57,12 @@ if any (k) cdf(k) = ones (1, length (k)); endif - + k = find ((x > a) & (x < b)); if any (k) cdf(k) = (x(k) < b(k)) .* (x(k) - a(k)) ./ (b(k) - a(k)); endif - + cdf = reshape (cdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/uniform_inv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/uniform_inv.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -20,12 +20,12 @@ ## at x of the uniform distribution on [a, b]. ## ## Default values are a = 0, b = 1. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Quantile function of the uniform distribution function inv = uniform_inv (x, a, b) - + if !(nargin == 1 || nargin == 3) usage ("uniform_inv (x [, a, b])"); endif @@ -34,7 +34,7 @@ a = 0; b = 1; endif - + [retval, x, a, b] = common_size (x, a, b); if (retval > 0) error ("uniform_inv: x, a and b must be of common size or scalars"); @@ -46,17 +46,17 @@ a = reshape (a, 1, s); b = reshape (b, 1, s); inv = zeros (1, s); - + k = find ((x < 0) | (x > 1) | isnan (x) | !(a < b)); if any (k) inv(k) = NaN * ones (1, length (k)); endif - + k = find ((x >= 0) & (x <= 1) & (a < b)); if any (k) inv(k) = a(k) + x(k) .* (b(k) - a(k)); endif inv = reshape (inv, r, c); - + endfunction
--- a/scripts/statistics/distributions/uniform_pdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/uniform_pdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,9 +23,9 @@ ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: PDF of the uniform distribution - + function pdf = uniform_pdf (x, a, b) - + if !(nargin == 1 || nargin == 3) usage ("uniform_pdf (x [, a, b])"); endif @@ -38,7 +38,7 @@ [retval, x, a, b] = common_size (x, a, b); if (retval > 0) error (["uniform_pdf: ", ... - "x, a and b must be of common size or scalars"]); + "x, a and b must be of common size or scalars"]); endif [r, c] = size (x); @@ -47,17 +47,17 @@ a = reshape (a, 1, s); b = reshape (b, 1, s); pdf = zeros (1, s); - + k = find (isnan (x) | !(a < b)); if any (k) pdf(k) = NaN * ones (1, length (k)); endif - + k = find ((x > a) & (x < b)); if any (k) pdf(k) = 1 ./ (b(k) - a(k)); endif - + pdf = reshape (pdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/uniform_rnd.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/uniform_rnd.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,10 +23,10 @@ ## uniform_rnd (a, b, r, c) returns an r by c matrix of random samples ## from the uniform distribution on [a, b]. Both a and b must be scalar ## or of size r by c. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Random deviates from the uniform distribution - + function rnd = uniform_rnd (a, b, r, c) if (nargin == 4) @@ -39,8 +39,8 @@ [retval, a, b] = common_size (a, b, zeros (r, c)); if (retval > 0) error (strcat("uniform_rnd: ", - "a and b must be scalar or of size ", - sprintf ("%d by %d", r, c))); + "a and b must be scalar or of size ", + sprintf ("%d by %d", r, c))); endif elseif (nargin == 2) [retval, a, b] = common_size (a, b); @@ -56,17 +56,17 @@ a = reshape (a, 1, s); b = reshape (b, 1, s); rnd = zeros (1, s); - + k = find (!(-Inf < a) | !(a < b) | !(b < Inf)); if any (k) rnd(k) = NaN * ones (1, length (k)); endif - + k = find ((-Inf < a) & (a < b) & (b < Inf)); if any (k) rnd(k) = a(k) + (b(k) - a(k)) .* rand (1, length (k)); endif - + rnd = reshape (rnd, r, c); - + endfunction \ No newline at end of file
--- a/scripts/statistics/distributions/weibull_cdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/weibull_cdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -19,12 +19,12 @@ ## Compute the cumulative distribution function (CDF) at x of the ## Weibull distribution with shape parameter alpha and scale parameter ## sigma, which is 1 - exp(-(x/sigma)^alpha), x >= 0. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: CDF of the Weibull distribution function cdf = weibull_cdf (x, shape, scale) - + if (nargin != 3) usage ("weibull_cdf (x, alpha, sigma)"); endif @@ -32,7 +32,7 @@ [retval, x, shape, scale] = common_size (x, shape, scale); if (retval > 0) error (["weibull_cdf: ", ... - "x, alpha and sigma must be of common size or scalar"]); + "x, alpha and sigma must be of common size or scalar"]); endif [r, c] = size (x); @@ -42,24 +42,24 @@ scale = reshape (scale, 1, s); cdf = NaN * ones (1, s); - + ok = ((shape > 0) & (shape < Inf) & (scale > 0) & (scale < Inf)); - + k = find ((x <= 0) & ok); if any (k) cdf(k) = zeros (1, length (k)); endif - + k = find ((x > 0) & (x < Inf) & ok); if any (k) cdf(k) = 1 - exp (- (x(k) ./ scale(k)) .^ shape(k)); endif - + k = find ((x == Inf) & ok); if any (k) cdf(k) = ones (1, length (k)); endif - + cdf = reshape (cdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/weibull_inv.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/weibull_inv.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -18,12 +18,12 @@ ## ## Compute the quantile (the inverse of the CDF) at x of the Weibull ## distribution with shape parameter alpha and scale parameter sigma. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Quantile function of the Weibull distribution function inv = weibull_inv (x, shape, scale) - + if (nargin != 3) usage ("weibull_inv (x, alpha, sigma)"); endif @@ -31,7 +31,7 @@ [retval, x, shape, scale] = common_size (x, shape, scale); if (retval > 0) error (["weibull_inv: ", ... - "x, alpha and sigma must be of common size or scalar"]); + "x, alpha and sigma must be of common size or scalar"]); endif [r, c] = size (x); @@ -42,12 +42,12 @@ inv = NaN * ones (1, s); ok = ((shape > 0) & (shape < Inf) & (scale > 0) & (scale < Inf)); - + k = find ((x == 0) & ok); if any (k) inv(k) = -Inf * ones (1, length (k)); endif - + k = find ((x > 0) & (x < 1) & ok); if any (k) inv(k) = scale(k) .* (- log (1 - x(k))) .^ (1 ./ shape(k)); @@ -57,7 +57,7 @@ if any (k) inv(k) = Inf * ones (1, length (k)); endif - + inv = reshape (inv, r, c); - + endfunction
--- a/scripts/statistics/distributions/weibull_pdf.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/weibull_pdf.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -18,15 +18,15 @@ ## ## Compute the probability density function (PDF) at x of the Weibull ## distribution with shape parameter alpha and scale parameter sigma -## which is given by +## which is given by ## alpha * sigma^(-alpha) * x^(alpha-1) * exp(-(x/sigma)^alpha) ## for x > 0. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: PDF of the Weibull distribution function pdf = weibull_pdf (x, shape, scale) - + if (nargin != 3) usage ("weibull_pdf (x, alpha, sigma)"); endif @@ -34,7 +34,7 @@ [retval, x, shape, scale] = common_size (x, shape, scale); if (retval > 0) error (["weibull_pdf: ", ... - "x, alpha and sigma must be of common size or scalar"]); + "x, alpha and sigma must be of common size or scalar"]); endif [r, c] = size (x); @@ -45,19 +45,19 @@ pdf = NaN * ones (1, s); ok = ((shape > 0) & (shape < Inf) & (scale > 0) & (scale < Inf)); - + k = find ((x > -Inf) & (x <= 0) & ok); if any (k) pdf(k) = zeros (1, length (k)); endif - + k = find ((x > 0) & (x < Inf) & ok); if any (k) pdf(k) = (shape(k) .* (scale(k) .^ shape(k)) - .* (x(k) .^ (shape(k) - 1)) - .* exp(- (x(k) ./ scale(k)) .^ shape(k))); + .* (x(k) .^ (shape(k) - 1)) + .* exp(- (x(k) ./ scale(k)) .^ shape(k))); endif pdf = reshape (pdf, r, c); - + endfunction
--- a/scripts/statistics/distributions/weibull_rnd.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/weibull_rnd.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,7 +23,7 @@ ## weibull_rnd (alpha, sigma, r, c) returns an r by c matrix of random ## samples from the Weibull distribution with parameters alpha and sigma ## which must be scalar or of size r by c. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Random deviates from the Weibull distribution @@ -39,14 +39,14 @@ [retval, shape, scale] = common_size (shape, scale, zeros (r, c)); if (retval > 0) error (strcat("weibull_rnd: ", - "alpha and sigma must be scalar or of size ", - sprintf ("%d by %d", r, c))); + "alpha and sigma must be scalar or of size ", + sprintf ("%d by %d", r, c))); endif elseif (nargin == 2) [retval, shape, scale] = common_size (shape, scale); if (retval > 0) error (strcat("weibull_rnd: ", - "alpha and sigma must be of common size or scalar")); + "alpha and sigma must be of common size or scalar")); endif else usage ("weibull_rnd (alpha, sigma [, r, c])"); @@ -60,10 +60,10 @@ rnd = NaN * ones (1, s); k = find ((shape > 0) & (shape < Inf) & (scale > 0) & (scale < Inf)); if any (k) - rnd(k) = (scale(k) - .* (- log (1 - rand (1, length (k)))) .^ (1 ./ shape(k))); + rnd(k) = (scale(k) + .* (- log (1 - rand (1, length (k)))) .^ (1 ./ shape(k))); endif - + rnd = reshape (rnd, r, c); - + endfunction \ No newline at end of file
--- a/scripts/statistics/distributions/wiener_rnd.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/distributions/wiener_rnd.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Friedrich Leisch -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
--- a/scripts/statistics/models/logistic_regression.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/models/logistic_regression.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -50,11 +50,11 @@ ## ## `p' holds estimates for the conditional distribution of Y given x. -## Original for MATLAB written by Gordon K Smyth <gks@maths.uq.oz.au>, +## Original for MATLAB written by Gordon K Smyth <gks@maths.uq.oz.au>, ## U of Queensland, Australia, on Nov 19, 1990. Last revision Aug 3, ## 1992. -## Author: Gordon K Smyth <gks@maths.uq.oz.au>, +## Author: Gordon K Smyth <gks@maths.uq.oz.au>, ## Adapted-By: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Ordinal logistic regression @@ -63,38 +63,38 @@ function [theta, beta, dev, dl, d2l, p] ... = logistic_regression (y, x, print, theta, beta) - + ## check input - y = round (vec (y)); - [my, ny] = size (y); + y = round (vec (y)); + [my, ny] = size (y); if (nargin < 2) - x = zeros (my, 0); + x = zeros (my, 0); endif; [mx, nx] = size (x); if (mx != my) error ("x and y must have the same number of observations"); endif - + ## initial calculations x = -x; tol = 1e-6; incr = 10; decr = 2; ymin = min (y); ymax = max (y); yrange = ymax - ymin; z = (y * ones (1, yrange)) == ((y * 0 + 1) * (ymin : (ymax - 1))); z1 = (y * ones (1, yrange)) == ((y * 0 + 1) * ((ymin + 1) : ymax)); - z = z(:, any (z)); - z1 = z1 (:, any(z1)); + z = z(:, any (z)); + z1 = z1 (:, any(z1)); [mz, nz] = size (z); - + ## starting values if (nargin < 3) - print = 0; + print = 0; endif; - if (nargin < 4) - beta = zeros (nx, 1); + if (nargin < 4) + beta = zeros (nx, 1); endif; - if (nargin < 5) - g = cumsum (sum (z))' ./ my; - theta = log (g ./ (1 - g)); + if (nargin < 5) + g = cumsum (sum (z))' ./ my; + theta = log (g ./ (1 - g)); endif; tb = [theta; beta]; @@ -102,7 +102,7 @@ [g, g1, p, dev] = logistic_regression_likelihood (y, x, tb, z, z1); [dl, d2l] = logistic_regression_derivatives (x, z, z1, g, g1, p); epsilon = std (vec (d2l)) / 1000; - + ## maximize likelihood using Levenberg modified Newton's method iter = 0; while (abs (dl' * (d2l \ dl) / length (dl)) > tol) @@ -115,12 +115,12 @@ epsilon = epsilon / decr; else while ((dev - devold) / (dl' * (tb - tbold)) > 0) - epsilon = epsilon * incr; + epsilon = epsilon * incr; if (epsilon > 1e+15) - error ("epsilon too large"); + error ("epsilon too large"); endif - tb = tbold - (d2l - epsilon * eye (size (d2l))) \ dl; - [g, g1, p, dev] = logistic_regression_likelihood (y, x, tb, z, z1); + tb = tbold - (d2l - epsilon * eye (size (d2l))) \ dl; + [g, g1, p, dev] = logistic_regression_likelihood (y, x, tb, z, z1); disp ("epsilon"); disp (epsilon); endwhile endif @@ -141,19 +141,19 @@ if (print >= 1) printf ("\n"); printf ("Logistic Regression Results:\n"); - printf ("\n"); + printf ("\n"); printf ("Number of Iterations: %d\n", iter); printf ("Deviance: %f\n", dev); printf ("Parameter Estimates:\n"); printf (" Theta S.E.\n"); - se = sqrt (diag (inv (-d2l))); + se = sqrt (diag (inv (-d2l))); for i = 1 : nz printf (" %8.4f %8.4f\n", tb (i), se (i)); endfor if (nx > 0) printf (" Beta S.E.\n"); for i = (nz + 1) : (nz + nx) - printf (" %8.4f %8.4f\n", tb (i), se (i)); + printf (" %8.4f %8.4f\n", tb (i), se (i)); endfor endif endif @@ -166,5 +166,5 @@ endif gamma = diff ([(y * 0), (exp (e) ./ (1 + exp (e))), (y * 0 + 1)]')'; endif - + endfunction
--- a/scripts/statistics/models/logistic_regression_derivatives.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/models/logistic_regression_derivatives.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,29 +1,29 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## Called by logistic_regression. Calculates derivates of the ## log-likelihood for ordinal logistic regression model. - + ## Author: Gordon K. Smyth <gks@maths.uq.oz.au> ## Adapted-By: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Derivates of log-likelihood in logistic regression function [dl, d2l] ... = logistic_regression_derivatives (x, z, z1, g, g1, p) - + ## first derivative v = g .* (1 - g) ./ p; v1 = g1 .* (1 - g1) ./ p; dlogp = [(dmult (v, z) - dmult (v1, z1)), (dmult (v - v1, x))]; @@ -33,5 +33,5 @@ w = v .* (1 - 2 * g); w1 = v1 .* (1 - 2 * g1); d2l = [z, x]' * dmult (w, [z, x]) - [z1, x]' * dmult (w1, [z1, x]) ... - dlogp' * dlogp; - + endfunction \ No newline at end of file
--- a/scripts/statistics/models/logistic_regression_likelihood.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/models/logistic_regression_likelihood.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,34 +1,34 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## Calculates likelihood for the ordinal logistic regression model. ## Called by logistic_regression. - + ## Author: Gordon K. Smyth <gks@maths.uq.oz.au> ## Adapted-By: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Likelihood in logistic regression function [g, g1, p, dev] ... = logistic_regression_likelihood (y, x, beta, z, z1) - + e = exp ([z, x] * beta); e1 = exp ([z1, x] * beta); g = e ./ (1 + e); g1 = e1 ./ (1 + e1); g = max (y == max (y), g); g1 = min (y > min(y), g1); - + p = g - g1; - dev = -2 * sum (log (p)); + dev = -2 * sum (log (p)); endfunction
--- a/scripts/statistics/tests/anova.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/tests/anova.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -37,9 +37,9 @@ ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: One-way analysis of variance (ANOVA) - + function [pval, f, df_b, df_w] = anova (y, g) - + if ((nargin < 1) || (nargin > 2)) usage ("anova (y [, g])"); elseif (nargin == 1) @@ -56,7 +56,7 @@ n = length (y); if (! is_vector (g) || (length (g) != n)) error (["anova: for `anova (y, g)', g must be a vector", ... - " of the same length y"]); + " of the same length y"]); endif s = sort (g); i = find (s (2 : n) > s(1 : (n-1))); @@ -71,12 +71,12 @@ group_count (i) = length (v); group_mean (i) = mean (v); endfor - + endif - - total_mean = mean (group_mean); + + total_mean = mean (group_mean); SSB = sum (group_count .* (group_mean - total_mean) .^ 2); - SST = sumsq (reshape (y, n, 1) - total_mean); + SST = sumsq (reshape (y, n, 1) - total_mean); SSW = SST - SSB; df_b = k - 1; df_w = n - k; @@ -84,7 +84,7 @@ v_w = SSW / df_w; f = v_b / v_w; pval = 1 - f_cdf (f, df_b, df_w); - + if (nargout == 0) ## This eventually needs to be done more cleanly ... printf ("\n"); @@ -97,9 +97,9 @@ printf ("---------------------------------------------------------\n"); printf ("Total %15.4f %4d\n", SST, n - 1); printf ("\n"); - printf ("Test Statistic f %15.4f\n", f); + printf ("Test Statistic f %15.4f\n", f); printf ("p-value %15.4f\n", pval); printf ("\n"); - endif - + endif + endfunction
--- a/scripts/statistics/tests/bartlett_test.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/tests/bartlett_test.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -54,7 +54,7 @@ chisq = (f_tot * log (v_tot) - sum (f .* log (v))) / c; df = k; pval = 1 - chisquare_cdf (chisq, df); - + if (nargout == 0) printf(" pval: %g\n", pval); endif
--- a/scripts/statistics/tests/chisquare_test_homogeneity.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/tests/chisquare_test_homogeneity.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -32,11 +32,11 @@ ## Description: Chi-square test for homogeneity function [pval, chisq, df] = chisquare_test_homogeneity (x, y, c) - + if (nargin != 3) usage ("[pval, chisq, df] = chisquare_test_homogeneity (x, y, c)"); endif - + if (! (is_vector(x) && is_vector(y) && is_vector(c))) error ("chisquare_test_homogeneity: x, y and c must be vectors"); endif @@ -45,7 +45,7 @@ if (any ( (c(2 : df) - c(1 : (df - 1))) <= 0)) error ("chisquare_test_homogeneity: c must be increasing"); endif - + c = [(reshape (c, 1, df)), Inf]; l_x = length (x); x = reshape (x, l_x, 1); @@ -55,7 +55,7 @@ n_y = sum(y * ones (1, df+1) < ones (l_y, 1) * c); chisq = l_x * l_y * sum ((n_x/l_x - n_y/l_y).^2 ./ (n_x + n_y)); pval = 1 - chisquare_cdf (chisq, df); - + if (nargout == 0) printf(" pval: %g\n", pval); endif
--- a/scripts/statistics/tests/chisquare_test_independence.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/tests/chisquare_test_independence.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -33,7 +33,7 @@ if (nargin != 1) usage ("chisquare_test_independence (X)"); endif - + [r, s] = size (X); df = (r - 1) * (s - 1); n = sum (sum (X)); @@ -41,7 +41,7 @@ X = (X - Y) .^2 ./ Y; chisq = sum (sum (X)); pval = 1 - chisquare_cdf (chisq, df); - + if (nargout == 0) printf(" pval: %g\n", pval); endif
--- a/scripts/statistics/tests/cor_test.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/tests/cor_test.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -33,13 +33,13 @@ ## Only the first character is necessary. ## ## The output is a structure with the following elements: -## pval The p-value of the test. -## stat The value of the test statistic. -## dist The distribution of the test statistic. -## params The parameters of the null distribution of the -## test statistic. -## alternative The alternative hypothesis. -## method The method used for testing. +## pval The p-value of the test. +## stat The value of the test statistic. +## dist The distribution of the test statistic. +## params The parameters of the null distribution of the +## test statistic. +## alternative The alternative hypothesis. +## method The method used for testing. ## ## If no output argument is given, the pval is displayed. @@ -48,7 +48,7 @@ ## Description: Test for zero correlation function t = cor_test (X, Y, ALTERNATIVE, METHOD) - + if ((nargin < 2) || (nargin > 4)) usage ("cor_test (X, Y [, ALTERNATIVE [, METHOD]])") endif @@ -82,7 +82,7 @@ cdf = t_cdf (t.stat, df); elseif (m == "k") tau = kendall (X, Y); - t.method = "Kendall's rank correlation tau"; + t.method = "Kendall's rank correlation tau"; t.params = []; t.stat = tau / sqrt ((2 * (2*n+5)) / (9*n*(n-1))); t.dist = "stdnormal"; @@ -92,7 +92,7 @@ t.method = "Spearman's rank correlation rho"; t.params = []; t.stat = sqrt (n-1) * (rho - 6/(n^3-n)); - t.dist = "stdnormal"; + t.dist = "stdnormal"; cdf = stdnormal_cdf (t.stat); else error ("cor_test: method `%s' not recognized", METHOD) @@ -113,5 +113,5 @@ if (nargout == 0) printf ("pval: %g\n", t.pval); endif - + endfunction
--- a/scripts/statistics/tests/f_test_regression.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/tests/f_test_regression.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -31,30 +31,30 @@ ## Description: Test linear hypotheses in linear regression model function [pval, f, df_num, df_den] = f_test_regression (y, X, R, r) - + if (nargin < 3 || nargin > 4) usage (["[pval, f, df_num, df_den] ", ... - "= f_test_regression (y, X, R [, r])"]); + "= f_test_regression (y, X, R [, r])"]); endif [T, k] = size (X); if !( is_vector (y) && (length (y) == T) ) error (["f_test_regression: ", ... - "y must be a vector of length rows (X)."]); + "y must be a vector of length rows (X)."]); endif y = reshape (y, T, 1); - + [q, c_R ] = size (R); if (c_R != k) error (["f_test_regression: ", ... - "R must have as many columns as X."]); + "R must have as many columns as X."]); endif - + if (nargin == 4) s_r = size (r); if ((min (s_r) != 1) || (max (s_r) != q)) error (["f_test_regression: ", ... - "r must be a vector of length rows (R)."]); + "r must be a vector of length rows (R)."]); endif r = reshape (r, q, 1); else @@ -63,12 +63,12 @@ df_num = q; df_den = T - k; - + [b, v] = ols (y, X); diff = R * b - r; f = diff' * inv (R * inv (X' * X) * R') * diff / ( q * v ); pval = 1 - f_cdf (f, df_num, df_den); - + if (nargout == 0) printf (" pval: %g\n", pval); endif
--- a/scripts/statistics/tests/hotelling_test.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/tests/hotelling_test.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -27,16 +27,16 @@ ## pval is the p-value of the test. ## ## If no output argument is given, the p-value of the test is displayed. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Test for mean of a multivariate normal - + function [pval, Tsq] = hotelling_test (x, m) - + if (nargin != 2) usage ("hotelling_test (x, m)"); endif - + if (is_vector (x)) if (! is_scalar (m)) error ("hotelling_test: If x is a vector, m must be a scalar."); @@ -52,19 +52,19 @@ m = reshape (m, 1, p); else error (strcat ("hotelling_test: ", - "If x is a matrix, m must be a vector\n", - "\tof length columns (x)")); + "If x is a matrix, m must be a vector\n", + "\tof length columns (x)")); endif else error ("hotelling_test: x must be a matrix or vector"); endif - + d = mean (x) - m; Tsq = n * d * (cov (x) \ d'); pval = 1 - f_cdf ((n-p) * Tsq / (p * (n-1)), p, n-p); - + if (nargout == 0) printf (" pval: %g\n", pval); endif - + endfunction
--- a/scripts/statistics/tests/hotelling_test_2.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/tests/hotelling_test_2.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -20,7 +20,7 @@ ## same number of variables (columns), unknown means and unknown equal ## covariance matrices, test the null hypothesis mean (x) == mean (y). ## -## Tsq is Hotelling's two-sample T^2. Under the null, +## Tsq is Hotelling's two-sample T^2. Under the null, ## (n_x+n_y-p-1) T^2 / (p(n_x+n_y-2)) ## has an F distribution with p and n_x+n_y-p-1 degrees of freedom, ## where n_x and n_y are the sample sizes and p is the number of @@ -32,13 +32,13 @@ ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Compare means of two multivariate normals - + function [pval, Tsq] = hotelling_test_2 (x, y) - + if (nargin != 2) usage ("hotelling_test_2 (x, y)"); endif - + if (is_vector (x)) n_x = length (x); if (! is_vector (y)) @@ -52,20 +52,20 @@ [n_y, q] = size (y); if (p != q) error (strcat ("hotelling_test_2: ", - "x and y must have the same number of columns")); + "x and y must have the same number of columns")); endif else error ("hotelling_test_2: x and y must be matrices (or vectors)"); endif - + d = mean (x) - mean (y); S = ((n_x - 1) * cov (x) + (n_y - 1) * cov (y)) / (n_x + n_y - 2); Tsq = (n_x * n_y / (n_x + n_y)) * d * (S \ d'); pval = 1 - f_cdf ((n_x + n_y - p - 1) * Tsq / (p * (n_x + n_y - 2)), - p, n_x + n_y - p - 1); - + p, n_x + n_y - p - 1); + if (nargout == 0) printf (" pval: %g\n", pval); endif - + endfunction \ No newline at end of file
--- a/scripts/statistics/tests/kolmogorov_smirnov_test.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/tests/kolmogorov_smirnov_test.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,20 +1,20 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -## usage: +## usage: ## [pval, ks] = kolmogorov_smirnov_test (x, dist [, params] [, alt]) ## ## @@ -44,11 +44,11 @@ ## Description: One-sample Kolmogorov-Smirnov test function [pval, ks] = kolmogorov_smirnov_test (x, dist, ...) - + if (nargin < 2) error (sprintf (["usage:\n\t", ... - "[pval, ks] = ", ... - "kolmogorov_smirnov_test (x, dist, [, params] [, alt])"])); + "[pval, ks] = ", ... + "kolmogorov_smirnov_test (x, dist, [, params] [, alt])"])); endif if (! is_vector (x)) @@ -60,7 +60,7 @@ f = sprintf ("%s_cdf", dist); alt = "!="; - + if (nargin == 2) z = reshape (feval (f, s), 1, n); else @@ -68,13 +68,13 @@ for k = 1 : (nargin-2); tmp = va_arg (); if isstr (tmp) - alt = tmp; + alt = tmp; else - args = sprintf ("%s, %g", args, tmp); + args = sprintf ("%s, %g", args, tmp); endif endfor z = reshape (eval (sprintf ("%s(s%s);", f, args)), 1, n); - endif + endif if (strcmp (alt, "!=") || strcmp (alt, "<>")) ks = sqrt(n) * max(max([abs(z - (0:(n-1))/n); abs(z - (1:n)/n)])); @@ -87,11 +87,11 @@ pval = exp(- 2 * ks^2); else error (sprintf (["kolmogorov_smirnov_test: ", ... - "alternative %s not recognized"], alt)); + "alternative %s not recognized"], alt)); endif - + if (nargout == 0) printf ("pval: %g\n", pval); endif - + endfunction
--- a/scripts/statistics/tests/kolmogorov_smirnov_test_2.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/tests/kolmogorov_smirnov_test_2.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -22,7 +22,7 @@ ## respectively, then the null is that F == G. ## ## With the optional argument string alt, the alternative of interest -## can be selected. +## can be selected. ## If alt is "!=" or "<>", the null is tested against the two-sided ## alternative F != G. In this case, the test statistic ks follows a ## two-sided Kolmogorov-Smirnov distribution. @@ -33,16 +33,16 @@ ## ## pval is the p-value of the test. ## -## If no output argument is given, the p-value is displayed. +## If no output argument is given, the p-value is displayed. ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Two-sample Kolmogorov-Smirnov test function [pval, ks] = kolmogorov_smirnov_test_2 (x, y, alt) - + if (nargin < 2 || nargin > 3) usage (strcat ("[pval, ks] = ", - "kolmogorov_smirnov_test_2 (x, y [, tol])")); + "kolmogorov_smirnov_test_2 (x, y [, tol])")); endif if !( is_vector (x) && is_vector (y)) @@ -51,7 +51,7 @@ if (nargin == 2) alt = "!="; - else + else if (! isstr (alt)) error ("kolmogorov_smirnov_test_2: alt must be a string."); endif @@ -76,9 +76,9 @@ pval = exp(- 2 * ks^2); else error (sprintf (["kolmogorov_smirnov_test_2: ", ... - "option %s not recognized"], alt)); + "option %s not recognized"], alt)); endif - + if (nargout == 0) printf (" pval: %g\n", pval); endif
--- a/scripts/statistics/tests/kruskal_wallis_test.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/tests/kruskal_wallis_test.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -30,14 +30,14 @@ ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Kruskal-Wallis test - + function [pval, k, df] = kruskal_wallis_test (...) - + m = nargin; if (m < 2) usage ("[pval, k, df] = kruskal_wallis_test (x1, ...)"); endif - + n = []; p = []; va_start; @@ -50,7 +50,7 @@ n = [n, l]; p = [p, (reshape (x, 1, l))]; endfor - + r = ranks (p); k = 0; @@ -59,12 +59,12 @@ k = k + (sum (r ((j + 1) : (j + n(i))))) ^ 2 / n(i); j = j + n(i); endfor - + n = length (p); k = 12 * k / (n * (n + 1)) - 3 * (n + 1); df = m - 1; pval = 1 - chisquare_cdf (k, df); - + if (nargout == 0) printf ("pval: %g\n", pval); endif
--- a/scripts/statistics/tests/manova.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/tests/manova.m Thu Jan 13 08:40:53 2000 +0000 @@ -33,7 +33,7 @@ ## Three test statistics (Wilks, Hotelling-Lawley, and Pillai-Bartlett) ## and corresponding approximate p-values are calculated and displayed. ## (Currently NOT because the f_cdf respectively betai code is too bad.) - + ## Author: TF <Thomas.Fuereder@ci.tuwien.ac.at> ## Adapted-By: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: One-way multivariate analysis of variance (MANOVA) @@ -57,7 +57,7 @@ s = sort (g); i = find (s (2:n) > s(1:(n-1))); k = length (i) + 1; - + if (k == 1) error ("manova: there should be at least 2 groups"); else @@ -75,7 +75,7 @@ SSB = SSB + s' * s / rows (v); endfor n_b = k - 1; - + SSW = SST - SSB; n_w = n - k; @@ -86,11 +86,11 @@ ## ============= Lambda = prod (1 ./ (1 + l)); - + delta = n_w + n_b - (p + n_b + 1) / 2 df_num = p * n_b W_pval_1 = 1 - chisquare_cdf (- delta * log (Lambda), df_num); - + if (p < 3) eta = p; else @@ -98,7 +98,7 @@ endif df_den = delta * eta - df_num / 2 + 1 - + WT = exp (- log (Lambda) / eta) - 1 W_pval_2 = 1 - f_cdf (WT * df_den / df_num, df_num, df_den); @@ -106,11 +106,11 @@ ## Hotelling-Lawley Test ## ===================== - + HL = sum (l); - + theta = min (p, n_b); - u = (abs (p - n_b) - 1) / 2; + u = (abs (p - n_b) - 1) / 2; v = (n_w - p - 1) / 2; df_num = theta * (2 * u + theta + 1); @@ -120,7 +120,7 @@ ## Pillai-Bartlett ## =============== - + PB = sum (l ./ (1 + l)); df_den = theta * (2 * v + theta + 1); @@ -128,7 +128,7 @@ printf ("\n"); printf ("One-way MANOVA Table:\n"); - printf ("\n"); + printf ("\n"); printf ("Test Test Statistic Approximate p\n"); printf ("**************************************************\n"); printf ("Wilks %10.4f %10.9f \n", Lambda, W_pval_1); @@ -142,13 +142,13 @@ printf ("\n"); printf ("MANOVA Results:\n"); printf ("\n"); - printf ("# of groups: %d\n", k); + printf ("# of groups: %d\n", k); printf ("# of samples: %d\n", n); printf ("# of variables: %d\n", p); - printf ("\n"); + printf ("\n"); printf ("Wilks' Lambda: %5.4f\n", Lambda); printf ("Approximate p: %10.9f (chisquare approximation)\n", W_pval_1); printf (" %10.9f (F approximation)\n", W_pval_2); printf ("\n"); - + endfunction
--- a/scripts/statistics/tests/mcnemar_test.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/tests/mcnemar_test.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -25,24 +25,24 @@ ## this distribution at chisq) of the test. ## ## If no output argument is given, the p-value of the test is displayed. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: McNemar's test for symmetry - + function [pval, chisq, df] = mcnemar_test (x) - + if (nargin != 1) usage ("mcnemar_test (x)"); endif - + if (! (min (size (x)) > 1) && is_square (x)) error (strcat ("mcnemar_test: ", - "x must be a square matrix of size > 1.")); + "x must be a square matrix of size > 1.")); elseif (! (all (all (x >= 0)) && all (all (x == round (x))))) error (strcat ("mcnemar_test: ", - "all entries of x must be nonnegative integers.")); + "all entries of x must be nonnegative integers.")); endif - + r = rows (x); df = r * (r - 1) / 2; if (r == 2) @@ -50,15 +50,15 @@ else num = abs (x - x') .^ 2; endif - + chisq = sum (sum (triu (num ./ (x + x'), 1))); pval = 1 - chisquare_cdf (chisq, df); - + if (nargout == 0) printf (" pval: %g\n", pval); endif - + endfunction - +
--- a/scripts/statistics/tests/prop_test_2.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/tests/prop_test_2.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,7 +23,7 @@ ## standard normal distribution. ## ## With the optional argument string alt, the alternative of interest -## can be selected. +## can be selected. ## If alt is "!=" or "<>", the null is tested against the two-sided ## alternative p1 != p2. ## If alt is ">", the one-sided alternative p1 > p2 is used, similarly @@ -31,28 +31,28 @@ ## The default is the two-sided case. ## ## pval is the p-value of the test. -## +## ## If no output argument is given, the p-value of the test is displayed. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Compare two proportions function [pval, z] = prop_test_2 (x1, n1, x2, n2, alt) - + if ((nargin < 4) || (nargin > 5)) - usage ("[pval, z] = prop_test_2 (x1, n1, x2, n2 [, alt])"); + usage ("[pval, z] = prop_test_2 (x1, n1, x2, n2 [, alt])"); endif - + ## Could do sanity checking on x1, n1, x2, n2 here p1 = x1 / n1; p2 = x2 / n2; pc = (x1 + x2) / (n1 + n2); - + z = (p1 - p2) / sqrt (pc * (1 - pc) * (1/n1 + 1/n2)); - + cdf = stdnormal_cdf (z); - + if (nargin == 4) alt = "!="; endif
--- a/scripts/statistics/tests/run_test.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/tests/run_test.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Friedrich Leisch -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -21,10 +21,10 @@ ## contains independent data. ## ## If no output argument is given, the pval is displayed. - + ## Author: FL <Friedrich.Leisch@ci.tuwien.ac.at> ## Description: Run test for independence - + function [pval, chisq] = run_test (x) if (nargin != 1) @@ -39,15 +39,15 @@ 27892, 55789, 83685, 111580, 139476, 172860]; b = [1/6; 5/24; 11/120; 19/720; 29/5040; 1/840]; - + n = rows (x); r = run_count (x, 6) - n * b * ones (1, columns(x)); chisq = diag (r' * A * r)' / n; pval = chisquare_cdf (chisq, 6); - + if (nargout == 0) printf("pval: %g\n", pval); endif - + endfunction
--- a/scripts/statistics/tests/sign_test.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/tests/sign_test.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -24,13 +24,13 @@ ## With the optional argument alt, the alternative of interest can be ## selected. ## If alt is "!=" or "<>", the null hypothesis is tested against the -## two-sided alternative PROB(x < y) != 1/2. +## two-sided alternative PROB(x < y) != 1/2. ## If alt is ">", the one-sided alternative PROB(x > y) > 1/2 ("x is ## stochastically greater than y") is considered, similarly for "<". ## The default is the two-sided case. ## ## pval is the p-value of the test. -## +## ## If no output argument is given, the p-value of the test is displayed. ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> @@ -41,7 +41,7 @@ if ((nargin < 2) || (nargin > 3)) usage ("[pval, b, n] = sign_test (x, y [, alt])"); endif - + if (! (is_vector (x) && is_vector (y) && (length (x) == length (y)))) error ("sign_test: x and y must be vectors of the same length"); endif @@ -52,7 +52,7 @@ n = sum (x != y); b = sum (x > y); cdf = binomial_cdf (b, n, 1/2); - + if (nargin == 2) alt = "!="; endif @@ -69,9 +69,9 @@ else error (sprintf ("sign_test: option %s not recognized", alt)); endif - + if (nargout == 0) printf (" pval: %g\n", pval); endif - + endfunction
--- a/scripts/statistics/tests/t_test.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/tests/t_test.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -22,38 +22,38 @@ ## with df = length (x) - 1 degrees of freedom. ## ## With the optional argument string alt, the alternative of interest -## can be selected. +## can be selected. ## If alt is "!=" or "<>", the null is tested against the two-sided ## alternative mean(x) != m. ## If alt is ">", the one-sided alternative mean(x) > m is considered, -## similarly for "<". +## similarly for "<". ## The default is the two-sided case. ## ## pval is the p-value of the test. -## +## ## If no output argument is given, the p-value of the test is displayed. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> -## Description: Student's one-sample t test +## Description: Student's one-sample t test function [pval, t, df] = t_test (x, m, alt) - + if ((nargin < 2) || (nargin > 3)) usage ("[pval, t, df] = t_test (x, m [, alt])"); endif - + if (! is_vector (x)) error ("t_test: x must be a vector."); endif if (! is_scalar (m)) error ("t_test: m must be a scalar."); endif - + n = length (x); df = n - 1; t = sqrt (n) * (sum (x) / n - m) / std (x); cdf = t_cdf (t, df); - + if (nargin == 2) alt = "!="; endif @@ -74,5 +74,5 @@ if (nargout == 0) printf (" pval: %g\n", pval); endif - + endfunction
--- a/scripts/statistics/tests/t_test_2.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/tests/t_test_2.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,26 +23,26 @@ ## with df degrees of freedom. ## ## With the optional argument string alt, the alternative of interest -## can be selected. +## can be selected. ## If alt is "!=" or "<>", the null is tested against the two-sided ## alternative mean(x) != mean(y). ## If alt is ">", the one-sided alternative mean(x) > mean(y) is used, -## similarly for "<". +## similarly for "<". ## The default is the two-sided case. ## ## pval is the p-value of the test. -## +## ## If no output argument is given, the p-value of the test is displayed. - + ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Student's two-sample t test function [pval, t, df] = t_test_2 (x, y, alt) - + if ((nargin < 2) || (nargin > 3)) - usage ("[pval, t, df] = t_test_2 (x, y [, alt])"); + usage ("[pval, t, df] = t_test_2 (x, y [, alt])"); endif - + if (! (is_vector (x) && is_vector (y))) error ("t_test_2: both x and y must be vectors"); endif
--- a/scripts/statistics/tests/t_test_regression.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/tests/t_test_regression.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -24,22 +24,22 @@ ## r is taken as 0 if not given explicitly. ## ## With the optional argument string alt, the alternative of interest -## can be selected. +## can be selected. ## If alt is "!=" or "<>", the null is tested against the two-sided ## alternative R * b != r. ## If alt is ">", the one-sided alternative R * b > r is used, -## similarly for "<". +## similarly for "<". ## The default is the two-sided case. ## ## pval is the p-value of the test. -## +## ## If no output argument is given, the p-value of the test is displayed. ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Test one linear hypothesis in linear regression model function [pval, t, df] = t_test_regression (y, X, R, r, alt) - + if (nargin == 3) r = 0; alt = "!="; @@ -52,33 +52,33 @@ endif elseif !(nargin == 5) usage (["[pval, t, df] ", ... - "= t_test_regression (y, X, R [, r] [, alt]"]); + "= t_test_regression (y, X, R [, r] [, alt]"]); endif - + if (! is_scalar (r)) error ("t_test_regression: r must be a scalar"); elseif (! isstr (alt)) error ("t_test_regression: alt must be a string"); endif - + [T, k] = size (X); if !(is_vector (y) && (length (y) == T)) error (["t_test_regression: ", ... - "y must be a vector of length rows (X)"]); + "y must be a vector of length rows (X)"]); endif s = size (R); if !((max (s) == k) && (min (s) == 1)) error (["t_test_regression: ", ... - "R must be a vector of length columns (X)"]); + "R must be a vector of length columns (X)"]); endif - + R = reshape (R, 1, k); y = reshape (y, T, 1); [b, v] = ols (y, X); df = T - k; t = (R * b - r) / sqrt (v * R * inv (X' * X) * R'); cdf = t_cdf (t, df); - + if (strcmp (alt, "!=") || strcmp (alt, "<>")) pval = 2 * min (cdf, 1 - cdf); elseif strcmp (alt, ">") @@ -88,7 +88,7 @@ else error ("t_test_regression: the value `%s' for alt is not possible", alt); endif - + if (nargout == 0) printf ("pval: %g\n", pval); endif
--- a/scripts/statistics/tests/u_test.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/tests/u_test.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,17 +23,17 @@ ## rank-sum test. ## ## With the optional argument string alt, the alternative of interest -## can be selected. +## can be selected. ## If alt is "!=" or "<>", the null is tested against the two-sided ## alternative PROB(x > y) != 1/2. ## If alt is ">", the one-sided alternative PROB(x > y) > 1/2 is -## considered, similarly for "<". +## considered, similarly for "<". ## The default is the two-sided case. ## ## pval is the p-value of the test. -## +## ## If no output argument is given, the p-value of the test is displayed. - + ## This implementation is still incomplete---for small sample sizes, ## the normal approximation is rather bad ... @@ -41,11 +41,11 @@ ## Description: Mann-Whitney U-test function [pval, z] = u_test (x, y, alt) - + if ((nargin < 2) || (nargin > 3)) usage ("[pval, z] = u_test (x, y [, alt])"); endif - + if (! (is_vector (x) && is_vector (y))) error ("u_test: both x and y must be vectors"); endif @@ -54,10 +54,10 @@ n_y = length (y); r = ranks ([(reshape (x, 1, n_x)), (reshape (y, 1, n_y))]); z = (sum (r(1 : n_x)) - n_x * (n_x + n_y + 1) / 2) ... - / sqrt (n_x * n_y * (n_x + n_y + 1) / 12); + / sqrt (n_x * n_y * (n_x + n_y + 1) / 12); cdf = stdnormal_cdf (z); - + if (nargin == 2) alt = "!="; endif @@ -78,5 +78,5 @@ if (nargout == 0) printf (" pval: %g\n", pval); endif - + endfunction
--- a/scripts/statistics/tests/var_test.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/tests/var_test.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,48 +1,48 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## usage: [pval, f, df_num, df_den] = var_test (x, y [, alt]) ## -## For two samples x and y from normal distributions with unknown +## For two samples x and y from normal distributions with unknown ## means and unknown variances, perform an F-test of the null ## hypothesis of equal variances. ## Under the null, the test statistic f follows an F-distribution ## with df_num and df_den degrees of freedom. ## ## With the optional argument string alt, the alternative of interest -## can be selected. +## can be selected. ## If alt is "!=" or "<>", the null is tested against the two-sided ## alternative var(x) != var(y). ## If alt is ">", the one-sided alternative var(x) > var(y) is used, -## similarly for "<". +## similarly for "<". ## The default is the two-sided case. ## ## pval is the p-value of the test. -## +## ## If no output argument is given, the p-value of the test is displayed. ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: F test to compare two variances function [pval, f, df_num, df_den] = var_test (x, y, alt) - + if ((nargin < 2) || (nargin > 3)) usage ("[pval, f, df_num, df_den] = var_test (x, y [, alt])"); endif - + if (! (is_vector (x) && is_vector (y))) error ("var_test: both x and y must be vectors"); endif @@ -51,11 +51,11 @@ df_den = length (y) - 1; f = var (x) / var (y); cdf = f_cdf (f, df_num, df_den); - + if (nargin == 2) alt = "!="; endif - + if (! isstr (alt)) error ("var_test: alt must be a string"); endif @@ -68,7 +68,7 @@ else error (sprintf ("var_test: option %s not recognized", alt)); endif - + if (nargout == 0) printf ("pval: %g\n", pval); endif
--- a/scripts/statistics/tests/welch_test.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/tests/welch_test.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,26 +23,26 @@ ## distribution with df degrees of freedom. ## ## With the optional argument string alt, the alternative of interest -## can be selected. +## can be selected. ## If alt is "!=" or "<>", the null is tested against the two-sided ## alternative mean(x) != m. ## If alt is ">", the one-sided alternative mean(x) > m is considered, -## similarly for "<". +## similarly for "<". ## The default is the two-sided case. ## ## pval is the p-value of the test. -## +## ## If no output argument is given, the p-value of the test is displayed. ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Welch two-sample t test function [pval, t, df] = welch_test (x, y, alt) - + if ((nargin < 2) || (nargin > 3)) usage ("[pval, t, df] = welch_test (x, y [, alt])"); endif - + if (! (is_vector (x) && is_vector (y))) error ("welch_test: both x and y must be vectors"); endif @@ -61,7 +61,7 @@ if (nargin == 2) alt = "!="; endif - + if (! isstr (alt)) error ("welch_test: alt must be a string"); endif @@ -74,7 +74,7 @@ else error (sprintf ("welch_test: option %s not recognized", alt)); endif - + if (nargout == 0) printf (" pval: %g\n", pval); endif
--- a/scripts/statistics/tests/wilcoxon_test.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/tests/wilcoxon_test.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -19,10 +19,10 @@ ## For two matched-pair sample vectors x and y, perform a Wilcoxon ## signed-rank test of the null hypothesis PROB(x > y) == 1/2. ## Under the null, the test statistic z approximately follows a -## standard normal distribution. +## standard normal distribution. ## ## With the optional argument string alt, the alternative of interest -## can be selected. +## can be selected. ## If alt is "!=" or "<>", the null is tested against the two-sided ## alternative PROB(x > y) != 1/2. ## If alt is ">", the one-sided alternative PROB(x > y) > 1/2 is @@ -30,18 +30,18 @@ ## The default is the two-sided case. ## ## pval is the p-value of the test. -## +## ## If no output argument is given, the p-value of the test is displayed. ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Wilcoxon signed-rank test - + function [pval, z] = wilcoxon_test (x, y, alt) - + if ((nargin < 2) || (nargin > 3)) usage ("[pval, z] = wilcoxon_test (x, y [, alt])"); endif - + if (! (is_vector (x) && is_vector (y) && (length (x) == length (y)))) error ("wilcoxon_test: x and y must be vectors of the same length"); endif @@ -61,7 +61,7 @@ endif cdf = stdnormal_cdf (z); - + if (nargin == 2) alt = "!="; endif @@ -81,5 +81,5 @@ if (nargout == 0) printf (" pval: %g\n", pval); endif - + endfunction
--- a/scripts/statistics/tests/z_test.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/tests/z_test.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,48 +1,48 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## usage: [pval, z] = z_test (x, m, v [, alt]) ## -## Perform a Z-test of the null hypothesis mean(x) == m for a sample x -## from a normal distribution with unknown mean and known variance v. +## Perform a Z-test of the null hypothesis mean(x) == m for a sample x +## from a normal distribution with unknown mean and known variance v. ## Under the null, the test statistic z follows a standard normal ## distribution. ## ## With the optional argument string alt, the alternative of interest -## can be selected. +## can be selected. ## If alt is "!=" or "<>", the null is tested against the two-sided ## alternative mean(x) != m. -## If alt is ">", the one-sided alternative mean(x) > m is considered, -## similarly for "<". +## If alt is ">", the one-sided alternative mean(x) > m is considered, +## similarly for "<". ## The default is the two-sided case. ## ## pval is the p-value of the test. -## +## ## If no output argument is given, the p-value of the test is displayed -## along with some information. +## along with some information. ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Test for mean of a normal sample with known variance function [pval, z] = z_test (x, m, v, alt) - + if ((nargin < 3) || (nargin > 4)) usage ("[pval, z] = z_test (x, m, v [, alt])"); endif - + if (! is_vector (x)) error ("z_test: x must be a vector."); endif @@ -52,11 +52,11 @@ if (! (is_scalar (v) && (v > 0))) error ("z_test: v must be a positive scalar."); endif - + n = length (x); z = sqrt (n/v) * (sum (x) / n - m); cdf = stdnormal_cdf (z); - + if (nargin == 3) alt = "!="; endif @@ -72,11 +72,11 @@ else error (sprintf ("z_test: option %s not recognized", alt)); endif - + if (nargout == 0) s = strcat ("Z-test of mean(x) == %g against mean(x) %s %g,\n", - "with known var(x) == %g:\n", - " pval = %g\n"); + "with known var(x) == %g:\n", + " pval = %g\n"); printf (s, m, alt, m, v, pval); endif
--- a/scripts/statistics/tests/z_test_2.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/statistics/tests/z_test_2.m Thu Jan 13 08:40:53 2000 +0000 @@ -1,15 +1,15 @@ ## Copyright (C) 1995, 1996, 1997 Kurt Hornik -## +## ## 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 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. -## +## General Public License for more details. +## ## You should have received a copy of the GNU General Public License ## along with this file. If not, write to the Free Software Foundation, ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -23,15 +23,15 @@ ## distribution. ## ## With the optional argument string alt, the alternative of interest -## can be selected. +## can be selected. ## If alt is "!=" or "<>", the null is tested against the two-sided ## alternative mean(x) != mean(y). ## If alt is ">", the one-sided alternative mean(x) > mean(y) is -## used, similarly for "<". +## used, similarly for "<". ## The default is the two-sided case. ## ## pval is the p-value of the test. -## +## ## If no output argument is given, the p-value of the test is displayed ## along with some information. @@ -39,25 +39,25 @@ ## Description: Compare means of two normal samples with known variances function [pval, z] = z_test_2 (x, y, v_x, v_y, alt) - + if ((nargin < 4) || (nargin > 5)) usage ("[pval, z] = z_test_2 (x, y, v_x, v_y [, alt])"); endif - + if (! (is_vector (x) && is_vector (y))) error("z_test_2: both x and y must be vectors"); elseif (! (is_scalar (v_x) && (v_x > 0) - && is_scalar (v_y) && (v_y > 0))) + && is_scalar (v_y) && (v_y > 0))) error ("z_test_2: both v_x and v_y must be positive scalars."); endif - + n_x = length (x); n_y = length (y); mu_x = sum (x) / n_x; mu_y = sum (y) / n_y; z = (mu_x - mu_y) / sqrt (v_x / n_x + v_y / n_y); cdf = stdnormal_cdf (z); - + if (nargin == 4) alt = "!="; endif @@ -73,12 +73,12 @@ else error (sprintf ("z_test_2: option %s not recognized", alt)); endif - + if (nargout == 0) s = strcat ("Two-sample Z-test of mean(x) == mean(y) against ", - "mean(x) %s mean(y),\n", - "with known var(x) == %g and var(y) == %g:\n", - " pval = %g\n"); + "mean(x) %s mean(y),\n", + "with known var(x) == %g and var(y) == %g:\n", + " pval = %g\n"); printf (s, alt, v_x, v_y, pval); endif
--- a/scripts/strings/deblank.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/strings/deblank.m Thu Jan 13 08:40:53 2000 +0000 @@ -19,7 +19,7 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} deblank (@var{s}) -## Removes the trailing blanks from the string @var{s}. +## Removes the trailing blanks from the string @var{s}. ## @end deftypefn ## Author: Kurt Hornik <Kurt.Hornik@ci.tuwien.ac.at>
--- a/scripts/strings/dec2bin.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/strings/dec2bin.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,7 +21,7 @@ ## @deftypefn {Function File} {} dec2bin (@var{n}) ## Return a binary number corresponding the nonnegative decimal number ## @var{n}, as a string of ones and zeros. For example, -## +## ## @example ## dec2bin (14) ## @result{} "1110" @@ -50,14 +50,14 @@ for i = 1:len tmp = x (i); if (tmp == round (tmp) && tmp >= 0) - while (tmp >= 2) - z = fix (tmp ./ 2); - y = [y, tmp - 2 * z]; - tmp = z; - endwhile - y = [y, tmp]; + while (tmp >= 2) + z = fix (tmp ./ 2); + y = [y, tmp - 2 * z]; + tmp = z; + endwhile + y = [y, tmp]; else - error ("dec2hex: invalid conversion"); + error ("dec2hex: invalid conversion"); endif endfor y = fliplr (y);
--- a/scripts/strings/dec2hex.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/strings/dec2hex.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,7 +21,7 @@ ## @deftypefn {Function File} {} dec2hex (@var{n}) ## Return the hexadecimal number corresponding to the nonnegative decimal ## number @var{n}, as a string. For example, -## +## ## @example ## dec2hex (2748) ## @result{} "abc" @@ -50,9 +50,9 @@ for i = 1:len tmp = d (i); if (tmp == round (tmp)) - h = sprintf ("%s%x", h, tmp); + h = sprintf ("%s%x", h, tmp); else - error ("dec2hex: invalid conversion"); + error ("dec2hex: invalid conversion"); endif endfor unwind_protect_cleanup
--- a/scripts/strings/findstr.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/strings/findstr.m Thu Jan 13 08:40:53 2000 +0000 @@ -23,7 +23,7 @@ ## @var{s} and @var{t} where an occurrence of the shorter of the two starts. ## If the optional argument @var{overlap} is nonzero, the returned vector ## can include overlapping positions (this is the default). For example, -## +## ## @example ## findstr ("ababab", "a") ## @result{} [ 1, 3, 5 ] @@ -68,10 +68,10 @@ k = 1; while (k <= limit) if (s (ind + k - 1) == t) - v (++i) = k; - if (! overlap) - k = k + l_t - 1; - endif + v (++i) = k; + if (! overlap) + k = k + l_t - 1; + endif endif k++; endwhile
--- a/scripts/strings/hex2dec.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/strings/hex2dec.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,7 +21,7 @@ ## @deftypefn {Function File} {} hex2dec (@var{s}) ## Return the decimal number corresponding to the hexadecimal number stored ## in the string @var{s}. For example, -## +## ## @example ## hex2dec ("12B") ## @result{} 299 @@ -45,14 +45,14 @@ for i = 1:nr s = h (i, :); if (isxdigit (s)) - tmp = sscanf (s, "%x"); - if (isempty (tmp)) - error ("hex2dec: invalid conversion"); - else - d (i) = tmp; - endif + tmp = sscanf (s, "%x"); + if (isempty (tmp)) + error ("hex2dec: invalid conversion"); + else + d (i) = tmp; + endif else - error ("hex2dec: argument must be a string of hexadecimal digits"); + error ("hex2dec: argument must be a string of hexadecimal digits"); endif endfor else
--- a/scripts/strings/index.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/strings/index.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,12 +21,12 @@ ## @deftypefn {Function File} {} index (@var{s}, @var{t}) ## Return the position of the first occurrence of the string @var{t} in the ## string @var{s}, or 0 if no occurrence is found. For example, -## +## ## @example ## index ("Teststring", "t") ## @result{} 4 ## @end example -## +## ## @strong{Note:} This function does not work for arrays of strings. ## @end deftypefn @@ -55,10 +55,10 @@ if (l_t <= l_s) tmp = l_s - l_t + 1; for idx = 1 : tmp - if (strcmp (substr (s, idx, l_t), t)) - n = idx; - return; - endif + if (strcmp (substr (s, idx, l_t), t)) + n = idx; + return; + endif endfor endif
--- a/scripts/strings/isletter.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/strings/isletter.m Thu Jan 13 08:40:53 2000 +0000 @@ -18,7 +18,7 @@ ## 02111-1307, USA. ## @deftypefn {Function File } { @var{bool} =} isletter(@var{s}) -## Returns true if @var{s} is a letter false otherwise. +## Returns true if @var{s} is a letter false otherwise. ## @end deftypefn ## @seealso{isalpha}
--- a/scripts/strings/rindex.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/strings/rindex.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,12 +21,12 @@ ## @deftypefn {Function File} {} rindex (@var{s}, @var{t}) ## Return the position of the last occurrence of the string @var{t} in the ## string @var{s}, or 0 if no occurrence is found. For example, -## +## ## @example ## rindex ("Teststring", "t") ## @result{} 6 ## @end example -## +## ## @strong{Note:} This function does not work for arrays of strings. ## @end deftypefn @@ -51,10 +51,10 @@ if (l_t <= l_s) tmp = l_s - l_t + 1; for idx = tmp : -1 : 1 - if (strcmp (substr (s, idx, l_t), t)) - n = idx; - return; - endif + if (strcmp (substr (s, idx, l_t), t)) + n = idx; + return; + endif endfor endif
--- a/scripts/strings/split.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/strings/split.m Thu Jan 13 08:40:53 2000 +0000 @@ -22,7 +22,7 @@ ## Divides the string @var{s} into pieces separated by @var{t}, returning ## the result in a string array (padded with blanks to form a valid ## matrix). For example, -## +## ## @example ## split ("Test string", "t") ## @result{} "Tes "
--- a/scripts/strings/str2mat.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/strings/str2mat.m Thu Jan 13 08:40:53 2000 +0000 @@ -22,7 +22,7 @@ ## Return a matrix containing the strings @var{s_1}, @dots{}, @var{s_n} as ## its rows. Each string is padded with blanks in order to form a valid ## matrix. -## +## ## @strong{Note:} ## This function is modelled after @sc{Matlab}. In Octave, you can create ## a matrix of strings by @code{[@var{s_1}; @dots{}; @var{s_n}]} even if
--- a/scripts/strings/strcat.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/strings/strcat.m Thu Jan 13 08:40:53 2000 +0000 @@ -20,7 +20,7 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} strcat (@var{s1}, @var{s2}, @dots{}) ## Return a string containing all the arguments concatenated. For example, -## +## ## @example ## @group ## s = [ "ab"; "cde" ]; @@ -40,18 +40,18 @@ unwind_protect empty_list_elements_ok = 1; if (isstr (s) && isstr (t)) - tmpst = [s, t]; + tmpst = [s, t]; else - error ("strcat: all arguments must be strings"); + error ("strcat: all arguments must be strings"); endif n = nargin - 2; while (n--) - tmp = va_arg (); - if (isstr (tmp)) + tmp = va_arg (); + if (isstr (tmp)) tmpst = [tmpst, tmp]; - else + else error ("strcat: all arguments must be strings"); - endif + endif endwhile unwind_protect_cleanup empty_list_elements_ok = save_empty_list_elements_ok;
--- a/scripts/strings/strcmp.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/strings/strcmp.m Thu Jan 13 08:40:53 2000 +0000 @@ -20,7 +20,7 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} strcmp (@var{s1}, @var{s2}) ## Compares two strings, returning 1 if they are the same, and 0 otherwise. -## +## ## @strong{Note:} For compatibility with @sc{Matlab}, Octave's strcmp ## function returns 1 if the strings are equal, and 0 otherwise. This is ## just the opposite of the corresponding C library function.
--- a/scripts/strings/strrep.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/strings/strrep.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,7 +21,7 @@ ## @deftypefn {Function File} {} strrep (@var{s}, @var{x}, @var{y}) ## Replaces all occurrences of the substring @var{x} of the string @var{s} ## with the string @var{y}. For example, -## +## ## @example ## strrep ("This is a test string", "is", "&%$") ## @result{} "Th&%$ &%$ a test string" @@ -59,8 +59,8 @@ tmp = s (1 : ind (1) - 1); t = strcat (tmp, y); for k = 1 : len - 1 - tmp = s (ind (k) + l_x : ind (k+1) - 1); - t = strcat (t, tmp, y); + tmp = s (ind (k) + l_x : ind (k+1) - 1); + t = strcat (t, tmp, y); endfor tmp = s (ind(len) + l_x : length (s)); t = [t, tmp];
--- a/scripts/strings/substr.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/strings/substr.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,22 +21,22 @@ ## @deftypefn {Function File} {} substr (@var{s}, @var{beg}, @var{len}) ## Return the substring of @var{s} which starts at character number ## @var{beg} and is @var{len} characters long. -## +## ## If OFFSET is negative, extraction starts that far from the end of ## the string. If LEN is omitted, the substring extends to the end ## of S. -## +## ## For example, -## +## ## @example ## substr ("This is a test string", 6, 9) ## @result{} "is a test" ## @end example -## +## ## @quotation ## @strong{Note:} ## This function is patterned after AWK. You can get the same result by -## @code{@var{s} (@var{beg} : (@var{beg} + @var{len} - 1))}. +## @code{@var{s} (@var{beg} : (@var{beg} + @var{len} - 1))}. ## @end quotation ## @end deftypefn @@ -53,19 +53,19 @@ nc = columns (s); if (abs (offset) > 0 && abs (offset) <= nc) if (offset > 0) - beg = offset; + beg = offset; else - beg = nc + offset + 1; + beg = nc + offset + 1; endif if (nargin == 2) - eos = nc; + eos = nc; else - eos = beg + len - 1; + eos = beg + len - 1; endif if (eos <= nc) - t = s (:, beg:eos); + t = s (:, beg:eos); else - error ("substr: length = %d out of range", len); + error ("substr: length = %d out of range", len); endif else error ("substr: offset = %d out of range", offset);
--- a/scripts/time/asctime.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/time/asctime.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,14 +21,14 @@ ## @deftypefn {Function File} {} asctime (@var{tm_struct}) ## Convert a time structure to a string using the following five-field ## format: Thu Mar 28 08:40:14 1996. For example, -## +## ## @example ## @group ## asctime (localtime (time ()) ## @result{} "Mon Feb 17 01:15:06 1997\n" ## @end group ## @end example -## +## ## This is equivalent to @code{ctime (time ())}. ## @end deftypefn
--- a/scripts/time/clock.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/time/clock.m Thu Jan 13 08:40:53 2000 +0000 @@ -21,14 +21,14 @@ ## @deftypefn {Function File} {} clock () ## Return a vector containing the current year, month (1-12), day (1-31), ## hour (0-23), minute (0-59) and second (0-61). For example, -## +## ## @example ## @group ## clock () ## @result{} [ 1993, 8, 20, 4, 56, 1 ] ## @end group ## @end example -## +## ## The function clock is more accurate on systems that have the ## @code{gettimeofday} function. ## @end deftypefn
--- a/scripts/time/ctime.m Thu Jan 13 08:32:16 2000 +0000 +++ b/scripts/time/ctime.m Thu Jan 13 08:40:53 2000 +0000 @@ -23,7 +23,7 @@ ## integer), to the local time and return a string of the same form as ## @code{asctime}. The function @code{ctime (time)} is equivalent to ## @code{asctime (localtime (time))}. For example, -## +## ## @example ## @group ## ctime (time ())