octave-cvsupdate

[Octave-cvsupdate] SF.net SVN: octave:[6981] trunk/octave-forge/extra/tsa/inst/mvfilter.m

[<sch...@us...>]

Revision: 6981
          http://octave.svn.sourceforge.net/octave/?rev=6981&view=rev
Author:   schloegl
Date:     2010-03-02 23:38:34 +0000 (Tue, 02 Mar 2010)

Log Message:
-----------
bug fix from Arto Karinen

Modified Paths:
--------------
    trunk/octave-forge/extra/tsa/inst/mvfilter.m

Modified: trunk/octave-forge/extra/tsa/inst/mvfilter.m
===================================================================
--- trunk/octave-forge/extra/tsa/inst/mvfilter.m	2010-03-02 02:09:59 UTC (rev 6980)
+++ trunk/octave-forge/extra/tsa/inst/mvfilter.m	2010-03-02 23:38:34 UTC (rev 6981)
@@ -1,3 +1,4 @@
+
 function [x,z]=mvfilter(B,A,x,z)
 % Multi-variate filter function
 %
@@ -6,7 +7,7 @@
 %
 %  Y = MVFILTER(B,A,X) filters the data in matrix X with the
 %    filter described by cell arrays A and B to create the filtered
-%    data Y.  The filter is a "Direct Form II Transposed"
+%    data Y.  The filter is a 'Direct Form II Transposed'
 %    implementation of the standard difference equation:
 % 
 %    a0*Y(n) = b0*X(:,n) + b1*X(:,n-1) + ... + bq*X(:,n-q)
@@ -97,7 +98,7 @@
 end; 
 
 for k = 1:N,
-        acc = B(:,1:M) * (x(:,k) + z(:,1));  % / A{1};
+        acc = B(:,1:M) * x(:,k) + z(:,1);  % / A{1};
 	z   = [z(:,2:oo), zeros(M,1)];
         for l = 1:q,
         	z(:,l) = z(:,l) + B(:,l*M+(1:M)) * x(:,k);
@@ -107,3 +108,4 @@
         end;
         x(:,k) = acc;
 end;
+


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

[Octave-cvsupdate] SF.net SVN: octave:[10726] trunk/octave-forge/extra/tsa/inst/mvfilter.m

[<sch...@us...>]

Revision: 10726
          http://octave.svn.sourceforge.net/octave/?rev=10726&view=rev
Author:   schloegl
Date:     2012-07-04 10:23:38 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
fix normalization when A0 is not the identity matrix

Modified Paths:
--------------
    trunk/octave-forge/extra/tsa/inst/mvfilter.m

Modified: trunk/octave-forge/extra/tsa/inst/mvfilter.m
===================================================================
--- trunk/octave-forge/extra/tsa/inst/mvfilter.m	2012-07-03 15:39:22 UTC (rev 10725)
+++ trunk/octave-forge/extra/tsa/inst/mvfilter.m	2012-07-04 10:23:38 UTC (rev 10726)
@@ -1,4 +1,3 @@
-
 function [x,z]=mvfilter(B,A,x,z)
 % Multi-variate filter function
 %
@@ -30,7 +29,7 @@
 % see also: MVAR, FILTER
 
 %	$Id$
-%	Copyright (C) 1996-2003 by Alois Schloegl <a.s...@ie...>	
+%	Copyright (C) 1996-2003,2010,2012 by Alois Schloegl <alo...@is...>	
 %
 %    This program is free software: you can redistribute it and/or modify
 %    it under the terms of the GNU General Public License as published by
@@ -84,18 +83,13 @@
 end;
 
 %%%%% normalization to A{1}=I;
-if p<=q, 
-        for k=1:p,
-                %A{k}=A{k}/A{1};
-                A(:,k*M+(1:M)) = A(:,k*M+(1:M)) / A(:,1:M);
+	for k=1:p,
+                A(:,k*M+(1:M)) = A(:,1:M) \ A(:,k*M+(1:M));
         end;
-	A(:,1:M) = eye(M);
-else
         for k=0:q,
-                %B{k}=B{k}/A{1};
-                B(:,k*M+(1:M)) = B(:,k*M+(1:M)) / A(:,1:M);
+                B(:,k*M+(1:M)) = A(:,1:M) \ B(:,k*M+(1:M));
         end;
-end; 
+	A(:,1:M) = eye(M);
 
 for k = 1:N,
         acc = B(:,1:M) * x(:,k) + z(:,1);  % / A{1};

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